Merge remote-tracking branch 'origin/bugfix/9256_IDFNameAndContents'

mantidproject · Apr 25, 2014 · c7bfc94 · c7bfc94
2 parents 6cd7e38 + 3bcf342
commit c7bfc94
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 40 deletions.
diff --git a/Code/Mantid/instrument/LET_Parameters.xml b/Code/Mantid/instrument/LET_Parameters.xml
@@ -41,6 +41,14 @@
   <value val="direct"/>
 </parameter>
 
+<!-- normalise_method normalistion. To compare different runs with different length one uses normalization by some flux-dependent parameter
+     Availible values are: none (-largely meaningles), monitor-1, current 
+     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
+     these three are currently disabled/unknown: monitor-2, uamph peak-->
+<parameter name="normalise_method" type="string">
+    <value val="monitor-1"/>
+</parameter>
+
 <!-- Monitor used to estimate total current on the sample.  -->
 <parameter name="norm-mon1-spec">
   <value val="40961"/>
@@ -287,12 +295,6 @@
 
 <!-- **************************************** ABSOLUTE UNITS CORRECTION DEFAULTS END ****************************  -->
 
-<!-- normalise_method normalistion. Availible values are: none (-largely meaningles), monitor-1, current 
-     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
-     these three are currently disabled/unknown: monitor-2, uamph peak-->
-<parameter name="normalise_method" type="string">
-    <value val="monitor-1"/>
-</parameter>
 
 <!-- if defined to true, fix incident energy to this value and do not calculate the energy from the run -->
 <parameter name="fixei"  type="bool">

diff --git a/Code/Mantid/instrument/LET_Parameters_dr2to9.xml b/Code/Mantid/instrument/LET_Parameters_dr2to9.xml
@@ -41,9 +41,17 @@
   <value val="direct"/>
 </parameter>
 
+<!-- normalise_method normalistion. To compare different runs with different length one uses normalization by some flux-dependent parameter
+     Availible values are: none (-largely meaningles), monitor-1, current 
+     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
+     these three are currently disabled/unknown: monitor-2, uamph peak-->
+<parameter name="normalise_method" type="string">
+    <value val="monitor-1"/>
+</parameter>
+
 <!-- Monitor used to estimate total current on the sample.  -->
 <parameter name="norm-mon1-spec">
-  <value val="40961"/>
+  <value val="57350"/>
 </parameter>
 <!-- Time interval used for integration to estimate current on the sample 
     This interval is usually taken around the monitor peak-->
@@ -286,13 +294,6 @@
 
 <!-- **************************************** ABSOLUTE UNITS CORRECTION DEFAULTS END ****************************  -->
 
-<!-- normalise_method normalistion. Availible values are: none (-largely meaningles), monitor-1, current 
-     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
-     these three are currently disabled/unknown: monitor-2, uamph peak-->
-<parameter name="normalise_method" type="string">
-    <value val="monitor-1"/>
-</parameter>
-
 <!-- if defined to true, fix incident energy to this value and do not calculate the energy from the run -->
 <parameter name="fixei"  type="bool">
     <value val="False"/>

diff --git a/Code/Mantid/instrument/MAPS_Parameters.xml b/Code/Mantid/instrument/MAPS_Parameters.xml
@@ -49,6 +49,14 @@
   <value val="direct"/>
 </parameter>
 
+<!-- normalise_method normalistion. To compare different runs with different length one uses normalization by some flux-dependent parameter
+     Availible values are: none (-largely meaningles), monitor-1, current 
+     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
+     these three are currently disabled/unknown: monitor-2, uamph peak-->
+<parameter name="normalise_method" type="string">
+    <value val="monitor-1"/>
+</parameter>
+
 <!-- Monitor used to estimate total current on the sample.  -->
 <parameter name="norm-mon1-spec">
   <value val="41473"/>
@@ -291,12 +299,6 @@
 
 <!-- **************************************** ABSOLUTE UNITS CORRECTION DEFAULTS END ****************************  -->
 
-<!-- normalise_method normalistion. Availible values are: none (-largely meaningles), monitor-1, current 
-     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
-     these three are currently disabled/unknown: monitor-2, uamph peak-->
-<parameter name="normalise_method" type="string">
-    <value val="monitor-1"/>
-</parameter>
 
 <!-- if defined to true, fix incident energy to this value and do not calculate the energy from the run -->
 <parameter name="fixei"  type="bool">

diff --git a/Code/Mantid/instrument/MARI_Parameters.xml b/Code/Mantid/instrument/MARI_Parameters.xml
@@ -48,6 +48,14 @@
   <value val="direct"/>
 </parameter>
 
+<!-- normalise_method normalistion. To compare different runs with different length one uses normalization by some flux-dependent parameter
+     Availible values are: none (-largely meaningles), monitor-1, current 
+     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
+     these three are currently disabled/unknown: monitor-2, uamph peak-->
+<parameter name="normalise_method" type="string">
+    <value val="monitor-1"/>
+</parameter>
+
 <!-- Monitor used to estimate total current on the sample.  -->
 <parameter name="norm-mon1-spec">
   <value val="1"/>
@@ -65,6 +73,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">
@@ -292,12 +301,6 @@
 
 <!-- **************************************** ABSOLUTE UNITS CORRECTION DEFAULTS END ****************************  -->
 
-<!-- normalise_method normalistion. Availible values are: none (-largely meaningles), monitor-1, current 
-     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
-     these three are currently disabled/unknown: monitor-2, uamph peak-->
-<parameter name="normalise_method" type="string">
-    <value val="monitor-1"/>
-</parameter>
 
 <!-- if defined to true, fix incident energy to this value and do not calculate the energy from the run -->
 <parameter name="fixei"  type="bool">

diff --git a/...trument/MERLIN_Definition_after2014_4.xml → ...trument/MERLIN_Definition_after2013_4.xml b/...trument/MERLIN_Definition_after2014_4.xml → ...trument/MERLIN_Definition_after2013_4.xml
diff --git a/Code/Mantid/instrument/MERLIN_Parameters.xml b/Code/Mantid/instrument/MERLIN_Parameters.xml
@@ -49,6 +49,14 @@
   <value val="direct"/>
 </parameter>
 
+<!-- normalise_method normalistion. To compare different runs with different length one uses normalization by some flux-dependent parameter
+     Availible values are: none (-largely meaningles), monitor-1, current 
+     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
+     these three are currently disabled/unknown: monitor-2, uamph peak-->
+<parameter name="normalise_method" type="string">
+    <value val="monitor-1"/>
+</parameter>
+
 <!-- Monitor used to estimate total current on the sample.  -->
 <parameter name="norm-mon1-spec">
   <value val="69633"/>
@@ -293,13 +301,6 @@
 
 <!-- **************************************** ABSOLUTE UNITS CORRECTION DEFAULTS END ****************************  -->
 
-<!-- normalise_method normalistion. Availible values are: none (-largely meaningles), monitor-1, current 
-     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
-     these three are currently disabled/unknown: monitor-2, uamph peak-->
-<parameter name="normalise_method" type="string">
-    <value val="monitor-1"/>
-</parameter>
-
 <!-- if defined to true, fix incident energy to this value and do not calculate the energy from the run -->
 <parameter name="fixei"  type="bool">
     <value val="False"/>

diff --git a/...trument/MERLIN_Parameters_after2014_4.xml → ...trument/MERLIN_Parameters_after2013_4.xml b/...trument/MERLIN_Parameters_after2014_4.xml → ...trument/MERLIN_Parameters_after2013_4.xml
@@ -49,6 +49,14 @@
   <value val="direct"/>
 </parameter>
 
+<!-- normalise_method normalistion. To compare different runs with different length one uses normalization by some flux-dependent parameter
+     Availible values are: none (-largely meaningles), monitor-1, current 
+     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
+     these three are currently disabled/unknown: monitor-2, uamph peak-->
+<parameter name="normalise_method" type="string">
+    <value val="monitor-1"/>
+</parameter>
+
 <!-- Monitor used to estimate total current on the sample.  -->
 <parameter name="norm-mon1-spec">
   <value val="69633"/>
@@ -293,13 +301,6 @@
 
 <!-- **************************************** ABSOLUTE UNITS CORRECTION DEFAULTS END ****************************  -->
 
-<!-- normalise_method normalistion. Availible values are: none (-largely meaningles), monitor-1, current 
-     the acceptable values are defined in DirectEnergyConversion init routine as recognized by direct energy conversion normalize method
-     these three are currently disabled/unknown: monitor-2, uamph peak-->
-<parameter name="normalise_method" type="string">
-    <value val="monitor-1"/>
-</parameter>
-
 <!-- if defined to true, fix incident energy to this value and do not calculate the energy from the run -->
 <parameter name="fixei"  type="bool">
     <value val="False"/>