Changeset 3697 for trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

Timestamp:

04/09/04 17:05:05 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (modified) (18 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -28 +28 @@
 //
 //   Task to calculate the calibration conversion factors and quantum efficiencies 
-//   from the FADC time slices. The integrated time slices have to be delivered by an 
-//   MExtractedSignalCam, pedestals by an MPedestalCam.
-//
-//   The output container MCalibrationCam holds one entry of type MCalibrationChargePix 
-//   for every pixel. It is filled in the following way:
-//
-//   PreProcess(): Initialize MCalibrationCam
+//   from the fit results to the summed FADC slice distributions delivered by 
+//   MCalibrationChargeCam, MCalibrationChargePix, MCalibrationChargeBlindPix and 
+//   MCalibrationChargePINDiode, calculated and filled by MHCalibrationChargeCam, 
+//   MHCalibrationChargePix, MHCalibrationChargeBlindPix and MHCalibrationChargePINDiode.
+//
+//   PreProcess(): Initialize pointers to MCalibrationChargeCam, MCalibrationChargeBlindPix
+//                 MCalibrationChargePINDiode and  MCalibrationQECam
+//
 //                 Initialize pulser light wavelength
 //               
@@ -231 +232 @@
 const Float_t MCalibrationChargeCalc::fgLambdaCheckLimit       = 0.2;
 const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 5.;
-const Float_t MCalibrationChargeCalc::fgTimeLowerLimit         = 1.;
-const Float_t MCalibrationChargeCalc::fgTimeUpperLimit         = 2.;
 // --------------------------------------------------------------------------
 //
@@ -251 +250 @@
 // - fLambdaCheckLimit  to fgLambdaCheckLimit 
 // - fLambdaErrLimit    to fgLambdaErrLimit 
-// - fTimeLowerLimit    to fgTimeLowerLimit 
-// - fTimeUpperLimit    to fgTimeUpperLimit 
 // - fPheErrLimit       to fgPheErrLimit  
 // - fPulserColor       to MCalibrationCam::kCT1
@@ -261 +258 @@
 MCalibrationChargeCalc::MCalibrationChargeCalc(const char *name, const char *title)
     : fBadPixels(NULL), fCam(NULL), fBlindPixel(NULL), fPINDiode(NULL), 
-      fQECam(NULL), fSignals(NULL), fSigBlind(NULL), fSigPIN(NULL),
-      fGeom(NULL), fPedestals(NULL), fEvtTime(NULL)
+      fQECam(NULL), fGeom(NULL), fPedestals(NULL), fEvtTime(NULL)
       {
 
@@ -280 +276 @@
   SetPheErrLimit();
   SetPulserColor(MCalibrationCam::kCT1);
-  SetTimeLowerLimit();
-  SetTimeUpperLimit();
 
   Clear();
@@ -302 +296 @@
 // The following container are searched for and execution aborted if not in MParList:
 //  - MPedestalCam
-//  - MExtractedSignalCam
-//  - MCalibrationChargeCam
 //
 // The following containers are searched and created if they were not found:
@@ -313 +305 @@
 // cannot be found, the corresponding calibration part is only skipped.
 //
-//  - MExtractedSignalBlindPixel and MCalibrationChargeBlindPix
-//  - MExtractedSignalPINDiode   and MCalibrationChargePINDiode
+//  - MCalibrationChargeBlindPix
+//  - MCalibrationChargePINDiode
 //  - MTime
 //
@@ -336 +328 @@
     }
   
-  fSignals = (MExtractedSignalCam*)pList->FindObject("MExtractedSignalCam");
-  if (!fSignals)
-    {
-      *fLog << err << "MExtractedSignalCam not found... aborting" << endl;
-      return kFALSE;
-    }
-  
-  fCam = (MCalibrationChargeCam*)pList->FindObject("MCalibrationChargeCam");
-  if (!fCam)
-    {
-      *fLog << err << "Cannot find MCalibrationChargeCam... aborting" << endl;
-      *fLog << err << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
-      return kFALSE;
-    }
-
   // 
   // Containers that are created in case that they are not there.
@@ -368 +345 @@
     }
 
-  // 
-  // Optional Containers 
-  //
-  fSigBlind = (MExtractedSignalBlindPixel*)pList->FindObject("MExtractedSignalBlindPixel");
-  if (!fSigBlind)
-    *fLog << warn << "MExtractedSignalBlindPixel not found... no blind pixel method! " << endl;
-  else
-    {
-      fBlindPixel = (MCalibrationChargeBlindPix*)pList->FindCreateObj("MCalibrationChargeBlindPix");
-      if (!fBlindPixel)
-        {
-          *fLog << err << "Cannot find nor create MCalibrationChargeBlindPix... aborting" << endl;
-          return kFALSE;
-        }
-    }
-  
-  fSigPIN  = (MExtractedSignalPINDiode*)pList->FindObject("MExtractedSignalPINDiode");
-  if (!fSigPIN)
-    *fLog << warn << "MExtractedSignalPINDiode not found... no PIN Diode method! " << endl;
-  else
-    {
-      fPINDiode = (MCalibrationChargePINDiode*)pList->FindCreateObj("MCalibrationChargePINDiode");
-      if (!fPINDiode)
-        {
-          *fLog << err << "Cannot find nor create MCalibrationChargePINDiode... aborting" << endl;
-          return kFALSE;
-        }
-    }
   
   fEvtTime = (MTime*)pList->FindObject("MTime");
@@ -418 +367 @@
 // The ReInit searches for the following input containers:
 //  - MGeomCam
-//
-// It retrieves the following variables from MExtractedSignalCam:
+//  - MCalibrationChargeCam
+//
+// It retrieves the following variables from MCalibrationChargeCam:
 //
 //  - fNumHiGainSamples 
@@ -446 +396 @@
     }
   
-  fNumHiGainSamples  =  fSignals->GetNumUsedHiGainFADCSlices();
-  fNumLoGainSamples  =  fSignals->GetNumUsedLoGainFADCSlices();
+  fCam = (MCalibrationChargeCam*)pList->FindObject("MCalibrationChargeCam");
+  if (!fCam)
+    {
+      *fLog << err << "Cannot find MCalibrationChargeCam... aborting" << endl;
+      *fLog << err << "Maybe you forget to call an MFillH for the MHCalibrationChargeCam before..." << endl;
+      return kFALSE;
+    }
+
+  // 
+  // Optional Containers 
+  //
+  fBlindPixel = (MCalibrationChargeBlindPix*)pList->FindObject("MCalibrationChargeBlindPix");
+  if (!fBlindPixel)
+    {
+      *fLog << warn << GetDescriptor() 
+            << ": MCalibrationChargeBlindPix not found... no blind pixel method! " << endl;
+      return kFALSE;
+    }
+  
+  fPINDiode = (MCalibrationChargePINDiode*)pList->FindCreateObj("MCalibrationChargePINDiode");
+  if (!fPINDiode)
+    {
+      *fLog << warn << GetDescriptor() 
+            << "MCalibrationChargePINDiode not found... no PIN Diode method! " << endl;
+      return kFALSE;
+    }
+
+  fNumHiGainSamples  =  fCam->GetNumHiGainFADCSlices();
+  fNumLoGainSamples  =  fCam->GetNumLoGainFADCSlices();
   fSqrtHiGainSamples =  TMath::Sqrt(fNumHiGainSamples);
   fSqrtLoGainSamples =  TMath::Sqrt(fNumLoGainSamples);
@@ -565 +542 @@
 // Finalize charges per pixel: 
 // - Check chage validity
-// - Check absolute time validity
 // - Calculate the reduced sigma
 // - Calculate the number of photo-electrons
@@ -609 +585 @@
     }
 
-  //
-  // The check returns kTRUE if:
-  //
-  // The mean arrival time is at least fTimeLowerLimit slices from the lower edge 
-  // and fUpperLimit slices from the upper edge
-  //
-  const Byte_t loweredge  = cal.IsHiGainSaturation() ? fSignals->GetFirstUsedSliceLoGain() 
-                                                     : fSignals->GetFirstUsedSliceHiGain();
-  const Byte_t upperedge  = cal.IsHiGainSaturation() ? fSignals->GetLastUsedSliceLoGain()
-                                                     : fSignals->GetLastUsedSliceHiGain();
-
-  const Float_t lowerlimit = (Float_t)loweredge + fTimeLowerLimit;
-  const Float_t upperlimit = (Float_t)upperedge + fTimeUpperLimit;  
-
-  if ( cal.GetAbsTimeMean() < lowerlimit)
-    {
-      *fLog << warn << GetDescriptor() << ": Mean ArrivalTime in first " << fTimeLowerLimit 
-            << " extraction bin of the Pixel " << cal.GetPixId() << endl;
-      *fLog << cal.GetAbsTimeMean() << "   " << lowerlimit << endl;
-      bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInFirstBin );
-    }
-  
-  if ( cal.GetAbsTimeMean() > upperlimit )
-    {
-      *fLog << warn << GetDescriptor() << ": Mean ArrivalTime in last " << fTimeUpperLimit 
-            << " two extraction bins of the Pixel " << cal.GetPixId() << endl;
-      *fLog << cal.GetAbsTimeMean() << "   " << upperlimit << endl;
-      bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInLast2Bins );
-    }
-      
   if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
     return kFALSE;
@@ -671 +617 @@
 // 3) PINDiode has a fitted charge smaller its fChargeRelErrLimit times its charge error
 // 4) PINDiode has a charge sigma smaller than its Pedestal RMS
-// 5) The mean arrival time is in fTimeLowerLimit slices from the lower edge 
-//    and fUpperLimit slices from the upper edge
 // 
 // Calls:
@@ -680 +624 @@
 {
 
-  if (!fSigPIN)
-    return kFALSE;
-  
   if (!fPINDiode)
     return kFALSE;  
@@ -709 +650 @@
   if (fPINDiode->GetSigma() < fPINDiode->GetPedRms())
     {
-      *fLog << warn << GetDescriptor() << ": Sigma of Fitted Charge smaller than Pedestal RMS in PINDiode " << endl;
-    }
-      return kFALSE;
-
-  const Byte_t  loweredge  = fSigPIN->GetFirstUsedSlice();
-  const Byte_t  upperedge  = fSigPIN->GetLastUsedSlice();
-  const Float_t lowerlimit = (Float_t)loweredge + fTimeLowerLimit;
-  const Float_t upperlimit = (Float_t)upperedge + fTimeUpperLimit;  
-
-  if (fPINDiode->GetAbsTimeMean() < lowerlimit)
-    {
-      *fLog << warn << GetDescriptor() << ": Mean ArrivalTime in first " << fTimeLowerLimit 
-            << " extraction bin in PIN Diode " << endl;
-      *fLog << fPINDiode->GetAbsTimeMean() << "   " << lowerlimit << endl;
-      return kFALSE;
-    }
-  
-  if ( fPINDiode->GetAbsTimeMean() > upperlimit )
-    {
-      *fLog << warn << GetDescriptor() << ": Mean ArrivalTime in last " << fTimeUpperLimit 
-            << " two extraction bins in PIN Diode " << endl;
-      *fLog << fPINDiode->GetAbsTimeMean() << "   " << upperlimit << endl;
-      return kFALSE;
-    }
+      *fLog << warn << GetDescriptor() 
+            << ": Sigma of Fitted Charge smaller than Pedestal RMS in PINDiode " << endl;
+      return kFALSE;
+    }
+
 
   if (!fPINDiode->CalcFluxOutsidePlexiglass())
@@ -760 +682 @@
 {
 
-  if (!fSigBlind)
-    return kFALSE;
-  
   if (!fBlindPixel)
     return kFALSE;  
@@ -1340 +1259 @@
                     "Pixels with Low Gain Saturation:                  ");
   PrintUncalibrated(MBadPixelsPix::kMeanTimeInFirstBin, 
-                    Form("%s%2.1f%s","Mean Abs. Arr. Time in First ",fTimeLowerLimit," Bin(s):          "));
+                    Form("%s%2.1f%s","Mean Abs. Arr. Time in First ",1," Bin(s):          "));
   PrintUncalibrated(MBadPixelsPix::kMeanTimeInLast2Bins, 
-                    Form("%s%2.1f%s","Mean Abs. Arr. Time in Last ",fTimeUpperLimit," Bin(s):           "));
+                    Form("%s%2.1f%s","Mean Abs. Arr. Time in Last ",2," Bin(s):           "));
   PrintUncalibrated(MBadPixelsPix::kHiGainOscillating,   
                     "Pixels with changing Hi Gain signal over time:    ");