Changeset 5374 for trunk/MagicSoft

Timestamp:

11/10/04 18:08:04 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MExtractTimeAndChargeSlidingWindow.cc (modified) (10 diffs)
• msignal/MExtractTimeAndChargeSpline.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -40 +40 @@
      - added treatment of IsNoiseCalculation() for the "integral" 
        method.
+
+   * msignal/MExtractTimeAndChargeSlidingWindow.cc
+     - added treatment of IsNoiseCalculation().
 
 

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSlidingWindow.cc

@@ -246 +246 @@
   Int_t count = 0;  // counter to recognize the AB-flag
 
-  Float_t pedes        = ped.GetPedestal();
+  const Float_t pedes  = ped.GetPedestal();
   const Float_t ABoffs = ped.GetPedestalABoffset();
 
@@ -276 +276 @@
       sat++;
   
+  if (IsNoiseCalculation())
+    return;
+   
   //
   // Calculate the i-th sum as
@@ -287 +290 @@
   for (p=first; p+fWindowSizeHiGain<end; p++)
     {
-
+      
       const Int_t ids      = fHiGainFirst + count + fWindowSizeHiGain;
       const Float_t signal = (Float_t)*(p+fWindowSizeHiGain) - PedMean[(ids+abflag) & 0x1];      
       sum                 += signal - fHiGainSignal[count];
       fHiGainSignal[count + fWindowSizeHiGain] = signal;
-
+      
       if (sum>max)
-        {
-          max   = sum;
+        {
+          max   = sum;
           idx   = count+1;
-        }
+        }
       count++;
     }
@@ -303 +306 @@
   if (fHiLoLast != 0)
     {
-
+      
       // 
       // overlap bins
@@ -311 +314 @@
       while (p < end && l < logain+fHiLoLast)
         {
-
+          
           const Int_t   ids    = fHiGainFirst + count + fWindowSizeHiGain;
           const Float_t signal = (Float_t)*l - PedMean[(ids+abflag) & 0x1];          
@@ -319 +322 @@
           if (*l++ >= fSaturationLimit)
             sat++;
-
+          
           if (sum>max)
             {
@@ -327 +330 @@
           p++;
         }
-
+      
       if (fHiLoLast > fWindowSizeHiGain)
         {
@@ -339 +342 @@
               if (*(l+fWindowSizeHiGain) >= fSaturationLimit)
                 sat++;
-
+              
               if (sum>max)
                 {
@@ -346 +349 @@
                 }
               l++;
-            }
-        }
-    }
+            } /* while (l < logain + fHiLoLast) */
+        } /* if (fHiLoLast > fWindowSizeHiGain) */
+    } /* if (fHiLoLast != 0) */
 
   //
@@ -416 +419 @@
       sat++;
   
+  if (IsNoiseCalculation())
+    return;
+
   //
   // Calculate the i-th sum as

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeSpline.cc

@@ -684 +684 @@
       // 
       Int_t startslice = IsNoiseCalculation() ? 0 : (Int_t)(fAbMaxPos - fRiseTime);
-      Int_t lastslice  = IsNoiseCalculation() ? (Int_t)(fRiseTime+fFallTim) : (Int_t)(fAbMaxPos + fFallTime);
+      Int_t lastslice  = IsNoiseCalculation() ? (Int_t)(fRiseTime+fFallTime) : (Int_t)(fAbMaxPos + fFallTime);
       
       if (startslice < 0)
@@ -1035 +1035 @@
       // 
       Int_t startslice = IsNoiseCalculation() ? 0 : (Int_t)(fAbMaxPos - fRiseTime);
-      Int_t lastslice  = IsNoiseCalculation() ? (Int_t)(fRiseTime+fFallTim) : (Int_t)(fAbMaxPos + fFallTime + 1);
+      Int_t lastslice  = IsNoiseCalculation() ? (Int_t)(fRiseTime+fFallTime) : (Int_t)(fAbMaxPos + fFallTime + 1);
       
       if (startslice < 0)