refs #4201 fixing warnings

mantidproject · Jan 8, 2012 · 6b8b7ff · 6b8b7ff
1 parent 70c8042
commit 6b8b7ff
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp
@@ -632,6 +632,15 @@ ConvertToMDEvents::identifyTheAlg(API::MatrixWorkspace_const_sptr inWS,const std
         }
         TargWSDescription.Ei = getEi(this);
     }
+    // event workspace currenlty can be in TOF units only
+    if(the_algID.find(this->SupportedWS[EventWSType])!=std::string::npos)
+    {
+        if(the_algID.find(this->ConvModes[ConvFromTOF])==std::string::npos){
+            convert_log.error()<<" event workspace: "<<inWS2D->name()<<" has to be in TOF units, but algorithm selector: "<<the_algID<<" suggests other units\n";
+            throw(std::invalid_argument(" Input event workspace has to be in TOF units"));
+        }
+    }
+
     // set up the target workspace description;
     TargWSDescription.n_dims          = nDims;
     TargWSDescription.emode           = emode;