r12474 - /branches/bmrb/data/exp_info.py -- January 31, 2011 - 18:06

Author: bugman
Date: Mon Jan 31 18:06:50 2011
New Revision: 12474

URL: http://svn.gna.org/viewcvs/relax?rev=12474&view=rev
Log:
Fixes for the experimental info data structures.

The element_name and element_desc are now simply name and desc in the Element 
container.


Modified:
    branches/bmrb/data/exp_info.py

Modified: branches/bmrb/data/exp_info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/data/exp_info.py?rev=12474&r1=12473&r2=12474&view=diff
==============================================================================
--- branches/bmrb/data/exp_info.py (original)
+++ branches/bmrb/data/exp_info.py Mon Jan 31 18:06:50 2011
@@ -34,10 +34,10 @@
         """Initialise the data container."""
 
         # The name of the container.
-        self.element_name = "exp_info"
-
-        # The description of the container.
-        self.element_desc = "Experimental information"
+        self.name = "exp_info"
+
+        # The description of the container.
+        self.desc = "Experimental information"
 
         # Blacklisted objects.
         self.blacklist = ["citations", "software", "temp_calibration", 
"temp_control"]
@@ -93,10 +93,10 @@
         cite = Element()
 
         # The name of the container.
-        cite.element_name = "citation"
-
-        # The description of the container.
-        cite.element_desc = "Literature citation"
+        cite.name = "citation"
+
+        # The description of the container.
+        cite.desc = "Literature citation"
 
         # Set the attributes.
         cite.cite_id = cite_id
@@ -217,10 +217,10 @@
         peak_intensity_type = Element()
 
         # The name of the container.
-        peak_intensity_type.element_name = "peak_intensity_type"
-
-        # The description of the container.
-        peak_intensity_type.element_desc = "Temperature control methods for 
the relaxation data."
+        peak_intensity_type.name = "peak_intensity_type"
+
+        # The description of the container.
+        peak_intensity_type.desc = "Temperature control methods for the 
relaxation data."
 
         # Set the attributes.
         peak_intensity_type.ri_label = ri_label
@@ -284,10 +284,10 @@
         script = Element()
 
         # The name of the container.
-        script.element_name = "script"
-
-        # The description of the container.
-        script.element_desc = "Script used for the analysis"
+        script.name = "script"
+
+        # The description of the container.
+        script.desc = "Script used for the analysis"
 
         # Set the attributes.
         script.file = file
@@ -336,10 +336,10 @@
         software = Element()
 
         # The name of the container.
-        software.element_name = "software"
-
-        # The description of the container.
-        software.element_desc = "Software program used in the analysis"
+        software.name = "software"
+
+        # The description of the container.
+        software.desc = "Software program used in the analysis"
 
         # Set the attributes.
         software.name = name
@@ -384,10 +384,10 @@
         temp_calibration = Element()
 
         # The name of the container.
-        temp_calibration.element_name = "temp_calibration"
-
-        # The description of the container.
-        temp_calibration.element_desc = "Temperature calibration methods for 
the relaxation data."
+        temp_calibration.name = "temp_calibration"
+
+        # The description of the container.
+        temp_calibration.desc = "Temperature calibration methods for the 
relaxation data."
 
         # Set the attributes.
         temp_calibration.ri_label = ri_label
@@ -429,10 +429,10 @@
         temp_control = Element()
 
         # The name of the container.
-        temp_control.element_name = "temp_control"
-
-        # The description of the container.
-        temp_control.element_desc = "Temperature control methods for the 
relaxation data."
+        temp_control.name = "temp_control"
+
+        # The description of the container.
+        temp_control.desc = "Temperature control methods for the relaxation 
data."
 
         # Set the attributes.
         temp_control.ri_label = ri_label