Changeset 4906 for trunk/MagicSoft/Mars/mjobs

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MJCalibrateSignal.cc (modified) (5 diffs)
• MJCalibrateSignal.h (modified) (1 diff)
• MJStar.cc (modified) (5 diffs)
• MJStar.h (modified) (1 diff)

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");

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.h

@@ -31 +31 @@
     MJCalibrateSignal(const char *name=NULL, const char *title=NULL);
 
-    Bool_t ProcessFile(MPedestalCam &cam);
+    Bool_t ProcessFile(MPedestalCam &cam, Bool_t ismc=kFALSE);
 
     ClassDef(MJCalibrateSignal, 0) // Tool to create a pedestal file (MPedestalCam)

trunk/MagicSoft/Mars/mjobs/MJStar.cc

@@ -49 +49 @@
 
 #include "MReadReports.h"
+#include "MReadMarsFile.h"
 #include "MGeomApply.h"
 #include "MEventRateCalc.h"
@@ -100 +101 @@
 }
 
-Bool_t MJStar::ProcessFile()
+Bool_t MJStar::ProcessFile(Bool_t ismc)
 {
     if (!fSequence.IsValid())
@@ -145 +146 @@
     plist.AddToList(&tlist);
 
-    MReadReports read;
-    read.AddTree("Events", "MTime.", kTRUE);
-    read.AddTree("Drive");
+    MReadReports readreal;
+    readreal.AddTree("Events", "MTime.", kTRUE);
+    readreal.AddTree("Drive");
     //read.AddTree("Trigger");
     //read.AddTree("Camera");
     //read.AddTree("CC");
     //read.AddTree("Currents");
-    read.AddFiles(iter);
+    readreal.AddFiles(iter);
+
+    MReadMarsFile readmc("Events");
+    readmc.DisableAutoScheme();
+    readmc.AddFiles(iter);
 
     // ------------------ Setup general tasks ----------------
@@ -215 +220 @@
     write.AddContainer("MNewImagePar2", "Events");
     write.AddContainer("MImageParTime", "Events");
-    write.AddContainer("MTime",         "Events");
     write.AddContainer("MRawEvtHeader", "Events");
-    // Monte Carlo
-    write.AddContainer("MMcEvt",              "Events", kFALSE);
-    write.AddContainer("MMcTrig",             "Events", kFALSE);
-    // Run Header
-    write.AddContainer("MRawRunHeader",       "RunHeaders");
-    write.AddContainer("MBadPixelsCam",       "RunHeaders");
-    write.AddContainer("MGeomCam",            "RunHeaders");
-    //write.AddContainer("MObservatory", "RunHeaders");
-    // Monte Carlo Headers
-    write.AddContainer("MMcTrigHeader",       "RunHeaders", kFALSE);
-    write.AddContainer("MMcConfigRunHeader",  "RunHeaders", kFALSE);
-    write.AddContainer("MMcCorsikaRunHeader", "RunHeaders", kFALSE);
-    // Drive
-    //write.AddContainer("MSrcPosCam",   "Drive");
-    write.AddContainer("MPointingPos", "Drive");
-    write.AddContainer("MReportDrive", "Drive");
-    write.AddContainer("MTimeDrive",   "Drive");
-    // Effective On Time
-    write.AddContainer("MEffectiveOnTime",     "EffectiveOnTime");
-    write.AddContainer("MTimeEffectiveOnTime", "EffectiveOnTime");
+    if (ismc)
+    {
+        write.AddContainer("MPointingPos", "Events");
+        // Monte Carlo
+        write.AddContainer("MMcEvt",              "Events");
+        write.AddContainer("MMcTrig",             "Events");
+        // Monte Carlo Headers
+        write.AddContainer("MMcTrigHeader",       "RunHeaders");
+        write.AddContainer("MMcConfigRunHeader",  "RunHeaders");
+        write.AddContainer("MMcCorsikaRunHeader", "RunHeaders");
+    }
+    else
+    {
+        write.AddContainer("MTime",         "Events");
+        // Run Header
+        write.AddContainer("MRawRunHeader",       "RunHeaders");
+        write.AddContainer("MBadPixelsCam",       "RunHeaders");
+        write.AddContainer("MGeomCam",            "RunHeaders");
+        //write.AddContainer("MObservatory", "RunHeaders");
+        // Drive
+        //write.AddContainer("MSrcPosCam",   "Drive");
+        write.AddContainer("MPointingPos", "Drive");
+        write.AddContainer("MReportDrive", "Drive");
+        write.AddContainer("MTimeDrive",   "Drive");
+        // Effective On Time
+        write.AddContainer("MEffectiveOnTime",     "EffectiveOnTime");
+        write.AddContainer("MTimeEffectiveOnTime", "EffectiveOnTime");
+    }
 
     MTaskList tlist2;
     tlist2.AddToList(&apply);
-    tlist2.AddToList(&rate);
-    //tlist2.AddToList(&rate10000);
-    tlist2.AddToList(&fill8);
-    tlist2.AddToList(&fill9);
-    tlist2.AddToList(&filla);
+    if (!ismc)
+    {
+        tlist2.AddToList(&rate);
+        //tlist2.AddToList(&rate10000);
+        tlist2.AddToList(&fill8);
+        tlist2.AddToList(&fill9);
+        tlist2.AddToList(&filla);
+    }
     //tlist2.AddToList(&fillb);
     tlist2.AddToList(&clean);
@@ -265 +280 @@
     //tlist3.AddToList(&srcpos);
 
-    tlist.AddToList(&read);
+    tlist.AddToList(ismc ? (MTask*)&readmc : (MTask*)&readreal);
     tlist.AddToList(&tlist3, "Drive");
     tlist.AddToList(&tlist2, "Events");

trunk/MagicSoft/Mars/mjobs/MJStar.h

@@ -14 +14 @@
     MJStar(const char *name=NULL, const char *title=NULL);
 
-    Bool_t ProcessFile();
+    Bool_t ProcessFile(Bool_t ismc=kFALSE);
 
     ClassDef(MJStar, 0) // Tool to create a pedestal file (MPedestalCam)