Merge branch 'gang/calypso-master-merged' into 'master' (62207ba4) · Commits · Di Wang / calypso

Commit 62207ba4 authored 4 years ago by Dave Casper

Merge branch 'gang/calypso-master-merged' into 'master'

Gang/calypso master merged

See merge request faser/calypso!91

parents 5a53d5df e6911771

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 2 additions, 0 deletions

.gitignore
.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
DetectorDescription/GeoModel/GeoModelInterfaces/GeoModelInterfaces/IGeoModelTool.h 2 additions, 1 deletion

...del/GeoModelInterfaces/GeoModelInterfaces/IGeoModelTool.h
Scintillator/ScintDetDescr/PreshowerGeoModel/PreshowerGeoModel/PreshowerDetectorTool.h 1 addition, 1 deletion

...eshowerGeoModel/PreshowerGeoModel/PreshowerDetectorTool.h
Scintillator/ScintDetDescr/TriggerGeoModel/TriggerGeoModel/TriggerDetectorTool.h 1 addition, 1 deletion

...scr/TriggerGeoModel/TriggerGeoModel/TriggerDetectorTool.h
Scintillator/ScintDetDescr/VetoGeoModel/VetoGeoModel/VetoDetectorTool.h 1 addition, 1 deletion

...cintDetDescr/VetoGeoModel/VetoGeoModel/VetoDetectorTool.h
Scintillator/ScintEventCnv/ScintEventAthenaPool/src/ScintWaveformCnv_p0.cxx 2 additions, 2 deletions

...EventCnv/ScintEventAthenaPool/src/ScintWaveformCnv_p0.cxx
Simulation/G4Utilities/Geo2G4/src/Geo2G4OpticalSurfaceFactory.cxx 1 addition, 1 deletion

...on/G4Utilities/Geo2G4/src/Geo2G4OpticalSurfaceFactory.cxx
Tracker/TrackerDetDescr/FaserSCT_GeoModel/FaserSCT_GeoModel/FaserSCT_DetectorTool.h 1 addition, 1 deletion

...serSCT_GeoModel/FaserSCT_GeoModel/FaserSCT_DetectorTool.h
Tracker/TrackerRecAlgs/TruthSeededTrackFinder/python/TruthSeededTrackFinderConfig.py 4 additions, 1 deletion

...hSeededTrackFinder/python/TruthSeededTrackFinderConfig.py
Tracker/TrackerRecAlgs/TruthSeededTrackFinder/src/TruthSeededTrackFinder.cxx 526 additions, 292 deletions

...lgs/TruthSeededTrackFinder/src/TruthSeededTrackFinder.cxx
Tracker/TrackerRecAlgs/TruthSeededTrackFinder/src/TruthSeededTrackFinder.h 8 additions, 2 deletions

...cAlgs/TruthSeededTrackFinder/src/TruthSeededTrackFinder.h
Tracker/TrackerRecAlgs/TruthSeededTrackFinder/src/components/TruthSeededTrackFinder_entries.cxx 0 additions, 1 deletion

...kFinder/src/components/TruthSeededTrackFinder_entries.cxx
Tracker/TrackerRecAlgs/TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py 8 additions, 7 deletions

.../TruthSeededTrackFinder/test/TruthSeededTrackFinderDbg.py
Tracker/TrackerRecEvent/TrackerSpacePoint/TrackerSpacePoint/SpacePointForSeed.h 24 additions, 0 deletions

...t/TrackerSpacePoint/TrackerSpacePoint/SpacePointForSeed.h
Tracker/TrackerRecEvent/TrackerSpacePoint/TrackerSpacePoint/SpacePointForSeedCollection.h 18 additions, 0 deletions

...pacePoint/TrackerSpacePoint/SpacePointForSeedCollection.h
Tracker/TrackerRecEvent/TrackerSpacePoint/src/SpacePointForSeed.cxx 6 additions, 0 deletions

...ackerRecEvent/TrackerSpacePoint/src/SpacePointForSeed.cxx
Tracker/TrackerRecTools/TruthSeededTrackFinderTool/CMakeLists.txt 37 additions, 0 deletions

...TrackerRecTools/TruthSeededTrackFinderTool/CMakeLists.txt
Tracker/TrackerRecTools/TruthSeededTrackFinderTool/TruthSeededTrackFinderTool/TruthSeededTrackFinderTool.h 57 additions, 0 deletions

...l/TruthSeededTrackFinderTool/TruthSeededTrackFinderTool.h
Tracker/TrackerRecTools/TruthSeededTrackFinderTool/src/TruthSeededTrackFinderTool.cxx 56 additions, 0 deletions

...hSeededTrackFinderTool/src/TruthSeededTrackFinderTool.cxx

with 756 additions and 312 deletions

Please register or to comment

Admin message

Merge branch 'gang/calypso-master-merged' into 'master'