Re #10681 Advanced properties removed from DirectReductionProperties

mantidproject · Dec 5, 2014 · 544b435 · 544b435
1 parent 3d2d8d8
commit 544b435
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 23 deletions.
diff --git a/Code/Mantid/scripts/Inelastic/DirectPropertyManager.py b/Code/Mantid/scripts/Inelastic/DirectPropertyManager.py
@@ -379,7 +379,6 @@ def __init__(self,Instrument,instr_run=None):
         #
         # define private properties served the class
         private_properties = {'descriptors':[],'subst_dict':{},'prop_allowed_values':{},'changed_properties':set(),
-        'advanced_properties':set(),
         'file_properties':[],'abs_norm_file_properties':[]};
         # place these properties to __dict__  with proper decoration
         self._set_private_properties(private_properties);
@@ -499,8 +498,6 @@ def __setattr__(self,name0,val):
 
         # record changes in the property
         self.__changed_properties.add(name);
-        if self.record_advanced_properties:
-           self.__advanced_properties.add(name);
 
    # ----------------------------
     def __getattr__(self,name):
@@ -547,14 +544,7 @@ def __getattr__(self,name):
     def getChangedProperties(self):
         """ method returns set of the properties changed from defaults """
         return self.__dict__[self._class_wrapper+'changed_properties'];
-    def getChangedAdvancedProperties(self):
-        """ method returns advanced properties, changed from defaults 
-          and recorded when record_advanced_properties was set to True
-
-          TODO: deal with this recording better. 
-          """ 
-        return self.__dict__[self._class_wrapper+'advanced_properties'];
-
+
     @property
     def relocate_dets(self) :
         if self.det_cal_file != None:

diff --git a/Code/Mantid/scripts/Inelastic/DirectReductionProperties.py b/Code/Mantid/scripts/Inelastic/DirectReductionProperties.py
@@ -159,9 +159,7 @@ def __init__(self,Instrument,run_workspace=None):
         object.__setattr__(self,'_second_white',None);
         object.__setattr__(self,'_mono_correction_factor',None);
 
-        # 
-        object.__setattr__(self,'_record_advanced_properties',False);
-
+
         self._set_instrument_and_facility(Instrument,run_workspace);
 
     #end
@@ -202,15 +200,6 @@ def seclond_white(self,value):
     def apply_detector_eff(self):
         return True;
     #-----------------------------------------------------------------------------------
-    #TODO: Implement auto-clearing decorator around it
-    @property
-    def record_advanced_properties(self):
-        return self._record_advanced_properties;
-    #
-    @record_advanced_properties.setter
-    def record_advanced_properties(self,value):
-         object.__setattr__(self,'_record_advanced_properties',bool(value));
-    #-----------------------------------------------------------------------------------
     @property 
     def psi(self):
         """ rotation angle (not available from IDF)"""