Changeset 17736 for trunk/Mars

Timestamp:

04/29/14 19:49:36 (11 years ago)

Author:

tbretz

Message:

Do not require MTime... callisto allows now to use a root file as input.

Location:

trunk/Mars/fact/analysis/mc

Files:

• callisto.C (modified) (3 diffs)
• star.C (modified) (1 diff)

trunk/Mars/fact/analysis/mc/callisto.C

@@ -36 +36 @@
 #include "MContinue.h"
 #include "MRawFitsRead.h"
+#include "MReadMarsFile.h"
 #include "MEvtLoop.h"
 #include "MParList.h"
@@ -530 +531 @@
     // ------------------ Setup the tasks ---------------
 
-    MRawFitsRead read5;
-    read5.LoadMap(map);
-    read5.AddFile(datfile);
+    MRawFitsRead read5a;
+    MReadMarsFile read5b("Events");
+    read5a.LoadMap(map);
+    read5a.AddFile(datfile);
+    read5b.DisableAutoScheme();
+    read5b.AddFile(datfile);
+
+    MRead &read5 = datfile.EndsWith(".root") ? static_cast<MRead&>(read5b) : static_cast<MRead&>(read5a);
 
     MFillH fill5a(&hrate);
@@ -649 +655 @@
     write5.AddContainer("MPointingPos",        "Events", kFALSE);
     write5.AddContainer("MSignalCam",          "Events");
-    write5.AddContainer("MTime",               "Events");
+    write5.AddContainer("MTime",               "Events", kFALSE);
     write5.AddContainer("MRawEvtHeader",       "Events");
     //write.AddContainer("MTriggerPattern", "Events");

trunk/Mars/fact/analysis/mc/star.C

@@ -322 +322 @@
 
     MWriteRootFile write(outfile, "RECREATE", "Image parameters", 2);
-    write.AddContainer("MTime",               "Events");
+    write.AddContainer("MTime",               "Events", kFALSE);
     write.AddContainer("MHillas",             "Events");
     write.AddContainer("MHillasExt",          "Events");