Skip to content
Snippets Groups Projects
Commit f06fa47d authored by Paul Gessinger's avatar Paul Gessinger Committed by Adam Edward Barton
Browse files

Accomodate Acts v0.10.4

parent 8f0c804e
No related branches found
No related tags found
No related merge requests found
Showing
with 12 additions and 18 deletions
...@@ -11,7 +11,7 @@ atlas_subdir( Horace_i ) ...@@ -11,7 +11,7 @@ atlas_subdir( Horace_i )
# Component(s) in the package: # Component(s) in the package:
atlas_add_library( Horace_i atlas_add_library( Horace_i
src/*.F src/*.F
PUBLIC_HEADERS Horace_i ) NO_PUBLIC_HEADERS )
# Install files from the package: # Install files from the package:
atlas_install_joboptions( share/*.py ) atlas_install_joboptions( share/*.py )
......
...@@ -27,8 +27,7 @@ atlas_add_library( ...@@ -27,8 +27,7 @@ atlas_add_library(
TrigByteStreamCnvSvcLib TrigByteStreamCnvSvcLib
TrigByteStreamCnvSvc/*.h TrigByteStreamCnvSvc/*.h
src/*.cxx src/*.cxx
PUBLIC_HEADERS NO_PUBLIC_HEADERS
TrigByteStreamCnvSvc
LINK_LIBRARIES LINK_LIBRARIES
AthenaBaseComps AthenaBaseComps
ByteStreamData ByteStreamData
......
...@@ -42,7 +42,7 @@ find_package( ROOT COMPONENTS Core Hist RIO ) ...@@ -42,7 +42,7 @@ find_package( ROOT COMPONENTS Core Hist RIO )
atlas_add_library( PixelConditionsAlgorithmsLib atlas_add_library( PixelConditionsAlgorithmsLib
PixelConditionsAlgorithms/*.h PixelConditionsAlgorithms/*.h
INTERFACE INTERFACE
PUBLIC_HEADERS PixelConditionsAlgorithms NO_PUBLIC_HEADERS
LINK_LIBRARIES GaudiKernel AthenaKernel AthenaBaseComps PixelConditionsData DetDescrConditions LINK_LIBRARIES GaudiKernel AthenaKernel AthenaBaseComps PixelConditionsData DetDescrConditions
AthenaPoolUtilities PathResolver TrkGeometry) AthenaPoolUtilities PathResolver TrkGeometry)
......
...@@ -28,7 +28,6 @@ find_package( XercesC ) ...@@ -28,7 +28,6 @@ find_package( XercesC )
atlas_add_component( LArG4FCAL atlas_add_component( LArG4FCAL
src/*.cc src/*.cc
src/components/*.cxx src/components/*.cxx
PUBLIC_HEADERS LArG4FCAL
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS} PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES LArG4Code LArReadoutGeometry CaloG4SimLib StoreGateLib SGtests LINK_LIBRARIES LArG4Code LArReadoutGeometry CaloG4SimLib StoreGateLib SGtests
......
...@@ -23,7 +23,6 @@ find_package( XercesC ) ...@@ -23,7 +23,6 @@ find_package( XercesC )
atlas_add_component( LArG4H8SD atlas_add_component( LArG4H8SD
src/*.cc src/*.cc
src/components/*.cxx src/components/*.cxx
PUBLIC_HEADERS LArG4H8SD
PRIVATE_INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${GEANT4_INCLUDE_DIRS} ${XERCESC_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS} PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES CaloG4SimLib StoreGateLib SGtests LINK_LIBRARIES CaloG4SimLib StoreGateLib SGtests
......
...@@ -28,7 +28,6 @@ find_package( XercesC ) ...@@ -28,7 +28,6 @@ find_package( XercesC )
atlas_add_component( LArG4MiniFCAL atlas_add_component( LArG4MiniFCAL
src/*.cc src/*.cc
src/components/*.cxx src/components/*.cxx
PUBLIC_HEADERS LArG4MiniFCAL
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CORAL_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS} PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
......
...@@ -29,6 +29,5 @@ atlas_add_component( MuonEventCnvTools ...@@ -29,6 +29,5 @@ atlas_add_component( MuonEventCnvTools
LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests Identifier EventPrimitives GaudiKernel MuonReadoutGeometry MuonIdHelpersLib MuonPrepRawData MuonRIO_OnTrack TrkDetElementBase TrkPrepRawData TrkRIO_OnTrack ) LINK_LIBRARIES AthenaBaseComps StoreGateLib SGtests Identifier EventPrimitives GaudiKernel MuonReadoutGeometry MuonIdHelpersLib MuonPrepRawData MuonRIO_OnTrack TrkDetElementBase TrkPrepRawData TrkRIO_OnTrack )
# Install files from the package: # Install files from the package:
atlas_install_headers( MuonEventCnvTools )
atlas_install_joboptions( share/*.py ) atlas_install_joboptions( share/*.py )
...@@ -25,5 +25,4 @@ atlas_add_component( MuonSegmentTrackMaker ...@@ -25,5 +25,4 @@ atlas_add_component( MuonSegmentTrackMaker
LINK_LIBRARIES AthenaBaseComps GaudiKernel StoreGateLib SGtests MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces Particle TrkSegment TrkTrack ) LINK_LIBRARIES AthenaBaseComps GaudiKernel StoreGateLib SGtests MuonSegment MuonRecHelperToolsLib MuonRecToolInterfaces Particle TrkSegment TrkTrack )
# Install files from the package: # Install files from the package:
atlas_install_headers( MuonSegmentTrackMaker )
...@@ -24,7 +24,7 @@ find_package( HepPDT ) ...@@ -24,7 +24,7 @@ find_package( HepPDT )
# Libraries in the package: # Libraries in the package:
atlas_add_library( VKalVrtValidationLib atlas_add_library( VKalVrtValidationLib
VKalVrtValidation/*.h src/*.cxx VKalVrtValidation/*.h src/*.cxx
PUBLIC_HEADERS VKalVrtValidation NO_PUBLIC_HEADERS
INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS}
LINK_LIBRARIES ${ROOT_LIBRARIES} xAODBase AthenaBaseComps AthAnalysisBaseCompsLib xAODTracking JpsiUpsilonToolsLib LINK_LIBRARIES ${ROOT_LIBRARIES} xAODBase AthenaBaseComps AthAnalysisBaseCompsLib xAODTracking JpsiUpsilonToolsLib
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AnalysisBaseExternalsVersion = 2.0.39 AnalysisBaseExternalsVersion = 2.0.40
# Versions of the various externals to build before starting the build of # Versions of the various externals to build before starting the build of
# this project, when doing a full stack nightly build. # this project, when doing a full stack nightly build.
AnalysisBaseExternalsVersion = 2.0.39 AnalysisBaseExternalsVersion = 2.0.40
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AtlasExternalsVersion = 2.0.39 AtlasExternalsVersion = 2.0.40
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthSimulationExternalsVersion = 2.0.39 AthSimulationExternalsVersion = 2.0.40
# The version of atlas/Gaudi to use: # The version of atlas/Gaudi to use:
GaudiVersion = v32r2.001 GaudiVersion = v32r2.001
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
# forbidden. # forbidden.
# The version of atlas/atlasexternals to use: # The version of atlas/atlasexternals to use:
AthenaExternalsVersion = 2.0.39 AthenaExternalsVersion = 2.0.40
# The version of atlas/Gaudi to use: # The version of atlas/Gaudi to use:
GaudiVersion = v32r2.001 GaudiVersion = v32r2.001
...@@ -32,7 +32,7 @@ find_package( GeoModel ) ...@@ -32,7 +32,7 @@ find_package( GeoModel )
# Component(s) in the package: # Component(s) in the package:
atlas_add_library( Geo2G4Lib atlas_add_library( Geo2G4Lib
src/*.cxx src/*.cxx
PUBLIC_HEADERS Geo2G4 NO_PUBLIC_HEADERS
INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} INCLUDE_DIRS ${XERCESC_INCLUDE_DIRS} ${GEANT4_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${GEOMODEL_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS} PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
......
...@@ -22,7 +22,7 @@ find_package( HepMC ) ...@@ -22,7 +22,7 @@ find_package( HepMC )
# Component(s) in the package: # Component(s) in the package:
atlas_add_library( McEventCollectionFilterLib atlas_add_library( McEventCollectionFilterLib
src/*.cxx src/*.cxx
PUBLIC_HEADERS McEventCollectionFilter NO_PUBLIC_HEADERS
PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS} PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS}
LINK_LIBRARIES StoreGateLib SGtests LINK_LIBRARIES StoreGateLib SGtests
......
...@@ -103,7 +103,7 @@ StatusCode ActsExtrapolationAlg::execute(const EventContext& ctx) const ...@@ -103,7 +103,7 @@ StatusCode ActsExtrapolationAlg::execute(const EventContext& ctx) const
Acts::BoundVector pars; Acts::BoundVector pars;
pars << d0, z0, phi, theta, qop, t; pars << d0, z0, phi, theta, qop, t;
std::unique_ptr<Acts::BoundSymMatrix> cov = nullptr; std::optional<Acts::BoundSymMatrix> cov = std::nullopt;
std::vector<Acts::detail::Step> steps; std::vector<Acts::detail::Step> steps;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment