Author: bugman
Date: Thu Oct 29 15:58:39 2009
New Revision: 9851
URL: http://svn.gna.org/viewcvs/relax?rev=9851&view=rev
Log:
The setting up of software and its citations is now functional again.
Modified:
branches/bmrb/generic_fns/bmrb.py
branches/bmrb/generic_fns/exp_info.py
Modified: branches/bmrb/generic_fns/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/bmrb.py?rev=9851&r1=9850&r2=9851&view=diff
==============================================================================
--- branches/bmrb/generic_fns/bmrb.py (original)
+++ branches/bmrb/generic_fns/bmrb.py Thu Oct 29 15:58:39 2009
@@ -103,11 +103,11 @@
mkdir_nofail(directory, verbosity=0)
# Add the relax citations.
- cdp.exp_info.add_citation(cite_id='relax_ref1',
authors=exp_info.RELAX_CITE1_AUTHORS, doi=exp_info.RELAX_CITE1_DOI,
pubmed_id=exp_info.RELAX_CITE1_PUBMED_ID,
full_citation=exp_info.RELAX_CITE1_FULL_CITATION,
title=exp_info.RELAX_CITE1_TITLE, status=exp_info.RELAX_CITE1_STATUS,
type=exp_info.RELAX_CITE1_TYPE,
journal_abbrev=exp_info.RELAX_CITE1_JOURNAL_ABBREV,
journal_full=exp_info.RELAX_CITE1_JOURNAL_FULL,
volume=exp_info.RELAX_CITE1_VOLUME, issue=exp_info.RELAX_CITE1_ISSUE,
page_first=exp_info.RELAX_CITE1_PAGE_FIRST,
page_last=exp_info.RELAX_CITE1_PAGE_LAST, year=exp_info.RELAX_CITE1_YEAR)
- cdp.exp_info.add_citation(cite_id='relax_ref2',
authors=exp_info.RELAX_CITE2_AUTHORS, doi=exp_info.RELAX_CITE2_DOI,
pubmed_id=exp_info.RELAX_CITE2_PUBMED_ID,
full_citation=exp_info.RELAX_CITE2_FULL_CITATION,
title=exp_info.RELAX_CITE2_TITLE, status=exp_info.RELAX_CITE2_STATUS,
type=exp_info.RELAX_CITE2_TYPE,
journal_abbrev=exp_info.RELAX_CITE2_JOURNAL_ABBREV,
journal_full=exp_info.RELAX_CITE2_JOURNAL_FULL,
volume=exp_info.RELAX_CITE2_VOLUME, issue=exp_info.RELAX_CITE2_ISSUE,
page_first=exp_info.RELAX_CITE2_PAGE_FIRST,
page_last=exp_info.RELAX_CITE2_PAGE_LAST, year=exp_info.RELAX_CITE2_YEAR)
+ cdp.exp_info.add_citation(cite_id='relax_ref1',
authors=exp_info.CITE['relax 1'].cite_authors, doi=exp_info.CITE['relax
1'].cite_doi, pubmed_id=exp_info.CITE['relax 1'].cite_pubmed_id,
full_citation=exp_info.CITE['relax 1'].cite_full_citation,
title=exp_info.CITE['relax 1'].cite_title, status=exp_info.CITE['relax
1'].cite_status, type=exp_info.CITE['relax 1'].cite_type,
journal_abbrev=exp_info.CITE['relax 1'].cite_journal_abbrev,
journal_full=exp_info.CITE['relax 1'].cite_journal_full,
volume=exp_info.CITE['relax 1'].cite_volume, issue=exp_info.CITE['relax
1'].cite_issue, page_first=exp_info.CITE['relax 1'].cite_page_first,
page_last=exp_info.CITE['relax 1'].cite_page_last, year=exp_info.CITE['relax
1'].cite_year)
+ cdp.exp_info.add_citation(cite_id='relax_ref2',
authors=exp_info.CITE['relax 2'].cite_authors, doi=exp_info.CITE['relax
2'].cite_doi, pubmed_id=exp_info.CITE['relax 2'].cite_pubmed_id,
full_citation=exp_info.CITE['relax 2'].cite_full_citation,
title=exp_info.CITE['relax 2'].cite_title, status=exp_info.CITE['relax
2'].cite_status, type=exp_info.CITE['relax 2'].cite_type,
journal_abbrev=exp_info.CITE['relax 2'].cite_journal_abbrev,
journal_full=exp_info.CITE['relax 2'].cite_journal_full,
volume=exp_info.CITE['relax 2'].cite_volume, issue=exp_info.CITE['relax
2'].cite_issue, page_first=exp_info.CITE['relax 2'].cite_page_first,
page_last=exp_info.CITE['relax 2'].cite_page_last, year=exp_info.CITE['relax
2'].cite_year)
# Add the relax software package.
- cdp.exp_info.software_setup(name=exp_info.RELAX_NAME,
version=version_full(), vendor_name=exp_info.RELAX_AUTHORS,
url=exp_info.RELAX_URL, cite_ids=['relax_ref1', 'relax_ref2'],
tasks=exp_info.RELAX_TASKS)
+ cdp.exp_info.software_setup(name=exp_info.CITE['relax 1'].name,
version=version_full(), vendor_name=exp_info.CITE['relax 1'].authors,
url=exp_info.CITE['relax 1'].url, cite_ids=['relax_ref1', 'relax_ref2'],
tasks=exp_info.CITE['relax 1'].tasks)
# Execute the specific BMRB writing code.
write_function(file_path, version=version)
Modified: branches/bmrb/generic_fns/exp_info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/exp_info.py?rev=9851&r1=9850&r2=9851&view=diff
==============================================================================
--- branches/bmrb/generic_fns/exp_info.py (original)
+++ branches/bmrb/generic_fns/exp_info.py Thu Oct 29 15:58:39 2009
@@ -372,7 +372,7 @@
cdp.exp_info.add_citation(cite_id=cite_ids[i][j],
authors=CITE[keys[i][j]].cite_authors, doi=CITE[keys[i][j]].cite_doi,
pubmed_id=CITE[keys[i][j]].cite_pubmed_id,
full_citation=CITE[keys[i][j]].cite_full_citation,
title=CITE[keys[i][j]].cite_title, status=CITE[keys[i][j]].cite_status,
type=CITE[keys[i][j]].cite_type,
journal_abbrev=CITE[keys[i][j]].cite_journal_abbrev,
journal_full=CITE[keys[i][j]].cite_journal_full,
volume=CITE[keys[i][j]].cite_volume,
page_first=CITE[keys[i][j]].cite_page_first,
page_last=CITE[keys[i][j]].cite_page_last, year=CITE[keys[i][j]].cite_year)
# Add the software info.
- cdp.exp_info.software_setup(name=CITE[keys[i][0]].name,
version=versions, vendor_name=CITE[keys[i][0]].authors,
url=CITE[keys[i][0]].url, cite_ids=cite_ids, tasks=CITE[keys[i][0]].tasks)
+ cdp.exp_info.software_setup(name=CITE[keys[i][0]].name,
version=versions[i], vendor_name=CITE[keys[i][0]].authors,
url=CITE[keys[i][0]].url, cite_ids=cite_ids, tasks=CITE[keys[i][0]].tasks)
def thiol_state(state=None):
r9851 - in /branches/bmrb/generic_fns: bmrb.py exp_info.py