Changeset 5918 for trunk

Timestamp:

01/20/05 18:49:08 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractTimeAndCharge.cc (modified) (2 diffs)
• MExtractTimeAndCharge.h (modified) (3 diffs)

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -86 +86 @@
 
 const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -2.8; 
-const Int_t   MExtractTimeAndCharge::fgMaxBinContentLimit = 100; 
+const Byte_t  MExtractTimeAndCharge::fgMaxBinContentLimit = 100; 
 // --------------------------------------------------------------------------
 //
@@ -211 +211 @@
       // Adapt the low-gain extraction range from the obtained high-gain time
       //
-      if (pixel.HasLoGain() && fMaxBinContent < fMaxBinContentLimit )
+      if (pixel.HasLoGain() && (fMaxBinContent < fMaxBinContentLimit) )
       {
           deltasumlo  = 0; // make logain of MExtractedSignalPix valid

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -12 +12 @@
 
   static const Float_t fgLoGainStartShift;   // Default for fLoGainStartShift (now set to: -2.8)
-  static const Int_t   fgMaxBinContentLimit; // Default for fMaxBinContentLimit (now set to: 100)
+  static const Byte_t  fgMaxBinContentLimit; // Default for fMaxBinContentLimit (now set to: 100)
   
   Byte_t  fLoGainFirstSave;       //! Temporary variable to store the original position of low-gain start slice
   Float_t fLoGainStartShift;      // Shift to start searching the low-gain signal obtained from the high-gain times.
 
-  Int_t   fMaxBinContentLimit;    // Limit for max. bin content before the low-gain gets extracted
+  Byte_t  fMaxBinContentLimit;    // Limit for max. bin content before the low-gain gets extracted
 
 protected:
@@ -24 +24 @@
   Int_t  fWindowSizeLoGain;       //  Window Size Low-Gain
 
-  Int_t  fMaxBinContent;          //  Maximum bin content
+  Byte_t fMaxBinContent;          //  Maximum bin content
 
   Int_t  PreProcess(MParList *pList);
@@ -36 +36 @@
   MExtractTimeAndCharge(const char *name=NULL, const char *title=NULL);
   
-  Int_t GetWindowSizeHiGain  () const { return fWindowSizeHiGain;   }
-  Int_t GetWindowSizeLoGain  () const { return fWindowSizeLoGain;   }
-  Int_t GetMaxBinContentLimit() const { return fMaxBinContentLimit; }
+  Int_t  GetWindowSizeHiGain  () const { return fWindowSizeHiGain;   }
+  Int_t  GetWindowSizeLoGain  () const { return fWindowSizeLoGain;   }
+  Byte_t GetMaxBinContentLimit() const { return fMaxBinContentLimit; }
 
   void Print(Option_t *o="") const;
   
   void SetLoGainStartShift( const Float_t f=fgLoGainStartShift )  { fLoGainStartShift = f + fOffsetLoGain;  }
-  void SetMaxBinContentLimit( const Int_t i=fgMaxBinContentLimit ) { fMaxBinContentLimit = i; }
+  void SetMaxBinContentLimit( const Byte_t i=fgMaxBinContentLimit ) { fMaxBinContentLimit = i; }
 
   virtual void SetWindowSize(Int_t windowh, Int_t windowl) { fWindowSizeHiGain = windowh;