refs #6667 diagnose seems work

mantidproject · Jun 14, 2013 · 3af63f7 · 3af63f7
1 parent 568b5c8
commit 3af63f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Code/Mantid/instrument/MAPS_Parameters.xml b/Code/Mantid/instrument/MAPS_Parameters.xml
@@ -202,7 +202,6 @@
   <value val="0.0"/>
 </parameter>
 
-
 <!-- Variation for ratio test with second white beam -->
 <parameter name="diag_variation">
   <value val="1.1"/>
@@ -315,6 +314,7 @@
        samp_lo    = diag_samp_median_sigma_lo=diag_samp_lo;
        samp_hi    = diag_samp_median_sigma_hi=diag_samp_hi;
        samp_sig   = diag_samp_median_sigma=diag_samp_sig;
+       variation  = diag_variation;
        bleed_test=bleed=diag_bleed_test;
        ei-mon2-spec = test_ei2_mon_spectra;
        ei_mon_spectra=test_mon_spectra_composite"

diff --git a/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py
@@ -111,7 +111,7 @@ def diagnose(self, white, **kwargs):
         for par in self.diag_params:
             arg = par.lstrip('diag_')
             if arg not in kwargs:
-                kwargs[arg] = getattr(self, par)
+                kwargs[arg] = getattr(self, arg)
 
         # Get the white beam vanadium integrals
         whiteintegrals = self.do_white(white, None, None,None) # No grouping yet
@@ -802,13 +802,13 @@ def init_idf_params(self, reload_instrument=False):
         self.relocate_dets = False
 
         #The rmm of Vanadium is a constant, should not be instrument parameter. Atom not exposed to python :(
-        self.van_rmm = 50.9415#self.get_default_parameter("vanadium-rmm") 
+        self.van_rmm = 50.9415
 
-        # Do we have specified spectra to diag over
-        try:
-            self.diag_spectra = self.get_default_parameter("diag_spectra")
-        except Exception:
-            self.diag_spectra = None
+        # Diag parameters -- keys used by diag method to pick from default parameters
+        self.diag_params = ['diag_tiny', 'diag_huge', 'diag_samp_zero', 'diag_samp_lo', 'diag_samp_hi','diag_samp_sig',\
+                            'diag_van_out_lo', 'diag_van_out_hi', 'diag_van_lo', 'diag_van_hi', 'diag_van_sig', 'diag_variation']
+
+        # special property -- synonims -- how to treat external parameters. 
         try:           
             self.synonims = self.get_default_parameter("synonims")
         except Exception: