Changeset 3061 for trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

Timestamp:

02/08/04 22:17:27 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -117 +117 @@
 const Byte_t MCalibrationCalc::fgSaturationLimit = 254;
 const Byte_t MCalibrationCalc::fgBlindPixelFirst = 3;
-const Byte_t MCalibrationCalc::fgBlindPixelLast  = 12;
+const Byte_t MCalibrationCalc::fgBlindPixelLast  = 14;
 
 // --------------------------------------------------------------------------
@@ -507 +507 @@
             {
           
-              Float_t blindpixelsum = 0.;
+              Float_t blindpixelsumhi = 0.;
+              Float_t blindpixelsumlo = 0.;
               //
               // We need a dedicated signal extractor for the blind pixel
               //
               MPedestalPix &ped  = (*fPedestals)[pixid];
-              if (!CalcSignalBlindPixel(pixel.GetHiGainSamples(), blindpixelsum, ped.GetPedestal()))
+              if (!CalcSignalBlindPixel(pixel.GetHiGainSamples(), blindpixelsumhi, ped.GetPedestal()))
                 return kFALSE;
+
+              CalcSignalBlindPixel(pixel.GetLoGainSamples(), blindpixelsumlo, ped.GetPedestal());
               
-              if (!blindpixel.FillCharge(blindpixelsum)) 
+              blindpixel.FillGraphs(blindpixelsumhi,blindpixelsumlo);
+          
+              if (!blindpixel.FillCharge(blindpixelsumhi)) 
                 *fLog << warn << 
-                  "Overflow or Underflow occurred filling Blind Pixel sum = " << blindpixelsum << endl;
+                  "Overflow or Underflow occurred filling Blind Pixel sum = " << blindpixelsumhi << endl;
               
-              //              if (!blindpixel.FillRChargevsTime(blindpixelsum,fEvents))
-                  //                  *fLog << warn << 
-                  //                    "Overflow or Underflow occurred filling Blind Pixel eventnr = " << fEvents << endl;
             } /* if use blind pixel */
           
@@ -684 +686 @@
         }
 
+      blindpixel.CheckOscillations();
+
       fCalibrations->SetBlindPixelMethodValid(kTRUE);
       blindpixel.DrawClone();