Re #10532 Fixed Merlin and Maps system tests

Modified property managed to allow it MonovanIntegrationRange accepting absolute energy range (used by MAPS system test)
mantidproject · Dec 3, 2014 · c573b48 · c573b48
1 parent 28985db
commit c573b48
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py
@@ -935,7 +935,7 @@ def convert_to_energy(self, mono_run, ei, white_run=None, mono_van=None,\
 
         self.prop_man.incident_energy = ei;      
         prop_man = self.prop_man;
-        prop_man.set_input_parameters_ignore_nan(sample_run=mono_run,incident_energy=ei,
+        prop_man.set_input_parameters_ignore_nan(sample_run=mono_run,
                                                  wb_run = white_run,monovan_run=mono_van,
                                                  wb_for_monovan_run =abs_white_run);   # note not-supported second ei for monovan
 

diff --git a/Code/Mantid/scripts/Inelastic/DirectPropertyManager.py b/Code/Mantid/scripts/Inelastic/DirectPropertyManager.py
@@ -126,12 +126,27 @@ def __get__(self,instance,type=None):
                 range = [lo_frac*ei,hi_frac*ei]
             return range
         else:
-            return def_range;
+            min_value = prop_helpers.gen_getter(instance.__dict__,'monovan_lo_value');
+            max_value = prop_helpers.gen_getter(instance.__dict__,'monovan_hi_value');
+
+            return [min_value,max_value];
 
     def __set__(self,instance,value):
-        if value != None:
-            raise NotImplementedError('Changing monovan_integr_range is not yet implemented. Try to set up monovan_lo_frac and monovan_hi_frac, which would specify energy limits') 
-        prop_helpers.gen_setter(instance.__dict__,'monovan_integr_range',value);
+        if value is None:
+            prop_helpers.gen_setter(instance.__dict__,'monovan_integr_range',None);
+        else:
+            if isinstance(value,str):
+                values = value.split(',');
+                result = [];
+                for val in values :
+                    result.append(int(val));
+                value = result;
+            if len(value) != 2:
+                raise KeyError("monovan_integr_range has to be list of two values, defining min/max values of integration range or None to use relative to incident energy limits")
+            prop_helpers.gen_setter(instance.__dict__,'monovan_lo_value',value[0]);
+            prop_helpers.gen_setter(instance.__dict__,'monovan_hi_value',value[1]);
+
+
 #end MonovanIntegrationRange