Author: bugman Date: Fri Mar 16 07:50:42 2007 New Revision: 3204 URL: http://svn.gna.org/viewcvs/relax?rev=3204&view=rev Log: Important fix for the PipeContainer data structure. All of the objects of the PipeContainer where being instantiated as objects of the class rather than the separate instances. Hence two different PipeContainer instances contained the same objects! All object instantiation is now done within the __init__() method to avoid the problem. Modified: 1.3/data/pipe_container.py Modified: 1.3/data/pipe_container.py URL: http://svn.gna.org/viewcvs/relax/1.3/data/pipe_container.py?rev=3204&r1=3203&r2=3204&view=diff ============================================================================== --- 1.3/data/pipe_container.py (original) +++ 1.3/data/pipe_container.py Fri Mar 16 07:50:42 2007 @@ -34,28 +34,31 @@ class PipeContainer(Prototype): """Class containing all the program data.""" - # Molecular structure data. - structure = SpecificData() + def __init__(self): + """Set up all the PipeContainer data structures.""" - # Diffusion data. - diff = DiffTensorData() + # Molecular structure data. + self.structure = SpecificData() - # The molecule-residue-spin object. - mol = MoleculeList() + # Diffusion data. + self.diff = DiffTensorData() - # The data pipe type. - pipe_type = None + # The molecule-residue-spin object. + self.mol = MoleculeList() - # Hybrid models. - hybrid_runs = {} + # The data pipe type. + self.pipe_type = None - # Global minimisation statistics. - chi2 = None - iter = None - f_count = None - g_count = None - h_count = None - warning = None + # Hybrid models. + self.hybrid_runs = {} + + # Global minimisation statistics. + self.chi2 = None + self.iter = None + self.f_count = None + self.g_count = None + self.h_count = None + self.warning = None def __repr__(self):