Changeset 4335 for trunk/MagicSoft/Mars

Timestamp:

06/23/04 01:10:43 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mcalib/MCalibrationCam.h (modified) (1 diff)
• mcalib/MHCalibrationCam.cc (modified) (4 diffs)
• mcalib/MHCalibrationCam.h (modified) (3 diffs)
• mjobs/MJCalibration.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.h

@@ -90 +90 @@
   void  SetPulserColor         ( const PulserColor_t col=kCT1 )  { fPulserColor = col; }
   
-  ClassDef(MCalibrationCam, 2)  // Base class Container for Calibration Results Camera
+  ClassDef(MCalibrationCam, 3)  // Base class Container for Calibration Results Camera
 };
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.cc

@@ -90 +90 @@
 //
 MHCalibrationCam::MHCalibrationCam(const char *name, const char *title)
-    :  fBadPixels(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL)
+    :  fBadPixels(NULL), fCam(NULL), fGeom(NULL), fRunHeader(NULL), fDebug(kFALSE)
 {
 
@@ -789 +789 @@
 {
 
+
   if (hist.IsEmpty())
     return;
-  
+
   //
   // 2) Fit the Hi Gain histograms with a Gaussian
@@ -826 +827 @@
   pix.SetHiGainNumPickup  ( hist.GetPickup()    );
   
+  if (IsDebug())
+    {
+      *fLog << dbginf << GetDescriptor() << ": ID " << hist.GetPixId() 
+            << " HiGainSaturation: " << pix.IsHiGainSaturation() 
+            << " HiGainMean: " << hist.GetMean()
+            << " HiGainMeanErr: " << hist.GetMeanErr()
+            << " HiGainMeanSigma: " << hist.GetSigma()
+            << " HiGainMeanSigmaErr: " << hist.GetSigmaErr()
+            << " HiGainMeanProb: " << hist.GetProb()
+            << " HiGainNumBlackout: " << hist.GetBlackout()
+            << " HiGainNumPickup  : " << hist.GetPickup  ()
+            << endl;
+    }
+
 }
 
@@ -890 +905 @@
   pix.SetLoGainNumPickup  ( hist.GetPickup()    );
   
+  if (IsDebug())
+    {
+      *fLog << dbginf << GetDescriptor() << "ID: " << hist.GetPixId() 
+            << " HiGainSaturation: " << pix.IsHiGainSaturation() 
+            << " LoGainMean: " << hist.GetMean()
+            << " LoGainMeanErr: " << hist.GetMeanErr()
+            << " LoGainMeanSigma: " << hist.GetSigma()
+            << " LoGainMeanSigmaErr: " << hist.GetSigmaErr()
+            << " LoGainMeanProb: " << hist.GetProb()
+            << " LoGainNumBlackout: " << hist.GetBlackout()
+            << " LoGainNumPickup  : " << hist.GetPickup  ()
+            << endl;
+    }
+
 }
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationCam.h

@@ -71 +71 @@
 
   Int_t      fPulserFrequency;          // Light pulser frequency
-
+  Bool_t     fDebug;                     
+  
   virtual Bool_t SetupHists(const MParList *pList);
   virtual Bool_t ReInitHists(MParList *pList);  
@@ -139 +140 @@
   const TArrayI       &GetRunNumbers         ()          const;
   const Int_t          GetSize               ()          const  { return fHiGainArray->GetSize();   }
+
+  const Bool_t         IsDebug                ()          const  { return fDebug; }
   
         MHGausEvents  &operator[]            (UInt_t i);
@@ -145 +148 @@
   const MHGausEvents  &operator()            (UInt_t i)  const;
  
+  void SetDebug                (const Bool_t b=kTRUE) { fDebug           = b; }
   void SetAverageNbins        ( const Int_t bins=fgAverageNbins ) { fAverageNbins = bins; }
   void SetNumLoGainSaturationLimit( const Float_t lim) { fNumLoGainSaturationLimit = lim; }

trunk/MagicSoft/Mars/mjobs/MJCalibration.cc

@@ -987 +987 @@
   }
 
+  MHCalibrationChargeCam   chargecam;
+
   plist.AddToList(&pedcam);
+  plist.AddToList(&chargecam);
   plist.AddToList(&fBadPixels);
   plist.AddToList(&fQECam);
@@ -1004 +1007 @@
   calcalc.SetOutputPath(fOutputPath);
   calcalc.SetOutputFile(Form("%s-ChargeCalibStat.txt",(const char*)fRuns->GetRunsAsFileName()));
+
   if (fDebug)
-    calcalc.SetDebug();
+    {
+      chargecam.SetDebug();
+      calcalc.SetDebug();      
+    }
 
   MCalibrationRelTimeCalc  timecalc;