Changeset 18282 for branches/MarsGapdTimeJitter/msignal

Timestamp:

08/18/15 10:28:44 (9 years ago)

Author:

Jens Buss

Message:

merged Trunk into Branch

Location:

branches/MarsGapdTimeJitter

Files:

• . (modified) (1 prop)
• msignal/MExtractFACT.cc (modified) (7 diffs)
• msignal/MSignalCam.cc (modified) (3 diffs)
• msignal/MSignalPix.cc (modified) (3 diffs)
• msignal/MSignalPix.h (modified) (5 diffs)

branches/MarsGapdTimeJitter/msignal/MExtractFACT.cc

@@ -171 +171 @@
         //
         Float_t max  = -1;
+        Float_t tmax  = -1;
         if (pmax>pbeg && pmax<pend-1)
         {
@@ -194 +195 @@
                         max = exp(a + b*dx + c*dx*dx);
 
-                        // Time is position of maximum
-                        //time = dx;
-                        //time += Int_t(pmax-ptr);
+                        // tmax is position of maximum
+                        tmax = dx;
+                        tmax += Int_t(pmax-ptr);
                     }
                 }
@@ -203 +204 @@
 
         Float_t time = -1;
+        Float_t slope = -1;
         if (max>=0)
         {
@@ -208 +210 @@
 
             // Time is position of half hight leading edge
-            pend = std::max(pbeg, pmax-10);
+            pend = std::max(pbeg, pmax-15);
             for (;pmax>=pend; pmax--)
                 if (*pmax<max/2)
@@ -217 +219 @@
                 time = (max/2-pmax[0])/(pmax[1]-pmax[0]);
                 time += Int_t(pmax-ptr);
+                slope = tmax - time;
             }
         }
@@ -223 +226 @@
         {
             time = gRandom->Uniform(rangehi)+fHiGainFirst+1;
-            max  = pbeg[uint16_t(time)];
+            max  = ptr[uint16_t(time)];
         }
 
@@ -232 +235 @@
         pix.SetGainSaturation(0);
 
-        tix.SetArrivalTime(time);
+        tix.SetArrivalTime(time, slope);
         tix.SetGainSaturation(0);
     }

branches/MarsGapdTimeJitter/msignal/MSignalCam.cc

@@ -584 +584 @@
 // 10: as 0, but returns kFALSE if signal <=0
 // 11: as 8, but returns kFALSE if signal <=0
+// 12: time slope
 //
 Bool_t MSignalCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
@@ -593 +594 @@
 
     // Used inlcudes status unampped
-    if (!pix.IsPixelUsed() && (type<6 || type==8))
+    if (!pix.IsPixelUsed() && (type<6 || type==8 || type==14))
         return kFALSE;
 
@@ -668 +669 @@
         return pix.GetNumPhotons()>0;
 
+    case 13: // time slope
+        val = pix.GetTimeSlope();
+        break;
+
+    case 14: // time slope
+        if (pix.IsPixelUnmapped())
+            return kFALSE;
+        val = pix.GetTimeSlope();
+        break;
+
     case 9:
     default:

branches/MarsGapdTimeJitter/msignal/MSignalPix.cc

@@ -64 +64 @@
 //    size of the calibrated data by roughly 0.5%
 //
+// Version 8:
+// ----------
+//  - added new time variable fTimeSlope describing the width of the rise time
+//
 ////////////////////////////////////////////////////////////////////////////
 #include "MSignalPix.h"
@@ -80 +84 @@
 MSignalPix::MSignalPix(Float_t phot, Float_t errphot) :
     fIsCore(kFALSE), fRing(1), fIdxIsland(-1),
-    fPhot(phot), fErrPhot(errphot), fArrivalTime(-1)
+    fPhot(phot), fErrPhot(errphot), fArrivalTime(-1),
+    fTimeSlope(-1)
 {
     MMath::ReducePrecision(fPhot);
@@ -94 +99 @@
     fErrPhot     =  0;
     fArrivalTime = -1;
+    fTimeSlope = -1;
 }
 

branches/MarsGapdTimeJitter/msignal/MSignalPix.h

@@ -19 +19 @@
     Float_t  fErrPhot;       // the error of fPhot
     Float_t  fArrivalTime;   // Calibrated Arrival Time
+    Float_t  fTimeSlope;     // Time between half rise time and position of maximum
 
 public:
@@ -24 +25 @@
     MSignalPix(const MSignalPix &pix)
         : fIsCore(pix.fIsCore), fRing(pix.fRing), fIdxIsland(pix.fIdxIsland),
-        fPhot(pix.fPhot), fErrPhot(pix.fErrPhot), fArrivalTime(pix.fArrivalTime)
+        fPhot(pix.fPhot), fErrPhot(pix.fErrPhot), fArrivalTime(pix.fArrivalTime),
+        fTimeSlope(pix.fTimeSlope)
     {
     }
@@ -39 +41 @@
         pix.fErrPhot     = fErrPhot;
         pix.fArrivalTime = fArrivalTime;
+        pix.fTimeSlope   = fTimeSlope;
     }
     void    Print(Option_t *opt = NULL) const;
@@ -46 +49 @@
     Float_t GetErrorPhot() const          { return fErrPhot; }
     Float_t GetArrivalTime() const        { return fArrivalTime; }
+    Float_t GetTimeSlope() const          { return fTimeSlope; }
 
     Bool_t  IsPixelUsed() const           { return fRing>0; }
@@ -65 +69 @@
     void    Set(Float_t np, Float_t ep)   { MMath::ReducePrecision(np); MMath::ReducePrecision(ep);  fPhot = np; fErrPhot = ep; }
     void    SetArrivalTime(Float_t tm)    { fArrivalTime = tm; }
+    void    SetTimeSlope(Float_t ts)      { fTimeSlope = ts; }
 
     //void    AddNumPhotons(Float_t f)      { fPhot += f; }
     //void    Scale(Float_t f)              { fPhot /= f; }
 
-    ClassDef(MSignalPix, 7)  // class containing information about the Cerenkov Photons in a pixel
+    ClassDef(MSignalPix, 8)  // class containing information about the Cerenkov Photons in a pixel
 };