Changeset 4605 for trunk/MagicSoft/Mars/msignal

Timestamp:

08/12/04 21:43:15 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

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

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -74 +74 @@
 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::fgFirst            =   0;
-const Byte_t  MExtractBlindPixel::fgLast             =   7;
 const Byte_t  MExtractBlindPixel::fgHiGainFirst      =  10;
 const Byte_t  MExtractBlindPixel::fgHiGainLast       =  19;
@@ -84 +83 @@
 const Int_t   MExtractBlindPixel::fgNSBFilterLimit   =  70;
 const Float_t MExtractBlindPixel::fgResolution       = 0.003;
-const UInt_t  MExtractBlindPixel::gkModificationRun  = 31693;
 const Float_t MExtractBlindPixel::gkOverflow         = 300.;
 // --------------------------------------------------------------------------
@@ -114 +112 @@
   SetRange(fgHiGainFirst, fgHiGainLast, fgLoGainFirst, fgLoGainLast);
   
-  SetFirst();
-  SetLast();
+  SetNumBlindPixels();
 
   Clear();
@@ -206 +203 @@
 // - MExtractor::PreProcess(pList)
 //
-// Sets fModified to kTRUE if the current run number is greater or equal gkModificationRun
-//
 // The following output containers are also searched and created if
 // they were not found:
 //
 //  - MExtractedBlindPixel
-//
-// 
 //
 Int_t MExtractBlindPixel::PreProcess(MParList *pList)
@@ -255 +248 @@
     delete [] fHiGainSecondDeriv;
 
-  if ( fRunHeader->GetRunNumber() >= gkModificationRun )
+  if (fModified)
   {
-      fModified = kTRUE;
-      SetExtractionType(kAmplitude);
-      SetRange(fFirst,fLast);
-      for (Int_t i=0;i<3;i++)
+    for (Int_t i=0;i<fNumBlindPixels;i++)
       {
-          SetBlindPixelIdx(fgBlindPixelIds[i],i);
-          fBlindPixel->SetBlindPixelIdx(fgBlindPixelIds[i],i);
+        SetBlindPixelIdx(fgBlindPixelIds[i],i);
+        fBlindPixel->SetBlindPixelIdx(fgBlindPixelIds[i],i);
       }
   }
   else
-  {
-      fBlindPixel->SetBlindPixelIdx(fBlindPixelIdx.At(0));
-      SetExtractionType(kIntegral);
-      SetExtractionType(kFilter);
-  }
+    fBlindPixel->SetBlindPixelIdx(fBlindPixelIdx.At(0));
 
   fBlindPixel->SetExtractionType(fExtractionType);
@@ -351 +337 @@
                 fHiLoLast ?  (Int_t)fHiLoLast-1 : (Int_t)fHiGainLast ) 
         << endl;
+
   if (IsExtractionType(kFilter))
     *fLog << inf << GetDescriptor() << ": Will use Filter using " 
@@ -377 +364 @@
 
   Int_t summ = 0;
-  Byte_t *p     = ptr;
+  Byte_t *p   = ptr;
   Byte_t *end = ptr + fHiGainLast - fHiGainFirst + 1;
 
@@ -694 +681 @@
       Byte_t sat  = 0;
 
-      if (!fModified)
+      if (IsExtractionType(kFilter))
       {
 
@@ -706 +693 @@
               continue;
           }
+
+          sum = 0;
+          FindSignalFilter(pixel.GetLoGainSamples(), sum, sat);          
+
+          /*
+          if (fModified)
+            {
+              if (sum > fNSBFilterLimit)
+                {
+                  fBlindPixel->SetExtractedSignal(-1.,id);
+                  fBlindPixel->SetNumSaturated(sat,id);
+                  fBlindPixel->SetReadyToSave();
+                  continue;
+                }
+            }
+          */
       }
-
+      
       Float_t newsum = 0.;
       sat = 0;
@@ -716 +719 @@
         FindIntegral    (pixel.GetHiGainSamples()+fHiGainFirst, pixel.GetLoGainSamples(), newsum, sat);
   
+
       fBlindPixel->SetExtractedSignal(newsum,id);
       fBlindPixel->SetNumSaturated(sat,id);

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  fgFirst;            //! Default First FADC slice after modification run (currently set to: 2  ) 
-  static const Byte_t  fgLast ;            //! Default Last  FADC slice after modification run (currently set to: 13 ) 
   static const Byte_t  fgHiGainFirst;      //! Default First FADC slice Hi-Gain Signal (currently set to: 10   ) 
   static const Byte_t  fgHiGainLast;       //! Default Last  FADC slice Hi-Gain Signal (currently set to: 29   ) 
@@ -26 +25 @@
   static const Float_t fgResolution;       //! Default for fResolution         (currently set to: 0.003)
   static const Float_t gkOverflow;         //! Default sum to assign overflow in case of saturation
-  static const UInt_t  gkModificationRun;  //! Run number from which on three blind pixels are used
 
   MExtractedSignalBlindPixel *fBlindPixel; // Extracted signal of the Blind Pixel
 
-  Byte_t   fFirst;                         // First extraction slice for runs after modification
-  Byte_t   fLast;                          // Last extraction slice for runs after modification
   Byte_t   fHiLoFirst;                     // If not zero, start extraction from fHiLoFirst slice of Low-Gain
 
@@ -45 +41 @@
   Byte_t  fExtractionType;                 // What extraction type has been chosen?
 
+  Int_t   fNumBlindPixels;                 // Current number of blind pixels
+  
 public:
   enum ExtractionType_t { kAmplitude, kIntegral, kFilter };
@@ -74 +72 @@
     fBlindPixelIdx.AddAt(idx,nr); }
   void SetExtractionType( const ExtractionType_t typ=kAmplitude );
-  void SetFirst         ( const Byte_t         first=fgFirst )  { fFirst          = first; }
-  void SetLast          ( const Byte_t         last =fgLast  )  { fLast           = last;  }
   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 SetRange         ( const Byte_t  hifirst=0, const Byte_t hilast=0, 
                           const Byte_t  lofirst=0, const Byte_t lolast=0 );