Tidy up includes in HLTEDMCreator

Tidy up includes in HLTEDMCreator

Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.cxx

@@ -10,6 +10,59 @@
 #include "StoreGate/WriteDecorHandle.h"
 #include "TrigOutputHandling/TriggerEDMAuxAccessors.h"
 
+#include "xAODTrigger/TrigCompositeAuxContainer.h"
+#include "xAODTrigEgamma/TrigElectronAuxContainer.h"
+#include "xAODTrigEgamma/TrigPhotonAuxContainer.h"
+#include "xAODEgamma/ElectronAuxContainer.h"
+#include "xAODEgamma/PhotonAuxContainer.h"
+#include "xAODTrigCalo/TrigEMClusterAuxContainer.h"
+#include "xAODTrigCalo/TrigCaloClusterAuxContainer.h"
+
+#include "xAODTrigRinger/TrigRingerRingsAuxContainer.h"
+
+#include "xAODTracking/TrackParticleAuxContainer.h"
+#include "xAODTrigMissingET/TrigMissingETAuxContainer.h"
+
+#include "xAODTrigMuon/L2StandAloneMuonAuxContainer.h"
+#include "xAODTrigMuon/L2CombinedMuonAuxContainer.h"
+#include "xAODTrigMuon/L2IsoMuonAuxContainer.h"
+#include "xAODMuon/MuonAuxContainer.h"
+#include "xAODTau/TauJetAuxContainer.h"
+#include "xAODTau/TauTrackAuxContainer.h"
+#include "xAODJet/JetAuxContainer.h"
+#include "xAODTracking/VertexAuxContainer.h"
+#include "xAODTrigBphys/TrigBphysAuxContainer.h"
+#include "xAODBTagging/BTaggingAuxContainer.h"
+#include "xAODBTagging/BTagVertexAuxContainer.h"
+
+#include "xAODTrigCalo/CaloClusterTrigAuxContainer.h"
+
+#include "xAODTrigMinBias/TrigT2MbtsBitsAuxContainer.h"
+
+#include "xAODHIEvent/HIEventShapeAuxContainer.h"
+
+#include "xAODTrigRinger/TrigRNNOutputAuxContainer.h"
+
+#include "xAODForward/AFPSiHitsClusterAuxContainer.h"
+#include "xAODForward/AFPTrackAuxContainer.h"
+#include "xAODForward/AFPToFTrackAuxContainer.h"
+#include "xAODForward/AFPProtonAuxContainer.h"
+#include "xAODForward/AFPVertexAuxContainer.h"
+
+#include "xAODTrigger/eFexEMRoIAuxContainer.h"
+#include "xAODTrigger/eFexTauRoIAuxContainer.h"
+#include "xAODTrigger/jFexTauRoIAuxContainer.h"
+#include "xAODTrigger/jFexFwdElRoIAuxContainer.h"
+#include "xAODTrigger/jFexSRJetRoIAuxContainer.h"
+#include "xAODTrigger/jFexLRJetRoIAuxContainer.h"
+#include "xAODTrigger/jFexMETRoIAuxContainer.h"
+#include "xAODTrigger/jFexSumETRoIAuxContainer.h"
+#include "xAODTrigger/gFexJetRoIAuxContainer.h"
+#include "xAODTrigger/gFexGlobalRoIAuxContainer.h"
+#include "xAODTrigger/MuonRoIAuxContainer.h"
+
+#include "xAODCore/ShallowAuxContainer.h"
+
 HLTEDMCreator::HLTEDMCreator( const std::string& type, 
             const std::string& name,
             const IInterface* parent )

Trigger/TrigSteer/TrigOutputHandling/src/HLTEDMCreator.h

@@ -6,109 +6,67 @@
 
 // STL includes
 #include <string>
-#include <functional>
 // FrameWork includes
 #include "AthenaBaseComps/AthAlgTool.h"
-#include "GaudiKernel/ServiceHandle.h"
 
 // OutputHandling includes
 #include "DecisionHandling/IHLTOutputTool.h"
+#include "StoreGate/ReadHandleKeyArray.h"
+#include "StoreGate/WriteHandleKeyArray.h"
 #include "StoreGate/WriteDecorHandleKeyArray.h"
 #include "AthViews/View.h"
 
 #include "TrigSteeringEvent/TrigRoiDescriptorCollection.h"
 #include "xAODTrigger/TrigCompositeContainer.h"
-#include "xAODTrigger/TrigCompositeAuxContainer.h"
 #include "xAODTrigEgamma/TrigElectronContainer.h"
-#include "xAODTrigEgamma/TrigElectronAuxContainer.h"
 #include "xAODTrigEgamma/TrigPhotonContainer.h"
-#include "xAODTrigEgamma/TrigPhotonAuxContainer.h"
 #include "xAODEgamma/ElectronContainer.h"
-#include "xAODEgamma/ElectronAuxContainer.h"
 #include "xAODEgamma/PhotonContainer.h"
-#include "xAODEgamma/PhotonAuxContainer.h"
 #include "xAODTrigCalo/TrigEMClusterContainer.h"
-#include "xAODTrigCalo/TrigEMClusterAuxContainer.h"
 #include "xAODTrigCalo/TrigCaloClusterContainer.h"
-#include "xAODTrigCalo/TrigCaloClusterAuxContainer.h"
 
 #include "xAODTrigRinger/TrigRingerRingsContainer.h"
-#include "xAODTrigRinger/TrigRingerRingsAuxContainer.h"
 
 #include "xAODTracking/TrackParticleContainer.h"
-#include "xAODTracking/TrackParticleAuxContainer.h"
 #include "xAODTrigMissingET/TrigMissingETContainer.h"
-#include "xAODTrigMissingET/TrigMissingETAuxContainer.h"
 
 #include "xAODTrigMuon/L2StandAloneMuonContainer.h"
-#include "xAODTrigMuon/L2StandAloneMuonAuxContainer.h"
 #include "xAODTrigMuon/L2CombinedMuonContainer.h"
-#include "xAODTrigMuon/L2CombinedMuonAuxContainer.h"
 #include "xAODTrigMuon/L2IsoMuonContainer.h"
-#include "xAODTrigMuon/L2IsoMuonAuxContainer.h"
 #include "xAODMuon/MuonContainer.h"
-#include "xAODMuon/MuonAuxContainer.h"
 #include "xAODTau/TauJetContainer.h"
-#include "xAODTau/TauJetAuxContainer.h"
 #include "xAODTau/TauTrackContainer.h"
-#include "xAODTau/TauTrackAuxContainer.h"
 #include "xAODJet/JetContainer.h"
-#include "xAODJet/JetAuxContainer.h"
 #include "xAODTracking/VertexContainer.h"
-#include "xAODTracking/VertexAuxContainer.h"
 #include "xAODTrigBphys/TrigBphysContainer.h"
-#include "xAODTrigBphys/TrigBphysAuxContainer.h"
 #include "xAODBTagging/BTaggingContainer.h"
-#include "xAODBTagging/BTaggingAuxContainer.h"
 #include "xAODBTagging/BTagVertexContainer.h"
-#include "xAODBTagging/BTagVertexAuxContainer.h"
 
 #include "xAODCaloEvent/CaloClusterContainer.h"
-#include "xAODTrigCalo/CaloClusterTrigAuxContainer.h"
-#include "xAODCore/ShallowAuxContainer.h"
 
 #include "xAODTrigMinBias/TrigT2MbtsBitsContainer.h"
-#include "xAODTrigMinBias/TrigT2MbtsBitsAuxContainer.h"
 
 #include "xAODHIEvent/HIEventShapeContainer.h"
-#include "xAODHIEvent/HIEventShapeAuxContainer.h"
 
 #include "xAODTrigRinger/TrigRNNOutputContainer.h"
-#include "xAODTrigRinger/TrigRNNOutputAuxContainer.h"
 
 #include "xAODForward/AFPSiHitsClusterContainer.h"
-#include "xAODForward/AFPSiHitsClusterAuxContainer.h"
 #include "xAODForward/AFPTrackContainer.h"
-#include "xAODForward/AFPTrackAuxContainer.h"
 #include "xAODForward/AFPToFTrackContainer.h"
-#include "xAODForward/AFPToFTrackAuxContainer.h"
 #include "xAODForward/AFPProtonContainer.h"
-#include "xAODForward/AFPProtonAuxContainer.h"
 #include "xAODForward/AFPVertexContainer.h"
-#include "xAODForward/AFPVertexAuxContainer.h"
 
 #include "xAODTrigger/eFexEMRoIContainer.h"
-#include "xAODTrigger/eFexEMRoIAuxContainer.h"
 #include "xAODTrigger/eFexTauRoIContainer.h"
-#include "xAODTrigger/eFexTauRoIAuxContainer.h"
 #include "xAODTrigger/jFexTauRoIContainer.h"
-#include "xAODTrigger/jFexTauRoIAuxContainer.h"
 #include "xAODTrigger/jFexFwdElRoIContainer.h"
-#include "xAODTrigger/jFexFwdElRoIAuxContainer.h"
 #include "xAODTrigger/jFexSRJetRoIContainer.h"
-#include "xAODTrigger/jFexSRJetRoIAuxContainer.h"
 #include "xAODTrigger/jFexLRJetRoIContainer.h"
-#include "xAODTrigger/jFexLRJetRoIAuxContainer.h"
 #include "xAODTrigger/jFexMETRoIContainer.h"
-#include "xAODTrigger/jFexMETRoIAuxContainer.h"
 #include "xAODTrigger/jFexSumETRoIContainer.h"
-#include "xAODTrigger/jFexSumETRoIAuxContainer.h"
 #include "xAODTrigger/gFexJetRoIContainer.h"
-#include "xAODTrigger/gFexJetRoIAuxContainer.h"
 #include "xAODTrigger/gFexGlobalRoIContainer.h"
-#include "xAODTrigger/gFexGlobalRoIAuxContainer.h"
 #include "xAODTrigger/MuonRoIContainer.h"
-#include "xAODTrigger/MuonRoIAuxContainer.h"
 
 /**
  * @class HLTEDMCreator