Changeset 8155 for trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.h

Timestamp:

10/24/06 09:43:51 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.h (modified) (4 diffs)

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.h

@@ -6 +6 @@
 #endif
 
-#ifndef ROOT_TArrayI
-#include <TArrayI.h>
+#ifndef MARS_MArrayI
+#include "MArrayI.h"
+#endif
+#ifndef MARS_MArrayF
+#include "MArrayF.h"
 #endif
 
 class MExtractedSignalBlindPixel;
+
 class MExtractBlindPixel : public MExtractor
 {
@@ -27 +31 @@
 
   Byte_t   fHiLoFirst;                     // If not zero, start extraction from fHiLoFirst slice of Low-Gain
+  Byte_t   fHiLoLast;
 
-  Float_t *fHiGainSignal;                  // Need fast access to the signals in a float way
-  Float_t *fHiGainFirstDeriv;              // First derivative at intersection
-  Float_t *fHiGainSecondDeriv;             // Second derivative at intersection
+  MArrayF  fHiGainSignal;                  //! Need fast access to the signals in a float way
+  MArrayF  fHiGainFirstDeriv;              //! First derivative at intersection
+  MArrayF  fHiGainSecondDeriv;             //! Second derivative at intersection
 
   Float_t fResolution;                     // The time resolution in FADC units
-  TArrayI fBlindPixelIdx;                  // Array holding the IDs of the blind pixel(s)
+  MArrayI fBlindPixelIdx;                  // Array holding the IDs of the blind pixel(s)
   Int_t   fNSBFilterLimit;                 // Limit of sum of FADC slices for filter part
 
@@ -56 +61 @@
 
   MExtractBlindPixel(const char *name=NULL, const char *title=NULL);
-  ~MExtractBlindPixel();
 
   void Clear( const Option_t *o ="");
@@ -65 +69 @@
 
   // Setters
-  void SetBlindPixelIdx(  const Int_t  idx=fgBlindPixelIdx, const Int_t nr=0 ) {
-    if (nr>fBlindPixelIdx.GetSize()-1)
-      fBlindPixelIdx.Set(nr+1);
-    fBlindPixelIdx.AddAt(idx,nr); }
+  void SetBlindPixelIdx(  const Int_t  idx=fgBlindPixelIdx, const UInt_t nr=0 )
+  {
+      if (nr>=fBlindPixelIdx.GetSize())
+          fBlindPixelIdx.Set(nr+1);
+      fBlindPixelIdx[nr] = idx;
+  }
   void SetExtractionType( const ExtractionType_t typ=kAmplitude );
   void SetDataType    ( const DataType_t       typ=kRawEvt    );