Merge branch 'calypso-22.0.40' into 'master' (ec1d5f4b) · Commits · John William Spencer / calypso

Commit ec1d5f4b authored 3 years ago by Dave Casper

Merge branch 'calypso-22.0.40' into 'master'

Calypso 22.0.40

See merge request faser/calypso!152

parents aab6c341 d73419de

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py 5 additions, 9 deletions

...ataAccessExample/python/TrackerDataAccessExampleConfig.py
MagneticField/MagFieldElements/MagFieldElements/FaserFieldCache.h 3 additions, 3 deletions

...Field/MagFieldElements/MagFieldElements/FaserFieldCache.h
MagneticField/MagFieldElements/src/FaserFieldCache.cxx 0 additions, 3 deletions

MagneticField/MagFieldElements/src/FaserFieldCache.cxx
Tracking/Acts/ActsInterop/CMakeLists.txt 0 additions, 0 deletions

Tracking/Acts/ActsInterop/CMakeLists.txt
Tracking/Acts/FaserActsGeometry/CMakeLists.txt 0 additions, 0 deletions

Tracking/Acts/FaserActsGeometry/CMakeLists.txt
Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FASERMagneticFieldWrapper.h 52 additions, 32 deletions

...ctsGeometry/FaserActsGeometry/FASERMagneticFieldWrapper.h
Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsExtrapolationTool.h 3 additions, 7 deletions

...tsGeometry/FaserActsGeometry/FaserActsExtrapolationTool.h
Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsMaterialJsonWriterTool.h 4 additions, 6 deletions

...metry/FaserActsGeometry/FaserActsMaterialJsonWriterTool.h
Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx 33 additions, 22 deletions

...Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx
Tracking/Acts/FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx 4 additions, 4 deletions

...FaserActsGeometry/src/FaserActsMaterialJsonWriterTool.cxx
Tracking/Acts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx 1 addition, 1 deletion

...cts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx
Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx 1 addition, 1 deletion

...Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx
Tracking/Acts/FaserActsGeometryInterfaces/CMakeLists.txt 0 additions, 0 deletions

Tracking/Acts/FaserActsGeometryInterfaces/CMakeLists.txt
Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsExtrapolationTool.h 1 addition, 1 deletion

...FaserActsGeometryInterfaces/IFaserActsExtrapolationTool.h
Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsMaterialJsonWriterTool.h 2 additions, 4 deletions

...ActsGeometryInterfaces/IFaserActsMaterialJsonWriterTool.h
Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt 0 additions, 0 deletions

Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h 1 addition, 1 deletion

...lter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h
Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsGeometryContainers.h 31 additions, 0 deletions

...ilter/FaserActsKalmanFilter/FaserActsGeometryContainers.h
Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h 2 additions, 0 deletions

...anFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h
Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h 5 additions, 0 deletions

...rActsKalmanFilter/FaserActsKalmanFilter/IndexSourceLink.h

with 148 additions and 94 deletions

Please register or to comment

Admin message

Merge branch 'calypso-22.0.40' into 'master'