Merge remote-tracking branch 'upstream/master' (ef7fc39c) · Commits · faser / calypso

Commit ef7fc39c authored 3 years ago by Eric Torrence

Browse files

Merge remote-tracking branch 'upstream/master'

parents 6af926d0 9dec925f

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 3 additions, 3 deletions

.gitlab-ci.yml
Calorimeter/CaloDetDescr/CaloIdDictFiles/data/IdDictCalorimeter_TB00.xml 27 additions, 0 deletions

...oDetDescr/CaloIdDictFiles/data/IdDictCalorimeter_TB00.xml
Calorimeter/CaloDetDescr/CaloReadoutGeometry/CaloReadoutGeometry/CaloDetectorElement.h 11 additions, 1 deletion

...ReadoutGeometry/CaloReadoutGeometry/CaloDetectorElement.h
Calorimeter/CaloDetDescr/EcalGeoModel/src/EcalDetectorTool.cxx 2 additions, 2 deletions

...imeter/CaloDetDescr/EcalGeoModel/src/EcalDetectorTool.cxx
Calorimeter/FaserCaloSimEvent/src/CaloHitIdHelper.cxx 2 additions, 2 deletions

Calorimeter/FaserCaloSimEvent/src/CaloHitIdHelper.cxx
Control/CalypsoConfiguration/python/AllConfigFlags.py 1 addition, 1 deletion

Control/CalypsoConfiguration/python/AllConfigFlags.py
Control/CalypsoConfiguration/python/DetectorConfigFlags.py 20 additions, 22 deletions

Control/CalypsoConfiguration/python/DetectorConfigFlags.py
Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.h 2 additions, 2 deletions

Control/CalypsoExample/GenEventExample/src/GenEventReadAlg.h
Control/CalypsoExample/GeoModelTest/CMakeLists.txt 5 additions, 0 deletions

Control/CalypsoExample/GeoModelTest/CMakeLists.txt
Control/CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py 72 additions, 0 deletions

.../CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py
Control/CalypsoExample/GeoModelTest/src/GeoModelTestAlg.cxx 10 additions, 10 deletions

Control/CalypsoExample/GeoModelTest/src/GeoModelTestAlg.cxx
Control/CalypsoExample/RDOReadExample/src/RDOReadAlg.h 1 addition, 1 deletion

Control/CalypsoExample/RDOReadExample/src/RDOReadAlg.h
Control/CalypsoExample/SimHitExample/CaloREADME.md 47 additions, 0 deletions

Control/CalypsoExample/SimHitExample/CaloREADME.md
Control/CalypsoExample/SimHitExample/src/CaloSimHitAlg.cxx 101 additions, 17 deletions

Control/CalypsoExample/SimHitExample/src/CaloSimHitAlg.cxx
Control/CalypsoExample/SimHitExample/src/CaloSimHitAlg.h 19 additions, 3 deletions

Control/CalypsoExample/SimHitExample/src/CaloSimHitAlg.h
Control/CalypsoExample/SimHitExample/src/SimHitAlg.h 2 additions, 2 deletions

Control/CalypsoExample/SimHitExample/src/SimHitAlg.h
Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py 5 additions, 9 deletions

...ataAccessExample/python/TrackerDataAccessExampleConfig.py
Control/CalypsoExample/WaveformAnalysisExample/CMakeLists.txt 8 additions, 0 deletions

...rol/CalypsoExample/WaveformAnalysisExample/CMakeLists.txt
Control/CalypsoExample/WaveformAnalysisExample/src/WaveformHitAlg.cxx 26 additions, 0 deletions

...psoExample/WaveformAnalysisExample/src/WaveformHitAlg.cxx
Control/CalypsoExample/WaveformAnalysisExample/src/WaveformHitAlg.h 28 additions, 0 deletions

...lypsoExample/WaveformAnalysisExample/src/WaveformHitAlg.h

with 392 additions and 75 deletions

Please register or to comment