Make sans gui work for none disc samples. re #4357

mantidproject · Dec 21, 2011 · 0028606 · 0028606
1 parent d0fdb80
commit 0028606
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/SANSRunWindow.cpp
@@ -1892,7 +1892,10 @@ QString SANSRunWindow::readUserFileGUIChanges(const States type)
 ///Reads the sample geometry, these settings will override what is stored in the run file
 QString SANSRunWindow::readSampleObjectGUIChanges()
 {
-  QString exec_reduce("\ni.ReductionSingleton().get_sample().geometry.height = ");
+  QString exec_reduce("\ni.ReductionSingleton().get_sample().geometry.shape = ");
+  exec_reduce += m_uiForm.sample_geomid->currentText().at(0);
+
+  exec_reduce +="\ni.ReductionSingleton().get_sample().geometry.height = ";
   exec_reduce += m_uiForm.sample_height->text();
 
   exec_reduce += "\ni.ReductionSingleton().get_sample().geometry.width = ";
@@ -1901,8 +1904,6 @@ QString SANSRunWindow::readSampleObjectGUIChanges()
   exec_reduce += "\ni.ReductionSingleton().get_sample().geometry.thickness = ";
   exec_reduce += m_uiForm.sample_thick->text();
 
-  exec_reduce += "\ni.ReductionSingleton().get_sample().geometry.shape = ";
-  exec_reduce += m_uiForm.sample_geomid->currentText().at(0);
   exec_reduce += "\n";
 
   return exec_reduce;

diff --git a/Code/Mantid/scripts/SANS/isis_reducer.py b/Code/Mantid/scripts/SANS/isis_reducer.py
@@ -115,6 +115,10 @@ def _init_steps(self):
                                isis_reduction_steps.TransmissionCalc(loader=None)
         self._corr_and_scale = isis_reduction_steps.AbsoluteUnitsISIS()
 
+        # note CalculateNormISIS does not inherit from ReductionStep 
+        # so currently do not understand why it is in isis_reduction_steps
+        # Also the main purpose of this class is to use it as an input argument
+        # to ConvertToQ below
         self.prep_normalize = isis_reduction_steps.CalculateNormISIS(
                             [self.norm_mon, self.transmission_calculator])
 

diff --git a/Code/Mantid/scripts/reduction/instruments/sans/sans_reduction_steps.py b/Code/Mantid/scripts/reduction/instruments/sans/sans_reduction_steps.py
@@ -1443,10 +1443,12 @@ def execute(self, reducer, workspace):
                 volume = self.geo.height*math.pi
                 volume *= math.pow(self.geo.width,2)/4.0
             elif self.geo.shape == 'cuboid':
+                # Flat plate sample
                 volume = self.geo.width
                 volume *= self.geo.height*self.geo.thickness
             elif self.geo.shape == 'cylinder-axis-along':
                 # Factor of four comes from radius = width/2
+                # Disc - where height is not used
                 volume = self.geo.thickness*math.pi
                 volume *= math.pow(self.geo.width, 2)/4.0
             else: