Changeset 2901

Timestamp:

01/24/04 01:37:33 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MExtractSignal.cc (modified) (5 diffs)
• manalysis/MExtractSignal.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -5 +5 @@
                                                  -*-*- END OF LINE -*-*-
 
- 2004/01/23: Abelardo Moralejo
+ 2004/01/23: Markus Gaug
 
    * manalysis/MExtractSignal.[h,cc]
+   * manalysis/MExtractedSignalPix.[h,cc]
      - use MArrivalTime for Storage (or calculation) of time
+  
 
 

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -47 +47 @@
 #include "MExtractedSignalPix.h"
 
+#include "MArrivalTime.h"
+
 ClassImp(MExtractSignal);
 
@@ -117 +119 @@
         *fLog << err << AddSerialNumber("MPedestalCam") << " not found... aborting" << endl;
         return kFALSE;
+
       }
+
+    fArrivalTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
     
     return kTRUE;
@@ -142 +147 @@
     fSignals->InitSize(cam->GetNumPixels());    
 
+    fArrivalTime->InitSize(cam->GetNumPixels());
+
     return kTRUE;
 }
@@ -153 +160 @@
 Int_t MExtractSignal::Process()
 {
+
     MRawEvtPixelIter pixel(fRawEvt);
     fSignals->Clear();
@@ -222 +230 @@
         pix.SetExtractedSignal((Float_t)sumHi - pedes*(Float_t)fNumHiGainSamples,
                                pedrms*fSqrtHiGainSamples,
-                               ((Float_t)sumLo - pedes*(Float_t)fNumLoGainSamples),
-                               pedrms*fSqrtLoGainSamples);
+                               (Float_t)sumLo - pedes*(Float_t)fNumLoGainSamples,
+                               pedrms*fSqrtLoGainSamples);
 
         pix.SetGainSaturation(satHi, satHi, satLo);
 
-        // FIXME: Arrival time has to be stored in MArrivalTime!
-        if (satHi)
-          pix.SetArrivalTimes((Float_t)(midlo+fLoGainFirst),0.,0.);
-        else
-          pix.SetArrivalTimes((Float_t)(midhi+fHiGainFirst),0.,0.);
+        if (satHi)
+          fArrivalTime->SetTime(pixid,(Float_t)(midlo+fLoGainFirst));
+        else
+          fArrivalTime->SetTime(pixid,(Float_t)(midhi+fHiGainFirst));
+
+
 
       } /* while (pixel.Next()) */

trunk/MagicSoft/Mars/manalysis/MExtractSignal.h

@@ -20 +20 @@
 class MPedestalCam;
 class MExtractedSignalCam;
+class MArrivalTime;
 
 class MExtractSignal : public MTask
@@ -34 +35 @@
     MRawRunHeader            *fRunHeader;    // RunHeader information
 
+    MArrivalTime             *fArrivalTime;  // Arrival Time of FADC sample
+  
     Byte_t fHiGainFirst;
     Byte_t fLoGainFirst;