Changeset 17854 for trunk/Mars

Timestamp:

05/14/14 15:18:38 (11 years ago)

Author:

tbretz

Message:

I made a mess reverting the last change... so this should correspond to revision 17737.

File:

• trunk/Mars/mjobs/MJSimulation.cc (modified) (3 diffs)

trunk/Mars/mjobs/MJSimulation.cc

@@ -229 +229 @@
 }
 
-void MJSimulation::SetupCommonFileStructure(MWriteRootFile &write) const
+template<class T>
+void MJSimulation::SetupCommonFileStructure(T &write) const
 {
     // Common run headers
@@ -241 +242 @@
     write.AddContainer("MCorsikaEvtHeader",   "Events", kFALSE);
     write.AddContainer("MRawEvtHeader",       "Events");
-    write.AddContainer("MMcEvt",              "Events");
+    write.AddContainer("MMcEvt",              "Events", kFALSE);
     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);
 }
 
@@ -653 +639 @@
     write3af.AddContainer("MRawEvtData",      "Events");
     write3af.AddContainer("MTruePhotonsPerPixelCont", "Events");
-    
-    if (fOperationMode == kModeData){
-        write3af.AddContainer("MMcEvtBasic",      "Events");
-    }
- 
+    write3af.AddContainer("MMcEvtBasic",      "Events", kFALSE);
+
     write3af.AddContainer("MPhotonEvent","Events");