The job plugins can now be plugged in a data plugin or in a molecular

viewer
Bug fix when closing a lugin pane
Bug fix with DL_POLY converter plugin

MDANSE/Framework/Jobs/AngularCorrelation.py

@@ -65,9 +65,9 @@ class AngularCorrelation(IJob):
     
     label = "Angular Correlation"
 
-    category = ('Dynamics',)
+    category = ('Analysis','Dynamics',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
     
     settings = collections.OrderedDict()    
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/AreaPerMolecule.py

@@ -54,9 +54,9 @@ class AreaPerMolecule(IJob):
 
     label = "Area Per Molecule"
     
-    category = ('Structure',)
+    category = ('Analysis','Structure',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{'default':os.path.join('..','..','..','Data','Trajectories','MMTK','dmpc_in_periodic_universe.nc')})

MDANSE/Framework/Jobs/BoxTranslatedTrajectory.py

@@ -51,9 +51,9 @@ class BoxCenteredTrajectory(IJob):
     
     label = "Box Translated Trajectory"
 
-    category = ('Trajectory',)
+    category = ('Analysis','Trajectory',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/CenterOfMassesTrajectory.py

@@ -49,9 +49,9 @@ class CenterOfMassesTrajectory(IJob):
     
     label = "Center Of Masses Trajectory"
 
-    category = ('Trajectory',)
+    category = ('Analysis','Trajectory',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/Converters/DL_POLY.py

@@ -287,7 +287,7 @@ class DL_POLYConverter(Converter):
 
     type = 'dl_poly'
     
-    label = "DL_POLY"
+    label = "DL-POLY"
 
     settings = collections.OrderedDict()   
     settings['field_file'] = ('input_file',{'wildcard':"FIELD files|FIELD*|All files|*",

MDANSE/Framework/Jobs/CoordinationNumber.py

@@ -46,9 +46,9 @@ class CoordinationNumber(DistanceHistogram):
 
     label = "Coordination Number"
     
-    category = ('Structure',)
+    category = ('Analysis','Structure',)
     
-    ancestor = ["mmtk_trajectory"]        
+    ancestor = ["mmtk_trajectory","molecular_viewer"]        
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/CroppedTrajectory.py

@@ -47,9 +47,9 @@ class CroppedTrajectory(IJob):
     
     label = "Cropped Trajectory"
 
-    category = ('Trajectory',)
+    category = ('Analysis','Trajectory',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/CurrentCorrelationFunction.py

@@ -54,9 +54,9 @@ class CurrentCorrelationFunction(IJob):
     
     label = "Current Correlation Function"
 
-    category = ('Scattering',)
+    category = ('Analysis','Scattering',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/Density.py

@@ -45,9 +45,9 @@ class Density(IJob):
     
     label = "Density"
 
-    category = ('Thermodynamics',)
+    category = ('Analysis','Thermodynamics',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/DensityOfStates.py

@@ -49,9 +49,9 @@ class DensityOfStates(IJob):
     
     label = "Density Of States"
 
-    category = ('Dynamics',)
+    category = ('Analysis','Dynamics',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/DensityProfile.py

@@ -52,9 +52,9 @@ class DensityProfile(IJob):
 
     label = "Density Profile"
     
-    category = ('Structure',)
+    category = ('Analysis','Structure',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
     
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/DipoleAutoCorrelationFunction.py

@@ -45,9 +45,9 @@ class DipoleAutoCorrelationFunction(IJob):
 
     label = "Dipole AutoCorrelation Function"
     
-    category = ('Infrared',)
+    category = ('Analysis','Infrared',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
     
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/DynamicCoherentStructureFactor.py

@@ -55,9 +55,9 @@ class DynamicCoherentStructureFactor(IJob):
     
     label = "Dynamic Coherent Structure Factor"
 
-    category = ('Scattering',)
+    category = ('Analysis','Scattering',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/DynamicIncoherentStructureFactor.py

@@ -50,9 +50,9 @@ class DynamicIncoherentStructureFactor(IJob):
     
     label = "Dynamic Incoherent Structure Factor"
 
-    category = ('Scattering',)
+    category = ('Analysis','Scattering',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
     
     settings = collections.OrderedDict()
     settings['trajectory']=('mmtk_trajectory',{})

MDANSE/Framework/Jobs/Eccentricity.py

@@ -86,9 +86,9 @@ class Eccentricity(IJob):
 
     label = "Eccentricity"
     
-    category = ('Structure',)
+    category = ('Analysis','Structure',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/ElasticIncoherentStructureFactor.py

@@ -54,9 +54,9 @@ class ElasticIncoherentStructureFactor(IJob):
     label = "Elastic Incoherent Structure Factor"
 
     # The category of the analysis.
-    category = ('Scattering',)
+    category = ('Analysis','Scattering',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
 
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/GaussianDynamicIncoherentStructureFactor.py

@@ -50,9 +50,9 @@ class GaussianDynamicIncoherentStructureFactor(IJob):
     
     label = "Gaussian Dynamic Incoherent Structure Factor"
 
-    category = ('Scattering',)
+    category = ('Analysis','Scattering',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
     
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/GeneralAutoCorrelationFunction.py

@@ -47,9 +47,9 @@ class GeneralAutoCorrelationFunction(IJob):
     
     label = "General AutoCorrelation Function"
 
-    category = ('Dynamics',)
+    category = ('Analysis','Dynamics',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
     
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/GlobalMotionFilteredTrajectory.py

@@ -63,9 +63,9 @@ class GlobalMotionFilteredTrajectory(IJob):
     
     label = "Global Motion Filtered Trajectory"
 
-    category = ('Trajectory',)
+    category = ('Analysis','Trajectory',)
     
-    ancestor = ["mmtk_trajectory"]
+    ancestor = ["mmtk_trajectory","molecular_viewer"]
         
     settings = collections.OrderedDict()
     settings['trajectory'] = ('mmtk_trajectory',{})

MDANSE/Framework/Jobs/JobStatus.py

@@ -32,12 +32,7 @@ class JobStatus(Status):
         
         self.save_status()
                     
-    def finish_status(self,message):
-
-        status = message
-
-        if status != self:
-            return
+    def finish_status(self):
 
         self.cleanup()
                     
@@ -47,9 +42,7 @@ class JobStatus(Status):
         return self._state    
 
     def cleanup(self):
-        
-        return
-                
+                        
         try:
             os.unlink(self._state['temporary_file'])
         except: