Changeset 5930

Timestamp:

01/21/05 13:39:16 (20 years ago)

Author:

mazin

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• callisto.rc (modified) (2 diffs)
• msignal/MExtractTime.cc (modified) (1 diff)
• msignal/MExtractTimeAndCharge.cc (modified) (7 diffs)
• msignal/MExtractTimeAndCharge.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
    * msignal/MExtractTimeAndChargeSpline.cc
      - use the max. bin content for low-gain extraction
+   
+   * callisto.rc
+     - add place for LoGainSwitch
 
  2005/01/21 Florian Goebel

trunk/MagicSoft/Mars/callisto.rc

@@ -155 +155 @@
 #MJCalibration.ExtractSignal.OffsetFromWindow:  1
 #MJCalibration.ExtractSignal.LoGainPeakShift:   0
+#MJCalibration.ExtractSignal.LoGainSwitch:    200
 
 # -------------------------------------------------------------------------
@@ -248 +249 @@
 
 # -------------------------------------------------------------------------
+# Use this if you want to change the signal extractor
+# -------------------------------------------------------------------------
+#MJCalibrateSignal.ExtractSignal.LoGainSwitch:    200
+
+# -------------------------------------------------------------------------
 # Setup calibration of data
 # -------------------------------------------------------------------------

trunk/MagicSoft/Mars/msignal/MExtractTime.cc

@@ -195 +195 @@
     if (IsA()==MExtractTime::Class())
         *fLog << GetDescriptor() << ":" << endl;
-    *fLog << " Offset Lo-Gain: " << fOffsetLoGain << endl;
+    *fLog << " Offset Lo-Gain:     " << fOffsetLoGain << endl;
     MExtractor::Print(o);
 }

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -86 +86 @@
 
 const Float_t MExtractTimeAndCharge::fgLoGainStartShift = -2.8; 
-const Byte_t  MExtractTimeAndCharge::fgMaxBinContentLimit = 100; 
+const Byte_t  MExtractTimeAndCharge::fgLoGainSwitch = 100; 
 // --------------------------------------------------------------------------
 //
@@ -95 +95 @@
 // - fWindowSizeHiGain and fWindowSizeLoGain to 0
 // - fLoGainStartShift to fgLoGainStartShift+fgOffsetLoGain
-// - fMaxBinContentLimt to fgMaxBinContentLimit
+// - fLoGainSwitch     to fgLoGainSwitch
 //
 MExtractTimeAndCharge::MExtractTimeAndCharge(const char *name, const char *title)
@@ -104 +104 @@
 
     SetLoGainStartShift();
-    SetMaxBinContentLimit();
+    SetLoGainSwitch();
 }
 
@@ -187 +187 @@
 
       // Initialize fMaxBinContent for the case, it gets not set by the derived class
-      fMaxBinContent = fMaxBinContentLimit + 1; 
+      fMaxBinContent = fLoGainSwitch + 1; 
 
       const Int_t pixidx = pixel.GetPixelId();
@@ -212 +212 @@
       // Adapt the low-gain extraction range from the obtained high-gain time
       //
-      if (pixel.HasLoGain() && (fMaxBinContent > fMaxBinContentLimit) )
+      if (pixel.HasLoGain() && (fMaxBinContent > fLoGainSwitch) )
       {
           deltasumlo  = 0; // make logain of MExtractedSignalPix valid
@@ -273 +273 @@
     }
 
-    if (IsEnvDefined(env, prefix, "MaxBinContentLimit", print))
+    if (IsEnvDefined(env, prefix, "LoGainSwitch", print))
     {
-        fMaxBinContentLimit = GetEnvValue(env, prefix, "MaxBinContentLimit", fMaxBinContentLimit);
+        fLoGainSwitch = GetEnvValue(env, prefix, "LoGainSwitch", fLoGainSwitch);
         rc = kTRUE;
     }
@@ -296 +296 @@
   
   *fLog << " LoGainStartShift:   " << fLoGainStartShift << endl;
-  *fLog << " MaxBinContentLimit: " << (Int_t)fMaxBinContentLimit << endl;
+  *fLog << " LoGainSwitch:       " << (Int_t)fLoGainSwitch << endl;
   MExtractTime::Print(o);
 }

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -12 +12 @@
 
   static const Float_t fgLoGainStartShift;   // Default for fLoGainStartShift (now set to: -2.8)
-  static const Byte_t  fgMaxBinContentLimit; // Default for fMaxBinContentLimit (now set to: 100)
+  static const Byte_t  fgLoGainSwitch; // Default for fLoGainSwitch (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.
 
-  Byte_t  fMaxBinContentLimit;    // Limit for max. bin content before the low-gain gets extracted
+  Byte_t  fLoGainSwitch;    // Limit for max. bin content before the low-gain gets extracted
 
 protected:
@@ -36 +36 @@
   MExtractTimeAndCharge(const char *name=NULL, const char *title=NULL);
   
-  Int_t  GetWindowSizeHiGain  () const { return fWindowSizeHiGain;   }
-  Int_t  GetWindowSizeLoGain  () const { return fWindowSizeLoGain;   }
-  Byte_t GetMaxBinContentLimit() const { return fMaxBinContentLimit; }
+  Int_t  GetWindowSizeHiGain  () const { return fWindowSizeHiGain; }
+  Int_t  GetWindowSizeLoGain  () const { return fWindowSizeLoGain; }
+  Byte_t GetLoGainSwitch      () const { return fLoGainSwitch;     }
 
   void Print(Option_t *o="") const;
   
-  void SetLoGainStartShift( const Float_t f=fgLoGainStartShift )  { fLoGainStartShift = f + fOffsetLoGain;  }
-  void SetMaxBinContentLimit( const Byte_t i=fgMaxBinContentLimit ) { fMaxBinContentLimit = i; }
+  void SetLoGainStartShift( const Float_t f=fgLoGainStartShift ) { fLoGainStartShift = f + fOffsetLoGain;  }
+  void SetLoGainSwitch    ( const Byte_t  i=fgLoGainSwitch     ) { fLoGainSwitch     = i; }
 
   virtual void SetWindowSize(Int_t windowh, Int_t windowl) { fWindowSizeHiGain = windowh;