Re #10532 Renamed ei monitors names to names with dashes.

Code/Mantid/instrument/LET_Parameters.xml

@@ -75,6 +75,7 @@
 </parameter>
 
 
+
 <!-- First spectra number (monitor number) to use when measuring incident energy
     Should be spectra with well defined energy peak -->
 <parameter name="ei-mon1-spec"  type="int">
@@ -373,7 +374,7 @@
        sum_runs=sum;
        wb_integr_range=detector_van_range;
        van_mass=vanadium-mass;
-       check_background = background;       
+       check_background = background;
        mon1_norm_spec=norm-mon1-spec;
        mon2_norm_spec=norm-mon2-spec;       
        scale_factor=scale-factor;
@@ -400,7 +401,8 @@
        bleed_test = bleed = diag_bleed_test;
        bleed_maxrate = diag_bleed_maxrate;
        bleed_pixels  = diag_bleed_pixels;
-       ei-mon2-spec = test_ei2_mon_spectra;
+       ei-mon1-spec=ei_mon1_spec;       
+       ei-mon2-spec = test_ei2_mon_spectra=ei_mon2_spec;
        ei_mon_spectra=test_mon_spectra_composite"
     />
 </parameter>

Code/Mantid/instrument/LET_Parameters_dr2to9.xml

@@ -91,7 +91,8 @@
 
 <!--if you use some detectors as monitors and work in event mode, one needs to specify the comma separated list of these detectors here 
     to copy detectors spectra to monitors spectra collected in histogram mode. If no such monitors are used "None" 
-    (with brackets) has to be specified as the value
+    (with brackets) has to be specified as the value. This is also necessary in Histogram mode if you want to use detectors as monitors and 
+    load_monitors_with_workspace is set to False (or monitors are measured with different time channels)
 -->
 <parameter name="spectra_to_monitors_list"  type="string">
   <value val="5506"/>
@@ -371,7 +372,7 @@
        sum_runs=sum;
        wb_integr_range=detector_van_range;
        van_mass=vanadium-mass;
-       check_background = background;       
+       check_background = background;
        mon1_norm_spec=norm-mon1-spec;
        mon2_norm_spec=norm-mon2-spec;       
        scale_factor=scale-factor;
@@ -398,7 +399,8 @@
        bleed_test = bleed = diag_bleed_test;
        bleed_maxrate = diag_bleed_maxrate;
        bleed_pixels  = diag_bleed_pixels;
-       ei-mon2-spec = test_ei2_mon_spectra;
+       ei-mon1-spec=ei_mon1_spec;       
+       ei-mon2-spec = test_ei2_mon_spectra=ei_mon2_spec;
        ei_mon_spectra=test_mon_spectra_composite"
     />
 </parameter>

Code/Mantid/instrument/LET_Parameters_dr3to10.xml

@@ -399,7 +399,8 @@
        bleed_test = bleed = diag_bleed_test;
        bleed_maxrate = diag_bleed_maxrate;
        bleed_pixels  = diag_bleed_pixels;
-       ei-mon2-spec = test_ei2_mon_spectra;
+       ei-mon1-spec=ei_mon1_spec;       
+       ei-mon2-spec = test_ei2_mon_spectra=ei_mon2_spec;
        ei_mon_spectra=test_mon_spectra_composite"
     />
 </parameter>

Code/Mantid/instrument/LET_Parameters_dr3to11.xml

@@ -92,7 +92,8 @@
 
 <!--if you use some detectors as monitors and work in event mode, one needs to specify the comma separated list of these detectors here 
     to copy detectors spectra to monitors spectra collected in histogram mode. If no such monitors are used "None" 
-    (with brackets) has to be specified as the value
+    (with brackets) has to be specified as the value. This is also necessary in Histogram mode if you want to use detectors as monitors and 
+    load_monitors_with_workspace is set to False (or monitors are measured with different time channels)
 -->
 <parameter name="spectra_to_monitors_list"  type="string">
   <value val="5506"/>
@@ -372,7 +373,7 @@
        sum_runs=sum;
        wb_integr_range=detector_van_range;
        van_mass=vanadium-mass;
-       check_background = background;       
+       check_background = background;
        mon1_norm_spec=norm-mon1-spec;
        mon2_norm_spec=norm-mon2-spec;       
        scale_factor=scale-factor;
@@ -399,7 +400,8 @@
        bleed_test = bleed = diag_bleed_test;
        bleed_maxrate = diag_bleed_maxrate;
        bleed_pixels  = diag_bleed_pixels;
-       ei-mon2-spec = test_ei2_mon_spectra;
+       ei-mon1-spec=ei_mon1_spec;       
+       ei-mon2-spec = test_ei2_mon_spectra=ei_mon2_spec;
        ei_mon_spectra=test_mon_spectra_composite"
     />
 </parameter>

Code/Mantid/instrument/MAPS_Parameters.xml

@@ -89,16 +89,16 @@
 
 <!-- First spectra number (monitor number) to use when measuring incident energy
     Should be spectra with well defined energy peak -->
-<parameter name="ei_mon1_spec"  type="int">
+<parameter name="ei-mon1-spec"  type="int">
   <value val="41474"/>
 </parameter>
 <!-- Second spectra number (monitor number) to use when measuring incident energy
      Should be spectra with well defined energy peak -->
-<parameter name="ei_mon2_spec"  type="int">
+<parameter name="ei-mon2-spec"  type="int">
   <value val="41475"/>
 </parameter>
 <parameter name="ei_mon_spectra"  type="string">
-  <value val="ei_mon1_spec:ei_mon2_spec"/>
+  <value val="ei-mon1-spec:ei-mon2-spec"/>
 </parameter>
 
 <!--if you use some detectors as monitors and work in event mode, one needs to specify the comma separated list of these detectors here 
@@ -411,8 +411,8 @@
        bleed_test = bleed = diag_bleed_test;
        bleed_maxrate= diag_bleed_maxrate;
        bleed_pixels  = diag_bleed_pixels;
-       ei_mon1_spec = ei-mon1-spec;       
-       ei_mon2_spec = test_ei2_mon_spectra=ei-mon2-spec;
+       ei-mon1-spec=ei_mon1_spec;       
+       ei-mon2-spec = test_ei2_mon_spectra=ei_mon2_spec;
        ei_mon_spectra=test_mon_spectra_composite"
     />
 </parameter>

Code/Mantid/instrument/MARI_Parameters.xml

@@ -91,16 +91,16 @@
 
 <!-- First spectra number (monitor number) to use when measuring incident energy
     Should be spectra with well defined energy peak -->
-<parameter name="ei_mon1_spec"  type="int">
+<parameter name="ei-mon1-spec"  type="int">
   <value val="2"/>
 </parameter>
 <!-- Second spectra number (monitor number) to use when measuring incident energy
      Should be spectra with well defined energy peak -->
-<parameter name="ei_mon2_spec"  type="int">
+<parameter name="ei-mon2-spec"  type="int">
   <value val="3"/>
 </parameter>
 <parameter name="ei_mon_spectra"  type="string">
-  <value val="ei_mon1_spec:ei_mon2_spec"/>
+  <value val="ei-mon1-spec:ei-mon2-spec"/>
 </parameter>
 <!--if you use some detectors as monitors and work in event mode, one needs to specify the comma separated list of these detectors here 
     to copy detectors spectra to monitors spectra collected in histogram mode. If no such monitors are used "None" 
@@ -414,8 +414,8 @@
        bleed_test = bleed = diag_bleed_test;
        bleed_maxrate= diag_bleed_maxrate;
        bleed_pixels  = diag_bleed_pixels;
-       ei_mon1_spec = ei-mon1-spec;       
-       ei_mon2_spec = test_ei2_mon_spectra=ei-mon2-spec;
+       ei-mon1-spec=ei_mon1_spec;       
+       ei-mon2-spec = test_ei2_mon_spectra=ei_mon2_spec;
        ei_mon_spectra=test_mon_spectra_composite"
     />
 </parameter>

Code/Mantid/instrument/MERLIN_Parameters.xml

@@ -91,16 +91,16 @@
 
 <!-- First spectra number (monitor number) to use when measuring incident energy
     Should be spectra with well defined energy peak -->
-<parameter name="ei_mon1_spec"  type="int">
+<parameter name="ei-mon1-spec"  type="int">
   <value val="69634"/>
 </parameter>
 <!-- Second spectra number (monitor number) to use when measuring incident energy
      Should be spectra with well defined energy peak -->
-<parameter name="ei_mon2_spec"  type="int">
+<parameter name="ei-mon2-spec"  type="int">
   <value val="69638"/>
 </parameter>
 <parameter name="ei_mon_spectra"  type="string">
-  <value val="ei_mon1_spec:ei_mon2_spec"/>
+  <value val="ei-mon1-spec:ei-mon2-spec"/>
 </parameter>
 
 <!--if you use some detectors as monitors and work in event mode, one needs to specify the comma separated list of these detectors here 
@@ -412,8 +412,8 @@
        bleed_test = bleed = diag_bleed_test;
        bleed_maxrate= diag_bleed_maxrate;
        bleed_pixels = diag_bleed_pixels;
-       ei_mon1_spec = ei-mon1-spec;       
-       ei_mon2_spec = test_ei2_mon_spectra=ei-mon2-spec;
+       ei-mon1-spec=ei_mon1_spec;       
+       ei-mon2-spec = test_ei2_mon_spectra=ei_mon2_spec;
        ei_mon_spectra=test_mon_spectra_composite"
     />
 </parameter>