Re #11868 Read sample_magn_field when frequency is left blank

mantidproject · Oct 1, 2015 · e6682c3 · e6682c3
1 parent e75758c
commit e6682c3
Showing 1 changed file with 32 additions and 18 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/CalMuonDetectorPhases.cpp b/Code/Mantid/Framework/Algorithms/src/CalMuonDetectorPhases.cpp
@@ -78,9 +78,41 @@ void CalMuonDetectorPhases::exec() {
   double startTime = getProperty("FirstGoodData");
   double endTime = getProperty("LastGoodData");
 
+  // If startTime is EMPTY_DBL():
+  if (startTime == EMPTY_DBL()) {
+    try {
+      // Read FirstGoodData from workspace logs if possible
+      double firstGoodData = inputWS->run().getLogAsSingleValue("FirstGoodData");
+      startTime = firstGoodData;
+    } catch (...) {
+      g_log.warning("Couldn't read FirstGoodData, setting to 0");
+      // Set startTime to 0
+      startTime = 0.;
+    }
+  }
+  // If endTime is EMPTY_DBL():
+  if (endTime == EMPTY_DBL()) {
+    // Last available time
+    endTime = inputWS->readX(0).back();
+  }
+
   // Get the frequency
   double freq = getProperty("Frequency");
 
+  // If frequency is EMPTY_DBL():
+  if (freq == EMPTY_DBL()) {
+    try {
+      // Read sample_magn_field from workspace logs
+      freq = inputWS->run().getLogAsSingleValue("sample_magn_field");
+      // Multiply by muon gyromagnetic ratio: 0.01355 MHz/G
+      freq *= 2 * M_PI * 0.01355;
+    } catch (...) {
+      throw std::runtime_error(
+          "Couldn't read sample_magn_field. Please provide a value for "
+          "the frequency");
+    }
+  }
+
   // Prepares the workspaces: extracts data from [startTime, endTime] and
   // removes exponential decay
   API::MatrixWorkspace_sptr tempWS = prepareWorkspace(inputWS, startTime, endTime);
@@ -245,24 +277,6 @@ API::MatrixWorkspace_sptr
 CalMuonDetectorPhases::prepareWorkspace(const API::MatrixWorkspace_sptr &ws,
                                         double startTime, double endTime) {
 
-  // If startTime is EMPTY_DBL():
-  if (startTime == EMPTY_DBL()) {
-    try {
-      // Read FirstGoodData from workspace logs if possible
-      double firstGoodData = ws->run().getLogAsSingleValue("FirstGoodData");
-      startTime = firstGoodData;
-    } catch (...) {
-      g_log.warning("Couldn't read FirstGoodData, setting to 0");
-      // Set startTime to 0
-      startTime = 0.;
-    }
-  }
-  // If endTime is EMPTY_DBL():
-  if (endTime == EMPTY_DBL()) {
-    // Last available time
-    endTime = ws->readX(0).back();
-  }
-
   // Extract counts from startTime to endTime
   API::IAlgorithm_sptr crop = createChildAlgorithm("CropWorkspace");
   crop->setProperty("InputWorkspace",ws);