Index: trunk/Mars/mjobs/MJSimulation.cc
===================================================================
--- trunk/Mars/mjobs/MJSimulation.cc	(revision 17736)
+++ trunk/Mars/mjobs/MJSimulation.cc	(revision 17737)
@@ -229,5 +229,6 @@
 }
 
-void MJSimulation::SetupCommonFileStructure(MWriteRootFile &write) const
+template<class T>
+void MJSimulation::SetupCommonFileStructure(T &write) const
 {
     // Common run headers
@@ -243,20 +244,5 @@
     write.AddContainer("MMcEvt",              "Events");
     write.AddContainer("IncidentAngle",       "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);
+    write.AddContainer("MPointingPos",        "Events", kFALSE);
 }
 
Index: trunk/Mars/mjobs/MJSimulation.h
===================================================================
--- trunk/Mars/mjobs/MJSimulation.h	(revision 17736)
+++ trunk/Mars/mjobs/MJSimulation.h	(revision 17737)
@@ -32,7 +32,8 @@
     Bool_t CheckEnvLocal();
 
+    template<class T>
+    void SetupCommonFileStructure(T &write) const;
+
     void SetupHist(MHn &hist) const;
-    void SetupCommonFileStructure(MWriteRootFile &write) const;
-    void SetupCommonFileStructure(MWriteFitsFile& write) const;
     void SetupHeaderKeys(MWriteFitsFile& write, MRawRunHeader &header) const;
     void SetupVetoColumns(MWriteFitsFile& write) const;