refs #6543 deal with warnings

mantidproject · Feb 27, 2013 · 2ccd3a7 · 2ccd3a7
1 parent fc53321
commit 2ccd3a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/test/LoadDetectorInfoTest.h b/Code/Mantid/Framework/DataHandling/test/LoadDetectorInfoTest.h
@@ -116,10 +116,9 @@ namespace
       detFalseSize[3*i+1] = 0.22f;
       detFalseSize[3*i+2] = 0.33f;
 
-      detOrient[3*i+0] = static_cast<float>(i*0.1);
-      detOrient[3*i+1] = static_cast<float>(i*0.2);
-      detOrient[3*i+2] = static_cast<float>(i*0.3);
-
+      detOrient[3*i+0] = static_cast<float>(i)*0.1f;
+      detOrient[3*i+1] = static_cast<float>(i)*0.2f;
+      detOrient[3*i+2] = static_cast<float>(i)*0.3f;
       detStruct[2*i+0] = boost::lexical_cast<float>(pressure[ic]);
       detStruct[2*i+1] =boost::lexical_cast<float>(wallThick[ic]);
 

diff --git a/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py
@@ -96,6 +96,7 @@ def diagnose(self, white, **kwargs):
               bleed_pixels - If the bleed test is on then this is the number of pixels ignored within the
                              bleed test diagnostic
               print_results - If True then the results are printed to the screen
+              NEEDED: norm_monitor  - if present, defines the number of monitor to normalize by
         """
         lhs_names = lhs_info('names')
         if len(lhs_names) > 0:
@@ -108,7 +109,7 @@ def diagnose(self, white, **kwargs):
             arg = par.lstrip('diag_')
             if arg not in kwargs:
                 kwargs[arg] = getattr(self, par)
-
+                
         # Get the white beam vanadium integrals
         whiteintegrals = self.do_white(white, None, None) # No grouping yet
         if 'second_white' in kwargs:
@@ -186,7 +187,7 @@ def diagnose(self, white, **kwargs):
         self.spectra_masks = result
         return result
 
-    def do_white(self, white_run, spectra_masks, map_file): 
+    def do_white(self, white_run, spectra_masks, map_file,monitor): 
         """
         Normalise to a specified white-beam run
         """