Changeset 2950 for trunk/MagicSoft/Mars

Timestamp:

01/28/04 21:39:47 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationPix.cc (modified) (2 diffs)
• MCalibrationPix.h (modified) (1 diff)
• MHCalibrationPixel.cc (modified) (1 diff)
• MHCalibrationPixel.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

@@ -312 +312 @@
 // 3) Decide if the LoGain Histogram is fitted or the HiGain Histogram
 // 4) Fit the histograms with a Gaussian
-// 5) In case of failure print out the fit results
+// 5) In case of failure set the bit kFitted to false
 // 6) Retrieve the results and store them in this class
 // 7) Calculate the number of photo-electrons after the F-Factor method
@@ -371 +371 @@
       *fLog << warn << "WARNING: Could not fit charges of pixel " << fPixId << endl;
       //          
-      // 5) In case of failure print out the fit results
-      //
-      //          fHist->PrintChargeFitResult();
+      // 5) In case of failure set the bit kFitted to false
+      //
       CLRBIT(fFlags,kFitted);
     }

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h

@@ -64 +64 @@
           kBlindPixelMethodValid, kFFactorMethodValid, kPINDiodeMethodValid };
   
-  MHCalibrationPixel *fHist;                //! Pointer to the histograms performing the fits, etc.  
+  MHCalibrationPixel *fHist;                // Pointer to the histograms performing the fits, etc.  
 
   Bool_t CheckChargeFitValidity();

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

@@ -331 +331 @@
 {
  
-  fHChargeHiGain->Reset();
-  fHTimeHiGain->Reset();
-  fHChargeLoGain->Reset();
-  fHTimeLoGain->Reset();
-
+  Reset();
+  
   return kTRUE;
 }

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.h

@@ -107 +107 @@
 
   // Getters
-  const TH1F *GetHCharge() const           { return fHChargeHiGain;    }
-
   const Double_t GetChargeMean()     const { return fChargeMean;    }
   const Double_t GetChargeMeanErr()  const { return fChargeMeanErr; }
@@ -129 +127 @@
   const Int_t    GetTimeNdf()         const { return fTimeNdf;       }   
   
+  const TH1F *GetHCharge()                  { return fHChargeHiGain;    }
+  const TH1F *GetHCharge()            const { return fHChargeHiGain;    }
+
   const TH1F *GetHTime()                    { return fHTimeHiGain; }
   const TH1F *GetHTime()              const { return fHTimeHiGain; }