Index: trunk/Mars/fact/analysis/mc/callisto.C
===================================================================
--- trunk/Mars/fact/analysis/mc/callisto.C	(revision 17735)
+++ trunk/Mars/fact/analysis/mc/callisto.C	(revision 17736)
@@ -36,4 +36,5 @@
 #include "MContinue.h"
 #include "MRawFitsRead.h"
+#include "MReadMarsFile.h"
 #include "MEvtLoop.h"
 #include "MParList.h"
@@ -530,7 +531,12 @@
     // ------------------ 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,5 +655,5 @@
     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");
Index: trunk/Mars/fact/analysis/mc/star.C
===================================================================
--- trunk/Mars/fact/analysis/mc/star.C	(revision 17735)
+++ trunk/Mars/fact/analysis/mc/star.C	(revision 17736)
@@ -322,5 +322,5 @@
 
     MWriteRootFile write(outfile, "RECREATE", "Image parameters", 2);
-    write.AddContainer("MTime",               "Events");
+    write.AddContainer("MTime",               "Events", kFALSE);
     write.AddContainer("MHillas",             "Events");
     write.AddContainer("MHillasExt",          "Events");