refs #6852 Should solve the ticket

in theory. Test are still needed.
mantidproject · Apr 22, 2013 · 10eb402 · 10eb402
1 parent a20cb78
commit 10eb402
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMD.h
@@ -92,8 +92,8 @@ namespace MDAlgorithms
 
         bool buildTargetWSDescription(API::IMDEventWorkspace_sptr spws,const std::string &Q_mod_req,const std::string &dEModeRequested,const std::vector<std::string> &other_dim_names,
                                       const std::string &convert_to_,MDEvents::MDWSDescription &targWSDescr);
-       /// Store metadata
-       uint16_t copyMetaData(API::IMDEventWorkspace_sptr mdEventWS) const;
+       /// Store metadata and set some methadata, needed for plugin to run on the target workspace description
+       void copyMetaData(API::IMDEventWorkspace_sptr mdEventWS,MDEvents::MDWSDescription &targWSDescr) const;
 
        // 
        DataObjects::TableWorkspace_const_sptr preprocessDetectorsPositions( Mantid::API::MatrixWorkspace_const_sptr InWS2D,const std::string &dEModeRequested,bool updateMasks);

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
@@ -370,10 +370,9 @@ void ConvertToMD::exec()
     else // setup existing MD workspace as workspace target.
        m_OutWSWrapper->setMDWS(spws);
 
-     // get the unique number, that identifies the run, the source workspace came from
-    uint16_t numExperiment= copyMetaData(spws);
-    targWSDescr.setProperty<uint16_t>("RUN_INDEX",numExperiment);
-    // preprocess detectors;
+    // copy the necessary methadata and get the unique number, that identifies the run, the source workspace came from.
+    copyMetaData(spws,targWSDescr);
+     // preprocess detectors;
     targWSDescr.m_PreprDetTable = this->preprocessDetectorsPositions(m_InWS2D,dEModReq,getProperty("UpdateMasks"));
 
 
@@ -403,26 +402,32 @@ void ConvertToMD::exec()
 /**
  * Copy over the metadata from the input matrix workspace to output MDEventWorkspace
  * @param mdEventWS :: The output MDEventWorkspace
+ * @param targWSDescr :: The descrition of the target workspace, used in the algorithm 
  *
  * @return  :: the number of experiment info added from the current MD workspace
  */
-uint16_t ConvertToMD::copyMetaData(API::IMDEventWorkspace_sptr mdEventWS) const
+void ConvertToMD::copyMetaData(API::IMDEventWorkspace_sptr mdEventWS, MDEvents::MDWSDescription &targWSDescr) const
 {
+ // Copy ExperimentInfo (instrument, run, sample) to the output WS
+  API::ExperimentInfo_sptr ei(m_InWS2D->cloneExperimentInfo());
+
+  ei->mutableRun().addProperty("W_MATRIX",targWSDescr.m_Wtransf,true);
+  uint16_t runIndex = mdEventWS->addExperimentInfo(ei);
+
   const MantidVec & binBoundaries = m_InWS2D->readX(0);
   auto mapping = m_InWS2D->spectraMap().createIDGroupsMap();
 
+
   uint16_t nexpts = mdEventWS->getNumExperimentInfo();
   for(uint16_t i = 0; i < nexpts; ++i)
   {
     ExperimentInfo_sptr expt = mdEventWS->getExperimentInfo(i);
     expt->mutableRun().storeHistogramBinBoundaries(binBoundaries);
     expt->cacheDetectorGroupings(*mapping);
   }
-  // Copy ExperimentInfo (instrument, run, sample) to the output WS
-   API::ExperimentInfo_sptr ei(m_InWS2D->cloneExperimentInfo());
-   mdEventWS->addExperimentInfo(ei);
-
 
+ // and add it to the target workspace description for further usage as identifier for the workspaces, which come from this run. 
+   targWSDescr.setProperty<uint16_t>("RUN_INDEX",runIndex);
 
 }