Changeset 3198 for trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.cc

Timestamp:

02/16/04 15:32:07 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.cc

@@ -40 +40 @@
 #include "MRawEvtPixelIter.h"
 
-#include "MPedestalCam.h"
-#include "MPedestalPix.h"
-
 #include "MExtractedSignalBlindPixel.h"
 
@@ -86 +83 @@
 // The PreProcess searches for the following input containers:
 //  - MRawEvtData
-//  - MPedestalCam
 //
 // The following output containers are also searched and created if
@@ -109 +105 @@
     fBlindPixel->SetUsedFADCSlices(fFirst, fLast);
 
-    fPedestals = (MPedestalCam*)pList->FindObject(AddSerialNumber("MPedestalCam"));
-
-    if (!fPedestals)
-    {
-        *fLog << err << AddSerialNumber("MPedestalCam") << " not found... aborting" << endl;
-        return kFALSE;
-    }
-
-    const MPedestalPix &ped   = (*fPedestals)[fBlindPixelIdx]; 
-
-    if (&ped)
-      {
-        fPedestal = ped.GetPedestal();
-        fPedRms   = ped.GetPedestalRms();
-      }
-    else
-      {
-        *fLog << err << " Cannot find MPedestalPix of the Blind Pixel (idx=" 
-              << fBlindPixelIdx << ")" << endl;
-        return kFALSE;
-      }
 
     return kTRUE;
@@ -149 +124 @@
  
     UInt_t sat  = 0;
-    UInt_t max  = 0;
 
     Byte_t *ptr = pixel.GetHiGainSamples();
     
-    UInt_t sumhi = 0;
-    UInt_t sumlo = 0;
     //
     // We need a dedicated signal extractor for the blind pixel
@@ -179 +151 @@
       {
         sum += *ptr;
-
-        if (*ptr > max)
-          max = *ptr;
 
         if (*ptr++ >= fSaturationLimit)
@@ -197 +166 @@
             sum += *ptr;
 
-            if (*ptr > max)
-              max = *ptr;
-
             if (*ptr++ >= fSaturationLimit)
               sat++;
@@ -206 +172 @@
       }
     
-    sumhi = sum;
-    
-    ptr = pixel.GetLoGainSamples();
-    
-    start   = ptr + fFirst - 1;
-    end     = ptr + fLast  - 1;
-    
-    ptr = start;
-    
-    sum = 0;
-    
-    while (ptr<=end)
-      {
-        
-      sum += *ptr;
-    
-      if (*ptr > max)
-        max = *ptr;
-      
-      if (*ptr++ >= fSaturationLimit)
-        sat++;
-      }
-    
-    sumlo = sum;
-    
-    fBlindPixel->SetExtractedSignal(sum - fPedestal*fNumSamples, fPedRms*fSqrtSamples);
-    fBlindPixel->SetSaturation(sat);
+    fBlindPixel->SetExtractedSignal(sum);
+    fBlindPixel->SetNumSaturated(sat);
 
     if (sat)