Re #4303 tweak X grouping

mantidproject · Feb 2, 2012 · 352d9cf · 352d9cf
1 parent ae45247
commit 352d9cf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/Code/Mantid/scripts/LargeScaleStructures/REF_L_geometry.py b/Code/Mantid/scripts/LargeScaleStructures/REF_L_geometry.py
@@ -19,8 +19,7 @@ def create_grouping(workspace=None):
     f = open("REFL_Detector_Grouping_Sum_X.xml",'w')
     f.write("<detector-grouping description=\"Integrated over X\">\n")
 
-    # Pixels are in the reverse order as read by the users
-    for y in range(npix_y-1,-1,-1):
+    for y in range(npix_y):
         # index = max_y * x + y
         indices = range(y, npix_x*(npix_y-1), npix_y)
 

diff --git a/Code/Mantid/scripts/reduction/instruments/reflectometer/data_manipulation.py b/Code/Mantid/scripts/reduction/instruments/reflectometer/data_manipulation.py
@@ -34,11 +34,29 @@ def counts_vs_y_distribution(file_path, minTOF, maxTOF):
     ws_output = "__REFL_Y_distribution"
     graph_name = "Counts vs Y"
     LoadEventNexus(Filename=file_path, OutputWorkspace=ws)
-    ws_integrated = wks_utility.createIntegratedWorkspace(mtd[ws],ws_output,0,303,0,255)
+
+    # 1D plot
+    GroupDetectors(InputWorkspace=ws, OutputWorkspace=ws_output,
+                   MapFile="Grouping/REFL_Detector_Grouping_Sum_X.xml")
     Transpose(InputWorkspace=ws_output, OutputWorkspace=ws_output)
-
+
+    # The pixel numbers start at 1 from the perspective of the users
+    # They also read in reversed order
+    x=mtd[ws_output].dataX(0)
+    y_reversed=mtd[ws_output].dataY(0)
+    y=[i for i in y_reversed]
+    for i in range(len(x)):
+        x[i] += 1
+        y_reversed[i] = y[len(y)-1-i]
+
+    # Copy over the units
+    units = mtd[ws_output].getAxis(0).getUnit().name()
+    mtd[ws_output].getAxis(0).setUnit(units)
+
+    # 2D plot
     Rebin(InputWorkspace=ws,OutputWorkspace=ws,Params="0,200,200000")
-    ws_integrated = wks_utility.createIntegratedWorkspace(mtd[ws],ws_output+"_2D",0,303,0,255)
+    GroupDetectors(InputWorkspace=ws, OutputWorkspace=ws_output+'_2D',
+                   MapFile="Grouping/REFL_Detector_Grouping_Sum_X.xml")
 
     g = _qti.app.graph(graph_name)
     if g is None: