Changeset 3496 for trunk

Timestamp:

03/13/04 18:31:13 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (2 diffs)
• mcalib/MCalibrationChargeCam.cc (modified) (3 diffs)
• mcalib/MCalibrationChargePix.cc (modified) (4 diffs)
• mcalib/MCalibrationChargePix.h (modified) (1 diff)
• mcalib/MHCalibrationChargeCam.cc (modified) (5 diffs)
• mcalib/MHCalibrationChargeLoGainPix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
  2004/03/13: Markus Gaug 
+
+   * mcalib/MCalibrationChargeCalc.cc
+   * mcalib/MCalibrationChargePix.[h,cc]
+   * mcalib/MCalibrationChargeCam.cc
+   * mcalib/MHCalibrationChargeCam.cc
+   * mcalib/MHCalibrationChargeLoGainPix.cc
+     - fixed Low Gain calibration
+
 
    * mcalib/MHGausEvents.cc

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -444 +444 @@
       if (!pix.CalcReducedSigma())
         {
+          *fLog << warn << GetDescriptor() 
+                << ": Could not calculate reduced sigmas of pixel: " << pix.GetPixId() << endl;
           bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
           continue;
@@ -449 +451 @@
       
       if (!pix.CalcFFactorMethod())
-        bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
-
-    }
-  
-
-
+        {
+          *fLog << warn << GetDescriptor() 
+                << ": Could not calculate F-Factor of pixel: " << pix.GetPixId() << endl;
+          bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
+        }
+    }
+  
   //
   // The Michele check ...

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc

@@ -737 +737 @@
   Int_t   validinner      = 0;
   Int_t   validouter      = 0;
-  
-      
+
   TIter Next(fPixels);
   MCalibrationChargePix *pix;
@@ -845 +844 @@
       if(!bad[idx].IsCalibrationResultOK())
         continue;
-      
+
       const Float_t nphe    = pix2->GetPheFFactorMethod();
       const Float_t npheerr = pix2->GetPheFFactorMethodErr();
@@ -857 +856 @@
           if (ratio == 1.)
             {
-
+              
               if (nphe < lowerpheinnerlimit || nphe > upperpheinnerlimit)
                 {

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -414 +414 @@
 }
 
+Float_t  MCalibrationChargePix::GetPedRms()  const
+{
+  return IsHiGainSaturation() ? fLoGainPedRms : fPedRms;
+}
+
+Float_t  MCalibrationChargePix::GetPedRmsErr()  const
+{
+  return IsHiGainSaturation() ? fLoGainPedRmsErr : fPedErr/2.;
+}
+
 Float_t  MCalibrationChargePix::GetMeanCharge()   const 
 {
@@ -544 +554 @@
 {
   
-  const Float_t loweredge     = IsHiGainSaturation() ? fTimeFirstHiGain   : fTimeFirstLoGain;
-  const Float_t upperedge     = IsHiGainSaturation() ? fTimeLastHiGain    : fTimeLastLoGain;
-  
-  if ( fAbsTimeMean < loweredge+1.)
+  const Byte_t loweredge     = IsHiGainSaturation() ? fTimeFirstLoGain   : fTimeFirstHiGain;
+  const Byte_t upperedge     = IsHiGainSaturation() ? fTimeLastLoGain    : fTimeLastHiGain;
+  
+  if ( fAbsTimeMean < (Float_t)loweredge+1)
     {
       *fLog << warn << "WARNING: Mean ArrivalTime in first extraction bin of the Pixel " << fPixId << endl;
+      *fLog << fAbsTimeMean << "   " << (Float_t)loweredge+1. << endl;
       bad->SetMeanTimeInFirstBin();
       bad->SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
     }
   
-  if ( fAbsTimeMean > upperedge-1.)
+  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;
       bad->SetMeanTimeInLastBin();
       bad->SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
@@ -617 +629 @@
   if (IsHiGainSaturation())
   {
-      CalcLoGainPed();
-
-      pedRmsSquare             =      fLoGainPedRms    * fLoGainPedRms;                                          
+      pedRmsSquare             =      fLoGainPedRms    * fLoGainPedRms;
       pedRmsSquareErrSquare    =  4.* fLoGainPedRmsErr * fLoGainPedRmsErr * pedRmsSquare;
-    }   /* if (HiGainSaturation) */
+    }
   else
   {
@@ -715 +725 @@
   fLoGainMeanChargeErr       = TMath::Sqrt(chargeRelErrSquare + conversionRelErrSquare) * fLoGainMeanCharge;
   
-  fLoGainSigmaCharge    *= fConversionHiLo;
-  fLoGainSigmaChargeErr =  TMath::Sqrt(sigmaRelErrSquare + conversionRelErrSquare) * fLoGainSigmaCharge;
+  fLoGainSigmaCharge        *= fConversionHiLo;
+  fLoGainSigmaChargeErr      =  TMath::Sqrt(sigmaRelErrSquare + conversionRelErrSquare) * fLoGainSigmaCharge;
   
   fElectronicPedRms     = gkElectronicPedRms    * TMath::Sqrt(fNumLoGainSamples);
   fElectronicPedRmsErr  = gkElectronicPedRmsErr * TMath::Sqrt(fNumLoGainSamples);
-
-}
-
+  
+  CalcLoGainPed();
+
+}
+
+

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h

@@ -248 +248 @@
   Float_t GetPed()                             const { return fPed;                              }
   Float_t GetPedErr()                          const { return fPedErr;                           }
-  Float_t GetPedRms()                          const { return fPedRms;                           }
-  Float_t GetPedRmsErr()                       const { return fPedErr / 2.;                      }
+  Float_t GetPedRms()                          const;
+  Float_t GetPedRmsErr()                       const;
 
   Float_t GetTotalFFactorFFactorMethod()       const { return fTotalFFactorFFactorMethod;        }

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -378 +378 @@
     }
   
-  Int_t n = signal->GetSize();
+  Int_t n       = signal->GetSize();
+  Int_t lofirst = signal->GetFirstUsedSliceLoGain();
 
   if (fHiGainArray->GetEntries() != n)
@@ -470 +471 @@
         continue;
 
-      const Int_t timehi   = (Int_t)pixel.GetIdxMaxHiGainSample();
-      const Float_t timelo = (Float_t)pixel.GetIdxMaxLoGainSample() + 15.;
+      const Float_t timehi = (Float_t)pixel.GetIdxMaxHiGainSample();
+      const Float_t timelo = (Float_t)pixel.GetIdxMaxLoGainSample(lofirst);
 
       (*this)[pixid].FillAbsTime(timehi);
@@ -626 +627 @@
 {
 
-
     if (hist.IsEmpty())
       {
@@ -633 +633 @@
         return;
       }
-    
 
     if (hist.GetSaturated() > fNumLoGainSaturationLimit*hist.GetHGausHist()->GetEntries())
@@ -685 +684 @@
     }       
     
-    pix.SetLoGainNumPickup     (  hist.GetPickup()           );
+    pix.SetLoGainNumPickup     (  hist.GetPickup()    );
 
     if (!hist.IsFourierSpectrumOK())

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeLoGainPix.cc

@@ -53 +53 @@
 const Axis_t  MHCalibrationChargeLoGainPix::fgChargeLast      = 199.5;
 const Int_t   MHCalibrationChargeLoGainPix::fgAbsTimeNbins    = 15;
-const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeFirst    = 14.5;
-const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeLast     = 29.5;
+const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeFirst    = -0.5;
+const Axis_t  MHCalibrationChargeLoGainPix::fgAbsTimeLast     = 14.5;
 // --------------------------------------------------------------------------
 //