From 0feb3db688e7602a3a00e1059b6e5f982f777054 Mon Sep 17 00:00:00 2001 From: Liza Mijovic Date: Fri, 12 Aug 2022 15:54:54 +0200 Subject: [PATCH] ISFParticleVector to ISFParticleContainer --- .../ISF_Event/ISFParticleContainer.h | 6 ++++- .../ISF_Event/ISFParticleOrderedQueue.h | 2 +- .../ISF_Event/ISFParticlePriorityQueue.h | 2 +- .../ISF_Event/ISF_Event/ISFParticleVector.h | 27 ------------------- .../ISF_Event/ISF_Event/ISFTruthIncident.h | 2 +- .../ISF_Interfaces/ISimulationSvc.h | 2 +- .../ISF_Interfaces/ISimulatorTool.h | 2 +- .../ISF_Services/src/InputConverter.cxx | 2 +- .../IPunchThroughTool.h | 2 +- .../src/FastCaloSimSvcPU.cxx | 2 +- .../src/PunchThroughTool.h | 2 +- .../IHadronicInteractionProcessor.h | 2 +- .../IPhotonConversionTool.h | 2 +- .../IPhysicsValidationTool.h | 2 +- .../IProcessSamplingTool.h | 2 +- .../src/HadIntProcessorParametric.h | 2 +- .../src/McMaterialEffectsEngine.h | 2 +- .../src/McMaterialEffectsUpdator.h | 2 +- .../src/PhotonConversionTool.cxx | 2 +- .../test/PhotonConversionTool_test.cxx | 2 +- .../ISF_FatrasToolsG4/G4HadIntProcessor.h | 2 +- .../ISF_FatrasToolsG4/G4ParticleDecayHelper.h | 2 +- .../src/G4HadIntProcessor.cxx | 2 +- .../src/G4LegacyTransportTool.cxx | 2 +- .../ISF_Geant4Tools/src/TransportTool.cxx | 2 +- 25 files changed, 28 insertions(+), 51 deletions(-) delete mode 100644 Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleVector.h diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleContainer.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleContainer.h index cd8ff514d6e..353e0dc7636 100644 --- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleContainer.h +++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleContainer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration */ /////////////////////////////////////////////////////////////////// @@ -11,6 +11,7 @@ // STL includes #include +#include // forward declarations namespace ISF { @@ -21,6 +22,9 @@ namespace ISF { /** generic ISFParticle container (not necessarily a std::list!) */ typedef std::list ISFParticleContainer; typedef std::list ConstISFParticleContainer; + /** ISFParticle vector */ + typedef std::vector ISFParticleVector; + typedef std::vector ConstISFParticleVector; } #endif // ISF_EVENT_ISFPARTICLECONTAINER_H diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleOrderedQueue.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleOrderedQueue.h index 5f795156b31..4410dfa0115 100644 --- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleOrderedQueue.h +++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleOrderedQueue.h @@ -14,7 +14,7 @@ // ISF includes #include "ISF_Event/ISFParticle.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" /** ISFParticleOrderedQueue */ diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticlePriorityQueue.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticlePriorityQueue.h index 5f795156b31..4410dfa0115 100644 --- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticlePriorityQueue.h +++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticlePriorityQueue.h @@ -14,7 +14,7 @@ // ISF includes #include "ISF_Event/ISFParticle.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" /** ISFParticleOrderedQueue */ diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleVector.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleVector.h deleted file mode 100644 index a62660b6575..00000000000 --- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFParticleVector.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration -*/ - -/////////////////////////////////////////////////////////////////// -// ISFParticleVector.h, (c) ATLAS Detector software -/////////////////////////////////////////////////////////////////// -// -#ifndef ISF_EVENT_ISFPARTICLEVECTOR_H -#define ISF_EVENT_ISFPARTICLEVECTOR_H - -// STL includes -#include - -// forward declarations -namespace ISF { - class ISFParticle; -} - -namespace ISF { - /** ISFParticle vector */ - typedef std::vector ISFParticleVector; - typedef std::vector ConstISFParticleVector; -} - -#endif // ISF_EVENT_ISFPARTICLEVECTOR_H - diff --git a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFTruthIncident.h b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFTruthIncident.h index 47b240cf900..a1c2fc3b489 100644 --- a/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFTruthIncident.h +++ b/Simulation/ISF/ISF_Core/ISF_Event/ISF_Event/ISFTruthIncident.h @@ -17,7 +17,7 @@ // ISF includes #include "ISF_Event/ISFParticle.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" #include "ISF_Event/ITruthIncident.h" // DetectorDescription #include "AtlasDetDescr/AtlasRegion.h" diff --git a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h index 314c61c8ae5..82d7429d525 100644 --- a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h +++ b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulationSvc.h @@ -14,7 +14,7 @@ #include "AthenaKernel/IOVSvcDefs.h" // ISF includes -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" #include "ISF_Event/SimSvcID.h" class McEventCollection; diff --git a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h index b18b25947e6..f65506728ae 100644 --- a/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h +++ b/Simulation/ISF/ISF_Core/ISF_Interfaces/ISF_Interfaces/ISimulatorTool.h @@ -15,7 +15,7 @@ #include "ISF_Event/ISFParticle.h" #include "ISF_Event/ISFParticleContainer.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" class McEventCollection; diff --git a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx index d4bf592820b..b3b141eb9e7 100644 --- a/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx +++ b/Simulation/ISF/ISF_Core/ISF_Services/src/InputConverter.cxx @@ -24,7 +24,7 @@ // ISF_Event include #include "ISF_Event/ISFParticle.h" #include "ISF_Event/ISFParticleContainer.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" #include "ISF_Event/ParticleUserInformation.h" // MCTruth includes #include "MCTruth/PrimaryParticleInformation.h" diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/ISF_FastCaloSimInterfaces/IPunchThroughTool.h b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/ISF_FastCaloSimInterfaces/IPunchThroughTool.h index 565f4ad2f43..41211af5398 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/ISF_FastCaloSimInterfaces/IPunchThroughTool.h +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimInterfaces/ISF_FastCaloSimInterfaces/IPunchThroughTool.h @@ -10,7 +10,7 @@ // ISF includes #include "ISF_Event/ISFParticle.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" namespace Trk{ class Track; diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx index 84537e6959b..ddba138274a 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/src/FastCaloSimSvcPU.cxx @@ -11,7 +11,7 @@ // ISF includes #include "ISF_Event/ISFParticle.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" #include "ISF_Event/ISFTruthIncident.h" // HepMC include needed for FastCaloSim diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h index 2aac4123749..d3512652645 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h @@ -26,7 +26,7 @@ #include "BarcodeEvent/PhysicsProcessCode.h" #include "GeoPrimitives/GeoPrimitives.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" #include "AtlasHepMC/GenEvent_fwd.h" diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IHadronicInteractionProcessor.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IHadronicInteractionProcessor.h index bb239bc0593..ba63020c1f9 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IHadronicInteractionProcessor.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IHadronicInteractionProcessor.h @@ -15,7 +15,7 @@ #include "TrkEventPrimitives/ParticleHypothesis.h" #include "TrkParameters/TrackParameters.h" // ISF -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" namespace Trk { class Material; diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhotonConversionTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhotonConversionTool.h index 085ed432d45..d08938723b0 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhotonConversionTool.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhotonConversionTool.h @@ -15,7 +15,7 @@ #include "TrkEventPrimitives/ParticleHypothesis.h" #include "TrkNeutralParameters/NeutralParameters.h" // ISF -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" namespace Trk { class MaterialProperties; diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhysicsValidationTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhysicsValidationTool.h index 2e7865a4cf8..17e09bc4ee1 100755 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhysicsValidationTool.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IPhysicsValidationTool.h @@ -12,7 +12,7 @@ // Gaudi #include "GaudiKernel/IAlgTool.h" // ISF -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" // Trk #include "TrkParameters/TrackParameters.h" #include "TrkNeutralParameters/NeutralParameters.h" diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IProcessSamplingTool.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IProcessSamplingTool.h index 62be54ca82b..369ce94b257 100755 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IProcessSamplingTool.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasInterfaces/ISF_FatrasInterfaces/IProcessSamplingTool.h @@ -13,7 +13,7 @@ #include "GaudiKernel/IAlgTool.h" #include "TrkExUtils/ExtrapolationCell.h" #include "TrkExUtils/TargetSurfaces.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" namespace Trk{ class Track; diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/HadIntProcessorParametric.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/HadIntProcessorParametric.h index 15fdba6effc..103770ecf14 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/HadIntProcessorParametric.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/HadIntProcessorParametric.h @@ -23,7 +23,7 @@ // ISF #include "ISF_Event/ITruthIncident.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" // Barcode #include "BarcodeEvent/PhysicsProcessCode.h" diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsEngine.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsEngine.h index 019208a961e..c919ae1e3f2 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsEngine.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsEngine.h @@ -27,7 +27,7 @@ // ISF #include "ISF_Event/ITruthIncident.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" // Barcode #include "BarcodeEvent/PhysicsProcessCode.h" diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsUpdator.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsUpdator.h index 36abdedbcc0..f645419066c 100755 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsUpdator.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/McMaterialEffectsUpdator.h @@ -24,7 +24,7 @@ #include "TrkParameters/TrackParameters.h" // ISF -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" #include "ISF_Event/ITruthIncident.h" // Barcode diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhotonConversionTool.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhotonConversionTool.cxx index 7c861b8815f..909f9f0e40d 100755 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhotonConversionTool.cxx +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/src/PhotonConversionTool.cxx @@ -16,7 +16,7 @@ #include "StoreGate/StoreGateSvc.h" // ISF includes #include "ISF_Event/ISFParticle.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" #include "ISF_Event/ParticleClipboard.h" #include "ISF_Event/ParticleUserInformation.h" #include "ISF_Interfaces/IParticleBroker.h" diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/test/PhotonConversionTool_test.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/test/PhotonConversionTool_test.cxx index cffd868129c..37fca65e37a 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/test/PhotonConversionTool_test.cxx +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasTools/test/PhotonConversionTool_test.cxx @@ -5,7 +5,7 @@ #include "ISF_Interfaces/ITruthSvc.h" #include "ISF_Event/ISFParticleContainer.h" #include "ISF_Interfaces/ISimulationSelector.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" #include "AthenaBaseComps/AthService.h" #include "GaudiKernel/ToolHandle.h" #include "GaudiKernel/ServiceHandle.h" diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h index ebfa3b51ffe..1c9fd162f1f 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4HadIntProcessor.h @@ -28,7 +28,7 @@ // ISF #include "ISF_Event/ITruthIncident.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" // Forward Declarations class TTree; diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4ParticleDecayHelper.h b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4ParticleDecayHelper.h index 770847f1163..b21750d32e8 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4ParticleDecayHelper.h +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/ISF_FatrasToolsG4/G4ParticleDecayHelper.h @@ -16,7 +16,7 @@ #include "AthenaKernel/IAtRndmGenSvc.h" // ISF #include "ISF_Event/ITruthIncident.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" // iFatras #include "ISF_FatrasInterfaces/IParticleDecayHelper.h" // STD diff --git a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx index 07715f8d271..8d23e74a9a3 100644 --- a/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx +++ b/Simulation/ISF/ISF_Fatras/ISF_FatrasToolsG4/src/G4HadIntProcessor.cxx @@ -14,7 +14,7 @@ // ISF #include "ISF_Event/ISFParticle.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" #include "ISF_Event/ParticleClipboard.h" #include "ISF_Event/ParticleUserInformation.h" #include "ISF_Interfaces/IParticleBroker.h" diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx index 8eeef22d61b..0de53582df3 100644 --- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx +++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/G4LegacyTransportTool.cxx @@ -14,7 +14,7 @@ // ISF classes #include "ISF_Event/ISFParticle.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" // Athena classes #include "GeneratorObjects/McEventCollection.h" diff --git a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx index 5dc9ae81969..c8a20da81ee 100644 --- a/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx +++ b/Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TransportTool.cxx @@ -17,7 +17,7 @@ // ISF classes #include "ISF_Event/ISFParticle.h" -#include "ISF_Event/ISFParticleVector.h" +#include "ISF_Event/ISFParticleContainer.h" // Athena classes #include "GeneratorObjects/McEventCollection.h" -- GitLab