Changes to Crystal tests. Re #6199

mantidproject · May 24, 2013 · 0faf3bd · 0faf3bd
1 parent 009565b
commit 0faf3bd
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 12 deletions.
diff --git a/Code/Mantid/Framework/API/src/AnalysisDataService.cpp b/Code/Mantid/Framework/API/src/AnalysisDataService.cpp
@@ -87,7 +87,10 @@ namespace Mantid
       // if workspace is already in the ADS this is equivalent to rename
       if ( ! workspace->name().empty() )
       {
-          rename( workspace->name(), name );
+          if (workspace->name() != name )
+          {
+              rename( workspace->name(), name );
+          }
           return;
       }
       //Attach the new name to the workspace

diff --git a/Code/Mantid/Framework/Crystal/test/CentroidPeaksTest.h b/Code/Mantid/Framework/Crystal/test/CentroidPeaksTest.h
@@ -159,7 +159,7 @@ class CentroidPeaksTest : public CxxTest::TestSuite
 
     // Create the peaks workspace
     PeaksWorkspace_sptr pkws(new PeaksWorkspace());
-    pkws->setName("TOPAZ");
+    //pkws->setName("TOPAZ");
 
     // Create a single peak on that particular detector
     Peak PeakObj(in_ws->getInstrument(),5050,2.,V3D(1,1,1));

diff --git a/Code/Mantid/Framework/Crystal/test/IntegratePeakTimeSlicesTest.h b/Code/Mantid/Framework/Crystal/test/IntegratePeakTimeSlicesTest.h
@@ -168,8 +168,8 @@ class IntegratePeakTimeSlicesTest: public CxxTest::TestSuite
     pks->addPeak(peak);
 
     IntegratePeakTimeSlices algP;
-    wsPtr->setName("InputWorkspace");
-    pks->setName("PeaksWorkspace");
+    //wsPtr->setName("InputWorkspace");
+    //pks->setName("PeaksWorkspace");
     try
     {
       algP.initialize();
@@ -358,7 +358,7 @@ TotIntensityError     72.7901     90.9626     109.655     125.595     109.655
       Peak peak(instP, pixelp->getID(), 6.955836);
 
       PeaksWorkspace_sptr pks(new PeaksWorkspace());
-      pks->setName("Peaks3");
+      //pks->setName("Peaks3");
       pks->addPeak(peak);
 
       IntegratePeakTimeSlices algP;

diff --git a/Code/Mantid/Framework/Crystal/test/MaskPeaksWorkspaceTest.h b/Code/Mantid/Framework/Crystal/test/MaskPeaksWorkspaceTest.h
@@ -56,7 +56,7 @@ class MaskPeaksWorkspaceTest : public CxxTest::TestSuite
 
     // Create the peaks workspace
     PeaksWorkspace_sptr pkws(new PeaksWorkspace());
-    pkws->setName("TOPAZ");
+    //pkws->setName("TOPAZ");
 
     // This loads (appends) the peaks
     Mantid::DataObjects::Peak PeakObj(inputW->getInstrument(),1000,100.);
@@ -118,7 +118,7 @@ class MaskPeaksWorkspaceTest : public CxxTest::TestSuite
 
     // Create the peaks workspace
     PeaksWorkspace_sptr pkws(new PeaksWorkspace());
-    pkws->setName("TOPAZ");
+    //pkws->setName("TOPAZ");
 
     // This loads (appends) the peaks
     Mantid::DataObjects::Peak PeakObj(inputW->getInstrument(),1000, 1.);

diff --git a/Code/Mantid/Framework/Crystal/test/OptimizeCrystalPlacementTest.h b/Code/Mantid/Framework/Crystal/test/OptimizeCrystalPlacementTest.h
@@ -54,14 +54,14 @@ class OptimizeCrystalPlacementTest: public CxxTest::TestSuite
     loadUB.setProperty("Filename", "ls5637.mat");
     loadUB.execute();
 
-    peaks->setName("abcd");
+    //peaks->setName("abcd");
 
   }
   void test_basic()
   {
     OptimizeCrystalPlacement alg;
     alg.initialize();
-    alg.setPropertyValue("PeaksWorkspace", "abcd");
+    //alg.setPropertyValue("PeaksWorkspace", "abcd");
     alg.setProperty("PeaksWorkspace", peaks);
     alg.setPropertyValue("ModifiedPeaksWorkspace", "ModPeaks");
     alg.setPropertyValue("FitInfoTable", "FitInfoTable");

diff --git a/Code/Mantid/Framework/Crystal/test/PeakIntegrationTest.h b/Code/Mantid/Framework/Crystal/test/PeakIntegrationTest.h
@@ -159,7 +159,7 @@ class PeakIntegrationTest : public CxxTest::TestSuite
 
     // Create the peaks workspace
     PeaksWorkspace_sptr pkws(new PeaksWorkspace());
-    pkws->setName("TOPAZ");
+    //pkws->setName("TOPAZ");
 
     // Create a single peak on that particular detector
     Peak PeakObj(in_ws->getInstrument(),5050,2.,V3D(1,1,1));

diff --git a/Code/Mantid/Framework/Crystal/test/SCDCalibratePanelsTest.h b/Code/Mantid/Framework/Crystal/test/SCDCalibratePanelsTest.h
@@ -63,7 +63,7 @@ class SCDCalibratePanelsTest : public CxxTest::TestSuite
      alg= AlgorithmFactory::Instance().create("SCDCalibratePanels", 1);
 
      alg->initialize();
-     Peakws->setName("PeaksWsp");
+     //Peakws->setName("PeaksWsp");
      alg->setProperty("PeakWorkspace", Peakws );
 
      alg->setProperty("a",14.0);

diff --git a/Code/Mantid/Framework/Crystal/test/SortHKLTest.h b/Code/Mantid/Framework/Crystal/test/SortHKLTest.h
@@ -38,7 +38,7 @@ class SortHKLTest : public CxxTest::TestSuite
     Instrument_sptr inst = ComponentCreationHelper::createTestInstrumentRectangular(4, 10, 1.0);
     PeaksWorkspace_sptr ws(new PeaksWorkspace());
     ws->setInstrument(inst);
-    ws->setName("TOPAZ_peaks");
+    //ws->setName("TOPAZ_peaks");
     double smu = 0.357;
     double amu = 0.011;
 	NeutronAtom *neutron = new NeutronAtom(static_cast<uint16_t>(EMPTY_DBL()), static_cast<uint16_t>(0),