refs #4201 Fixing Unix warnings

mantidproject · Dec 7, 2011 · c3bd33e · c3bd33e
1 parent 2287bdc
commit c3bd33e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEvents.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEvents.h
@@ -205,7 +205,7 @@ namespace MDAlgorithms
     template<size_t nd>
     API::IMDEventWorkspace_sptr  createEmptyEventWS(size_t split_into,size_t split_threshold,size_t split_maxDepth);
 
-    // known momentum analysis modes ID-s;
+    // known momentum analysis mo des ID-s;
     std::vector<std::string> Q_modes;
     // known energy transfer modes ID-s
     std::vector<std::string> dE_modes;

diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsUnitsConv.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsUnitsConv.h
@@ -41,7 +41,7 @@ struct UNITS_CONVERSION
     */
     inline void     setUpConversion(ConvertToMDEvents const * const pHost ){UNUSED_ARG(pHost);}
     /// Update all spectra dependednt  variables, relevant to conversion in the loop over spectra (detectors)
-    inline void     updateConversion(uint64_t i){};
+    inline void     updateConversion(uint64_t i){UNUSED_ARG(i);}
     /// Convert current X variable into the units requested;
     inline coord_t  getXConverted(const MantidVec& X,size_t j)const
     {

diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToQ3DdE.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToQ3DdE.h
@@ -58,9 +58,9 @@ namespace MDAlgorithms
     //
     bool is_defined(void)const{return det_dir.size()>0;}
     bool is_defined(size_t new_size)const{return det_dir.size()==new_size;}
-    double  * const pL2(){return &L2[0];}
-    double  * const pTwoTheta(){return &TwoTheta[0];}
-    Kernel::V3D  *const pDetDir(){return &det_dir[0];}
+    double  *  pL2(){return &L2[0];}
+    double  *  pTwoTheta(){return &TwoTheta[0];}
+    Kernel::V3D  * pDetDir(){return &det_dir[0];}
   };
   class DLLExport ConvertToQ3DdE  : public API::Algorithm
   {

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp
@@ -821,10 +821,13 @@ class LOOP_ND<2,Q,MODE,CONV>{
  *  needs to pick up all known algorithms. 
 */
 ConvertToMDEvents::ConvertToMDEvents():
-algo_id(""),
 Q_modes(3),
 dE_modes(4),
-ConvModes(4)
+ConvModes(4),
+// The conversion subalgorithm expects workspaces in these units; 
+// Change of the units have to be accompanied by correspondent change in conversion subalgorithm
+native_inelastic_unitID("DeltaE"),
+native_elastic_unitID("MomentumTransfer") // Why it is a transfer? Hope it is just a momentum
 {
      Q_modes[modQ]="|Q|";
      Q_modes[Q3D] ="QxQyQz";    
@@ -838,11 +841,7 @@ ConvModes(4)
      ConvModes[ConvertFast]="CnvFast";
      ConvModes[ConvByTOF]  ="CnvByTOF";
      ConvModes[ConvFromTOF]="CnvFromTOF";
-     // The conversion subalgorithm expects workspaces in these units; 
-     // Change of the units have to be accompanied by correspondent change in conversion subalgorithm
-     native_inelastic_unitID     ="DeltaE";
-     native_elastic_unitID ="MomentumTransfer"; // Why it is a transfer? Hope it is just a momentum
-
+
 // NoQ --> any Analysis mode will do as it does not depend on it; we may want to convert unuts
     LOOP_ND<MAX_NDIM,NoQ,ANY_Mode,ConvertNo>::EXEC(this);
     LOOP_ND<MAX_NDIM,NoQ,ANY_Mode,ConvertFast>::EXEC(this);