Changeset 3276 for trunk/MagicSoft

Timestamp:

02/24/04 16:07:43 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MExtractBlindPixel.cc (modified) (5 diffs)
• MExtractBlindPixel.h (modified) (3 diffs)
• MExtractedSignalBlindPixel.h (modified) (4 diffs)

trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.cc

@@ -49 +49 @@
 using namespace std;
 
-const UInt_t MExtractBlindPixel::fgBlindPixelIdx   = 559;
+const Int_t  MExtractBlindPixel::fgBlindPixelIdx   = 559;
 const Byte_t MExtractBlindPixel::fgSaturationLimit = 254;
 const Byte_t MExtractBlindPixel::fgFirst =  3;
@@ -113 +113 @@
 
     fBlindPixel->SetUsedFADCSlices(fFirst, fLast);
+    fBlindPixel->SetBlindPixelIdx(fBlindPixelIdx);
 
     return kTRUE;
@@ -131 +132 @@
     pixel.Jump(fBlindPixelIdx);
  
-    UInt_t sat  = 0;
+    const UInt_t nhigain = pixel.GetNumHiGainSamples();
 
     Byte_t *ptr = pixel.GetHiGainSamples();
@@ -141 +142 @@
     UInt_t first = fFirst;
     UInt_t last  = fLast;
-
-    if (last > 15)
+    UInt_t sat  = 0;
+
+    if (last > nhigain)
       {
-        diff = last - 15;
-        last = 15;
+        diff = last - nhigain;
+        last = nhigain;
       }
     
@@ -186 +188 @@
       *fLog << warn << "WARNING - saturation occurred in the Blind Pixel " << endl;
 
+
     fBlindPixel->SetReadyToSave();
 

trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.h

@@ -24 +24 @@
 private:
 
-  static const UInt_t fgBlindPixelIdx;  
+  static const Int_t  fgBlindPixelIdx;  
   static const Byte_t fgSaturationLimit;
   static const Byte_t fgFirst;
@@ -41 +41 @@
   Byte_t  fSaturationLimit;
 
-  UInt_t  fBlindPixelIdx;
+  Int_t  fBlindPixelIdx;
   Int_t  PreProcess(MParList *pList);
   Int_t  Process();
@@ -54 +54 @@
   void SetRange(const Byte_t first=fgFirst, const Byte_t last=fgLast);
   void SetSaturationLimit(const Byte_t lim=fgSaturationLimit) { fSaturationLimit = lim; }
-  void SetBlindPixelIdx(  const UInt_t idx=fgBlindPixelIdx  ) { fBlindPixelIdx   = idx; }  
+  void SetBlindPixelIdx(  const  Int_t idx=fgBlindPixelIdx  ) { fBlindPixelIdx   = idx; }  
 
   ClassDef(MExtractBlindPixel, 0) // Task to fill the Extracted BlindPixel Containers from raw data

trunk/MagicSoft/Mars/mcalib/MExtractedSignalBlindPixel.h

@@ -5 +5 @@
 #include "MParContainer.h"
 #endif
+
+#include <TArrayI.h>
 
 class MExtractedSignalBlindPixel : public MParContainer
@@ -21 +23 @@
   Float_t fPedRmsErr;
 
+  Int_t fBlindPixelIdx;
+
 public:
 
@@ -29 +33 @@
   
   // Setter
-  void SetExtractedSignal(const UInt_t sig)          { fExtractedSignal = sig;  }
-  void SetNumSaturated(   const Byte_t numsat)       { fNumSaturated    = numsat;  }
+  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);
-    
+  void SetNumFADCSamples( const Byte_t num    )    { fNumFADCSamples  = num;     }    
+
   void SetPed(      const Float_t f )     { fPed       = f; }
   void SetPedErr(   const Float_t f )     { fPedErr    = f; }
@@ -38 +43 @@
   void SetPedRmsErr(const Float_t f )     { fPedRmsErr = f; }
 
+  void SetBlindPixelIdx( const Int_t i)   { fBlindPixelIdx = i; }
+
     // Getter
   UInt_t GetExtractedSignal()    const { return fExtractedSignal; }
-
   Byte_t GetNumFADCSamples()     const { return fNumFADCSamples;  }