Re #9249 Corrected IDF. Added TODO list.

mantidproject · May 16, 2014 · 2a36af7 · 2a36af7
1 parent f332231
commit 2a36af7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/src/LoadILLReflectometry.cpp b/Code/Mantid/Framework/DataHandling/src/LoadILLReflectometry.cpp
@@ -293,6 +293,8 @@ void LoadILLReflectometry::loadDataIntoTheWorkSpace(NeXus::NXEntry& entry, std::
 	  progress.report();
   }
 
+  // TODO
+  // copy data if m_numberOfTubes = 1 or m_numberOfPixelsPerTube = 1
 
   // Then Tubes
   for (size_t i = 0; i < m_numberOfTubes; ++i)

diff --git a/Code/Mantid/instrument/D17_Definition.xml b/Code/Mantid/instrument/D17_Definition.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.mantidproject.org/IDF/1.0 Schema/IDFSchema.xsd" name="D17" valid-from="1900-01-31 23:59:59"
-valid-to="2100-01-31 23:59:59" last-modified="2014-05-15 15:39:43">
+valid-to="2100-01-31 23:59:59" last-modified="2014-05-16 13:27:36">
   <!-- Author: ricardo.leal@ill.fr -->
   <defaults>
     <length unit="meter" />
@@ -54,22 +54,22 @@ valid-to="2100-01-31 23:59:59" last-modified="2014-05-15 15:39:43">
   </component>
   <!-- Detector Panels -->
   <type name="detectors">
-    <component type="back_detector" idstart="2" idfillbyfirst="y" idstep="1" idstepbyrow="1">
+    <component type="uniq_detector" idstart="2" idfillbyfirst="x" idstep="1" idstepbyrow="256">
       <location z='3.100000' />
     </component>
   </type>
-  <!-- Definition of every bank -->
-  <!-- Back detector: 640 x 640 mm -->
-  <type name="back_detector" is="rectangular_detector" type="pixel" xpixels="64" xstart="0.000000" xstep="0.006700" ypixels="256" ystart="-0.153600" ystep="0.001200">
+  <!-- Definition of the detector -->
+  <!-- Back detector: 30.7 x 42.9 mm -->
+  <type name="uniq_detector" is="rectangular_detector" type="pixel" xpixels="256" xstart="0.000000" xstep="0.001200" ypixels="1" ystart="-0.003350" ystep="0.006700">
     <properties />
   </type>
   <!-- Pixel size = tubePixelSize * tubeWidth-->
   <type is="detector" name="pixel">
     <cuboid id="pixel-shape">
-      <left-front-bottom-point y="-0.002350" x="2.999400" z="0.0" />
-      <left-front-top-point y="0.002350" x="2.999400" z="0.0" />
-      <left-back-bottom-point y="-0.002350" x="2.999400" z="-0.0001" />
-      <right-front-bottom-point y="-0.002350" x="-2.999400" z="0.0" />
+      <left-front-bottom-point y="-0.005700" x="-0.000900" z="0.0" />
+      <left-front-top-point y="0.005700" x="-0.000900" z="0.0" />
+      <left-back-bottom-point y="-0.005700" x="-0.000900" z="-0.0001" />
+      <right-front-bottom-point y="-0.005700" x="0.000900" z="0.0" />
     </cuboid>
     <algebra val="pixel-shape" />
   </type>