Changeset 3559 for trunk/MagicSoft

Timestamp:

03/19/04 23:01:55 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• mbadpixels/MBadPixelsPix.cc (modified) (1 diff)
• mbadpixels/MBadPixelsPix.h (modified) (3 diffs)
• mcalib/MCalibrationChargeCalc.cc (modified) (3 diffs)
• mcalib/MCalibrationChargeCalc.h (modified) (1 diff)
• mcalib/MCalibrationChargeCam.cc (modified) (3 diffs)
• mcalib/MCalibrationChargePix.cc (modified) (1 diff)
• mcalib/MCalibrationChargePix.h (modified) (3 diffs)

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.cc

@@ -17 +17 @@
 !
 !   Author(s): Thomas Bretz, 1/2004 <mailto:tbretz@astro.uni-wuerzburg.de>
-!
+!              Markus Gaug,  3/2004 <mailto:markus@ifae.es>
+! 
 !   Copyright: MAGIC Software Development, 2000-2004
 !

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -41 +41 @@
       kMeanTimeInFirstBin       = BIT(12),
       kMeanTimeInLastBin        = BIT(13), 
-      kNotCalibrated            = BIT(14)   
+      kDeviatingNumPhes         = BIT(14),
+      kNotCalibrated            = BIT(15)   
     };
     
@@ -69 +70 @@
     void SetLoGainNotFitted          () { fInfo[1] |= kLoGainNotFitted; }
     void SetHiGainNotFitted          () { fInfo[1] |= kHiGainNotFitted; }
+    void SetDeviatingNumPhes         () { fInfo[1] |= kDeviatingNumPhes; }
 
     // Getter
@@ -90 +92 @@
     Bool_t IsLoGainNotFitted          () const      { return fInfo[1] & kLoGainNotFitted;          }
     Bool_t IsHiGainNotFitted          () const      { return fInfo[1] & kHiGainNotFitted;          }
+    Bool_t IsDeviatingNumPhes         () const      { return fInfo[1] & kDeviatingNumPhes;         }    
 
+    
     Bool_t IsLoGainBad() const { return IsLoGainSaturation() || IsConvHiLoNotValid() || IsLoGainOscillating() ;}
     Bool_t IsHiGainBad() const { return (IsHiGainSaturation() && IsConvHiLoNotValid()) || IsHiGainOscillating(); }

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -365 +365 @@
   for (UInt_t i=0; i<npixels; i++)
     {
+
       MCalibrationChargePix &pix = (*fCam)      [i];
       MCalibrationQEPix     &pqe = (*fQECam)    [i];
@@ -506 +507 @@
 Int_t MCalibrationChargeCalc::PostProcess()
 {
+
+  if (GetNumExecutions()==0)
+    return kFALSE;
 
   //
@@ -626 +630 @@
       }
   }
+
   fCam->SetReadyToSave();
-  
-return kTRUE;
-}
+
+  PrintInfo();
+  
+  return kTRUE;
+}
+
+void MCalibrationChargeCalc::PrintInfo()
+{
+  
+  *fLog << inf << endl;
+  *fLog << GetDescriptor() << ": Calibration statistics:" << endl;
+  *fLog << dec << setfill(' ');
+  
+  UInt_t countinner = 0;
+  UInt_t countouter = 0;  
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsOK())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Successfully calibrated Pixels: " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+  
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Bad Pixels:                     " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsUnsuitable(MBadPixelsPix::kUnreliableRun))
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Unreliable Pixels:              " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+
+  *fLog << inf << endl;
+  *fLog << GetDescriptor() << ": Errors statistics:" << endl;  
+
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsChargeIsPedestal())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Signal less than 3 Pedestal RMS:                 " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsChargeErrNotValid())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Signal Error smaller than 0:                     " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+  
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsChargeRelErrNotValid())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Signal Error bigger than Mean Signal:            " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+  
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsChargeSigmaNotValid())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Signal Sigma smaller than Pedestal RMS:          " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+  
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsLoGainSaturation())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Pixels with Low Gain Saturation:                 " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsMeanTimeInFirstBin())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Pixels with Mean Abs. Arr. Time in First Bin:    " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsMeanTimeInLastBin())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Pixels with Mean Abs. Arr. Time in Last 2 Bins:  " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+  
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsHiGainOscillating())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Pixels with changing Hi Gain signal over time:   " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsLoGainOscillating())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Pixels with changing Lo Gain signal over time:   " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (!bad.IsCalibrationFitOK())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Pixels with unsuccessful signal fit:             " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+
+  countinner = 0;
+  countouter = 0;
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
+      if (bad.IsDeviatingNumPhes())
+        {
+          if (fGeom->GetPixRatio(i) == 1.)
+            countinner++;
+          else
+            countouter++;
+        }
+    }
+
+  *fLog << " " << setw(7) << "Pixels with deviating number of phes:            " 
+        << "Inner: " << countinner << " Outer: " << countouter << endl;
+
+}

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

@@ -66 +66 @@
                          Float_t &avped, Float_t &avrms);
   void FinalizeAvPedestals(MCalibrationChargePix &cal, Float_t avped, Float_t avrms, Int_t avnum);
-  
   Bool_t FinalizeCharges(MCalibrationChargePix &cal, MBadPixelsPix &bad);
+  void PrintInfo();
   
 public:

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -13 +13 @@
 ! * in supporting documentation. It is provided "as is" without express
 ! * or implied warranty.
-
 ! *
 !
@@ -895 +894 @@
               if (nphe < lowerpheinnerlimit || nphe > upperpheinnerlimit)
                 {
+                  bad[idx].SetDeviatingNumPhes();
                   bad[idx].SetUnsuitable(MBadPixelsPix::kUnreliableRun);
                   continue;
@@ -909 +909 @@
               if (nphe < lowerpheouterlimit || nphe > upperpheouterlimit)
                 {
+                  bad[idx].SetDeviatingNumPhes();
                   bad[idx].SetUnsuitable(MBadPixelsPix::kUnreliableRun);
                   continue;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -697 +697 @@
     }
   
-  if ( fAbsTimeMean > (Float_t)upperedge-1)
-    {
-      *fLog << warn << "WARNING: Mean ArrivalTime in last extraction bin of the Pixel " << fPixId << endl;
-      *fLog << fAbsTimeMean << "   " << (Float_t)upperedge-1. << endl;
+  if ( fAbsTimeMean > (Float_t)upperedge-2)
+    {
+      *fLog << warn << "WARNING: Mean ArrivalTime in last two extraction bins of the Pixel " << fPixId << endl;
+      *fLog << fAbsTimeMean << "   " << (Float_t)upperedge-2. << endl;
       bad->SetMeanTimeInLastBin();
       bad->SetUnsuitable(MBadPixelsPix::kUnsuitableRun);

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h

@@ -115 +115 @@
           kExcluded, 
           kChargeValid, kTimeFitValid,
-          kHiGainFitted, kLoGainFitted, 
           kBlindPixelMethodValid, kFFactorMethodValid, 
           kPINDiodeMethodValid, kCombinedMethodValid };
@@ -185 +184 @@
   void SetLoGainSaturation    (  const Bool_t b = kTRUE );
   void SetExcluded            (  const Bool_t b = kTRUE );
-  void SetHiGainFitted        (  const Bool_t b = kTRUE );
-  void SetLoGainFitted        (  const Bool_t b = kTRUE );
   void SetBlindPixelMethodValid( const Bool_t b = kTRUE );
   void SetFFactorMethodValid  (  const Bool_t b = kTRUE );
@@ -268 +265 @@
   Bool_t IsHiGainSaturation()                  const;
   Bool_t IsLoGainSaturation()                  const;
-  Bool_t IsHiGainFitted()                      const;
-  Bool_t IsLoGainFitted()                      const;
-  Bool_t IsFitted()                            const;
   Bool_t IsBlindPixelMethodValid()             const;
   Bool_t IsPINDiodeMethodValid()               const;