Author: bugman
Date: Fri Oct 9 21:44:46 2009
New Revision: 9719
URL: http://svn.gna.org/viewcvs/relax?rev=9719&view=rev
Log:
Added the software task to the software containers.
Modified:
branches/bmrb/data/exp_info.py
branches/bmrb/generic_fns/bmrb.py
Modified: branches/bmrb/data/exp_info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/data/exp_info.py?rev=9719&r1=9718&r2=9719&view=diff
==============================================================================
--- branches/bmrb/data/exp_info.py (original)
+++ branches/bmrb/data/exp_info.py Fri Oct 9 21:44:46 2009
@@ -43,7 +43,7 @@
self.blacklist = ['software']
- def software_setup(self, name, version=None, url=None, vendor_name=None,
cite=None):
+ def software_setup(self, name, version=None, url=None, vendor_name=None,
cite=None, tasks=None):
"""Set up the software information.
@param name: The name of the software program.
@@ -56,6 +56,8 @@
@type vendor_name: str
@keyword cite: The literature citation.
@type cite: None or str
+ @keyword tasks: The tasks performed by the program.
+ @type tasks: list of str
"""
# Initialise the container if needed.
@@ -63,7 +65,7 @@
self.software = SoftwareList()
# Append a container.
- self.software.append(Software(name, version=version, url=url,
vendor_name=vendor_name, cite=cite))
+ self.software.append(Software(name, version=version, url=url,
vendor_name=vendor_name, cite=cite, tasks=tasks))
@@ -84,7 +86,7 @@
class Software(Element):
"""The individual software data container."""
- def __init__(self, name, version=None, url=None, vendor_name=None,
cite=None):
+ def __init__(self, name, version=None, url=None, vendor_name=None,
cite=None, tasks=None):
"""Initialise the data container.
@param name: The name of the software program.
@@ -97,6 +99,8 @@
@type vendor_name: str
@keyword cite: The literature citation.
@type cite: None or str
+ @keyword tasks: The tasks performed by the program.
+ @type tasks: list of str
"""
# The name of the container.
@@ -115,7 +119,5 @@
self.vendor_name = vendor_name
if cite:
self.cite = cite
-
-
-
-
+ if tasks:
+ self.tasks = tasks
Modified: branches/bmrb/generic_fns/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/bmrb.py?rev=9719&r1=9718&r2=9719&view=diff
==============================================================================
--- branches/bmrb/generic_fns/bmrb.py (original)
+++ branches/bmrb/generic_fns/bmrb.py Fri Oct 9 21:44:46 2009
@@ -92,7 +92,7 @@
# NMRPipe.
if name == 'NMRPipe':
- cdp.exp_info.software_setup('NMRPipe', version=version,
url="http://spin.niddk.nih.gov/NMRPipe/";, vendor_name="Delaglio, F.",
cite="Delaglio, F., Grzesiek, S., Vuister, G. W., Zhu, G., Pfeifer, J., and
Bax, A. (1995). NMRPipe: a multidimensional spectral processing system based
on UNIX pipes. J. Biomol. NMR. 6, 277-293.")
+ cdp.exp_info.software_setup('NMRPipe', version=version,
url="http://spin.niddk.nih.gov/NMRPipe/";, vendor_name="Delaglio, F.",
cite="Delaglio, F., Grzesiek, S., Vuister, G. W., Zhu, G., Pfeifer, J., and
Bax, A. (1995). NMRPipe: a multidimensional spectral processing system based
on UNIX pipes. J. Biomol. NMR. 6, 277-293.", tasks=["processing"])
# Sparky.
elif name == 'Sparky':
@@ -101,8 +101,7 @@
raise RelaxError("The Sparky version number has not been
supplied.")
# Add the data.
- cdp.exp_info.software_setup('Sparky', version=version,
url="http://www.cgl.ucsf.edu/home/sparky/";, vendor_name="Goddard, T. D.",
cite="Goddard, T. D. and Kneller, D. G., SPARKY 3, University of California,
San Francisco."
-)
+ cdp.exp_info.software_setup('Sparky', version=version,
url="http://www.cgl.ucsf.edu/home/sparky/";, vendor_name="Goddard, T. D.",
cite="Goddard, T. D. and Kneller, D. G., SPARKY 3, University of California,
San Francisco.", tasks=["spectral analysis"])
def write(file=None, directory=None, version='3.1', force=False):
r9719 - in /branches/bmrb: data/exp_info.py generic_fns/bmrb.py