diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfig.py b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfig.py index bc9874556c864cd1b1f72f1b300dd674626220ae..d4da7662a6a50cbbf7aa49b541a873b1634e656c 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfig.py +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_FastCaloSimServices/python/ISF_FastCaloSimServicesConfig.py @@ -19,7 +19,6 @@ def PunchThroughClassifierCfg(flags, name="ISF_PunchThroughClassifier", **kwargs def PunchThroughToolCfg(flags, name="ISF_PunchThroughTool", **kwargs): - from BarcodeServices.BarcodeServicesConfig import BarcodeSvcCfg from SubDetectorEnvelopes.SubDetectorEnvelopesConfig import EnvelopeDefSvcCfg acc = ComponentAccumulator() if "PunchThroughClassifier" not in kwargs: @@ -39,7 +38,6 @@ def PunchThroughToolCfg(flags, name="ISF_PunchThroughTool", **kwargs): kwargs.setdefault("FullCorrelationEnergy" , [ 100000., 100000., 100000., 100000., 0., 100000., 100000., 100000., 100000.] ) kwargs.setdefault("MinEnergy" , [ 938.3, 135.6, 50., 50., 105.7, 939.6, 493.7, 497.6, 497.6 ] ) kwargs.setdefault("MaxNumParticles" , [ -1, -1, -1, -1, -1, -1, -1, -1, -1 ] ) - kwargs.setdefault("BarcodeSvc", acc.getPrimaryAndMerge(BarcodeSvcCfg(flags)).name) kwargs.setdefault("EnvelopeDefSvc", acc.getPrimaryAndMerge(EnvelopeDefSvcCfg(flags)).name) kwargs.setdefault("BeamPipeRadius", 500.) acc.setPrivateTools(CompFactory.ISF.PunchThroughTool(name, **kwargs)) diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt index c72b5efc13292f9be6a8049db251166ccb4eeb47..40b8f68a0458205b5c3fe1d0fbb151572d1f6b59 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2024 CERN for the benefit of the ATLAS collaboration # Declare the package name: atlas_subdir( ISF_PunchThroughTools ) @@ -17,4 +17,4 @@ atlas_add_component( ISF_PunchThroughTools src/*.cxx src/components/*.cxx INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} ${LWTNN_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} - LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} ${LWTNN_LIBRARIES} ${LIBXML2_LIBRARIES} AthenaBaseComps AthenaKernel BarcodeInterfacesLib GeoPrimitives ISF_FastCaloSimInterfaces ISF_FastCaloSimEvent AthContainers GaudiKernel ISF_Event ISF_InterfacesLib PathResolver SubDetectorEnvelopesLib TruthUtils ) + LINK_LIBRARIES ${HEPPDT_LIBRARIES} ${ROOT_LIBRARIES} ${CLHEP_LIBRARIES} AtlasHepMCLib ${EIGEN_LIBRARIES} ${LWTNN_LIBRARIES} ${LIBXML2_LIBRARIES} AthenaBaseComps AthenaKernel GeoPrimitives ISF_FastCaloSimInterfaces ISF_FastCaloSimEvent AthContainers GaudiKernel ISF_Event ISF_InterfacesLib PathResolver SubDetectorEnvelopesLib TruthUtils ) diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx index d6ceb2fec51c382d465bccf06dc9a4d87f97f3cf..318e4c33b54a9f59d06364462e3138781bb12fa9 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.cxx @@ -141,13 +141,6 @@ StatusCode ISF::PunchThroughTool::initialize() return StatusCode::FAILURE; } - //barcode service - if (m_barcodeSvc.retrieve().isFailure() ) - { - ATH_MSG_ERROR( "[ punchthrough ] Could not retrieve " << m_barcodeSvc ); - return StatusCode::FAILURE; - } - //envelope definition service if (m_envDefSvc.retrieve().isFailure() ) { @@ -1346,12 +1339,11 @@ ISF::ISFParticle* ISF::PunchThroughTool::createExitPs( const ISF::ISFParticle &i charge *= (pdg > 0.) ? 1. : -1.; const double pTime = 0; /** @TODO: fix */ - - //assign barcodes to the produced particles - const int secBC = m_barcodeSvc->newSecondaryParticle( isfp.barcode() ); + const int status = 1 + HepMC::SIM_STATUS_THRESHOLD; + const int id = HepMC::UNDEFINED_ID; // NB we are not considering the possibility that the punch-through // particle is the incoming particle having survived an interaction. - ISF::ISFParticle* finalPar = new ISF::ISFParticle (pos, mom, mass, charge, pdg, 1 + HepMC::SIM_STATUS_THRESHOLD, pTime, isfp, secBC); + ISF::ISFParticle* finalPar = new ISF::ISFParticle ( pos, mom, mass, charge, pdg, status, pTime, isfp, id); finalPar->setNextGeoID( AtlasDetDescr::fAtlasMS); // return the punch-through particle diff --git a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h index 16a29fb731630f040297c7cba38297dfdf18979a..158febec48a0bf72049148c6877b679b68716b68 100644 --- a/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h +++ b/Simulation/ISF/ISF_FastCaloSim/ISF_PunchThroughTools/src/PunchThroughTool.h @@ -13,9 +13,6 @@ // Athena Base #include "AthenaBaseComps/AthAlgTool.h" -//Barcode -#include "BarcodeInterfaces/IBarcodeSvc.h" - //Geometry #include "SubDetectorEnvelopes/IEnvelopeDefSvc.h" @@ -200,7 +197,6 @@ namespace ISF { *---------------------------------------------------------------------*/ ServiceHandle<IPartPropSvc> m_particlePropSvc{this, "PartPropSvc", "PartPropSvc", "particle properties svc"}; ServiceHandle<IGeoIDSvc> m_geoIDSvc{this, "GeoIDSvc", "ISF::GeoIDSvc"}; - ServiceHandle<Barcode::IBarcodeSvc> m_barcodeSvc{this, "BarcodeSvc", "BarcodeSvc"}; ServiceHandle<IEnvelopeDefSvc> m_envDefSvc{this, "EnvelopeDefSvc", "AtlasGeometry_EnvelopeDefSvc"}; /** beam pipe radius */