Changeset 8362

Timestamp:

03/04/07 13:25:16 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractBlindPixel.cc (modified) (1 diff)
• MExtractTimeAndCharge.cc (modified) (7 diffs)
• MExtractTimeAndCharge.h (modified) (3 diffs)

trunk/MagicSoft/Mars/msignal/MExtractBlindPixel.cc

@@ -362 +362 @@
     Int_t sat1 = fHiGainLast;  // Last  slice to extract and last saturating slice
 
-    Int_t maxcont;
+    UInt_t maxcont;
     Int_t maxpos = fSignal->GetMax(idx, sat0, sat1, maxcont);
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.63 2007-03-03 22:46:10 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractTimeAndCharge.cc,v 1.64 2007-03-04 13:25:07 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -59 +59 @@
 //   - Byte_t fMaxBinContent;
 //
+// Class Version 4:
+// ----------------
+//   - Byte_t fLoGainSwitch
+//   + UInt_t fLoGainSwitch
+//
 //
 // Input Containers:
@@ -100 +105 @@
 
 const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -2.5;
-const Byte_t  MExtractTimeAndCharge::fgLoGainSwitch     =  120;
+const UInt_t  MExtractTimeAndCharge::fgLoGainSwitch     =  120;
 
 // --------------------------------------------------------------------------
@@ -226 +231 @@
         Int_t sathi1 = fHiGainLast;   // Last  slice to extract and last saturating slice
 
-        Int_t maxcont;
+        UInt_t maxcont;
         Int_t maxposhi = fSignal->GetMax(pixidx, sathi0, sathi1, maxcont);
         // Would it be better to take lastsat-firstsat?
@@ -334 +339 @@
 
             // Would it be better to take lastsat-firstsat?
-            Int_t maxlo;
+            UInt_t maxlo;
             Int_t maxposlo = fSignal->GetMax(pixidx, satlo0, satlo1, maxlo);
             numsatlo = fSignal->GetSaturation(pixidx, fSaturationLimit, satlo0, satlo1);
@@ -420 +425 @@
     if (IsEnvDefined(env, prefix, "LoGainSwitch", print))
     {
-        fLoGainSwitch = GetEnvValue(env, prefix, "LoGainSwitch", fLoGainSwitch);
+        fLoGainSwitch = GetEnvValue(env, prefix, "LoGainSwitch", (Int_t)fLoGainSwitch);
         rc = kTRUE;
     }
@@ -435 +440 @@
         *fLog << dec;
         *fLog << " LoGainStartShift:   " << fLoGainStartShift << endl;
-        *fLog << " LoGainSwitch:       " << (Int_t)fLoGainSwitch << endl;
+        *fLog << " LoGainSwitch:       " << fLoGainSwitch << endl;
     }
 }

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -12 +12 @@
 private:
   static const Float_t fgLoGainStartShift; //! Default for fLoGainStartShift (now set to: -2.8)
-  static const Byte_t  fgLoGainSwitch;     //! Default for fLoGainSwitch     (now set to: 100)
+  static const UInt_t  fgLoGainSwitch;     //! Default for fLoGainSwitch     (now set to: 100)
   
   Float_t fLoGainStartShift;      // Shift to start searching the low-gain signal obtained from the high-gain times.
-  Byte_t  fLoGainSwitch;          // Limit for max. bin content before the low-gain gets extracted
+  UInt_t  fLoGainSwitch;          // Limit for max. bin content before the low-gain gets extracted
 
 protected:
@@ -33 +33 @@
   Int_t   GetWindowSizeLoGain  () const { return fWindowSizeLoGain; }
   Float_t GetLoGainStartShift  () const { return fLoGainStartShift; }
-  Byte_t  GetLoGainSwitch      () const { return fLoGainSwitch;     }
+  UInt_t  GetLoGainSwitch      () const { return fLoGainSwitch;     }
 
   void SetLoGainStartShift( const Float_t f=fgLoGainStartShift ) { fLoGainStartShift = f + fOffsetLoGain;  }
-  void SetLoGainSwitch    ( const Byte_t  i=fgLoGainSwitch     ) { fLoGainSwitch     = i; }
+  void SetLoGainSwitch    ( const UInt_t  i=fgLoGainSwitch     ) { fLoGainSwitch     = i; }
 
   virtual void SetWindowSize(Int_t windowh, Int_t windowl) { fWindowSizeHiGain = windowh; fWindowSizeLoGain = windowl;  }
@@ -56 +56 @@
   void Print(Option_t *o="") const; //*MENU*
 
-  ClassDef(MExtractTimeAndCharge, 3)   // Time And Charge Extractor Base Class
+  ClassDef(MExtractTimeAndCharge, 4)   // Time And Charge Extractor Base Class
 };
 
 #endif
-
-
-