refs #6856 Resolving merge conflicts

Merge branch 'feature/6856_ConvertToDiffractionMDWS_v2' into develop Conflicts: Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
mantidproject · May 22, 2013 · cb7dade · cb7dade
2 parents 202de9c + 3082a78
commit cb7dade
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace2.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace2.cpp
@@ -104,8 +104,10 @@ namespace MDAlgorithms
       DisabledProperty():
           EnabledWhenProperty("NonExistingProperty",IS_DEFAULT)
       {};
-      virtual bool fulfillsCriterion(const IPropertyManager * algo) const
-      {return false;}
+      virtual bool fulfillsCriterion(const IPropertyManager * /*algo*/) const
+      {
+          return false;
+      }
   };
 
   //----------------------------------------------------------------------------------------------

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMD.cpp
@@ -453,7 +453,9 @@ void ConvertToMD::copyMetaData(API::IMDEventWorkspace_sptr mdEventWS, MDEvents::
   }
 
  // and add it to the target workspace description for further usage as the identifier for the events, which come from this run. 
-  }
+   targWSDescr.addProperty("RUN_INDEX",runIndex,true);
+
+
 
 /** Constructor */
 ConvertToMD::ConvertToMD()