Merge pull request #13211 from mantidproject/13193_fix_iris_osiris_detector_positions

Correct detector positions for IRIS and OSIRIS

Merge pull request #13211 from mantidproject/13193_fix_iris_osiris_detector_positions
Correct detector positions for IRIS and OSIRIS
3b934428 · Federico Montesino Pouzols · 12f91770 · 7ad757a2 · 3b934428 · 3b934428
Commit 3b934428 authored 9 years ago by Federico Montesino Pouzols
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
@@ -579,7 +579,7 @@ class IRISResolution(ISISIndirectInelasticResolution):
        self.analyser = 'graphite'
        self.reflection = '002'
        self.detector_range = [3, 53]
-        self.background = [-0.54, 0.65]
+        self.background = [-0.54, 0.54]
        self.rebin_params = '-0.2,0.002,0.2'
        self.files = ['IRS53664.raw']


--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISMultiFileReduction1.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISMultiFileReduction1.nxs.md5
-5bf32dd0e2d067376b9456b69e215cb0
\ No newline at end of file
+18efd974244fb437fe733b9192819f95
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISMultiFileSummedReduction.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISMultiFileSummedReduction.nxs.md5
-d6b8752fa3d982cbb58bde32452f7b22
\ No newline at end of file
+ea8e00b31b2aad3666e2d40f63bed87b
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISReductionFromFile.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISReductionFromFile.nxs.md5
-ad023239413ac3d1ea834b541d051b93
\ No newline at end of file
+b8a280ce81240fde8011bff666b35a9e
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISResolution.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISResolution.nxs.md5
-8fbb035c43d925db9b49bbc2e6021a6b
\ No newline at end of file
+9bab5fccfd1cfeca90a113e94838b093
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISTransmissionMonitor.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.IRISTransmissionMonitor.nxs.md5
-45aa175193fc91bb3bb7dfcbaa75b0d4
\ No newline at end of file
+1978830456c55809b8ae5d01cf4f9721
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.OSIRISMultiFileReduction1.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.OSIRISMultiFileReduction1.nxs.md5
-6e18bd32432fdc34f69d5adcafacb906
\ No newline at end of file
+2c7eed86df20f03d48fe39f6f926927c
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.OSIRISMultiFileSummedReduction.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.OSIRISMultiFileSummedReduction.nxs.md5
-4e0e097bc4843e1aa0549bd50a122e19
\ No newline at end of file
+e36c9052b10bb12dde7332657682db20
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.OSIRISReductionFromFile.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.OSIRISReductionFromFile.nxs.md5
-ca8cb35dc426335e5696ddaa998c72f2
\ No newline at end of file
+b4156e9c1ca69987e8762b69323d8a45
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.OSIRISResolution.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/II.OSIRISResolution.nxs.md5
-1a27f63a71668ccff72d88f09358b102
\ No newline at end of file
+99cac9d218081badb41693dace7dc513
--- a/Code/Mantid/Testing/SystemTests/tests/analysis/reference/IRISDiffspecDiffractionTest.nxs.md5
+++ b/Code/Mantid/Testing/SystemTests/tests/analysis/reference/IRISDiffspecDiffractionTest.nxs.md5
-2e197b638ee991fbb5272a97327ba5b7
\ No newline at end of file
+1e8ef92154ba00cd749dce36e3053b51
--- a/Code/Mantid/docs/source/algorithms/ElasticWindowMultiple-v1.rst
+++ b/Code/Mantid/docs/source/algorithms/ElasticWindowMultiple-v1.rst
@@ -61,7 +61,7 @@ Usage

        SetInstrumentParameter(Workspace=ws_name,
                               ParameterName='Efixed',
-                               DetectorList=range(1,114),
+                               DetectorList=range(1,113),
                               ParameterType='Number',
                               Value='1.555')


--- a/Code/Mantid/docs/source/algorithms/ISISIndirectDiffractionReduction-v1.rst
+++ b/Code/Mantid/docs/source/algorithms/ISISIndirectDiffractionReduction-v1.rst
@@ -42,7 +42,7 @@ Output:

    Workspace name: IRS21360_diffspec_red
    Number of spectra: 1
-    Number of bins: 1935
+    Number of bins: 1934

 .. categories::


--- a/Code/Mantid/instrument/IRIS_Definition.xml
+++ b/Code/Mantid/instrument/IRIS_Definition.xml
 <?xml version="1.0" encoding="UTF-8" ?>
-<!-- For help on the notation used to specify an Instrument Definition File 
+<!-- For help on the notation used to specify an Instrument Definition File
     see http://www.mantidproject.org/IDF -->
-<instrument xmlns="http://www.mantidproject.org/IDF/1.0" 
+<instrument xmlns="http://www.mantidproject.org/IDF/1.0"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 http://schema.mantidproject.org/IDF/1.0/IDFSchema.xsd"
- name="IRIS" valid-from   ="1900-01-31 23:59:59"
-                        valid-to     ="2100-01-31 23:59:59"
-		        last-modified="2010-10-07 00:00:00">
+            name="IRIS"
+            valid-from="1900-01-31 23:59:59"
+            valid-to="2100-01-31 23:59:59"
+            last-modified="2010-10-07 00:00:00">
 <!-- modified by FD 7/10/2010 -->

 <defaults>
@@ -21,7 +22,7 @@
 </defaults>

 <!-- LIST OF PHYSICAL COMPONENTS (which the instrument consists of) -->
-  
+
 <!-- source and sample-position components -->

 <component type="moderator">
@@ -38,10 +39,10 @@

 <type name="sample" is="SamplePos">
  <cuboid id="shape">
-    <left-front-bottom-point x="0.02" y="-0.02" z="0.0"  />
-    <left-front-top-point  x="0.02" y="-0.02" z="0.02"  />
-    <left-back-bottom-point  x="-0.02" y="-0.02" z="0.0"  />
-    <right-front-bottom-point  x="0.02" y="0.02" z="0.0"  />
+    <left-front-bottom-point  x="0.02"  y="-0.02" z="0.0"   />
+    <left-front-top-point     x="0.02"  y="-0.02" z="0.02"  />
+    <left-back-bottom-point   x="-0.02" y="-0.02" z="0.0"   />
+    <right-front-bottom-point x="0.02"  y="0.02"  z="0.0"   />
  </cuboid>
  <algebra val="shape" />
 </type>
@@ -50,43 +51,43 @@

 <!-- monitor components -->

-  <component type="monitor1" idlist="monitor1">
-    <location z="-0.335" />
-  </component>
+<component type="monitor1" idlist="monitor1">
+  <location z="-0.355" />
+</component>

-  <type name="monitor1" is="monitor">
-    <percent-transparency val="99.9" />
-    <cuboid id="shape">
-      <left-front-bottom-point x="0.0125" y="-0.0125" z="0.0"  />
-      <left-front-top-point  x="0.0125" y="-0.0125" z="0.005"  />
-      <left-back-bottom-point  x="-0.0125" y="-0.0125" z="0.0"  />
-      <right-front-bottom-point  x="0.0125" y="0.0125" z="0.0"  />
-    </cuboid>
-    <algebra val="shape" />
-  </type>  
+<type name="monitor1" is="monitor">
+  <percent-transparency val="99.9" />
+  <cuboid id="shape">
+    <left-front-bottom-point  x="0.0125"  y="-0.0125" z="0.0"   />
+    <left-front-top-point     x="0.0125"  y="-0.0125" z="0.005" />
+    <left-back-bottom-point   x="-0.0125" y="-0.0125" z="0.0"   />
+    <right-front-bottom-point x="0.0125"  y="0.0125"  z="0.0"   />
+  </cuboid>
+  <algebra val="shape" />
+</type>

-  <idlist idname="monitor1">
-    <id val="1" />  
-  </idlist>
-  
-  <component type="monitor2" idlist="monitor2">
-    <location z="2.35" />
-  </component>
-  
-  <type name="monitor2" is="monitor">
-    <percent-transparency val="99.9" />
-    <cuboid id="shape">
-      <left-front-bottom-point x="0.0125" y="-0.0125" z="0.0"  />
-      <left-front-top-point  x="0.0125" y="-0.0125" z="0.005"  />
-      <left-back-bottom-point  x="-0.0125" y="-0.0125" z="0.0"  />
-      <right-front-bottom-point  x="0.0125" y="0.0125" z="0.0"  />
-    </cuboid>
-    <algebra val="shape" />
-  </type> 
+<idlist idname="monitor1">
+  <id val="1" />
+</idlist>

-  <idlist idname="monitor2">
-    <id val="2" />  
-  </idlist>
+<component type="monitor2" idlist="monitor2">
+  <location z="2.349" />
+</component>
+
+<type name="monitor2" is="monitor">
+  <percent-transparency val="99.9" />
+  <cuboid id="shape">
+    <left-front-bottom-point  x="0.0125"  y="-0.0125" z="0.0"   />
+    <left-front-top-point     x="0.0125"  y="-0.0125" z="0.005" />
+    <left-back-bottom-point   x="-0.0125" y="-0.0125" z="0.0"   />
+    <right-front-bottom-point x="0.0125"  y="0.0125"  z="0.0"   />
+  </cuboid>
+  <algebra val="shape" />
+</type>
+
+<idlist idname="monitor2">
+  <id val="2" />
+</idlist>

 <!--  detector components -->

@@ -97,34 +98,34 @@

 <type name="graphite">
 <component type="pix1">
-  <location r="1.45" t="27.07" p="0" name="S3" />
-  <location r="1.45" t="29.70" p="0" name="S4" />
-  <location r="1.45" t="32.32" p="0" name="S5" />
-  <location r="1.45" t="34.95" p="0" name="S6" />
-  <location r="1.45" t="37.58" p="0" name="S7" />
-  <location r="1.45" t="40.21" p="0" name="S8" />
-  <location r="1.45" t="42.83" p="0" name="S9" />
-  <location r="1.45" t="45.46" p="0" name="S10" />
-  <location r="1.45" t="48.08" p="0" name="S11" />
-  <location r="1.45" t="50.71" p="0" name="S12" />
-  <location r="1.45" t="53.34" p="0" name="S13" />
-  <location r="1.45" t="55.96" p="0" name="S14" />
-  <location r="1.45" t="58.59" p="0" name="S15" />
-  <location r="1.45" t="61.21" p="0" name="S16" />
-  <location r="1.45" t="63.84" p="0" name="S17" />
-  <location r="1.45" t="66.47" p="0" name="S18" />
-  <location r="1.45" t="69.10" p="0" name="S19" />
-  <location r="1.45" t="71.72" p="0" name="S20" />
-  <location r="1.45" t="74.35" p="0" name="S21" />
-  <location r="1.45" t="76.98" p="0" name="S22" />
-  <location r="1.45" t="79.60" p="0" name="S23" />
-  <location r="1.45" t="82.23" p="0" name="S24" />
-  <location r="1.45" t="84.85" p="0" name="S25" />
-  <location r="1.45" t="87.48" p="0" name="S26" />
-  <location r="1.45" t="90.11" p="0" name="S27" />
-  <location r="1.45" t="92.74" p="0" name="S28" />
-  <location r="1.45" t="95.36" p="0" name="S29" />
-  <location r="1.45" t="97.99" p="0" name="S30" />
+  <location r="1.45" t="27.07"  p="0" name="S3" />
+  <location r="1.45" t="29.70"  p="0" name="S4" />
+  <location r="1.45" t="32.32"  p="0" name="S5" />
+  <location r="1.45" t="34.95"  p="0" name="S6" />
+  <location r="1.45" t="37.58"  p="0" name="S7" />
+  <location r="1.45" t="40.21"  p="0" name="S8" />
+  <location r="1.45" t="42.83"  p="0" name="S9" />
+  <location r="1.45" t="45.46"  p="0" name="S10" />
+  <location r="1.45" t="48.08"  p="0" name="S11" />
+  <location r="1.45" t="50.71"  p="0" name="S12" />
+  <location r="1.45" t="53.34"  p="0" name="S13" />
+  <location r="1.45" t="55.96"  p="0" name="S14" />
+  <location r="1.45" t="58.59"  p="0" name="S15" />
+  <location r="1.45" t="61.21"  p="0" name="S16" />
+  <location r="1.45" t="63.84"  p="0" name="S17" />
+  <location r="1.45" t="66.47"  p="0" name="S18" />
+  <location r="1.45" t="69.10"  p="0" name="S19" />
+  <location r="1.45" t="71.72"  p="0" name="S20" />
+  <location r="1.45" t="74.35"  p="0" name="S21" />
+  <location r="1.45" t="76.98"  p="0" name="S22" />
+  <location r="1.45" t="79.60"  p="0" name="S23" />
+  <location r="1.45" t="82.23"  p="0" name="S24" />
+  <location r="1.45" t="84.85"  p="0" name="S25" />
+  <location r="1.45" t="87.48"  p="0" name="S26" />
+  <location r="1.45" t="90.11"  p="0" name="S27" />
+  <location r="1.45" t="92.74"  p="0" name="S28" />
+  <location r="1.45" t="95.36"  p="0" name="S29" />
+  <location r="1.45" t="97.99"  p="0" name="S30" />
  <location r="1.45" t="100.61" p="0" name="S31" />
  <location r="1.45" t="103.24" p="0" name="S32" />
  <location r="1.45" t="105.87" p="0" name="S33" />
@@ -157,10 +158,10 @@

 <type name="pix1" is="detector">
  <cuboid id="app-shape">
-    <left-front-bottom-point x="0.005" y="-0.1" z="0.0"  />
-    <left-front-top-point  x="0.005" y="-0.1" z="0.0002"  />
-    <left-back-bottom-point  x="-0.005" y="-0.1" z="0.0"  />
-    <right-front-bottom-point  x="0.005" y="0.1" z="0.0"  />
+    <left-front-bottom-point  x="0.005"   y="-0.1"  z="0.0"     />
+    <left-front-top-point     x="0.005"   y="-0.1"  z="0.0002"  />
+    <left-back-bottom-point   x="-0.005"  y="-0.1"  z="0.0"     />
+    <right-front-bottom-point x="0.005"   y="0.1"   z="0.0"     />
  </cuboid>
  <algebra val="app-shape" />
 </type>
@@ -172,36 +173,36 @@

 <type name="mica">
 <component type="pix1">
-  <location r="1.47" t="-21.70" p="0" name="S54" />
-  <location r="1.47" t="-24.43" p="0" name="S55" />
-  <location r="1.47" t="-27.16" p="0" name="S56" />
-  <location r="1.47" t="-29.89" p="0" name="S57" />
-  <location r="1.47" t="-32.62" p="0" name="S58" />
-  <location r="1.47" t="-35.35" p="0" name="S59" />
-  <location r="1.47" t="-38.08" p="0" name="S60" /> 
-  <location r="1.47" t="-40.81" p="0" name="S61" />
-  <location r="1.47" t="-43.54" p="0" name="S62" />
-  <location r="1.47" t="-46.27" p="0" name="S63" />
-  <location r="1.47" t="-49.00" p="0" name="S64" />
-  <location r="1.47" t="-51.73" p="0" name="S65" />
-  <location r="1.47" t="-54.46" p="0" name="S66" />
-  <location r="1.47" t="-57.19" p="0" name="S67" />
-  <location r="1.47" t="-59.92" p="0" name="S68" />
-  <location r="1.47" t="-62.65" p="0" name="S69" />
-  <location r="1.47" t="-65.38" p="0" name="S70" />
- <location r="1.47" t="-68.11" p="0" name="S71" />
-  <location r="1.47" t="-70.84" p="0" name="S72" />
-  <location r="1.47" t="-73.57" p="0" name="S73" />
-  <location r="1.47" t="-76.30" p="0" name="S74" />
-  <location r="1.47" t="-79.00" p="0" name="S75" />
-  <location r="1.47" t="-81.70" p="0" name="S76" />
-  <location r="1.47" t="-84.20" p="0" name="S77" />
-  <location r="1.47" t="-86.70" p="0" name="S78" />
-  <location r="1.47" t="-89.20" p="0" name="S79" />
-  <location r="1.47" t="-91.70" p="0" name="S80" />
-  <location r="1.47" t="-94.20" p="0" name="S81" />
-  <location r="1.47" t="-96.70" p="0" name="S82" />
-  <location r="1.47" t="-99.20" p="0" name="S83" />
+  <location r="1.47" t="-21.70"  p="0" name="S54" />
+  <location r="1.47" t="-24.43"  p="0" name="S55" />
+  <location r="1.47" t="-27.16"  p="0" name="S56" />
+  <location r="1.47" t="-29.89"  p="0" name="S57" />
+  <location r="1.47" t="-32.62"  p="0" name="S58" />
+  <location r="1.47" t="-35.35"  p="0" name="S59" />
+  <location r="1.47" t="-38.08"  p="0" name="S60" />
+  <location r="1.47" t="-40.81"  p="0" name="S61" />
+  <location r="1.47" t="-43.54"  p="0" name="S62" />
+  <location r="1.47" t="-46.27"  p="0" name="S63" />
+  <location r="1.47" t="-49.00"  p="0" name="S64" />
+  <location r="1.47" t="-51.73"  p="0" name="S65" />
+  <location r="1.47" t="-54.46"  p="0" name="S66" />
+  <location r="1.47" t="-57.19"  p="0" name="S67" />
+  <location r="1.47" t="-59.92"  p="0" name="S68" />
+  <location r="1.47" t="-62.65"  p="0" name="S69" />
+  <location r="1.47" t="-65.38"  p="0" name="S70" />
+  <location r="1.47" t="-68.11"  p="0" name="S71" />
+  <location r="1.47" t="-70.84"  p="0" name="S72" />
+  <location r="1.47" t="-73.57"  p="0" name="S73" />
+  <location r="1.47" t="-76.30"  p="0" name="S74" />
+  <location r="1.47" t="-79.00"  p="0" name="S75" />
+  <location r="1.47" t="-81.70"  p="0" name="S76" />
+  <location r="1.47" t="-84.20"  p="0" name="S77" />
+  <location r="1.47" t="-86.70"  p="0" name="S78" />
+  <location r="1.47" t="-89.20"  p="0" name="S79" />
+  <location r="1.47" t="-91.70"  p="0" name="S80" />
+  <location r="1.47" t="-94.20"  p="0" name="S81" />
+  <location r="1.47" t="-96.70"  p="0" name="S82" />
+  <location r="1.47" t="-99.20"  p="0" name="S83" />
  <location r="1.47" t="-101.70" p="0" name="S84" />
  <location r="1.47" t="-104.20" p="0" name="S85" />
  <location r="1.47" t="-106.70" p="0" name="S86" />
@@ -237,31 +238,32 @@

 <type name="diffraction">
 <component type="pix2">
-  <location r="0.8576" t="-167.15" p="0" name="S105" />
-  <location r="0.8502" t="-167.72" p="0" name="S106" />
-  <location r="0.8570" t="-168.33" p="0" name="S107" />
-  <location r="0.8499" t="-168.91" p="0" name="S108" />
-  <location r="0.8568" t="-169.50" p="0" name="S109" />
-  <location r="0.8499" t="-170.09" p="0" name="S110" />
-  <location r="0.8570" t="-170.67" p="0" name="S111" />
-  <location r="0.8502" t="-171.26" p="0" name="S112" />
-  <location r="0.8576" t="-171.83" p="0" name="S113" />
-  <location r="0.8510" t="-172.41" p="0" name="S114" />
+  <location r="0.8563" t="-167.15" p="0" name="S105" />
+  <location r="0.8490" t="-167.72" p="0" name="S106" />
+  <location r="0.8558" t="-168.33" p="0" name="S107" />
+  <location r="0.8486" t="-168.91" p="0" name="S108" />
+  <location r="0.8558" t="-169.50" p="0" name="S109" />
+  <location r="0.8486" t="-170.09" p="0" name="S110" />
+  <location r="0.8558" t="-170.67" p="0" name="S111" />
+  <location r="0.8490" t="-171.26" p="0" name="S112" />
+  <!-- These detectors do not count corectly (or at all) -->
+  <!-- <location r="0.8576" t="-171.83" p="0" name="S113" /> -->
+  <!-- <location r="0.8510" t="-172.41" p="0" name="S114" /> -->
 </component>
 </type>

 <type name="pix2" is="detector">
  <cuboid id="app-shape">
-    <left-front-bottom-point x="0.0025" y="-0.1" z="0.0"  />
-    <left-front-top-point  x="0.0025" y="-0.1" z="0.0002"  />
-    <left-back-bottom-point  x="-0.0025" y="-0.1" z="0.0"  />
-    <right-front-bottom-point  x="0.0025" y="0.1" z="0.0"  />
+    <left-front-bottom-point  x="0.0025"  y="-0.1"  z="0.0"     />
+    <left-front-top-point     x="0.0025"  y="-0.1"  z="0.0002"  />
+    <left-back-bottom-point   x="-0.0025" y="-0.1"  z="0.0"     />
+    <right-front-bottom-point x="0.0025"  y="0.1"   z="0.0"     />
  </cuboid>
  <algebra val="app-shape" />
 </type>

 <idlist idname="diffraction">
-  <id start="105" end="114" />
+  <id start="105" end="112" />
 </idlist>

 </instrument>
--- a/Code/Mantid/instrument/OSIRIS_Definition.xml
+++ b/Code/Mantid/instrument/OSIRIS_Definition.xml