WIP Transform events to HKL frame.

Refs #11056
mantidproject · Dec 9, 2015 · bbe7caf · bbe7caf
1 parent 4414354
commit bbe7caf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/Framework/MDAlgorithms/src/LoadSQW2.cpp b/Framework/MDAlgorithms/src/LoadSQW2.cpp
@@ -260,7 +260,8 @@ void LoadSQW2::readDataSection() {
     auto signal = pixBuffer[offset + 7];
     auto error = pixBuffer[offset + 8];
     auto u1(pixBuffer[offset]), u2(pixBuffer[offset + 1]),
-        u3(pixBuffer[offset + 2]), en(pixBuffer[offset+3]);
+        u3(pixBuffer[offset + 2]), en(pixBuffer[offset + 3]);
+    toHKL(u1, u2, u3, irun);
     coord_t centres[4] = {u1, u2, u3, en};
     m_outputWS->addEvent(
         MDEvent<4>(signal, error * error, irun, idet, centres));
@@ -342,7 +343,7 @@ void LoadSQW2::readSQWDimensions() {
       os << val << ",";
     }
     os << "\n";
-    os << "    ulimits: ";
+    os << "    ulimits (from file): ";
     for (size_t i = 0; i < 4; ++i) {
       os << "(" << urange[0][i] << "," << urange[1][i] << ") ";
     }
@@ -359,12 +360,18 @@ void LoadSQW2::readSQWDimensions() {
   const char *ids[] = {"Q1", "Q2", "Q3", "DeltaE"};
   const char *units[] = {"A\\^-1", "A\\^-1", "A\\^-1", "mev"};
   const char *frames[] = {"HKL", "HKL", "HKL", "meV"};
+  std::vector<float> dimMin{urange[0][0], urange[0][1], urange[0][2],
+                            urange[0][3]};
+  toHKL(dimMin[0], dimMin[1], dimMin[2], 0);
+  std::vector<float> dimMax{urange[1][0], urange[1][1], urange[1][2],
+                            urange[1][3]};
+  toHKL(dimMax[0], dimMax[1], dimMax[2], 0);
   for (size_t i = 0; i < 4; ++i) {
     MDHistoDimensionBuilder builder;
     builder.setId(ids[i]);
     builder.setName(dimNames[i]);
-    builder.setMin(urange[0][i]);
-    builder.setMax(urange[1][i]);
+    builder.setMin(dimMin[i]);
+    builder.setMax(dimMax[i]);
     builder.setNumBins(static_cast<size_t>(nbins[i]));
     builder.setFrameName(frames[i]);
     builder.setUnits(units[i]);

diff --git a/Framework/MDAlgorithms/test/LoadSQW2Test.h b/Framework/MDAlgorithms/test/LoadSQW2Test.h
@@ -92,8 +92,8 @@ class LoadSQW2Test : public CxxTest::TestSuite {
     TS_ASSERT_EQUALS(4, outputWS.getNumDims());
     std::array<const char *, 4> ids{"Q1", "Q2", "Q3", "DeltaE"};
     std::array<const char *, 4> names{"Q_\\zeta", "Q_\\xi", "Q_\\eta", "E"};
-    std::array<double, 8> ulimits{0.0962059, 2.02969,  -1.01689, -0.881047,
-                                  -1.7117,   -1.10604, 2.5,      147.5};
+    std::array<double, 8> ulimits{0.0439,  0.9271,  -0.4644, -0.4024,
+                                  -0.7818, -0.5052, 2.5,     147.5};
     std::array<size_t, 4> nbins{3, 3, 2, 2};
     std::array<const char *, 4> units{"A\\^-1", "A\\^-1", "A\\^-1", "mev"};
     std::array<const char *, 4> frames{"HKL", "HKL", "HKL", "meV"};
@@ -188,7 +188,7 @@ class LoadSQW2Test : public CxxTest::TestSuite {
         auto idet = iter->getInnerDetectorID(i);
         TSM_ASSERT("Expected 1 <= det ID <= 10. Found " + std::to_string(idet),
                    1 <= idet || idet <= 10);
-        ids[idet-1] += 1;
+        ids[idet - 1] += 1;
       }
     } while (iter->next());
     TS_ASSERT_EQUALS(290, nexpt1);