Changeset 3213 for trunk/MagicSoft/Mars/manalysis

Timestamp:

02/17/04 16:52:29 (21 years ago)

Author:

hbartko

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MArrivalTimeCalc2.cc (modified) (8 diffs)
• MArrivalTimeCalc2.h (modified) (5 diffs)
• MGeomApply.cc (modified) (4 diffs)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MArrivalTimeCalc2.cc

@@ -46 +46 @@
 #include "MPedestalPix.h"
 
-#include "MArrivalTime.h"
-
+#include "MArrivalTimeCam.h"
+#include "MArrivalTimePix.h"
 
 
@@ -144 +144 @@
     }
 
-    fArrivalTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
+    fArrivalTime = (MArrivalTimeCam*)pList->FindCreateObj(AddSerialNumber("MArrivalTimeCam"));
     if (!fArrivalTime)
         return kFALSE;
@@ -151 +151 @@
 }
 
-void MArrivalTimeCalc2::FindSignalTime(Byte_t *ptr, Byte_t size, Float_t &time, Int_t &sat, Byte_t pedes) const
+void MArrivalTimeCalc2::FindSignalTime(Byte_t *ptr, Byte_t size, Float_t &time, Float_t &deltatime, Int_t &sat, Float_t pedes, Float_t pedrms) const
 {
     const Byte_t *end = ptr + size;
@@ -203 +203 @@
 
     Int_t timesignalsum = 0;  
+    Int_t timesquaredsum =0;
     Int_t timesum =0;    
    
@@ -210 +211 @@
       timesignalsum += *p*(p-ptr);
       timesum += p-ptr;
+      timesquaredsum  += (p-ptr)*(p-ptr);
     }
     
@@ -219 +221 @@
     time = pedsubsum != 0 ? pedsubtimesignalsum / pedsubsum : 1;
 
- 
+    deltatime = pedsubsum != 0 ? pedrms / pedsubsum * sqrt(timesquaredsum - fWindowSize*time) : 1;
 }
 
@@ -238 +240 @@
         // Find signal in hi- and lo-gain
         //
-        Float_t timehi, timelo;
+        Float_t timehi, timelo, deltatimehi, deltatimelo;
         Int_t sathi, satlo;
 
@@ -247 +249 @@
 
         const MPedestalPix  &ped = (*fPedestals)[pixid];
+
+        MArrivalTimePix &pix = (*fArrivalTime)[pixid];
      
         const Float_t pedes  = ped.GetPedestal();
-        //  const Float_t pedrms = ped.GetPedestalRms();
-
-
-        FindSignalTime(pixel.GetHiGainSamples()+fHiGainFirst, fNumHiGainSamples, timehi, sathi, pedes);
-        FindSignalTime(pixel.GetLoGainSamples()+fLoGainFirst, fNumLoGainSamples, timelo, satlo, pedes);
-        if (satlo)
+        const Float_t pedrms = ped.GetPedestalRms();
+
+
+        FindSignalTime(pixel.GetHiGainSamples()+fHiGainFirst, fNumHiGainSamples, timehi, deltatimehi, sathi, pedes, pedrms);
+        FindSignalTime(pixel.GetLoGainSamples()+fLoGainFirst, fNumLoGainSamples, timelo, deltatimelo, satlo, pedes, pedrms);
+        
+        if (satlo)
             sat++;
      
-        if (!sathi)
-        {
-          fArrivalTime->SetTime(pixid,timehi);
-        }
-        else
-          fArrivalTime->SetTime(pixid,timelo);
+        pix.SetArrivalTime(timehi, deltatimehi,
+                           timelo, deltatimelo);        
+        
+        pix.SetGainSaturation(sathi, sathi, satlo);
 
 

trunk/MagicSoft/Mars/manalysis/MArrivalTimeCalc2.h

@@ -10 +10 @@
 
 class MPedestalCam;
-class MExtractedSignalCam;
-class MArrivalTime;
+class MArrivalTimeCam;
 
 class MArrivalTimeCalc2 : public MTask
@@ -22 +21 @@
 
     MPedestalCam        *fPedestals;    // Pedestals of all pixels in the camera
-    // MExtractedSignalCam *fSignals;      // Extracted signal of all pixels in the camera
 
     MRawEvtData         *fRawEvt;       // raw event data (time slices)
@@ -28 +26 @@
 
     
-    MArrivalTime        *fArrivalTime;  // Arrival Time of FADC sample
+    MArrivalTimeCam        *fArrivalTime;  // Arrival Time of FADC sample
      
   
@@ -42 +40 @@
     Byte_t  fSaturationLimit;
 
-    void   FindSignalTime(Byte_t *ptr, Byte_t size, Float_t &time, Int_t &sat, Byte_t pedes) const;
+    void   FindSignalTime(Byte_t *ptr, Byte_t size, Float_t &time,  Float_t &deltatime, Int_t &sat, Float_t pedes, Float_t pedrms) const;
 
     Int_t  PreProcess(MParList *pList);
@@ -57 +55 @@
 
 #endif
+
+

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -38 +38 @@
 //   MBlindPixels
 //   MArrivalTime
+//   MArrivalTimeCam
+//   MArrivalTimePix
 //
 //  It uses the geometry (MGeomCam) found in the parameter list.
@@ -54 +56 @@
 //   [MBlindPixels]
 //   [MArrivalTime]
+//   [MArrivalTimeCam]
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -72 +75 @@
 #include "MExtractedSignalCam.h"
 #include "MBlindPixels.h"
+#include "MArrivalTimeCam.h"
+
 
 ClassImp(MGeomApply);
@@ -148 +153 @@
         tme->InitSize(cam->GetNumPixels());
 
+    MArrivalTimeCam *tmecam = (MArrivalTimeCam*)pList->FindObject(AddSerialNumber("MArrivalTimeCam"));
+    if (tmecam)
+      tmecam->InitSize(cam->GetNumPixels());
+
+
     return kTRUE;
 }

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -24 +24 @@
 INCLUDES = -I. -I../mbase -I../mmc -I../mraw -I../mgeom -I../mfilter \
            -I../mdata -I../mhbase -I../mhist -I../mgui -I../mimage   \
-           -I../mhistmc -I../mfileio -I../mmain -I../mcalib          \
+           -I../mhistmc -I../mfileio -I../mmain -I../mcalib -I../msignal         \
            -I../mpointing -I../mtools
 # mcalib: MGeomApply (MCalibrationCam)