Changeset 17853 for trunk/Mars/mjobs


Ignore:
Timestamp:
05/14/14 15:15:52 (11 years ago)
Author:
tbretz
Message:
Reverting to last revision.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/mjobs/MJSimulation.cc

    r17839 r17853  
    229229}
    230230
    231 template<class T>
    232 void MJSimulation::SetupCommonFileStructure(T &write) const
     231void MJSimulation::SetupCommonFileStructure(MWriteRootFile &write) const
    233232{
    234233    // Common run headers
     
    242241    write.AddContainer("MCorsikaEvtHeader",   "Events", kFALSE);
    243242    write.AddContainer("MRawEvtHeader",       "Events");
    244     write.AddContainer("MMcEvt",              "Events", kFALSE);
     243    write.AddContainer("MMcEvt",              "Events");
    245244    write.AddContainer("IncidentAngle",       "Events", kFALSE);
    246     write.AddContainer("MPointingPos",        "Events", kFALSE);
     245}
     246//FIXME Etienne. I'm doing the same for fits and root. I probably should adapt somehow
     247void MJSimulation::SetupCommonFileStructure(MWriteFitsFile& write) const
     248{
     249    // Common run headers
     250    write.AddContainer("MMcCorsikaRunHeader", "RunHeaders", kFALSE);
     251    write.AddContainer("MCorsikaRunHeader",   "RunHeaders", kFALSE);
     252    write.AddContainer("MRawRunHeader",       "RunHeaders");
     253    write.AddContainer("MGeomCam",            "RunHeaders");
     254    write.AddContainer("MMcRunHeader",        "RunHeaders");
     255
     256    // Common events
     257    write.AddContainer("MCorsikaEvtHeader",   "Events", kFALSE);
     258    write.AddContainer("MRawEvtHeader",       "Events");
     259    write.AddContainer("MMcEvt",              "Events");
     260    write.AddContainer("IncidentAngle",       "Events", kFALSE);
    247261}
    248262
     
    639653    write3af.AddContainer("MRawEvtData",      "Events");
    640654    write3af.AddContainer("MTruePhotonsPerPixelCont", "Events");
    641     write3af.AddContainer("MPhotonEvent",     "Events");
     655   
     656    if (fOperationMode == kModeData){
     657        write3af.AddContainer("MMcEvtBasic",      "Events");
     658    }
     659 
     660    write3af.AddContainer("MPhotonEvent","Events");
    642661
    643662    write3ar.AddContainer("ElectronicNoise",  "RunHeaders");
Note: See TracChangeset for help on using the changeset viewer.