Refs #9445. Added null pointer check to PoldiTimeTransformer

mantidproject · Jun 24, 2014 · c1aec4c · c1aec4c
1 parent 74af488
commit c1aec4c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiTimeTransformer.cpp b/Code/Mantid/Framework/SINQ/src/PoldiUtilities/PoldiTimeTransformer.cpp
@@ -21,6 +21,10 @@ PoldiTimeTransformer::PoldiTimeTransformer(PoldiInstrumentAdapter_sptr poldiInst
 
 void PoldiTimeTransformer::initializeFromPoldiInstrument(PoldiInstrumentAdapter_sptr poldiInstrument)
 {
+    if(!poldiInstrument) {
+        throw std::invalid_argument("Cannot initialize PoldiTimeTransformer from null-instrument.");
+    }
+
     PoldiAbstractDetector_sptr detector = poldiInstrument->detector();
     PoldiAbstractChopper_sptr chopper = poldiInstrument->chopper();
 

diff --git a/Code/Mantid/Framework/SINQ/test/PoldiTimeTransformerTest.h b/Code/Mantid/Framework/SINQ/test/PoldiTimeTransformerTest.h
@@ -72,7 +72,7 @@ class PoldiTimeTransformerTest : public CxxTest::TestSuite
       DetectorElementData data(102, center, m_detector, m_chopper);
 
       TS_ASSERT_DELTA(data.intensityFactor(), 1.010685, 1e-6);
-      //TS_ASSERT_DELTA(data.lambdaFactor(), 2.6941614e-4, 1e-11);
+      TS_ASSERT_DELTA(data.lambdaFactor(), 2.6941614e-4, 1e-11);
       TS_ASSERT_DELTA(data.timeFactor(), 0.9346730, 1e-7);
   }
 
@@ -85,8 +85,18 @@ class PoldiTimeTransformerTest : public CxxTest::TestSuite
       DetectorElementData data(102, center, m_detector, m_chopper);
 
       TS_ASSERT_EQUALS(data.intensityFactor(), elements[102]->intensityFactor());
-      //TS_ASSERT_DELTA(data.lambdaFactor(), 2.6941614e-4, 1e-11);
-      //TS_ASSERT_DELTA(data.timeFactor(), 0.9346730, 1e-7);
+      TS_ASSERT_DELTA(data.lambdaFactor(), 2.6941614e-4, 1e-11);
+      TS_ASSERT_DELTA(data.timeFactor(), 0.9346730, 1e-7);
+  }
+
+  void testInitializationFromInstrument()
+  {
+      TestablePoldiTimeTransformer transformer;
+
+      TS_ASSERT_THROWS_NOTHING(transformer.initializeFromPoldiInstrument(m_instrument));
+
+      PoldiInstrumentAdapter_sptr invalid;
+      TS_ASSERT_THROWS(transformer.initializeFromPoldiInstrument(invalid), std::invalid_argument);
   }
 
   void testTimeTransformedWidth()