Merge pull request mantidproject#20258 from mantidproject/20210_HET_r…

…eduction Inelastic reduction for HET
wdzhou · Sep 5, 2017 · f497ab5 · f497ab5
2 parents 4ae9781 + 3f1c819
commit f497ab5
Show file tree

Hide file tree

Showing 6 changed files with 26,218 additions and 25,143 deletions.
diff --git a/Framework/Algorithms/test/ConvertUnitsTest.h b/Framework/Algorithms/test/ConvertUnitsTest.h
@@ -58,7 +58,8 @@ void setup_WS(std::string &inputSpace) {
   loader.initialize();
   // Path to test input file assumes Test directory checked out from SVN
   const std::string inputFile =
-      ConfigService::Instance().getInstrumentDirectory() + "HET_Definition.xml";
+      ConfigService::Instance().getInstrumentDirectory() +
+      "HET_Definition_old.xml";
   loader.setPropertyValue("Filename", inputFile);
   loader.setPropertyValue("Workspace", inputSpace);
   loader.setProperty("RewriteSpectraMap", Mantid::Kernel::OptionalBool(false));
@@ -93,7 +94,8 @@ void setup_Points_WS(std::string &inputSpace) {
   loader.initialize();
   // Path to test input file assumes Test directory checked out from SVN
   const std::string inputFile =
-      ConfigService::Instance().getInstrumentDirectory() + "HET_Definition.xml";
+      ConfigService::Instance().getInstrumentDirectory() +
+      "HET_Definition_old.xml";
   loader.setPropertyValue("Filename", inputFile);
   loader.setPropertyValue("Workspace", inputSpace);
   loader.setProperty("RewriteSpectraMap", Mantid::Kernel::OptionalBool(false));

diff --git a/Framework/DataHandling/test/LoadInstrumentTest.h b/Framework/DataHandling/test/LoadInstrumentTest.h
@@ -110,8 +110,8 @@ class LoadInstrumentTest : public CxxTest::TestSuite {
     const auto &detectorInfo = output->detectorInfo();
     const auto &ptrDet103 = detectorInfo.detector(detectorInfo.indexOf(103));
     TS_ASSERT_EQUALS(ptrDet103.getID(), 103);
-    TS_ASSERT_EQUALS(ptrDet103.getName(), "pixel");
-    TS_ASSERT_DELTA(ptrDet103.getPos().X(), 0.4013, 0.01);
+    TS_ASSERT_EQUALS(ptrDet103.getName(), "HET_non_PSDtube");
+    TS_ASSERT_DELTA(ptrDet103.getPos().X(), 0.3826351418, 0.01);
     TS_ASSERT_DELTA(ptrDet103.getPos().Z(), 2.4470, 0.01);
     double d = ptrDet103.getPos().distance(samplepos->getPos());
     TS_ASSERT_DELTA(d, 2.512, 0.0001);
@@ -162,8 +162,8 @@ class LoadInstrumentTest : public CxxTest::TestSuite {
     TS_ASSERT_THROWS_NOTHING(loadAgain.execute());
     TS_ASSERT_EQUALS(output->getInstrument()->baseInstrument(), i);
 
-    // Valid-from/to
-    Kernel::DateAndTime validFrom("1900-01-31T23:59:59");
+    // Valid-from/to1951-01-01 00:00:01
+    Kernel::DateAndTime validFrom("1951-01-01T00:00:01");
     Kernel::DateAndTime validTo("2100-01-31 23:59:59");
     TS_ASSERT_EQUALS(i->getValidFromDate(), validFrom);
     TS_ASSERT_EQUALS(i->getValidToDate(), validTo);

diff --git a/Framework/DataHandling/test/LoadRaw3Test.h b/Framework/DataHandling/test/LoadRaw3Test.h
@@ -112,7 +112,7 @@ class LoadRaw3Test : public CxxTest::TestSuite {
     const auto detIndex = detectorInfo.indexOf(103);
     const auto &det103 = detectorInfo.detector(detIndex);
     TS_ASSERT_EQUALS(det103.getID(), 103);
-    TS_ASSERT_EQUALS(det103.getName(), "pixel");
+    TS_ASSERT_EQUALS(det103.getName(), "HET_non_PSDtube");
     TS_ASSERT_DELTA(detectorInfo.position(detIndex).X(), 0.4013, 0.01);
     TS_ASSERT_DELTA(detectorInfo.position(detIndex).Z(), 2.4470, 0.01);
 
@@ -545,7 +545,7 @@ class LoadRaw3Test : public CxxTest::TestSuite {
     const auto &detector103 = detectorInfo.detector(detectorIndex);
 
     TS_ASSERT_EQUALS(detector103.getID(), 103);
-    TS_ASSERT_EQUALS(detector103.getName(), "pixel");
+    TS_ASSERT_EQUALS(detector103.getName(), "HET_non_PSDtube");
     TS_ASSERT_DELTA(detectorInfo.position(detectorIndex).X(), 0.4013, 0.01);
     TS_ASSERT_DELTA(detectorInfo.position(detectorIndex).Z(), 2.4470, 0.01);