Index: trunk/Mars/fact/analysis/callisto.C
===================================================================
--- trunk/Mars/fact/analysis/callisto.C	(revision 17878)
+++ trunk/Mars/fact/analysis/callisto.C	(revision 17880)
@@ -860,10 +860,18 @@
     // The second rule is for the case reading raw-files!
     MWriteRootFile write5(2, fname, "RECREATE", "Calibrated Data");
-    write5.AddContainer("MRawRunHeader", "RunHeaders");
-    write5.AddContainer("MGeomCam",      "RunHeaders");
-    write5.AddContainer("MSignalCam",    "Events");
-    write5.AddContainer("MTime",         "Events");
-    write5.AddContainer("MRawEvtHeader", "Events");
-    //write.AddContainer("MTriggerPattern", "Events");
+    write5.AddContainer("MRawRunHeader",       "RunHeaders");
+    write5.AddContainer("MGeomCam",            "RunHeaders");
+    write5.AddContainer("MMcCorsikaRunHeader", "RunHeaders", kFALSE);
+    write5.AddContainer("MCorsikaRunHeader",   "RunHeaders", kFALSE);
+    write5.AddContainer("MMcRunHeader",        "RunHeaders", kFALSE);
+
+    // Common events
+    write5.AddContainer("MCorsikaEvtHeader",   "Events", kFALSE);
+    write5.AddContainer("MMcEvt",              "Events", kFALSE);
+    write5.AddContainer("IncidentAngle",       "Events", kFALSE);
+    write5.AddContainer("MPointingPos",        "Events", kFALSE);
+    write5.AddContainer("MSignalCam",          "Events");
+    write5.AddContainer("MTime",               "Events", kFALSE);
+    write5.AddContainer("MRawEvtHeader",       "Events");
 
     // ------------------ Setup histograms and fill tasks ----------------