Refs #6550 Published a revert already

"Refs #6550 Added a test program" This reverts commit a1fac66.
mantidproject · Mar 23, 2013 · 1a6738c · 1a6738c
1 parent a1fac66
commit 1a6738c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 274 deletions.
diff --git a/Code/Mantid/Framework/Crystal/CMakeLists.txt b/Code/Mantid/Framework/Crystal/CMakeLists.txt
@@ -112,7 +112,6 @@ set ( TEST_FILES
 	LoadIsawUBTest.h
 	MaskPeaksWorkspaceTest.h
 	NormaliseVanadiumTest.h
-	OptimizeCrystalPlacementTest.h
 	PeakHKLErrorsTest.h
 	PeakIntegrationTest.h
 	PeakIntensityVsRadiusTest.h

diff --git a/Code/Mantid/Framework/Crystal/src/OptimizeCrystalPlacement.cpp b/Code/Mantid/Framework/Crystal/src/OptimizeCrystalPlacement.cpp
@@ -85,7 +85,7 @@ namespace Mantid
           "Workspace of Results");
 
 
-      declareProperty("AdjustSampleOffsets", false,
+      declareProperty("AdjustSampleOffsets", true,
           "If true sample offsets will be adjusted to give better fits, otherwise they will be fixed as zero(def=true)");
 
       declareProperty("OptimizeGoniometerTilt", false, "Set true if main error is due to a tilted Goniometer(def=false)");
@@ -103,8 +103,8 @@ namespace Mantid
       declareProperty(
           "MaxHKLPeaks2Use", -1.0,
           "If less than 0 all peaks are used, otherwise only peaks whose h,k, and l values are below the level are used(def=-1)");
-      declareProperty("MaxSamplePositionChange_meters", .0005,
-          "Maximum Change in Sample position in meters(def=.0005)");
+      declareProperty("MaxSamplePositionChange_meters", .005,
+          "Maximum Change in Sample position in meters(def=.005)");
 
 
       setPropertyGroup("MaxAngularChange", "Tolerance settings");
@@ -350,14 +350,14 @@ namespace Mantid
 
       //------------------ Fix up Covariance output --------------------
       declareProperty( new  WorkspaceProperty< ITableWorkspace>(
-          "OutputNormalisedCovarianceMatrixOptX" , "" ,  Direction::Output ) ,
+          "OutputNormalisedCovarianceMatrix" , "" ,  Direction::Output ) ,
           "The name of the TableWorkspace in which to store the final covariance matrix" );
 
 
       ITableWorkspace_sptr NormCov = fit_alg->getProperty( "OutputNormalisedCovarianceMatrix" );
 
       AnalysisDataService::Instance().addOrReplace( std::string( "CovarianceInfo" ) , NormCov );
-      setPropertyValue( "OutputNormalisedCovarianceMatrixOptX" , std::string( "CovarianceInfo" ) );//What if 2 instances are run
+      setPropertyValue( "OutputNormalisedCovarianceMatrix" , std::string( "CovarianceInfo" ) );//What if 2 instances are run
 
       if ( chisq < 0 || chisq != chisq )
         sigma = -1;

diff --git a/Code/Mantid/Framework/Crystal/test/OptimizeCrystalPlacementTest.h b/Code/Mantid/Framework/Crystal/test/OptimizeCrystalPlacementTest.h
diff --git a/Code/Mantid/Framework/Crystal/test/PeakHKLErrorsTest.h b/Code/Mantid/Framework/Crystal/test/PeakHKLErrorsTest.h
@@ -66,7 +66,7 @@ class Jacob: public API::Jacobian
         alg.execute();
         alg.setProperty("OutputWorkspace","abcd");
         DataObjects::PeaksWorkspace_sptr peaks =alg.getProperty("OutputWorkspace");
-        //std::cout<<"Peaks number="<<peaks->getNumberPeaks()<<std::endl;
+        std::cout<<"Peaks number="<<peaks->getNumberPeaks()<<std::endl;
 
         LoadIsawUB loadUB;
         loadUB.initialize();