Index: trunk/Mars/mjobs/MJSimulation.cc
===================================================================
--- trunk/Mars/mjobs/MJSimulation.cc	(revision 17837)
+++ trunk/Mars/mjobs/MJSimulation.cc	(revision 17839)
@@ -242,5 +242,5 @@
     write.AddContainer("MCorsikaEvtHeader",   "Events", kFALSE);
     write.AddContainer("MRawEvtHeader",       "Events");
-    write.AddContainer("MMcEvt",              "Events");
+    write.AddContainer("MMcEvt",              "Events", kFALSE);
     write.AddContainer("IncidentAngle",       "Events", kFALSE);
     write.AddContainer("MPointingPos",        "Events", kFALSE);
@@ -639,10 +639,5 @@
     write3af.AddContainer("MRawEvtData",      "Events");
     write3af.AddContainer("MTruePhotonsPerPixelCont", "Events");
-    
-    if (fOperationMode == kModeData){
-	write3af.AddContainer("MMcEvtBasic",      "Events");
-    }
- 
-    write3af.AddContainer("MPhotonEvent","Events");
+    write3af.AddContainer("MPhotonEvent",     "Events");
 
     write3ar.AddContainer("ElectronicNoise",  "RunHeaders");