Changeset 4605 for trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

Timestamp:

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

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc (modified) (10 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);