Changeset 9274 for trunk/MagicSoft/Mars/melectronics

Timestamp:

01/27/09 10:40:55 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/melectronics

Files:

• ElectronicsLinkDef.h (modified) (1 diff)
• MAnalogSignal.cc (modified) (6 diffs)
• MAnalogSignal.h (modified) (3 diffs)
• MPulseShape.cc (added)
• MPulseShape.h (added)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/melectronics/ElectronicsLinkDef.h

@@ -6 +6 @@
 
 #pragma link C++ class APD+;
+#pragma link C++ class MPulseShape+;
 #pragma link C++ class MAnalogSignal+;
 #pragma link C++ class MDigitalSignal+;

trunk/MagicSoft/Mars/melectronics/MAnalogSignal.cc

@@ -33 +33 @@
 #include "MAnalogSignal.h"
 
+#include <TF1.h>
 #include <TRandom.h>
 #include <TObjArray.h>
@@ -69 +70 @@
 // and multiplied by f.
 //
-void MAnalogSignal::AddPulse(const MSpline3 &spline, Float_t t, Float_t f)
+// Return kTRUE if the full range of the spline could be added to the
+// analog signal, kFALSE otherwise.
+//
+Bool_t MAnalogSignal::AddPulse(const MSpline3 &spline, Float_t t, Float_t f)
 {
     // FIXME: This could be improved using a MExtralgoSpline with
@@ -79 +83 @@
     const Float_t end   = t+spline.GetXmax();
 
-    /*const*/ Int_t  first = TMath::CeilNint(start);
-    /*const*/ UInt_t last  = TMath::CeilNint(end); // Ceil:< Floor:<=
-
-    if (first<0 || last>GetSize())
-    {
-        gLog << err << "ERROR - AddPulse: Out of bounds, ";
-        gLog << "Win=[" << first << "," << last << "] N=" << GetSize() << " t=" << t;
-        gLog << " Spline=[" << spline.GetXmin() << "," << spline.GetXmax() << "]" << endl;
-
-        if (first<0)
-            first=0;
-        if (last>GetSize())
-            last=GetSize();
-    }
+    Int_t  first = TMath::CeilNint(start);
+    UInt_t last  = TMath::CeilNint(end); // Ceil:< Floor:<=
+
+    Bool_t rc = kTRUE;
+    if (first<0)
+    {
+        first=0;
+        rc = kFALSE;
+    }
+    if (last>GetSize())
+    {
+        last=GetSize();
+        rc = kFALSE;
+    }
+
+    // FIXME: As soon as we have access to TSpline3::fPoly we can
+    //        gain a lot in execution speed here.
 
     Float_t *arr = GetArray();
     for (UInt_t i=first; i<last; i++)
         arr[i] += spline.Eval(i-t)*f;
+
+    return rc;
+}
+
+// ------------------------------------------------------------------------
+//
+// Evaluate the spline an add the result between t+xmin and t+xmax
+// (xmin and xmax are the limits of the TF1) to the signal.
+// The spline is evaluated at the bin-center of the analog signal
+// and multiplied by f.
+//
+// Return kTRUE if the full range of the function could be added to the
+// analog signal, kFALSE otherwise.
+//
+Bool_t MAnalogSignal::AddPulse(const TF1 &func, Float_t t, Float_t f)
+{
+    // Both in units of the sampling frequency
+    const Float_t start = t+func.GetXmin();
+    const Float_t end   = t+func.GetXmax();
+
+    Int_t  first = TMath::CeilNint(start);
+    UInt_t last  = TMath::CeilNint(end); // Ceil:< Floor:<=
+
+    Bool_t rc = kTRUE;
+    if (first<0)
+    {
+        first=0;
+        rc = kFALSE;
+    }
+    if (last>GetSize())
+    {
+        last=GetSize();
+        rc = kFALSE;
+    }
+
+    // FIXME: As soon as we have access to TSpline3::fPoly we can
+    //        gain a lot in execution speed here.
+
+    Float_t *arr = GetArray();
+    for (UInt_t i=first; i<last; i++)
+        arr[i] += func.Eval(i-t)*f;
+
+    return rc;
 }
 
@@ -156 +206 @@
 // The user is responsible of deleting the TObjArray.
 //
-TObjArray *MAnalogSignal::Discriminate(Float_t threshold, Float_t len) const
+TObjArray *MAnalogSignal::Discriminate(Float_t threshold, Double_t start, Double_t end, Float_t len) const
 {
     TObjArray *ttl = new TObjArray;
@@ -175 +225 @@
 
     Double_t x1 = 0;
-    Double_t x2 = 0;
+    Double_t x2 = start;  // Start searching at x2
 
     while (1)
     {
-        x1 = sp.SearchYup(x2+deadtime, threshold);
-        if (x1<0)
-            break;
-
-        const Bool_t rising = sp.Deriv1(x1)>0;
-        if (!rising)
+        // Search for the next rising edge (starting at x2)
+        while (1)
         {
-            // The last value might just have been a local max/min
-            // or its period was short than 1e-4
+            x1 = sp.SearchYup(x2+deadtime, threshold);
+            if (x1<0 || x1>=end)
+                return ttl;
+
+            const Bool_t rising = sp.Deriv1(x1)>0;
+            if (rising)
+                break;
+
             x2 = x1;
-            //gLog << warn << "Rising edge expected at " << x1 << " (after " << x2 << ", N=" << fN << ")" << endl;
-            continue;
         }
 
-        x2 = sp.SearchYup(x1+deadtime, threshold);
-        if (x2<0)
-            break;
-
-        const Bool_t falling = sp.Deriv1(x2)<=0;
-        if (!falling)
+        // Search for the next falling edge (starting at x1)
+        while (1)
         {
-            // The last value might just have been a local max/min
-            // or its period was short than 1e-4
+            x2 = sp.SearchYup(x1+deadtime, threshold);
+            if (x2<0)
+                x2 = end;
+            if (x2>=end)
+                break;
+
+            const Bool_t falling = sp.Deriv1(x2)<0;
+            if (falling)
+                break;
+
             x1 = x2;
-            //gLog << warn << "Falling edge expected at " << x2 << " (after " << x1 << " N=" << fN << ")" << endl;
-            continue;
         }
 
+        // We found a rising and a falling edge
         MDigitalSignal *sig = new MDigitalSignal(x1, len>0?len:x2-x1);
 
@@ -228 +281 @@
     }
 
-    if (x1>=0)
-        gLog << warn << "Falling edge expected before end at N=" << fN << "!" << endl;
-
     return ttl;
 }

trunk/MagicSoft/Mars/melectronics/MAnalogSignal.h

@@ -6 +6 @@
 #endif
 
+class TF1;
 class MSpline3;
 
@@ -17 +18 @@
     MAnalogSignal(UInt_t n) { Set(n); }
 
-    void Set(UInt_t n);
-    void AddPulse(const MSpline3 &spline, Float_t t, Float_t f=1);
-    void AddSignal(const MAnalogSignal &s);
+    void   Set(UInt_t n);
+    Bool_t AddPulse(const MSpline3 &spline, Float_t t, Float_t f=1);
+    Bool_t AddPulse(const TF1 &f1, Float_t t, Float_t f=1);
+    void   AddSignal(const MAnalogSignal &s);
 
     // Deprecated. Use MSimRandomPhotons instead
@@ -26 +28 @@
     void AddGaussianNoise(Float_t amplitude=1, Float_t offset=0);
 
-    TObjArray *Discriminate(Float_t threshold, Float_t len=-1) const;
+    TObjArray *Discriminate(Float_t threshold, Double_t start, Double_t end, Float_t len=-1) const;
+    TObjArray *Discriminate(Float_t threshold, Float_t len=-1) const { return Discriminate(threshold, 0, fN-1, len); }
 
     ClassDef(MAnalogSignal, 1) // Storage class for an analog signal

trunk/MagicSoft/Mars/melectronics/Makefile

@@ -24 +24 @@
            MAnalogSignal.cc \
            MAnalogChannels.cc \
-           MDigitalSignal.cc 
+           MDigitalSignal.cc  \
+           MPulseShape.cc
 
 ############################################################