Working on figuring out the problem with the geometry correction. Thi…

…s refs #4303
mantidproject · Feb 23, 2012 · f984766 · f984766
1 parent d5601cf
commit f984766
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/RefLReduction.py b/Code/Mantid/Framework/PythonAPI/PythonAlgorithms/RefLReduction.py
@@ -62,7 +62,7 @@ def PyExec(self):
         # Q binning for output distribution
         q_min = self.getProperty("QMin")
         q_step = self.getProperty("QStep")
-                
+
         #dimension of the detector (256 by 304 pixels)
         maxX = 304
         maxY = 256
@@ -240,7 +240,7 @@ def PyExec(self):
                                               source_to_detector=dMD,
                                               sample_to_detector=dSD,
                                               theta=theta,
-                                              geo_correction=False,
+                                              geo_correction=True,
                                               q_binning=[q_min,q_step,q_max])
 
         ws_data = "_DataWks"
@@ -306,6 +306,8 @@ def PyExec(self):
             ConvertToHistogram(InputWorkspace=ws_integrated_data,
                                OutputWorkspace=ws_data)
 
+        Rebin(InputWorkspace=ws_data, OutputWorkspace=ws_data, Params=[q_step])
+
         # Work on Normalization file #########################################
         if (NormFlag):
 
@@ -421,10 +423,6 @@ def PyExec(self):
                                  WorkspaceToMatch=ws_data,
                                  OutputWorkspace=ws_norm_rebinned)
 
-
-                RebinToWorkspace(WorkspaceToRebin=ws_integrated_data,
-                                 WorkspaceToMatch=ws_data,
-                                 OutputWorkspace=ws_norm_rebinned)
 #perform the integration myself
 #            mt_temp = mtd[ws_norm_rebinned]
 #            x_axis = mt_temp.readX(0)[:]   #[9100,9300,.... 23500] (73,1)

diff --git a/Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refl_data_simple.py b/Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refl_data_simple.py
@@ -713,9 +713,9 @@ def set_editing_state(self, state):
         self._norm_clicked(state.NormFlag)
 
         # Q binning
-        #self._summary.q_min_edit.setText(str(state.q_min))
-        #self._summary.log_scale_chk.setChecked(state.q_step<0)
-        #self._summary.q_step_edit.setText(str(math.fabs(state.q_step)))
+        self._summary.q_min_edit.setText(str(state.q_min))
+        self._summary.log_scale_chk.setChecked(state.q_step<0)
+        self._summary.q_step_edit.setText(str(math.fabs(state.q_step)))
 
         # Scattering angle
         if hasattr(state, "use_center_pixel"):