Changeset 4333

Timestamp:

06/23/04 00:26:01 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargePix.h (modified) (4 diffs)
• MCalibrationPix.cc (modified) (4 diffs)
• MCalibrationPix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h

@@ -36 +36 @@
   Float_t fPedVar;                          // Variance of pedestal 
   Float_t fPedRms;                          // Pedestal RMS (from MPedestalPix) times sqrt nr. FADC slices
+  Float_t fPedRmsVar;                       // Pedestal RMS (from MPedestalPix) times sqrt nr. FADC slices
   Float_t fPheFFactorMethod;                // Number Phe's calculated (F-factor method)
   Float_t fPheFFactorMethodVar;             // Variance number of Phe's (F-factor method)
@@ -66 +67 @@
   void SetMeanFFactorFADC2Phot  ( const Float_t f)                          { fMeanFFactorFADC2Phot   = f; }
   void SetPedestal              ( const Float_t ped, const Float_t pedrms, const Float_t pederr);
+  void SetPed                   ( const Float_t ped, const Float_t pederr);  
+  void SetPedRMS              ( const Float_t pedrms, const Float_t pedrmserr);  
   void SetPheFFactorMethod      ( const Float_t f)                          { fPheFFactorMethod       = f; }
   void SetPheFFactorMethodVar   ( const Float_t f)                          { fPheFFactorMethodVar    = f; }  
@@ -89 +92 @@
   Float_t GetMeanFFactorFADC2PhotVar () const { return fMeanFFactorFADC2PhotVar; }    
   Float_t GetPed                     () const { return fPed;                     }
-  Float_t GetPedErr                  () const;
+  Float_t GetPedErr                  () const { return TMath::Sqrt(fPedVar);     }
   Float_t GetPedRms                  () const;
   Float_t GetPedRmsErr               () const;
@@ -110 +113 @@
   Bool_t CalcMeanFFactor   ( const Float_t nphotons, const Float_t nphotonsrelvar );
   
-  ClassDef(MCalibrationChargePix, 1)    // Container Charge Calibration Results Pixel
+  ClassDef(MCalibrationChargePix, 2)    // Container Charge Calibration Results Pixel
 };
 

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

@@ -98 +98 @@
   SetExcluded          ( kFALSE );
   SetValid             ( kFALSE );
+  SetDebug             ( kFALSE );
 
 }
@@ -110 +111 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Set the Valid Bit from outside 
+//
+void MCalibrationPix::SetDebug(Bool_t b )
+{ 
+    b ?  SETBIT(fFlags, kDebug) : CLRBIT(fFlags, kDebug); 
+}
 
 // --------------------------------------------------------------------------
@@ -255 +264 @@
 
   if (IsHiGainSaturation())
-    if (fLoGainMeanVar < 0.)
+    if (fLoGainMeanVar < 0. || fLoGainMean < 0.)
       return -1.;
     else
       return fLoGainMeanVar / (fLoGainMean * fLoGainMean);
   else
-    if (fHiGainMeanVar < 0.)
+    if (fHiGainMeanVar < 0. || fHiGainMean < 0.)
       return -1.;
     else
@@ -377 +386 @@
 // --------------------------------------------------------------------------
 //
+// Test bit kDebug
+//
+Bool_t MCalibrationPix::IsDebug()     const
+{ 
+   return TESTBIT(fFlags,kDebug);  
+}
+
+// --------------------------------------------------------------------------
+//
 // Test bit kExcluded
 //

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.h

@@ -27 +27 @@
   Float_t fLoGainProb;        // Probability of fit to low gain values
 
-  enum { kHiGainSaturation, kExcluded, kValid };   // Possible bits to be sets
+  enum { kHiGainSaturation, kExcluded, kValid, kDebug };   // Possible bits to be sets
 
 public:
@@ -60 +60 @@
   void SetSigma      ( const Float_t f ) { IsHiGainSaturation() ? fLoGainSigma       = f : fHiGainSigma       = f     ; }
   void SetSigmaVar   ( const Float_t f ) { IsHiGainSaturation() ? fLoGainSigmaVar    = f : fHiGainSigmaVar    = f  ; }
-  
+
+  void SetDebug           ( const Bool_t  b = kTRUE );  
   void SetExcluded        ( const Bool_t  b = kTRUE );
   void SetHiGainSaturation( const Bool_t  b = kTRUE );
@@ -100 +101 @@
   
   Bool_t  IsHiGainSaturation() const;
+  Bool_t  IsDebug   ()         const;
   Bool_t  IsExcluded()         const;
   Bool_t  IsValid   ()         const;