Refs #6086 Wiki doc changes, removed code from test case constructor

mantidproject · May 1, 2013 · 4047e60 · 4047e60
1 parent ba2c77e
commit 4047e60
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/Crystal/src/OptimizeCrystalPlacement.cpp b/Code/Mantid/Framework/Crystal/src/OptimizeCrystalPlacement.cpp
@@ -77,9 +77,9 @@ namespace Mantid
     void OptimizeCrystalPlacement::initDocs()
     {
       this->setWikiSummary(
-          "This algorithms  optimizing goniometer settings  and sample orientation to better index the peaks." );
+          "This algorithm  optimizes goniometer settings  and sample orientation to better index the peaks." );
       this->setOptionalMessage(
-          "This algorithms  optimizing goniometer settings  and sample orientation to better index the peaks." );
+          "This algorithm  optimizes goniometer settings  and sample orientation to better index the peaks." );
     }
 
     void OptimizeCrystalPlacement::init()

diff --git a/Code/Mantid/Framework/Crystal/src/SCDCalibratePanels.cpp b/Code/Mantid/Framework/Crystal/src/SCDCalibratePanels.cpp
@@ -2,9 +2,9 @@
 
 
 This algorithm calibrates sets of Rectangular Detectors in one instrument.
-The initial path, time offset,panel width's, panel height's, panel locations and orientation are all
+The initial path, time offset,panel widths, panel heights, panel locations and orientation are all
 adjusted so the error in q positions from the theoretical q positions is minimized.  Also, there
-are options to optimize taking into account sample position and to have the rotations be rigid rotations.
+are optimize options that take into account sample position and the need for rigid rotations.
 
 Some features:
 

diff --git a/Code/Mantid/Framework/Crystal/test/OptimizeCrystalPlacementTest.h b/Code/Mantid/Framework/Crystal/test/OptimizeCrystalPlacementTest.h
@@ -39,6 +39,14 @@ class OptimizeCrystalPlacementTest: public CxxTest::TestSuite
 public:
   OptimizeCrystalPlacementTest()
   {
+    initted = false;
+  }
+
+  void init()
+  {
+    if( initted)
+      return;
+    initted = true;
     LoadIsawPeaks alg;
     alg.initialize();
     alg.setProperty("Filename", "TOPAZ_5637_8.peaks");
@@ -58,7 +66,7 @@ class OptimizeCrystalPlacementTest: public CxxTest::TestSuite
 
   }
   void test_basic()
-  {
+  { init();
     OptimizeCrystalPlacement alg;
     alg.initialize();
     alg.setPropertyValue("PeaksWorkspace", "abcd");
@@ -131,6 +139,7 @@ class OptimizeCrystalPlacementTest: public CxxTest::TestSuite
 
   void test_tilt()
   {
+    init();
     Kernel::Matrix<double> tilt = PeakHKLErrors::RotationMatrixAboutRegAxis(1, 'x')
         * PeakHKLErrors::RotationMatrixAboutRegAxis(-2, 'y')
         * PeakHKLErrors::RotationMatrixAboutRegAxis(1.3, 'z');
@@ -214,6 +223,7 @@ class OptimizeCrystalPlacementTest: public CxxTest::TestSuite
 
   void test_SamplePosition()
   {
+    init();
     API::IPeak & peak = peaks1->getPeak(0);
     boost::shared_ptr<const Geometry::Instrument> Inst = peak.getInstrument();
     Kernel::V3D SampPos(.0003, -.00025, .00015);
@@ -262,6 +272,7 @@ class OptimizeCrystalPlacementTest: public CxxTest::TestSuite
   DataObjects::PeaksWorkspace_sptr peaks;
   DataObjects::PeaksWorkspace_sptr peaks1;
   Kernel::Matrix<double> origGon5637, origGon5638;
+  bool initted;
 };
 
 #endif /* OPTIMIZECRYSTALPLACEMENTTEST_H_ */