Index: /trunk/Mars/mjobs/MJSimulation.cc
===================================================================
--- /trunk/Mars/mjobs/MJSimulation.cc	(revision 17852)
+++ /trunk/Mars/mjobs/MJSimulation.cc	(revision 17853)
@@ -229,6 +229,5 @@
 }
 
-template<class T>
-void MJSimulation::SetupCommonFileStructure(T &write) const
+void MJSimulation::SetupCommonFileStructure(MWriteRootFile &write) const
 {
     // Common run headers
@@ -242,7 +241,22 @@
     write.AddContainer("MCorsikaEvtHeader",   "Events", kFALSE);
     write.AddContainer("MRawEvtHeader",       "Events");
-    write.AddContainer("MMcEvt",              "Events", kFALSE);
+    write.AddContainer("MMcEvt",              "Events");
     write.AddContainer("IncidentAngle",       "Events", kFALSE);
-    write.AddContainer("MPointingPos",        "Events", kFALSE);
+}
+//FIXME Etienne. I'm doing the same for fits and root. I probably should adapt somehow
+void MJSimulation::SetupCommonFileStructure(MWriteFitsFile& write) const
+{
+    // Common run headers
+    write.AddContainer("MMcCorsikaRunHeader", "RunHeaders", kFALSE);
+    write.AddContainer("MCorsikaRunHeader",   "RunHeaders", kFALSE);
+    write.AddContainer("MRawRunHeader",       "RunHeaders");
+    write.AddContainer("MGeomCam",            "RunHeaders");
+    write.AddContainer("MMcRunHeader",        "RunHeaders");
+
+    // Common events
+    write.AddContainer("MCorsikaEvtHeader",   "Events", kFALSE);
+    write.AddContainer("MRawEvtHeader",       "Events");
+    write.AddContainer("MMcEvt",              "Events");
+    write.AddContainer("IncidentAngle",       "Events", kFALSE);
 }
 
@@ -639,5 +653,10 @@
     write3af.AddContainer("MRawEvtData",      "Events");
     write3af.AddContainer("MTruePhotonsPerPixelCont", "Events");
-    write3af.AddContainer("MPhotonEvent",     "Events");
+    
+    if (fOperationMode == kModeData){
+	write3af.AddContainer("MMcEvtBasic",      "Events");
+    }
+ 
+    write3af.AddContainer("MPhotonEvent","Events");
 
     write3ar.AddContainer("ElectronicNoise",  "RunHeaders");