Changeset 4669 for trunk/MagicSoft/Mars/msignal

Timestamp:

08/17/04 23:31:30 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

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

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -70 +70 @@
 using namespace std;
 
-const Int_t   MExtractBlindPixel::fgNumBlindPixels   = 2;
-const UInt_t  MExtractBlindPixel::fgBlindPixelIds[3] = { 559, 560, 561 };
 const UInt_t  MExtractBlindPixel::fgBlindPixelIdx    = 559;
 const Byte_t  MExtractBlindPixel::fgHiGainFirst      =  10;
@@ -140 +138 @@
 //
 // Initializes:
-// - fModified to kFALSE
 // - fBlindPixelIdx to 0
 // - fExtractionType to 0
@@ -155 +152 @@
 {
 
-  fModified       = kFALSE;
   fExtractionType = 0;
 
@@ -244 +240 @@
     delete [] fHiGainSecondDeriv;
 
-  if (fModified)
-  {
-    for (Int_t i=0;i<fNumBlindPixels;i++)
-      {
-        SetBlindPixelIdx(fgBlindPixelIds[i],i);
-        fBlindPixel->SetBlindPixelIdx(fgBlindPixelIds[i],i);
-      }
-  }
-  else
-    fBlindPixel->SetBlindPixelIdx(fBlindPixelIdx.At(0));
+  for (Int_t i=0;i<fNumBlindPixels;i++)
+    fBlindPixel->SetBlindPixelIdx(fBlindPixelIdx.At(i),i);
 
   fBlindPixel->SetExtractionType(fExtractionType);

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.h

@@ -15 +15 @@
 private:
 
-  static const Int_t   fgNumBlindPixels;   //! Default number of blind pixels after modification run  
-  static const UInt_t  fgBlindPixelIds[3]; //! Default blind pixel indices after modification run
   static const UInt_t  fgBlindPixelIdx;    //! Default blind pixels index before modification run
   static const Byte_t  fgHiGainFirst;      //! Default First FADC slice Hi-Gain Signal (currently set to: 10   ) 
@@ -38 +36 @@
   Int_t   fNSBFilterLimit;                 // Limit of sum of FADC slices for filter part
 
-  Bool_t  fModified;                       // Is the run taken after the modifications? 
   Byte_t  fExtractionType;                 // What extraction type has been chosen?
-
   Int_t   fNumBlindPixels;                 // Current number of blind pixels
   
@@ -73 +69 @@
   void SetExtractionType( const ExtractionType_t typ=kAmplitude );
   void SetNSBFilterLimit( const Int_t   lim=fgNSBFilterLimit )  { fNSBFilterLimit = lim;   }     
-  void SetModified     ( const Bool_t b=kTRUE)               {   fModified = b;    }
   
-  void SetNumBlindPixels( const Int_t   num=fgNumBlindPixels )  { fNumBlindPixels = num;   }
+  void SetNumBlindPixels( const Int_t   num=1 )  { fNumBlindPixels = num;   }
   
   void SetRange         ( const Byte_t  hifirst=0, const Byte_t hilast=0,