Changeset 3702 for trunk

Timestamp:

04/09/04 19:33:44 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (8 diffs)
• MCalibrationChargeCalc.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -499 +499 @@
 // Retrieves pedestal and pedestal RMS from MPedestalPix 
 // Retrieves total entries from MPedestalCam
-// Sums up pedestal and pedestalRMS for the average pixel
 // Sets pedestal*fNumHiGainSamples and pedestal*fNumLoGainSamples in MCalibrationChargePix
 // Sets pedRMS *fSqrtHiGainSamples and pedRMS *fSqrtLoGainSamples in MCalibrationChargePix
 //
-void MCalibrationChargeCalc::FinalizePedestals(const MPedestalPix &ped, MCalibrationChargePix &cal,
-                                               Float_t &avped, Float_t &avrms)
+void MCalibrationChargeCalc::FinalizePedestals(const MPedestalPix &ped, MCalibrationChargePix &cal)
 {
   
@@ -514 +512 @@
   const Float_t num    = TMath::Sqrt((Float_t)fPedestals->GetTotalEntries());
 
-  //
-  // Calculate the average pedestal
-  //
-  avped += pedes;
-  avrms += prms;
-  
   //
   // set them in the calibration camera
@@ -537 +529 @@
     }
   
-}
-
-void MCalibrationChargeCalc::FinalizeAvPedestals(MCalibrationChargePix &cal, 
-                                                 Float_t avped, Float_t avrms, Int_t avnum)
-{
-  
-  //
-  // set the pedestans in the calibration camera
-  //
-  if (cal.IsHiGainSaturation())
-    {
-      cal.SetPedestal(avped/avnum * fNumLoGainSamples,
-                      avrms/avnum * fSqrtLoGainSamples,
-                      avrms/avnum * fSqrtLoGainSamples/avnum);
-      cal.CalcLoGainPedestal((Float_t)fNumLoGainSamples);
-    }
-  else
-    {
-      cal.SetPedestal(avped/avnum * fNumHiGainSamples,
-                      avrms/avnum * fSqrtHiGainSamples,
-                      avrms/avnum * fSqrtHiGainSamples/avnum);
-    }
 }
 
@@ -626 +596 @@
       return kFALSE;
     }
+
   return kTRUE;
 }
@@ -1134 +1105 @@
   //
   Int_t   nvalid      = 0;
-  Float_t avinnerped  = 0.;
-  Float_t avinnerprms = 0.;
-  Int_t   avinnernum  = 0;
-  Float_t avouterped  = 0.;
-  Float_t avouterprms = 0.;
-  Int_t   avouternum  = 0;
 
   for (Int_t pixid=0; pixid<fPedestals->GetSize(); pixid++)
@@ -1154 +1119 @@
       MBadPixelsPix &bad = (*fBadPixels)[pixid];
 
-      if (fGeom->GetPixRatio(pixid) == 1.)
-        {
-          FinalizePedestals(ped,pix,avinnerped,avinnerprms);
-          avinnernum++;
-        }
-      else
-        {
-          FinalizePedestals(ped,pix,avouterped,avouterprms);
-          avouternum++;
-        }
+      FinalizePedestals(ped,pix);
 
       if (FinalizeCharges(pix,bad))
-          nvalid++;
+        nvalid++;
     }
   
@@ -1185 +1141 @@
     {
 
-      FinalizeAvPedestals((MCalibrationChargePix&)fCam->GetAverageArea(aidx), 
-                          avinnerped, avinnerprms,avinnernum);
-      FinalizeCharges((MCalibrationChargePix&)fCam->GetAverageArea(aidx),
-                      fCam->GetAverageBadArea(aidx));
+      const MPedestalPix     &ped = fPedestals->GetAverageArea(aidx);
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageArea(aidx);
+
+      FinalizePedestals(ped,pix);
+      FinalizeCharges(pix, fCam->GetAverageBadArea(aidx));
     }
   
@@ -1194 +1151 @@
     {
 
-      FinalizeAvPedestals((MCalibrationChargePix&)fCam->GetAverageSector(sector), 
-                          avinnerped, avinnerprms,avinnernum);
-      FinalizeCharges((MCalibrationChargePix&)fCam->GetAverageSector(sector),
-                      fCam->GetAverageBadSector(sector));
+      const MPedestalPix     &ped = fPedestals->GetAverageSector(sector);
+      MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageSector(sector);
+
+      FinalizePedestals(ped,pix);
+      FinalizeCharges(pix, fCam->GetAverageBadSector(sector));
     }
   

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

@@ -78 +78 @@
 
   // functions
-  void   FinalizePedestals      ( const MPedestalPix &ped, MCalibrationChargePix &cal,
-                                  Float_t &avped, Float_t &avrms                      );
-  void   FinalizeAvPedestals    ( MCalibrationChargePix &cal, 
-                                  Float_t avped, Float_t avrms, Int_t avnum);
+  void   FinalizePedestals      ( const MPedestalPix &ped, MCalibrationChargePix &cal );
   Bool_t FinalizeCharges        ( MCalibrationChargePix &cal, MBadPixelsPix &bad      );
   Bool_t FinalizePINDiode       ();