refs #5754 Fix errors

mantidproject · Aug 20, 2012 · be2bde7 · be2bde7
1 parent 27435a1
commit be2bde7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/StitchGroup1D.cpp b/Code/Mantid/Framework/MDAlgorithms/src/StitchGroup1D.cpp
@@ -91,8 +91,6 @@ namespace MDAlgorithms
 
     declareProperty("StartOverlap", 0.0, overlap_validator->clone(), "Fraction along axis to start overlap. 0 to 1.");
     declareProperty("EndOverlap", 0.1, overlap_validator->clone(), "Fraction along axis to end overlap. 0 to 1.");
-    declareProperty("ExpectGroupWorkspaces", false, "True if the input workspaces expected to be group workspaces.");
-    declareProperty("GroupWorkspaceIndex", 0, "Index of the workspace in the group workspaces");
     declareProperty("ScaleRHSWorkspace", true, "Scaling either with respect to RHS or LHS Workspace.");
     declareProperty("UseManualScaleFactor", false, "True to use a provided value for the scale factor.");
     declareProperty("ManualScaleFactor", 1.0, "Provided value for the scale factor.");

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/StitchGroup1DTest.h b/Code/Mantid/Framework/MDAlgorithms/test/StitchGroup1DTest.h
@@ -506,14 +506,11 @@ class StitchGroup1DTest : public CxxTest::TestSuite
       auto outWS = AnalysisDataService::Instance().retrieveWS<IMDHistoWorkspace>(alg.getPropertyValue("OutputWorkspace"));
       for(size_t i = 0; i < 10; ++i)
       {
-        std::stringstream out;
-        out << "error occured on " << i;
-
-        TSM_ASSERT_DELTA(out.str(), expected_output_signal[i], outWS->signalAt(i), 0.0001);  
+        TS_ASSERT_DELTA(expected_output_signal[i], outWS->signalAt(i), 0.0001);  
       }
 
       double scale_factor = alg.getProperty("OutScaleFactor");
-      TS_ASSERT_EQUALS(manual_scale_factor, scale_factor, 0.0001);
+      TS_ASSERT_EQUALS(manual_scale_factor, scale_factor);
     }
 };