Commit 72af9765 authored 3 years ago by Dave Casper

Merge branch 'calypso-22.0.31' into 'master'

Tracking 22.0.31

See merge request faser/calypso!137

parents fd143a45 e335e787

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FASERMagneticFieldWrapper.h 3 additions, 2 deletions

...ctsGeometry/FaserActsGeometry/FASERMagneticFieldWrapper.h
Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsGeometryContext.h 2 additions, 2 deletions

...ActsGeometry/FaserActsGeometry/FaserActsGeometryContext.h
Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsLayerBuilder.h 4 additions, 0 deletions

...serActsGeometry/FaserActsGeometry/FaserActsLayerBuilder.h
Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometrySvc.h 7 additions, 0 deletions

...Geometry/FaserActsGeometry/FaserActsTrackingGeometrySvc.h
Tracking/Acts/FaserActsGeometry/FaserActsGeometry/FaserActsTrackingGeometryTool.h 4 additions, 0 deletions

...eometry/FaserActsGeometry/FaserActsTrackingGeometryTool.h
Tracking/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx 1 addition, 1 deletion

...g/Acts/FaserActsGeometry/src/FaserActsDetectorElement.cxx
Tracking/Acts/FaserActsGeometry/src/FaserActsExtrapolationAlg.cxx 1 addition, 1 deletion

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

...Acts/FaserActsGeometry/src/FaserActsExtrapolationTool.cxx
Tracking/Acts/FaserActsGeometry/src/FaserActsObjWriterTool.cxx 1 addition, 1 deletion

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

...cts/FaserActsGeometry/src/FaserActsSurfaceMappingTool.cxx
Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx 21 additions, 1 deletion

...ts/FaserActsGeometry/src/FaserActsTrackingGeometrySvc.cxx
Tracking/Acts/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx 6 additions, 0 deletions

...s/FaserActsGeometry/src/FaserActsTrackingGeometryTool.cxx
Tracking/Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx 1 addition, 1 deletion

...Acts/FaserActsGeometry/src/FaserActsVolumeMappingTool.cxx
Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsTrackingGeometrySvc.h 11 additions, 0 deletions

...serActsGeometryInterfaces/IFaserActsTrackingGeometrySvc.h
Tracking/Acts/FaserActsGeometryInterfaces/FaserActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h 7 additions, 0 deletions

...erActsGeometryInterfaces/IFaserActsTrackingGeometryTool.h
Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt 0 additions, 0 deletions

Tracking/Acts/FaserActsKalmanFilter/CMakeLists.txt
Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/CombinatorialKalmanFilterAlg.h 46 additions, 0 deletions

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

...ilter/FaserActsKalmanFilter/FaserActsGeometryContainers.h
Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h 18 additions, 10 deletions

...anFilter/FaserActsKalmanFilter/FaserActsKalmanFilterAlg.h
Tracking/Acts/FaserActsKalmanFilter/FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h 4 additions, 4 deletions

...ilter/FaserActsKalmanFilter/FaserActsRecMultiTrajectory.h

with 231 additions and 28 deletions

Please register or to comment