Changeset 3198 for trunk/MagicSoft

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MExtractBlindPixel.cc (modified) (7 diffs)
• MExtractBlindPixel.h (modified) (2 diffs)
• MExtractedSignalBlindPixel.cc (modified) (4 diffs)
• MExtractedSignalBlindPixel.h (modified) (2 diffs)
• MHGausEvents.cc (modified) (1 diff)

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)

trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.h

@@ -29 +29 @@
   static const Byte_t fgLast;
 
-  MPedestalCam                *fPedestals;    // Pedestals of all pixels in the camera
   MExtractedSignalBlindPixel  *fBlindPixel;   // Extracted signal of the Blind Pixel
 
@@ -43 +42 @@
   UInt_t  fBlindPixelIdx;
 
-  Float_t fPedestal;
-  Float_t fPedRms;
-  
-  void   FindSignal(Byte_t *ptr, Int_t size, UInt_t &sum, UInt_t &sum2, UInt_t &sat, UInt_t &max) const;
-  
   Int_t  PreProcess(MParList *pList);
   Int_t  Process();

trunk/MagicSoft/Mars/mcalib/MExtractedSignalBlindPixel.cc

@@ -40 +40 @@
 using namespace std;
 
-static const Float_t gkSignalInitializer = 99999.9;
+static const UInt_t gkSignalInitializer = 99999;
 
 // ------------------------------------------------------------------------
@@ -66 +66 @@
 void MExtractedSignalBlindPixel::Clear(Option_t *o)
 {
-  fExtractedSignal          = gkSignalInitializer;
-  fExtractedSignalErr       = gkSignalInitializer;
+
+  fExtractedSignal    = gkSignalInitializer;
 
   fNumSaturated       = 0;
@@ -79 +79 @@
 
 
-void MExtractedSignalBlindPixel::SetExtractedSignal(const Float_t sig, const Float_t sigerr)   
-{
-  fExtractedSignal      = sig; 
-  fExtractedSignalErr = sigerr;
-}
-
-
 Bool_t MExtractedSignalBlindPixel::IsValid() const
 {
-    return fExtractedSignal >= 0. || fExtractedSignalErr >= 0.;
-}
-
-void MExtractedSignalBlindPixel::SetSaturation(const Byte_t numsat)
-{
-  fNumSaturated = numsat; 
+    return fExtractedSignal >= 0 && fExtractedSignal <  gkSignalInitializer;
 }
 
@@ -99 +87 @@
 {
   *fLog << " Signal: " << fExtractedSignal
-        << " +- " << fExtractedSignalErr
         << " Nr. Saturation: " <<  fNumSaturated
         << endl;

trunk/MagicSoft/Mars/mcalib/MExtractedSignalBlindPixel.h

@@ -10 +10 @@
 private:
 
-  Float_t fExtractedSignal;    // mean value of the extracted signal
-  Float_t fExtractedSignalErr; // error of the mean value of the extracted signal
+  UInt_t fExtractedSignal;    // mean value of the extracted signal
 
   Byte_t fFirst;
@@ -18 +17 @@
 
 public:
-    MExtractedSignalBlindPixel(const char* name=NULL, const char* title=NULL);
 
-    void Clear(Option_t *o="");
-    void Print(Option_t *o="") const;
+  MExtractedSignalBlindPixel(const char* name=NULL, const char* title=NULL);
 
-    // Setter
-    void SetExtractedSignal(const Float_t sig, const Float_t sigerr);
-    void SetSaturation(   const Byte_t numsat);
-    void SetUsedFADCSlices( const Byte_t first, const Byte_t num);
+  void Clear(Option_t *o="");
+  void Print(Option_t *o="") const;
+  
+  // Setter
+  void SetExtractedSignal(const UInt_t sig)          { fExtractedSignal = sig;  }
+  void SetNumSaturated(  const Byte_t numsat)       { fNumSaturated    = numsat;  }
+  void SetUsedFADCSlices( const Byte_t first, const Byte_t num);
     
     // Getter
-    Float_t GetExtractedSignal()    const { return fExtractedSignal; }
-    Float_t GetExtractedSignalErr() const { return fExtractedSignalErr; }
+  UInt_t GetExtractedSignal()    const { return fExtractedSignal; }
 
-    Byte_t  GetNumFADCSamples()     const { return fNumFADCSamples;  }
-    
-    Bool_t IsValid() const;   
+  Byte_t  GetNumFADCSamples()     const { return fNumFADCSamples;  }
+  
+  Bool_t IsValid() const;   
 
-    ClassDef(MExtractedSignalBlindPixel, 0)     // Storage Container for Extracted Signal of the blind pixel
+  ClassDef(MExtractedSignalBlindPixel, 0)       // Storage Container for Extracted Signal of the blind pixel
 };
 

trunk/MagicSoft/Mars/mcalib/MHGausEvents.cc

@@ -212 +212 @@
   if (fHGausHist.Fill(f) == -1)
     return kFALSE;
-  
-  return kTRUE;
+
+ return kTRUE;
 }