Re #7452 tweak sensitivity algorithms to allow D33 correction

mantidproject · Jan 30, 2014 · 5333bc4 · 5333bc4
1 parent 2aa1695
commit 5333bc4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/CalculateEfficiency.cpp b/Code/Mantid/Framework/Algorithms/src/CalculateEfficiency.cpp
@@ -41,7 +41,7 @@ using namespace DataObjects;
 void CalculateEfficiency::init()
 {
   declareProperty(
-    new WorkspaceProperty<>("InputWorkspace","",Direction::Input, boost::make_shared<CommonBinsValidator>()),
+    new WorkspaceProperty<>("InputWorkspace","",Direction::Input),
                             "The workspace containing the flood data" );
   declareProperty(
     new WorkspaceProperty<>("OutputWorkspace","",Direction::Output),

diff --git a/...ntid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py b/...ntid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/TransmissionUtils.py
@@ -153,8 +153,6 @@ def _normalise(workspace):
     # Ensuring that the binning is uniform
     spec0 = empty_ws.dataX(0)
     spec_last = empty_ws.dataX(empty_ws.getNumberHistograms()-1)
-    diff = sum(spec0)-sum(spec_last)
-    Logger.get("TransmissionUtils").error(str(diff))
     if abs(sum(spec0)-sum(spec_last))>0.000001:
         alg = _execute("ExtractSingleSpectrum",
                        {"InputWorkspace": empty_ws,

diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/SANSSensitivityCorrection.cpp
@@ -112,7 +112,7 @@ void SANSSensitivityCorrection::init()
    else if(count==0)
    {
      g_log.error("Error no entries found in " + filePath);
-     throw Exception::FileError("Error no entries found in " , filePath);
+     return false;
    }
 
    if( entryName[0]=="mantid_workspace_1" ) return true;
@@ -314,7 +314,6 @@ void SANSSensitivityCorrection::exec()
       } else {
         floodWS = rawFloodWS;
       }
-
       // Patch as needed
       if (reductionManager->existsProperty("SensitivityPatchAlgorithm"))
       {