refs #4201 Fixing test failure

Trivial fix (piece of code commented)
mantidproject · Dec 9, 2011 · d395410 · d395410
1 parent c8e91c9
commit d395410
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/Kernel/src/Unit.cpp b/Code/Mantid/Framework/Kernel/src/Unit.cpp
@@ -787,13 +787,13 @@ void Momentum::init()
     if ( emode == 1 ) // Direct
     {
       ltot = l2;
-      sfpFrom = ( sqrt( PhysicalConstants::NeutronMass / (2.0*PhysicalConstants::meV) ) * TOFisinMicroseconds * l1 ) / sqrt(efixed);
+      sfpFrom = sfpTo;
       do_sfpFrom = true;
     }
     else if ( emode == 2 ) // Indirect
     {
       ltot = l1;
-      sfpFrom = ( sqrt( PhysicalConstants::NeutronMass / (2.0*PhysicalConstants::meV) ) * TOFisinMicroseconds * l2 ) / sqrt(efixed);
+      sfpFrom = sfpTo;
       do_sfpFrom = true;
     }
     else
@@ -829,7 +829,7 @@ double Momentum::singleFromTOF(const double tof) const
 {
   double x = tof;
   if (do_sfpFrom) x -= sfpFrom;
-  if (x==0.)      x  = DBL_MIN;
+  if (x==0)       x  = DBL_MIN;
 
   return factorFrom/x;
 }

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp
@@ -796,7 +796,7 @@ class LOOP_ND{
             num << i;
             std::string Key = pH->Q_modes[Q]+pH->dE_modes[MODE]+pH->ConvModes[CONV]+num.str();
 
-          //  pH->alg_selector.insert(std::pair<std::string,pMethod>(Key,&ConvertToMDEvents::processQND<i,Q,MODE,CONV>));
+            pH->alg_selector.insert(std::pair<std::string,pMethod>(Key,&ConvertToMDEvents::processQND<i,Q,MODE,CONV>));
     }
 };
 template< Q_state Q, AnalMode MODE, CnvrtUnits CONV >