refs #4201 Fixing unix error

mantidproject · Jan 9, 2012 · f2a5cab · f2a5cab
1 parent 83865ee
commit f2a5cab
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsCoordTransf.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsCoordTransf.h
@@ -107,16 +107,6 @@ struct COORD_TRANSFORMER
 
 }; // end COORD_TRANSFORMER structure:
 
-template<Q_state Q,AnalMode MODE,CnvrtUnits CONV,XCoordType Type>
-struct ICOORD_TRANSFORMER
-{
-public:
-
-protected:
- // class which would convert units
-     UNITS_CONVERSION<CONV,Type> CONV_UNITS_FROM;
-};
-
 
 //----------------------------------------------------------------------------------------------------------------------
 // SPECIALIZATIONS:
@@ -125,7 +115,7 @@ struct ICOORD_TRANSFORMER
 // NoQ,ANY_Mode -- no units conversion. This templates just copies the data into MD events and not doing any momentum transformations
 //
 template<AnalMode MODE,CnvrtUnits CONV,XCoordType Type> 
-struct COORD_TRANSFORMER<NoQ,MODE,CONV,Type>: public ICOORD_TRANSFORMER<NoQ,MODE,CONV,Type>
+struct COORD_TRANSFORMER<NoQ,MODE,CONV,Type>
 {
     inline bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd)    
     {
@@ -184,7 +174,8 @@ struct COORD_TRANSFORMER<NoQ,MODE,CONV,Type>: public ICOORD_TRANSFORMER<NoQ,MODE
      API::NumericAxis *pYAxis;
      // pointer to MD workspace convertor
      IConvertToMDEventsMethods *pHost;
-
+// class which would convert units
+     UNITS_CONVERSION<CONV,Type> CONV_UNITS_FROM;
 };
 //
 ////----------------------------------------------------------------------------------------------------------------------
@@ -209,7 +200,7 @@ inline double k_trans<Indir>(double Ei, double E_tr){
 //  ----->  modQ
 // modQ,Inelastic 
 template<AnalMode MODE,CnvrtUnits CONV,XCoordType Type> 
-struct COORD_TRANSFORMER<modQ,MODE,CONV,Type>: public ICOORD_TRANSFORMER<modQ,MODE,CONV,Type> 
+struct COORD_TRANSFORMER<modQ,MODE,CONV,Type>
 { 
     inline bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd)
     {
@@ -295,11 +286,13 @@ struct COORD_TRANSFORMER<modQ,MODE,CONV,Type>: public ICOORD_TRANSFORMER<modQ,MO
     Kernel::V3D const *pDet;
     // Calling Mantid algorithm
     IConvertToMDEventsMethods *pHost;
+   // class which would convert units
+     UNITS_CONVERSION<CONV,Type> CONV_UNITS_FROM;
 
 };
 // modQ,Elastic 
 template<CnvrtUnits CONV,XCoordType Type> 
-struct COORD_TRANSFORMER<modQ,Elastic,CONV,Type>: public ICOORD_TRANSFORMER<modQ,Elastic,CONV,Type>
+struct COORD_TRANSFORMER<modQ,Elastic,CONV,Type>
 { 
     inline bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd)
     {
@@ -377,12 +370,15 @@ struct COORD_TRANSFORMER<modQ,Elastic,CONV,Type>: public ICOORD_TRANSFORMER<modQ
     Kernel::V3D const * pDet;
     // Calling Mantid algorithm
     IConvertToMDEventsMethods *pHost;  
+   // class which would convert units
+     UNITS_CONVERSION<CONV,Type> CONV_UNITS_FROM;
+
 };
 
 
 // Direct/Indirect tramsformatiom, this template describes 3D Q analysis mode. 
 template<AnalMode MODE,CnvrtUnits CONV,XCoordType Type> 
-struct COORD_TRANSFORMER<Q3D,MODE,CONV,Type>: public ICOORD_TRANSFORMER<Q3D,MODE,CONV,Type>
+struct COORD_TRANSFORMER<Q3D,MODE,CONV,Type>
 {
     inline bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd)
     {
@@ -461,12 +457,14 @@ struct COORD_TRANSFORMER<Q3D,MODE,CONV,Type>: public ICOORD_TRANSFORMER<Q3D,MODE
     Kernel::V3D const *pDet;
     // Calling Mantid algorithm
     IConvertToMDEventsMethods *pHost;
-
+   // class which would convert units
+     UNITS_CONVERSION<CONV,Type> CONV_UNITS_FROM;
+
 };
 
 // Elastic
 template<CnvrtUnits CONV,XCoordType Type> 
-struct COORD_TRANSFORMER<Q3D,Elastic,CONV,Type>: public ICOORD_TRANSFORMER<Q3D,Elastic,CONV,Type>
+struct COORD_TRANSFORMER<Q3D,Elastic,CONV,Type>
 {
     inline bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd)
     {
@@ -532,6 +530,9 @@ struct COORD_TRANSFORMER<Q3D,Elastic,CONV,Type>: public ICOORD_TRANSFORMER<Q3D,E
     Kernel::V3D const *pDet;
     // pointer to the algoritm, which calls all these transformations
     IConvertToMDEventsMethods *pHost;  
+   // class which would convert units
+     UNITS_CONVERSION<CONV,Type> CONV_UNITS_FROM;
+
 };
 
 

diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsDetInfo.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsDetInfo.h
@@ -29,6 +29,7 @@
 #include "MantidKernel/PhysicalConstants.h"
 #include "MantidKernel/V3D.h"
 #include "MantidDataObjects/Workspace2D.h"
+#include "MantidAPI/Progress.h"
   /** the lightweight class below contain 3D uint vectors, pointing to the positions of the detectors
       This vector used to preprocess and catch the partial positions of the detectors in Q-space
       to avoid repetative calculations, and (possibly) to write these data as part of the physical compression scheme