Changeset 3752

Timestamp:

04/15/04 15:24:56 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MGeomApply.cc (modified) (3 diffs)
• mcalib/MCalibrateRelTimes.cc (modified) (8 diffs)
• mcalib/MCalibrateRelTimes.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
    * mcalib/CalibLinkDef.h
      - new class to calibrate the relative times
+
+   * manalysis/MGeomApply.cc
+     - added MArrivalTime::Init()
 
 

trunk/MagicSoft/Mars/manalysis/MGeomApply.cc

@@ -41 +41 @@
 //   MBlindPixels
 //   MArrivalTimeCam
-//   MArrivalTimePix
+//   MArrivalTime
 //
 //  It uses the geometry (MGeomCam) found in the parameter list.
@@ -80 +80 @@
 #include "MBlindPixels.h"
 #include "MArrivalTimeCam.h"
+#include "MArrivalTime.h"
 #include "MBadPixelsCam.h"
 
@@ -169 +170 @@
       tme->InitSize(cam->GetNumPixels());
 
+    MArrivalTime    *atm = (MArrivalTime*)pList->FindObject(AddSerialNumber("MArrivalTime"));
+    if (atm)
+      atm->InitSize(cam->GetNumPixels());
+
     MBadPixelsCam *bad = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
     if (bad)

trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc

@@ -36 +36 @@
 //
 //   Output Containers:
-//    MCerPhotEvt
+//    MArrivalTime
 //
 //////////////////////////////////////////////////////////////////////////////
@@ -58 +58 @@
 #include "MBadPixelsPix.h"
 
-#include "MCerPhotEvt.h"
+#include "MArrivalTime.h"
 
 ClassImp(MCalibrateRelTimes);
@@ -69 +69 @@
 MCalibrateRelTimes::MCalibrateRelTimes(const char *name, const char *title) 
     : fGeomCam(NULL), fCalibrations(NULL), fBadPixels(NULL), fSignals(NULL), 
-      fCerPhotEvt(NULL)
+      fArrivalTime(NULL)
 {
     fName  = name  ? name  : "MCalibrateRelTimes";
@@ -86 +86 @@
 // they were not found:
 //
-//  - MCerPhotEvt
+//  - MArrivalTime
 //
 Int_t MCalibrateRelTimes::PreProcess(MParList *pList)
@@ -103 +103 @@
       *fLog << warn << AddSerialNumber("MBadPixelsCam") << " not found ... no action" << endl;
     
+
     fCalibrations = (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
     if (!fCalibrations)
@@ -111 +112 @@
 
 
-    fCerPhotEvt = (MCerPhotEvt*)pList->FindObject(AddSerialNumber("MCerPhotEvt"));
-    if (!fCerPhotEvt)
+    fArrivalTime = (MArrivalTime*)pList->FindCreateObj(AddSerialNumber("MArrivalTime"));
+    if (!fArrivalTime)
       {
-        *fLog << err << AddSerialNumber("MCerPhotEvt") << " not found ... aborting." << endl;
+        *fLog << err << AddSerialNumber("MArrivalTime") << ": Cannot create ... aborting." << endl;
         return kFALSE;
       }
@@ -159 +160 @@
 
       MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCalibrations)[pixidx];
-      MBadPixelsPix          &bad = (*fBadPixels)[pixidx];
       
       if (fBadPixels)
-        if (!bad.IsCalibrationResultOK())
-          continue;
+        {
+          MBadPixelsPix          &bad = (*fBadPixels)[pixidx];
+          if (!bad.IsCalibrationResultOK())
+            continue;
+        }
       
       offset     = pix.GetTimeOffset();
@@ -190 +193 @@
       */
 
-      MCerPhotPix &cpix = (*fCerPhotEvt)[pixidx];
-      cpix.SetTime(time);
+      fArrivalTime->SetTime(pixidx,time);
 
     } /* for (UInt_t pixidx=0; pixidx<npix; pixidx++) */
   
-  fCerPhotEvt->SetReadyToSave();
+  fArrivalTime->SetReadyToSave();
   
   return kTRUE;

trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.h

@@ -18 +18 @@
 class MCalibrationRelTimeCam;
 class MArrivalTimeCam;
-class MCerPhotEvt;
+class MArrivalTime;
 class MCalibrateRelTimes : public MTask
 {
@@ -26 +26 @@
     MBadPixelsCam          *fBadPixels;    // Bad Pixels information
     MArrivalTimeCam        *fSignals;      // Extracted Arrival Time
-    MCerPhotEvt            *fCerPhotEvt;   // Cerenkov Photon Event used for calculation
+    MArrivalTime           *fArrivalTime;  // Calibrated arrival times
 
     Int_t PreProcess(MParList *pList);