Changeset 3320 for trunk/MagicSoft

Timestamp:

02/26/04 06:09:06 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• msignal/MArrivalTimeCalc.cc (modified) (3 diffs)
• msignal/MArrivalTimeCalc.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -6 +6 @@
  
  2004/02/25: Markus Gaug
+
+  * msignal/MArrivalTimeCalc.[h,cc]
+    - fill now MArrivalTimePix instead of MArrivalTime
+
 
   * mcalib/MHCalibrationChargeCam.cc

trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc.cc

@@ -49 +49 @@
 
 #include "MGeomCam.h"
-#include "MArrivalTime.h"
+#include "MArrivalTimeCam.h"
+#include "MArrivalTimePix.h"
+
 #include "MRawEvtData.h"      
 #include "MRawEvtPixelIter.h"
@@ -92 +94 @@
     }
 
-    fArrTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
+    fArrTime = (MArrivalTimeCam*)pList->FindCreateObj(AddSerialNumber("MArrivalTimeCam"));
     if (!fArrTime)
         return kFALSE;
@@ -157 +159 @@
       // If pixel is saturated and hasn't lo gains we do nothing, it's value remains -1
       //
-      fArrTime->SetTime(idx,time);
-      
+      MArrivalTimePix &pix = (*fArrTime)[idx];
+      pix.SetArrivalTime(time,0.);
     }
     

trunk/MagicSoft/Mars/msignal/MArrivalTimeCalc.h

@@ -8 +8 @@
 class MRawEvtData;
 class MRawRunHeader;
-class MArrivalTime;
-
+class MArrivalTimeCam;
 class MArrivalTimeCalc : public MTask
 {
@@ -16 +15 @@
     MRawRunHeader  *fRunHeader;  // RunHeader information
 
-    MArrivalTime   *fArrTime;    // Container with the photons arrival times
+    MArrivalTimeCam *fArrTime;   // Container with the photons arrival times
 
     Int_t PreProcess(MParList *pList);
@@ -33 +32 @@
 
 #endif
+
+
+