Changeset 3991 for trunk/MagicSoft/Mars

Timestamp:

05/05/04 19:41:31 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (5 diffs)
• MCalibrationChargeCalc.h (modified) (1 diff)
• MCalibrationChargePix.cc (modified) (1 diff)
• MCalibrationChargePix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -570 +570 @@
       MPedestalPix  &ped = (*fPedestals)[pixid];
       MBadPixelsPix &bad = (*fBadPixels)[pixid];
-
-      FinalizePedestals(ped,pix);
+      const Int_t aidx    = (*fGeom)[pixid].GetAidx();
+
+      FinalizePedestals(ped,pix,aidx);
 
       if (FinalizeCharges(pix,bad))
@@ -596 +597 @@
       MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageArea(aidx);
 
-      FinalizePedestals(ped,pix);
+      FinalizePedestals(ped,pix,aidx);
       FinalizeCharges(pix, fCam->GetAverageBadArea(aidx));
     }
@@ -605 +606 @@
       const MPedestalPix     &ped = fPedestals->GetAverageSector(sector);
       MCalibrationChargePix &pix = (MCalibrationChargePix&)fCam->GetAverageSector(sector);
-
-      FinalizePedestals(ped,pix);
+      FinalizePedestals(ped,pix, 0);
       FinalizeCharges(pix, fCam->GetAverageBadSector(sector));
     }
@@ -705 +705 @@
 // - MCalibrationChargePix::CalcLoGainPedestal()
 //
-void MCalibrationChargeCalc::FinalizePedestals(const MPedestalPix &ped, MCalibrationChargePix &cal)
+void MCalibrationChargeCalc::FinalizePedestals(const MPedestalPix &ped, MCalibrationChargePix &cal, const Int_t aidx)
 {
   
@@ -723 +723 @@
                       prms * fSqrtLoGainSamples,
                       prms * fNumLoGainSamples / num);
-      cal.CalcLoGainPedestal((Float_t)fNumLoGainSamples);
+      cal.CalcLoGainPedestal((Float_t)fNumLoGainSamples, aidx);
     }
   else

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

@@ -80 +80 @@
 
   // functions
-  void   FinalizePedestals      ( const MPedestalPix &ped, MCalibrationChargePix &cal );
+  void   FinalizePedestals      ( const MPedestalPix &ped, MCalibrationChargePix &cal, const Int_t aidx );
   Bool_t FinalizeCharges        ( MCalibrationChargePix &cal, MBadPixelsPix &bad      );
   Bool_t FinalizePINDiode       ();

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -697 +697 @@
     {
       *fLog << warn << GetDescriptor() << ": Conversion F-Factor Method Rel. Variance: " 
-            << convrelvar << " above limits of: [0," << Form("%3.2f",fConvFFactorRelVarLimit)
+            << convrelvar << " above limits of: [0," << Form("%3.2f",limit)
             << "] in pixel: " << fPixId << endl;
       return kFALSE;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h

@@ -10 +10 @@
 private:
 
-  static const Float_t gkElectronicPedRms;       //! Electronic component of ped. RMS (now set to: 1.5)
-  static const Float_t gkElectronicPedRmsErr;    //! Error Electr. component ped. RMS (now set to: 0.3)
+  static const Float_t gkElectronicPedRmsInner;  //! Electronic component of ped. RMS (now set to: 1.5)
+  static const Float_t gkElectronicPedRmsOuter;  //! Electronic component of ped. RMS (now set to: 1.8)
+  static const Float_t gkElectronicPedRmsErr;    //! Error Electr. component ped. RMS (now set to: 0.35)
   static const Float_t gkFFactor;                //! Laboratory F-factor PMTs         (now set to: 1.15)
   static const Float_t gkFFactorErr;             //! Laboratory F-factor Error PMTs   (now set to: 0.02)
@@ -101 +102 @@
 
   // Calculations
-  void   CalcLoGainPedestal       ( const Float_t logainsamples  );
-  Bool_t CalcReducedSigma  ();
+  void   CalcLoGainPedestal       ( const Float_t logainsamples, const Int_t aidx );
+  Bool_t CalcReducedSigma  (  );
   Bool_t CalcFFactorMethod ();
   Bool_t CalcMeanFFactor   ( const Float_t nphotons, const Float_t nphotonsrelvar );