Changeset 4340 for trunk/MagicSoft/Mars/msignal

Timestamp:

06/23/04 02:00:32 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/msignal

Files:

• MExtractAmplitudeSpline.cc (added)
• MExtractAmplitudeSpline.h (added)
• MExtractFixedWindow.cc (modified) (4 diffs)
• MExtractFixedWindow.h (modified) (1 diff)
• MExtractFixedWindowPeakSearch.cc (modified) (7 diffs)
• MExtractFixedWindowPeakSearch.h (modified) (1 diff)
• MExtractFixedWindowSpline.cc (modified) (13 diffs)
• MExtractFixedWindowSpline.h (modified) (1 diff)
• MExtractSlidingWindow.cc (modified) (5 diffs)
• MExtractSlidingWindow.h (modified) (1 diff)
• MExtractor.cc (modified) (3 diffs)
• Makefile (modified) (1 diff)
• SignalLinkDef.h (modified) (1 diff)

trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.cc

@@ -186 +186 @@
 // - If *logain is greater than fSaturationLimit, raise sat by 1
 //
-void MExtractFixedWindow::FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const
-{
+void MExtractFixedWindow::FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Float_t &sum, Byte_t &sat) const
+{
+
+  Int_t summ = 0;
 
   Byte_t *end = ptr + fHiGainLast - fHiGainFirst + 1;
@@ -193 +195 @@
   while (ptr<end)
     {
-      sum += *ptr;
+      summ += *ptr;
       if (*ptr++ >= fSaturationLimit)
         sat++;
     }
 
-  if (fHiLoLast == 0)
-    return;
-  
+  Byte_t *p = logain;
   end = logain + fHiLoLast;
-  while (logain<end)
-    {
-      sum += *logain;
-      
-      if (*logain++ >= fSaturationLimit)
+  while (p<end)
+    {
+      summ += *p;
+      if (*p++ >= fSaturationLimit)
         sat++;
     }
+
+  sum = (Float_t)summ;
+
+  return;
 }
 
@@ -221 +224 @@
 // - Add contents of *logain to sum
 // 
-void MExtractFixedWindow::FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
-{
+void MExtractFixedWindow::FindSignalLoGain(Byte_t *ptr, Float_t &sum, Byte_t &sat) const
+{
+
+  Int_t summ = 0;
 
   Byte_t *end = ptr + fLoGainLast - fLoGainFirst + 1;
@@ -228 +233 @@
   while (ptr<end)
     {
-      sum += *ptr;
+      summ += *ptr;
       
       if (*ptr++ >= fSaturationLimit)
         sat++;
     }
+
+  sum = (Float_t)summ;
 }
 

trunk/MagicSoft/Mars/msignal/MExtractFixedWindow.h

@@ -22 +22 @@
   static const Byte_t fgLoGainLast;      // Last FADC slice Lo-Gain (currently set to: 14) 
 
-  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const;
-  void   FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
+  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Float_t &sum, Byte_t &sat) const;
+  void   FindSignalLoGain(Byte_t *ptr, Float_t &sum, Byte_t &sat) const;
   void   StreamPrimitive(ofstream &out) const;
   

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.cc

@@ -299 +299 @@
 // - If *ptr is greater than fSaturationLimit, raise sat by 1
 // 
-void MExtractFixedWindowPeakSearch::FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const
+void MExtractFixedWindowPeakSearch::FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Float_t &sum, Byte_t &sat) const
 {
 
   Byte_t *end = ptr + fWindowSizeHiGain-fHiLoLast;
 
+  Int_t summ = 0;
   //
   // Calculate the sum of the "window" slices starting in ptr
@@ -309 +310 @@
   while (ptr<end)
     {
-      sum += *ptr;
+      summ += *ptr;
       if (*ptr++ >= fSaturationLimit)
         sat++;
@@ -323 +324 @@
     {
   
-      sum += *p;
+      summ += *p;
       if (*p++ >= fSaturationLimit)
         sat++;
     }
 
+  sum = (Float_t)summ;
   return;
 }
@@ -339 +341 @@
 // - If *ptr is greater than fSaturationLimit, raise sat by 1
 // 
-void MExtractFixedWindowPeakSearch::FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
+void MExtractFixedWindowPeakSearch::FindSignalLoGain(Byte_t *ptr, Float_t &sum, Byte_t &sat) const
 {
   //
@@ -345 +347 @@
   //
   Byte_t *p = ptr;
+  Int_t summ = 0;
 
   while (p<ptr+fWindowSizeLoGain)
     {
-      sum += *p;
+      summ += *p;
       if (*p++ >= fSaturationLimit)
         sat++;
     }
 
+  sum = (Float_t)summ;
   return;
 }
@@ -417 +421 @@
       // Find signal in hi- and lo-gain
       //
-      Int_t sumhi=0;
+      Float_t sumhi=0.;
       Byte_t sathi=0;
 
       FindSignalHiGain(pixel.GetHiGainSamples()+hiGainFirst, pixel.GetLoGainSamples(), sumhi, sathi);
 
-      Int_t sumlo=0;
+      Float_t sumlo=0.;
       Byte_t satlo=0;
       if (pixel.HasLoGain())
@@ -449 +453 @@
 
       pix.SetGainSaturation(sathi, sathi, satlo);
+
+      //      pix.SetNumHiGainSlices(fNumHiGainSamples);
+      //      pix.SetNumLoGainSlices(fNumLoGainSamples);      
+      
     } /* while (pixel.Next()) */
 

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowPeakSearch.h

@@ -26 +26 @@
   Byte_t  fLowGainPeakShift;     // Shift of the low gain pulse with respect to the high gain pulse, in slices: it is 0 if the low gain is delayed with respect to HG by 15 slices.
 
-  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const;
-  void   FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;  
+  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Float_t &sum, Byte_t &sat) const;
+  void   FindSignalLoGain(Byte_t *ptr, Float_t &sum, Byte_t &sat) const;  
 
   void   FindPeak(Byte_t *ptr, Byte_t window, Byte_t &startslice, Int_t &signal, Int_t &sat) const;

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowSpline.cc

@@ -224 +224 @@
 // - If *logain is greater than fSaturationLimit, raise sat by 1
 //
-void MExtractFixedWindowSpline::FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const
+void MExtractFixedWindowSpline::FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Float_t &sum, Byte_t &sat) const
 {
   
@@ -236 +236 @@
   fHiGainFirstDeriv[0]  = 0.;
 
-  Float_t sumf = *ptr++/2.;
+  Int_t summ = 0;
+  sum = (Float_t)*ptr++/2.;
   //
   // Check for saturation in all other slices
@@ -243 +244 @@
     {
 
-      sumf += *ptr;
+      summ += *ptr;
       i++;
 
@@ -260 +261 @@
   if (fHiLoLast == 0)
     {
-      sumf += *ptr/2.;
+      sum += (Float_t)*ptr/2.;
       fHiGainSecondDeriv[++i] = 0.;      
 
@@ -266 +267 @@
   else
     {
-      sumf += *ptr;
+      summ += *ptr;
       i++;
 
@@ -279 +280 @@
         {
 
-          sumf += *logain;
+          summ += *logain;
           i++;
           
@@ -291 +292 @@
           
         }
-      sumf += *logain/2;
+      sum += (Float_t)*logain/2;
       fHiGainSecondDeriv[++i] = 0.;
     }
@@ -298 +299 @@
     {
       fHiGainSecondDeriv[k] = fHiGainSecondDeriv[k]*fHiGainSecondDeriv[k+1] + fHiGainFirstDeriv[k];
-      sumf += 0.25*fHiGainSecondDeriv[k];
-    }
-  
-  sum = (Int_t)sumf;
+      sum += 0.25*fHiGainSecondDeriv[k];
+    }
+  
+  sum += (Float_t)summ;
 }
 
@@ -312 +313 @@
 // - If *ptr is greater than fSaturationLimit, raise sat by 1
 // 
-void MExtractFixedWindowSpline::FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const
+void MExtractFixedWindowSpline::FindSignalLoGain(Byte_t *ptr, Float_t &sum, Byte_t &sat) const
 {
   
@@ -324 +325 @@
   fLoGainFirstDeriv[0]  = 0.;
 
-  Float_t sumf = *ptr++/2.;
+  Int_t summ = 0;
+  sum = (Float_t)*ptr++/2.;
   //
   // Check for saturation in all other slices
@@ -331 +333 @@
     {
 
-      sumf += *ptr;
+      summ += *ptr;
       i++;
 
@@ -346 +348 @@
     sat++;
 
-  sumf += *ptr/2.;
+  sum += (Float_t)*ptr/2.;
   fLoGainSecondDeriv[++i] = 0.;      
   
@@ -352 +354 @@
     {
       fLoGainSecondDeriv[k] = fLoGainSecondDeriv[k]*fLoGainSecondDeriv[k+1] + fLoGainFirstDeriv[k];
-      sumf += 0.25*fLoGainSecondDeriv[k];
-    }
-  
-  sum = (Int_t)sumf;
-}
-
+      sum += 0.25*fLoGainSecondDeriv[k];
+    }
+  
+  sum += (Float_t)summ;
+}
+

trunk/MagicSoft/Mars/msignal/MExtractFixedWindowSpline.h

@@ -23 +23 @@
   Bool_t ReInit    (MParList *pList);
   
-  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &sum, Byte_t &sat) const;
-  void   FindSignalLoGain(Byte_t *ptr, Int_t &sum, Byte_t &sat) const;
+  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Float_t &sum, Byte_t &sat) const;
+  void   FindSignalLoGain(Byte_t *ptr, Float_t &sum, Byte_t &sat) const;
 
 public:

trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.cc

@@ -215 +215 @@
 // - Check if the sum has become bigger and store it in case yes.
 // 
-void MExtractSlidingWindow::FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &max, Byte_t &sat) const
+void MExtractSlidingWindow::FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Float_t &max, Byte_t &sat) const
 {
     const Byte_t *end = ptr + fHiGainLast - fHiGainFirst + 1;
 
     Int_t sum=0;
+    Int_t sumtot =0;
 
     //
@@ -259 +260 @@
     // This is fast and accurate (because we are using int's)
     //
-    max=sum;
+    sumtot=sum;
     for (p=ptr; p+fWindowSizeHiGain-fHiLoLast<end; p++)
     {
         sum += *(p+fWindowSizeHiGain-fHiLoLast) - *p;
-        if (sum>max)
-            max = sum;
+        if (sum>sumtot)
+            sumtot = sum;
     }
 
@@ -270 +271 @@
     {
         sum += *l - *p++;
-        if (sum>max)
-            max = sum;
-    }
-
+        if (sum>sumtot)
+            sumtot = sum;
+    }
+    max = (Float_t)sumtot;
 }
 
@@ -288 +289 @@
 // - Check if the sum has become bigger and store it in case yes.
 // 
-void MExtractSlidingWindow::FindSignalLoGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const
+void MExtractSlidingWindow::FindSignalLoGain(Byte_t *ptr, Float_t &max, Byte_t &sat) const
 {
     const Byte_t *end = ptr + fLoGainLast - fLoGainFirst + 1;
 
     Int_t sum=0;
-
+    Int_t sumtot=0;
     //
     // Calculate the sum of the first fWindowSize slices
@@ -318 +319 @@
     // This is fast and accurate (because we are using int's)
     //
-    max=sum;
+    sumtot=sum;
     for (p=ptr; p+fWindowSizeLoGain<end; p++)
     {
         sum += *(p+fWindowSizeLoGain) - *p;
-        if (sum>max)
-            max = sum;
-    }
-}
-
+        if (sum>sumtot)
+            sumtot = sum;
+    }
+    max = (Float_t)sumtot;
+}
+
+

trunk/MagicSoft/Mars/msignal/MExtractSlidingWindow.h

@@ -20 +20 @@
   Byte_t  fWindowSizeLoGain;             // Number of Lo Gain slices in window  
   
-  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Int_t &max, Byte_t &sat) const;
-  void   FindSignalLoGain(Byte_t *ptr, Int_t &max, Byte_t &sat) const;  
+  void   FindSignalHiGain(Byte_t *ptr, Byte_t *logain, Float_t &max, Byte_t &sat) const;
+  void   FindSignalLoGain(Byte_t *ptr, Float_t &max, Byte_t &sat) const;  
 
   Bool_t  ReInit(MParList *pList);

trunk/MagicSoft/Mars/msignal/MExtractor.cc

@@ -228 +228 @@
 
 
-void MExtractor::FindSignalHiGain(Byte_t *firstused, Byte_t *logain, Int_t &sum, Byte_t &sat) const
+void MExtractor::FindSignalHiGain(Byte_t *firstused, Byte_t *logain, Float_t &sum, Byte_t &sat) const
 {
   return;
 }
 
-void MExtractor::FindSignalLoGain(Byte_t *firstused, Int_t &sum, Byte_t &sat) const
+void MExtractor::FindSignalLoGain(Byte_t *firstused, Float_t &sum, Byte_t &sat) const
 {
   return;
@@ -251 +251 @@
   while (pixel.Next())
     {
-      Int_t sumhi  = 0;
+      Float_t sumhi = 0.;
       Byte_t sathi = 0;
 
       FindSignalHiGain(pixel.GetHiGainSamples()+fHiGainFirst, pixel.GetLoGainSamples(), sumhi, sathi);
 
-      Int_t  sumlo = 0;
+      Float_t sumlo = 0.;
       Byte_t satlo = 0;
 
@@ -269 +269 @@
       const Float_t pedes  = ped.GetPedestal();
       const Float_t pedrms = ped.GetPedestalRms();
-      
+
       pix.SetExtractedSignal(sumhi - pedes*fNumHiGainSamples, pedrms*fSqrtHiGainSamples,
                              sumlo - pedes*fNumLoGainSamples, pedrms*fSqrtLoGainSamples);

trunk/MagicSoft/Mars/msignal/Makefile

@@ -37 +37 @@
            MExtractFixedWindowPeakSearch.cc \
            MExtractFixedWindowSpline.cc \
+           MExtractAmplitudeSpline.cc \
            MExtractSignal.cc \
            MExtractSignal2.cc \

trunk/MagicSoft/Mars/msignal/SignalLinkDef.h

@@ -19 +19 @@
 #pragma link C++ class MExtractFixedWindowPeakSearch+;
 #pragma link C++ class MExtractFixedWindowSpline+;
+#pragma link C++ class MExtractAmplitudeSpline+;
 #pragma link C++ class MExtractPINDiode++;
 #pragma link C++ class MExtractBlindPixel++;