Changeset 4906 for trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

Timestamp:

09/09/04 17:51:57 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -59 +59 @@
 
 #include "MReadReports.h"
+#include "MReadMarsFile.h"
 #include "MGeomApply.h"
 #include "MPointingPosCalc.h"
@@ -180 +181 @@
 }
 
-Bool_t MJCalibrateSignal::ProcessFile(MPedestalCam &pedcam)
+Bool_t MJCalibrateSignal::ProcessFile(MPedestalCam &pedcam, Bool_t ismc)
 {
     if (!fSequence.IsValid())
@@ -270 +271 @@
     plist.AddToList(&tlist);
 
-    //MReadMarsFile read("Events");
-    //read.DisableAutoScheme();
-    MReadReports read;
-    read.AddTree("Events", "MTime.", kTRUE);
-    read.AddTree("Trigger");
-    read.AddTree("Camera");
-    read.AddTree("Drive");
-    read.AddTree("CC");
-    read.AddTree("Currents");
-    read.AddFiles(iter);
-    //read.AddFiles(fnamein);
+    MReadReports readreal;
+    readreal.AddTree("Events", "MTime.", kTRUE);
+    readreal.AddTree("Trigger");
+    readreal.AddTree("Camera");
+    readreal.AddTree("Drive");
+    readreal.AddTree("CC");
+    readreal.AddTree("Currents");
+    readreal.AddFiles(iter);
+
+    MReadMarsFile readmc("Events");
+    readmc.DisableAutoScheme();
+    readmc.AddFiles(iter);
 
     MGeomApply             apply; // Only necessary to create geometry
@@ -332 +334 @@
     write.AddContainer("MCerPhotEvt",         "Events");
     write.AddContainer("MPedPhotCam",         "Events");
-    write.AddContainer("MTime",               "Events");
+    write.AddContainer("MTime",               "Events", kFALSE);
     write.AddContainer("MRawEvtHeader",       "Events");
     write.AddContainer("MArrivalTime",        "Events");
@@ -383 +385 @@
 
     // Now setup main tasklist
-    tlist.AddToList(&read);
+    tlist.AddToList(ismc ? (MTask*)&readmc : (MTask*)&readreal);
     tlist.AddToList(&tlist2, "Events");
     tlist.AddToList(&pcalc,  "Drive");