Changeset 3032 for trunk/MagicSoft/Mars

Timestamp:

02/05/04 17:37:02 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MArrivalTimeCalc.cc (modified) (4 diffs)
• manalysis/MExtractSignal.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
      - default step width 100 ps. 
      - look for half maximum (at rising edge)
+
+   * manalysis/MExtractSignal.[h,cc]
+     - removed uncommented code
+     - set start byte back by one like it was before TB's changes 
+       (does not affect the calculation of number of FADC slices)
+
 
 

trunk/MagicSoft/Mars/manalysis/MArrivalTimeCalc.cc

@@ -61 +61 @@
 // Default constructor.
 //
+// Initialize step size by default to 0.03 time slices == 100 ps.
+// 
 MArrivalTimeCalc::MArrivalTimeCalc(const char *name, const char *title)
-    : fStepSize(0.1)
+    : fStepSize(0.03) 
 {
 
@@ -80 +82 @@
 //  - MArrivalTime
 //
+
 Int_t MArrivalTimeCalc::PreProcess(MParList *pList)
 {
+
+
     fRawEvt = (MRawEvtData*)pList->FindObject(AddSerialNumber("MRawEvtData"));
     if (!fRawEvt)
@@ -186 +191 @@
 
   //
-  // Now find the maximum evaluating the spline function at every 1/10 time slice
+  // Now find the half maximum (!) 
+  // evaluating the spline function at every fStepSize time slice
   //
   Double_t abscissa=0;
@@ -201 +207 @@
           maxAb  = abscissa;
         }
+      // make step size a bit bigger first
       abscissa += fStepSize;
-    }
-
-  return (Float_t)maxAb;
-}
-
+      //      abscissa += fStepSize;
+    }
+
+  //
+  // another (much smaller) loop to move back from the maximum 
+  //
+  Double_t halfMaxAb = 0;
+
+  abscissa = maxAb;
+  
+  while (abscissa > 0)
+    {
+      
+      const Double_t swap = spline.Eval(abscissa);
+      
+      if (swap < maxOrd/2.)
+        {
+          halfMaxAb = abscissa;
+          break;
+        }
+      
+      abscissa -= fStepSize;
+    }
+  
+
+  //  return (Float_t)maxAb;
+  return (Float_t)halfMaxAb;
+}
+

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -17 +17 @@
 !
 !   Author(s): Markus Gaug, 09/2003 <mailto:markus@ifae.es>
+!              Thomas Bretz, 01/2004 
 !
 !   Copyright: MAGIC Software Development, 2000-2004
@@ -124 +125 @@
 void MExtractSignal::FindSignal(Byte_t *ptr, Int_t size, Int_t &sum, Byte_t &sat) const
 {
-    Byte_t *end = ptr + size;
-
-    sum = 0;
-    sat = 0;
-
-    while (ptr<end)
-    {
-        sum += *ptr;
-
-        if (*ptr++ >= fSaturationLimit)
-            sat++;
+
+  Byte_t *end = ptr + size;
+  
+  sum = 0;
+  sat = 0;
+  
+  while (ptr<end)
+    {
+      sum += *ptr;
+      
+      if (*ptr++ >= fSaturationLimit)
+        sat++;
     }
 }
@@ -156 +158 @@
         Byte_t sathi, satlo;
 
-        FindSignal(pixel.GetHiGainSamples()+fHiGainFirst, fNumHiGainSamples, sumhi, sathi);
-        FindSignal(pixel.GetLoGainSamples()+fLoGainFirst, fNumLoGainSamples, sumlo, satlo);
+        FindSignal(pixel.GetHiGainSamples()+fHiGainFirst-1, fNumHiGainSamples, sumhi, sathi);
+        FindSignal(pixel.GetLoGainSamples()+fLoGainFirst-1, fNumLoGainSamples, sumlo, satlo);
 
         if (satlo)
@@ -170 +172 @@
         const Float_t pedrms = ped.GetPedestalRms();
 
+        
         pix.SetExtractedSignal(sumhi - pedes*fNumHiGainSamples, pedrms*fSqrtHiGainSamples,
                                sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);