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

Timestamp:

02/12/04 16:16:26 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -115 +115 @@
 const UInt_t MCalibrationCalc::fPINDiodeId   = 9999;
 const Byte_t MCalibrationCalc::fgSaturationLimit = 254;
-const Byte_t MCalibrationCalc::fgBlindPixelFirst = 3;
-const Byte_t MCalibrationCalc::fgBlindPixelLast  = 12;
+const Byte_t MCalibrationCalc::fgBlindPixelFirst = 10;
+const Byte_t MCalibrationCalc::fgBlindPixelLast  = 20;
+const Int_t  MCalibrationCalc::fgBlindPixelSinglePheCut = 150;
 
 // --------------------------------------------------------------------------
@@ -460 +461 @@
               Byte_t *ptr = pixel.GetHiGainSamples();
 
-              Float_t blindpixelsumhi = 0.;
-              Float_t blindpixelsumlo = 0.;
+              Int_t blindpixelsumhi = 0;
+              Int_t blindpixelsumlo = 0;
               //
               // We need a dedicated signal extractor for the blind pixel
@@ -499 +500 @@
                 }
               
-              blindpixelsumhi = (Float_t)sum;
+              blindpixelsumhi = sum;
 
               ptr = pixel.GetLoGainSamples();
@@ -513 +514 @@
                 sum += *ptr;
 
-              blindpixelsumlo = (Float_t)sum;
+              blindpixelsumlo = sum;
 
               //              if (!CalcSignalBlindPixel(hiptr, blindpixelsumhi))
@@ -527 +528 @@
               blindpixel.FillGraphs(blindpixelsumhi,blindpixelsumlo);
           
-              TH1I *hist = blindpixel.GetSinglePheFADCSlices();
-
-              if (blindpixelsumhi > 50.)
-                {
-                  ptr = pixel.GetHiGainSamples();
-                  for (Int_t i=0;i<15;i++)
-                    hist->Fill(i,*ptr++);
-                  ptr = pixel.GetLoGainSamples();
-                  for (Int_t i=15;i<30;i++)
-                    hist->Fill(i,*ptr++);
-                }
+              TH1I *hist;
+
+              if (blindpixelsumhi > fBlindPixelSinglePheCut)
+                hist = (blindpixel.GetHist())->GetHSinglePheFADCSlices();
+              else
+                hist = (blindpixel.GetHist())->GetHPedestalFADCSlices();
+
+              ptr = pixel.GetHiGainSamples();
+              for (Int_t i=1;i<16;i++)
+                hist->Fill(i,*ptr++);
+              ptr = pixel.GetLoGainSamples();
+              for (Int_t i=16;i<31;i++)
+                hist->Fill(i,*ptr++);
+
             } /* if use blind pixel */