Changeset 2825

Timestamp:

01/16/04 11:20:15 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MMcCalibrationCalc.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/01/16: Abelardo Moralejo
+   * manalysis/MMcCalibrationCalc.cc
+     - TMath::Max() is no longer used because it did not compile in some 
+       systems for unkown reasons. I replaced it by a safer (and may be 
+       slower) code.
+
  2004/01/15: Abelardo Moralejo
 

trunk/MagicSoft/Mars/manalysis/MMcCalibrationCalc.cc

@@ -223 +223 @@
         //
 
+
         const Float_t pedestrms  = sigpix.IsLoGainUsed()? 
-          sqrt((Double_t)(fSignalCam->GetNumUsedLoGainFADCSlices())) * TMath::Max(0.01, fHeaderFadc->GetPedestalRmsLow(i)) : 
-          sqrt((Double_t)(fSignalCam->GetNumUsedHiGainFADCSlices())) * TMath::Max(0.01, fHeaderFadc->GetPedestalRmsHigh(i));
+          sqrt((Double_t)(fSignalCam->GetNumUsedLoGainFADCSlices())) * 
+          (fHeaderFadc->GetPedestalRmsLow(i)>0.? fHeaderFadc->GetPedestalRmsLow(i): 0.01)
+          : 
+          sqrt((Double_t)(fSignalCam->GetNumUsedHiGainFADCSlices())) * 
+          (fHeaderFadc->GetPedestalRmsHigh(i)>0.? fHeaderFadc->GetPedestalRmsHigh(i) : 0.01);
 
         calpix.SetPedestal(pedestmean, pedestrms);