Changeset 5595 for trunk

Timestamp:

12/14/04 18:24:32 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndCharge.cc (modified) (2 diffs)
• msignal/MExtractTimeAndCharge.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
   * msignal/MExtractor.[h,cc]
     - add possibility to set pedestal pointer from outside
+
+  * msignal/MExtractTimeAndCharge.[h,cc]
+    - make modification of extraction window only for case of now 
+      high-gain saturation.
 
   * msignal/MExtractTimeAndChargeSpline.cc

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.cc

@@ -191 +191 @@
       if (pixel.HasLoGain())
         {
-          fLoGainFirstSave = (Int_t)fLoGainFirst;
-          const Int_t logainstart = (Int_t)(timehi+fLoGainStartShift);
-          fLoGainFirst     = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
+          fLoGainFirstSave = fLoGainFirst;
+          const Byte_t logainstart = (Byte_t)(timehi+fLoGainStartShift);
+          if (!sathi)
+            fLoGainFirst = logainstart > fLoGainFirstSave ? logainstart : fLoGainFirstSave;
         
           if ( fLoGainFirst < fLoGainLast )
@@ -203 +204 @@
                                       satlo, ped, logainabflag);
             }
-          
           fLoGainFirst     = fLoGainFirstSave;
         }

trunk/MagicSoft/Mars/msignal/MExtractTimeAndCharge.h

@@ -13 +13 @@
   static const Float_t fgLoGainStartShift; // Default for fLoGainStartShift (now set to: -2.8)
   
-  Int_t   fLoGainFirstSave;       //! Temporary variable to store the original position of low-gain start slice
+  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.