Refs #4980 append option for events

mantidproject · Mar 26, 2012 · 92d1e31 · 92d1e31
1 parent 07a10b9
commit 92d1e31
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/MPIAlgorithms/src/GatherWorkspaces.cpp b/Code/Mantid/Framework/MPIAlgorithms/src/GatherWorkspaces.cpp
@@ -204,15 +204,22 @@ void GatherWorkspaces::execEvent()
   {
     if ( included.rank() == 0 )
     {
-      outputWorkspace->dataX(wi) = eventW->readX(wi);
+      // How do we accumulate the data?
+      std::string accum = this->getPropertyValue("AccumulationMethod");
       std::vector<Mantid::DataObjects::EventList> out_values;
       gather(included, eventW->getEventList(wi), out_values, 0);
-      for (int n = 0; n < included.size(); n++)
-        outputWorkspace->getOrAddEventList(wi) += out_values[n];
-      const ISpectrum * inSpec = eventW->getSpectrum(wi);
-      ISpectrum * outSpec = outputWorkspace->getSpectrum(wi);
-      outSpec->clearDetectorIDs();
-      outSpec->addDetectorIDs( inSpec->getDetectorIDs() );
+      for (int i = 0; i < included.size(); i++)
+      {
+        size_t index = wi; // accum == "Add"
+        if (accum == "Append")
+          index = wi + i * totalSpec;
+        outputWorkspace->dataX(index) = eventW->readX(wi);
+        outputWorkspace->getOrAddEventList(index) += out_values[i];
+        const ISpectrum * inSpec = eventW->getSpectrum(wi);
+        ISpectrum * outSpec = outputWorkspace->getSpectrum(index);
+        outSpec->clearDetectorIDs();
+        outSpec->addDetectorIDs( inSpec->getDetectorIDs() );
+      }
     }
     else
     {