refs #4609 Small test to check that the axis captions are correct

for at least an rectangular lattice (To Andrei to verify)
mantidproject · Jan 23, 2012 · 868b42b · 868b42b
1 parent 9801d36
commit 868b42b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp
@@ -336,7 +336,7 @@ void ConvertToMDEvents::exec()
   }
 
 
-  if(TWS.detInfoLost){ // in NoQ mode one can not have DetPositions any more. Neither this information is needed for anything except data conversion interface. 
+  if(TWS.detInfoLost){ // in NoQ mode one may not have DetPositions any more. Neither this information is needed for anything except data conversion interface. 
       buildFakeDetectorsPositions(inWS2D,det_loc);
   }else{
     bool reuse_preprocecced_detectors = getProperty("UsePreprocessedDetectors");
@@ -836,8 +836,9 @@ void ConvertToMDEvents::buildDimNames(MDEvents::MDWSDescription &TargWSDescripti
     if(TargWSDescription.AlgID.find(Q_modes[Q3D])!=std::string::npos){
         std::vector<Kernel::V3D> dim_directions(3);
         dim_directions[0]=TargWSDescription.u;
-        dim_directions[1]=TargWSDescription.v;
-        dim_directions[2]=dim_directions[0].cross_prod(dim_directions[1]);
+        dim_directions[2]=TargWSDescription.u.cross_prod(TargWSDescription.v);
+        dim_directions[1]=dim_directions[2].cross_prod(dim_directions[0]);
+
         for(int i=0;i<3;i++){
             TargWSDescription.dim_names[i]=MDEvents::makeAxisName(dim_directions[i],TWS.defailt_qNames);
             if(TargWSDescription.convert_to_hkl){

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDEventsTest.h b/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDEventsTest.h
@@ -58,6 +58,9 @@ class Convert2AnyTestHelper: public ConvertToMDEvents
    std::string parseConvMode(const std::string &Q_MODE_ID,const std::string &natural_units,const std::vector<std::string> &ws_dim_units){
        return ConvertToMDEvents::parseConvMode(Q_MODE_ID,natural_units,ws_dim_units);
    }
+   void buildDimNames(MDEvents::MDWSDescription &TargWSDescription){
+       this->ConvertToMDEvents::buildDimNames(TargWSDescription);
+   }
 
    void setAlgoID(const std::string &newID){
        ConvertToMDEvents::setAlgoID(newID);
@@ -651,6 +654,26 @@ void testExecQ3D()
     AnalysisDataService::Instance().remove("OutputWorkspace"); 
 }
 
+void test_buildDimNames(){
+
+    MDEvents::MDWSDescription TargWSDescription(4);
+
+    TargWSDescription.u=Kernel::V3D(1,0,0);
+    TargWSDescription.v=Kernel::V3D(0,1,0);
+    TargWSDescription.emode=1;
+    TargWSDescription.AlgID = "QhQkQl";
+    TargWSDescription.convert_to_hkl=true;
+    TargWSDescription.rotMatrix.assign(9,0);
+
+    pAlg->buildDimNames(TargWSDescription);
+    TS_ASSERT_EQUALS("[Qh,0,0]",TargWSDescription.dim_names[0]);
+    TS_ASSERT_EQUALS("[0,Qk,0]",TargWSDescription.dim_names[1]);
+    TS_ASSERT_EQUALS("[0,0,Ql]",TargWSDescription.dim_names[2]);
+
+
+}
+
+
 //DO NOT DISABLE THIS TEST
 void testAlgorithmProperties()
 {