refs #4201 fixing Unix warnings

mantidproject · Dec 5, 2011 · d5a79ed · d5a79ed
1 parent 1a8ff6b
commit d5a79ed
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEvents.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEvents.h
@@ -140,9 +140,9 @@ namespace MDAlgorithms
 
    // Parts of the identifyMatrixAlg, separated for unit testing:
    std::string parseQMode(const std::string &Q_mode_req,const Strings &ws_dim_names,const Strings &ws_dim_units,Strings &out_dim_names,Strings &out_dim_units, int &nQdims);
-   std::string parseDEMode(const std::string &Q_MODE_ID,const std::string &dE_mode_req,const Strings &ws_dim_names,const Strings &ws_dim_units,Strings &out_dim_names, 
+   std::string parseDEMode(const std::string &Q_MODE_ID,const std::string &dE_mode_req,const Strings &ws_dim_units,Strings &out_dim_names, 
                                  Strings &out_dim_units, int &ndE_dims,std::string &natural_units);
-   std::string parseConvMode(const std::string &Q_MODE_ID,const std::string &natural_units,const Strings &ws_dim_names,const Strings &ws_dim_units);
+   std::string parseConvMode(const std::string &Q_MODE_ID,const std::string &natural_units,const Strings &ws_dim_units);
 
    /** identifies conversion subalgorithm to run on a workspace */
    std::string identifyTheAlg(API::MatrixWorkspace_const_sptr inMatrixWS,const std::string &Q_mode_req, const std::string &dE_mode_req,

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToMDEvents.cpp
@@ -328,9 +328,9 @@ ConvertToMDEvents::identifyMatrixAlg(API::MatrixWorkspace_const_sptr inMatrixWS,
     // identify Q_mode
     Q_MODE_ID = parseQMode (Q_mode_req,ws_dim_names,ws_dim_units,out_dim_names,out_dim_units,nQ_dims);
     // identify dE mode    
-    DE_MODE_ID= parseDEMode(Q_MODE_ID,dE_mode_req,ws_dim_names,ws_dim_units,out_dim_names,out_dim_units,ndE_dims,natural_units);
+    DE_MODE_ID= parseDEMode(Q_MODE_ID,dE_mode_req,ws_dim_units,out_dim_names,out_dim_units,ndE_dims,natural_units);
     // identify conversion mode;
-    CONV_MODE_ID=parseConvMode(Q_MODE_ID,natural_units,ws_dim_names,ws_dim_units);
+    CONV_MODE_ID=parseConvMode(Q_MODE_ID,natural_units,ws_dim_units);
 
     the_WSalgID = Q_MODE_ID+DE_MODE_ID+CONV_MODE_ID;
 
@@ -345,7 +345,7 @@ ConvertToMDEvents::identifyMatrixAlg(API::MatrixWorkspace_const_sptr inMatrixWS,
   *@param ws_dim_units  -- vector of input workspace dimensions units ID-s
 */
 std::string
-ConvertToMDEvents::parseConvMode(const std::string &Q_MODE_ID,const std::string &natural_units,const Strings &ws_dim_names,const Strings &ws_dim_units)
+ConvertToMDEvents::parseConvMode(const std::string &Q_MODE_ID,const std::string &natural_units,const Strings &ws_dim_units)
 {
     std::string CONV_MODE_ID("Unknown");
     // IDENTIFY UNITS CONVERSION MODE
@@ -392,7 +392,7 @@ ConvertToMDEvents::parseConvMode(const std::string &Q_MODE_ID,const std::string
   *@returns natural_units -- name of the units, the algorithm expects to work with. 
 */
 std::string 
-ConvertToMDEvents::parseDEMode(const std::string &Q_MODE_ID,const std::string &dE_mode_req,const Strings &ws_dim_names,const Strings &ws_dim_units,Strings &out_dim_names,Strings &out_dim_units, 
+ConvertToMDEvents::parseDEMode(const std::string &Q_MODE_ID,const std::string &dE_mode_req,const Strings &ws_dim_units,Strings &out_dim_names,Strings &out_dim_units, 
                                int &ndE_dims,std::string &natural_units)
 {
     std::string DE_MODE_ID= dE_mode_req;

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDEventsTest.h b/Code/Mantid/Framework/MDAlgorithms/test/ConvertToMDEventsTest.h
@@ -46,11 +46,11 @@ class Convert2AnyTestHelper: public ConvertToMDEvents
       return ConvertToMDEvents::parseQMode(Q_mode_req,ws_dim_names,ws_dim_units,out_dim_names,out_dim_units, nQ_dims);
     }
     //
-    std::string parseDEMode(const std::string &Q_MODE_ID,const std::string &dE_mode_req,const std::vector<std::string> &ws_dim_names,const std::vector<std::string> &ws_dim_units,
+    std::string parseDEMode(const std::string &Q_MODE_ID,const std::string &dE_mode_req,const std::vector<std::string> &ws_dim_units,
                             std::vector<std::string> &out_dim_names,std::vector<std::string> &out_dim_units, 
                                int &ndE_dims,std::string &natural_units)
    {
-       return ConvertToMDEvents::parseDEMode(Q_MODE_ID,dE_mode_req,ws_dim_names,ws_dim_units,out_dim_names,out_dim_units,ndE_dims,natural_units);
+       return ConvertToMDEvents::parseDEMode(Q_MODE_ID,dE_mode_req,ws_dim_units,out_dim_names,out_dim_units,ndE_dims,natural_units);
 
    }
 
@@ -97,6 +97,12 @@ void testInit(){
 
     TSM_ASSERT_EQUALS("algortithm should have 8 propeties",8,(size_t)(pAlg->getProperties().size()));
 }
+void testParseQMode_NoQ()
+{
+    std::string MODE;
+    //MODE=pAlg->parseQMode("",const std::vector<std::string> &ws_dim_names,const std::vector<std::string> &ws_dim_units,
+
+}
 // --> GET DIMENSIONS FROM WS MATRIX:
 void testNeedsNumericAxis(){
     Mantid::API::MatrixWorkspace_sptr ws2D =WorkspaceCreationHelper::Create2DWorkspace(4,10);