Refs #4531 - Change method used to get third spectra.

An undo of changes made previously on this ticket, and replacing them with a simple change to the Workflow.FixedGrouping property value in TOSCA_parameters.xml.

This gives us the same functionality, but removes the problem of having
more than one spectra with the same ID.

Change to System Tests to follow...

Code/Mantid/Framework/DataHandling/test/LoadRaw3Test.h

@@ -387,7 +387,7 @@ class LoadRaw3Test : public CxxTest::TestSuite
     TS_ASSERT_EQUALS( ptrDet->getID(), 60);
 
     Mantid::Geometry::ParameterMap& pmap = output2D->instrumentParameters();
-    TS_ASSERT_EQUALS( static_cast<int>(pmap.size()), 155);
+    TS_ASSERT_EQUALS( static_cast<int>(pmap.size()), 154);
 	AnalysisDataService::Instance().remove("parameterIDF");
   }
 

Code/Mantid/instrument/TOSCA_Parameters.xml

@@ -51,15 +51,11 @@
     <value val="Fixed" />
 </parameter>
 <parameter name="Workflow.FixedGrouping" type="string">
-    <value val="0-69,70-139" />
+    <value val="0-69,70-139,0-139" />
 </parameter>
 <parameter name="Workflow.Masking" type="string">
     <value val="IdentifyNoisyDetectors" />
 </parameter>
-<!-- Available options are "average", "sum", or "none". -->
-<parameter name="Workflow.Summary" type="string">
-    <value val="Average" />
-</parameter>
 
 </component-link>
 

Code/Mantid/scripts/Inelastic/inelastic_indirect_reducer.py

@@ -94,11 +94,6 @@ def _setup_steps(self):
             else:
                 return
 
-        # "Summary" adds another histogram onto the end of the resultant workspaces.
-        # "none", "sum" or "average" are currently supported.
-        step = steps.Summary(MultipleFrames=self._multiple_frames)
-        self.append_step(step)
-
         step = steps.ConvertToCm1(MultipleFrames=self._multiple_frames)
         step.set_save_to_cm_1(self._save_to_cm_1)
         self.append_step(step)

Code/Mantid/scripts/Inelastic/inelastic_indirect_reduction_steps.py

@@ -581,57 +581,6 @@ def _ws_in_range(self, ranges, xval):
             if ( xval >= range[0] and xval <= range[1] ): result += 1
         return result
 
-class Summary(ReductionStep):
-    """
-    Adds an extra histogram to the workspace(s) that result from the reduction.
-    The options are:
-    
-    * "Sum" - the sum of all the other histograms in the workspace.
-    * "Average" - the average of all the other histograms in the workspace.
-    * "None" - no extra histogram is added.
-    """
-
-    _multiple_frames = False
-
-    def __init__(self, MultipleFrames=False):
-        super(Summary, self).__init__()
-        self._multiple_frames = MultipleFrames
-
-    def execute(self, reducer, file_ws):
-        try: 
-            summary = mtd[file_ws].getInstrument().getStringParameter('Workflow.Summary')[0]
-        except IndexError:
-            return
-
-        if ((summary != "Sum") and (summary != "Average")):
-            return
-
-        if ( self._multiple_frames ):
-            try:
-                workspaceNames = mtd[file_ws].getNames()
-            except AttributeError:
-                workspaceNames = [file_ws]
-        else:
-            workspaceNames = [file_ws]
-
-        for wsName in workspaceNames:
-            try:
-                ws = mtd[wsName]
-            except:
-                continue
-            nSpec = ws.getNumberHistograms()
-            if (nSpec == 0):
-                continue
-            tempName = wsName + '_temp_sum'
-            SumSpectra(InputWorkspace=wsName, OutputWorkspace=tempName)
-
-            if (summary == 'Average'):
-                tempWs = mtd[tempName]
-                tempWs /= nSpec
-            # Note: Detector info of the output becomes spurious as there will be a third entry for a detector 
-            # that does not exist.
-            ConjoinWorkspaces(wsName, tempName, False)
-
 class ConvertToCm1(ReductionStep):
     """
     Converts the workspaces to cm-1.