Refs #8506. Updated PlotAsymmetryByLogValue.

So it uses new functionality and doesn't convert the vector to table itself.
mantidproject · Nov 26, 2013 · 42de2f8 · 42de2f8
1 parent 148053b
commit 42de2f8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 100 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h b/Code/Mantid/Framework/Algorithms/inc/MantidAlgorithms/PlotAsymmetryByLogValue.h
@@ -89,13 +89,6 @@ namespace Mantid
       /// Get log value
       double getLogValue(MatrixWorkspace& ws,const std::string& logName);
 
-      /// Create a Dead Time Table using given list of dead times
-      Workspace_sptr deadTimesToTable(const std::vector<double>& deadTimes, size_t numDetectors = 0);
-
-      /// Creates Dead Time Table using all the data between begin and end
-      ITableWorkspace_sptr createDeadTimeTable( std::vector<double>::const_iterator begin, 
-        std::vector<double>::const_iterator end);
-
       /// Runs an appropriate applyDeadTimeCorrection function depending on the type of workspaces
       Workspace_sptr applyDeadTimeCorrection(Workspace_sptr deadTimeWs, Workspace_sptr ws);
 

diff --git a/Code/Mantid/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp b/Code/Mantid/Framework/Algorithms/src/PlotAsymmetryByLogValue.cpp
@@ -164,7 +164,7 @@ namespace Mantid
 
       std::string dtcType = getProperty("DeadTimeCorrType");
 
-      Workspace_sptr deadTimeWs; // Workspace with Dead Time Table[s]
+      Workspace_sptr customDTT; // Workspace with custom Dead Time Table[s]
 
       // If use wants to use Dead Times from his own file, load them
       if(dtcType == "FromSpecifiedFile")
@@ -177,7 +177,7 @@ namespace Mantid
           loadDeadTimes->setPropertyValue("Filename", dtcFile);
           loadDeadTimes->execute();
 
-          deadTimeWs = loadDeadTimes->getProperty("OutputWorkspace");
+          customDTT = loadDeadTimes->getProperty("OutputWorkspace");
         }
         catch(...)
         {
@@ -249,31 +249,20 @@ namespace Mantid
 
         Workspace_sptr loadedWs = loadNexus->getProperty("OutputWorkspace");
 
-        // Get Dead Times from run data file if necessary
-        if(dtcType == "FromRunData")
-        {
-          std::vector<double> deadTimes = loadNexus->getProperty("DeadTimes");
-
-          if(WorkspaceGroup_sptr loadedGroup = boost::dynamic_pointer_cast<WorkspaceGroup>(loadedWs))
-          {
-            // Assume all the WS in a group will have the same number of detectors
-            Workspace2D_sptr firstMember = 
-              boost::dynamic_pointer_cast<Workspace2D>(loadedGroup->getItem(0));
-
-            size_t numDetectors = firstMember->getNumberHistograms();
-
-            deadTimeWs = deadTimesToTable(deadTimes, numDetectors);
-          }
-          else
-            deadTimeWs = deadTimesToTable(deadTimes);
-        }
-
         // Apply Dead Time Correction if necessary
         if(dtcType != "None")
         {
           try
           {
-            loadedWs = applyDeadTimeCorrection(deadTimeWs, loadedWs);
+            if ( dtcType == "FromRunData" )
+            {
+              Workspace_sptr runDataDTT = loadNexus->getProperty("DeadTimesTable");
+              loadedWs = applyDeadTimeCorrection(runDataDTT, loadedWs);
+            }
+            else
+            {
+              loadedWs = applyDeadTimeCorrection(customDTT, loadedWs);
+            }
           }
           catch(...)
           {
@@ -748,71 +737,6 @@ namespace Mantid
       return boost::dynamic_pointer_cast<Workspace2D>(output);
     }
 
-    /**
-     * Create a Dead Time Table using given list of dead times. 
-     *
-     * deadTimes could contain information for multiple Dead Time Tables, in which case 
-     * WorkspaceGroup is returned with information for numDetectors in every workspace.
-     * 
-     * @param    deadTimes :: List of dead times, on for every spectra
-     * @param numDetectors :: How many detectors. If 0 then numDetectors = deadTimes.size()
-     * @return Dead Time Table (ITableWorkspace) or a group of such tables (WorkspaceGroup)
-     */
-    Workspace_sptr PlotAsymmetryByLogValue::deadTimesToTable(const std::vector<double>& deadTimes, 
-      size_t numDetectors)
-    {
-      if(numDetectors == 0 || numDetectors == deadTimes.size())
-      {
-        // Use the whole vector to create a table
-
-        return createDeadTimeTable(deadTimes.begin(), deadTimes.end());
-      }
-      else
-      {
-        // Use parts of vector for multiple workspaces
-
-        if(deadTimes.size() % numDetectors != 0)
-          throw std::invalid_argument("Invalid number of Dead Times. Should me multiple of numDetectors");
-
-        WorkspaceGroup_sptr deadTimeGroup = boost::make_shared<WorkspaceGroup>();
-
-        for(auto it = deadTimes.begin(); it != deadTimes.end(); it += numDetectors)
-        {
-          ITableWorkspace_sptr deadTimeTable = createDeadTimeTable(it, it + numDetectors);
-
-          deadTimeGroup->addWorkspace(deadTimeTable);
-        }
-
-        return deadTimeGroup;
-      }
-    }
-
-    /**
-     * Creates Dead Time Table using all the data between begin and end.
-     *
-     * @param begin :: Iterator to the first element of the data to use
-     * @param   end :: Iterator to the last element of the data to use
-     * @return Dead Time Table create using the data
-     */
-    ITableWorkspace_sptr PlotAsymmetryByLogValue::createDeadTimeTable(
-      std::vector<double>::const_iterator begin, std::vector<double>::const_iterator end)
-    {
-      ITableWorkspace_sptr deadTimeTable = WorkspaceFactory::Instance().createTable("TableWorkspace");
-
-      deadTimeTable->addColumn("int","spectrum");
-      deadTimeTable->addColumn("double","dead-time");
-
-      int s = 1; // Current spectrum
-
-      for(auto it = begin; it != end; it++)
-      {
-        TableRow row = deadTimeTable->appendRow();
-        row << s++ << *it;
-      }
-
-      return deadTimeTable;
-    }
-
   } // namespace Algorithm
 } // namespace Mantid
 

diff --git a/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h b/Code/Mantid/Framework/Algorithms/test/PlotAsymmetryByLogValueTest.h
@@ -169,9 +169,6 @@ class PlotAsymmetryByLogValueTest : public CxxTest::TestSuite
 
   void test_DeadTimeCorrection_FromSpecifiedFile()
   {
-    TS_WARN("Skipped until changed to use new type of DeadTimes");
-    return;
-
     const std::string ws = "Ws";
     const std::string deadTimeWs = "DeadTimeWs";
     const std::string deadTimeFile = "TestDeadTimeFile.nxs";
@@ -234,9 +231,6 @@ class PlotAsymmetryByLogValueTest : public CxxTest::TestSuite
 
   void test_DeadTimeCorrection_FromRunData()
   {
-    TS_WARN("Skipped until changed to use new type of DeadTimes");
-    return;
-
     const std::string ws = "Test_DeadTimeCorrection_FromRunData_Ws";
 
     PlotAsymmetryByLogValue alg;