Merge branch 'master' into tmp (172eca28) · Commits · Charlotte Cavanagh / calypso

Commit 172eca28 authored 2 years ago by Tobias Bockh

Browse files

Merge branch 'master' into tmp

parents ecb23104 1d960089

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Calorimeter/CaloDigiAlgs/CMakeLists.txt 1 addition, 1 deletion

Calorimeter/CaloDigiAlgs/CMakeLists.txt
Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py 4 additions, 0 deletions

Calorimeter/CaloDigiAlgs/python/CaloDigiAlgsConfig.py
Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx 59 additions, 18 deletions

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx
Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h 19 additions, 5 deletions

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.h
Calorimeter/FaserCaloSimEvent/CMakeLists.txt 2 additions, 2 deletions

Calorimeter/FaserCaloSimEvent/CMakeLists.txt
Calorimeter/FaserCaloSimEvent/FaserCaloSimEvent/CaloHitIdHelper.h 10 additions, 0 deletions

...ter/FaserCaloSimEvent/FaserCaloSimEvent/CaloHitIdHelper.h
Calorimeter/FaserCaloSimEvent/src/CaloHitIdHelper.cxx 9 additions, 4 deletions

Calorimeter/FaserCaloSimEvent/src/CaloHitIdHelper.cxx
Control/CalypsoExample/Reconstruction/CMakeLists.txt 9 additions, 0 deletions

Control/CalypsoExample/Reconstruction/CMakeLists.txt
Control/CalypsoExample/Reconstruction/scripts/faser_reco.py 17 additions, 8 deletions

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig_Faser01.py 13 additions, 3 deletions

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser01.py
Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig_Faser02.py 12 additions, 3 deletions

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser02.py
Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig_FaserTB00.py 12 additions, 3 deletions

...e/WriteAlignment/python/WriteAlignmentConfig_FaserTB00.py
Control/CalypsoExample/rawdata/Faser-Physics-006525-filtered.raw 0 additions, 0 deletions

.../CalypsoExample/rawdata/Faser-Physics-006525-filtered.raw
Control/CalypsoExample/rawdata/Faser-Physics-pilot_tracks-filtered.raw 0 additions, 0 deletions

...soExample/rawdata/Faser-Physics-pilot_tracks-filtered.raw
Database/ConnectionManagement/FaserAuthentication/data/dblookup.xml 5 additions, 0 deletions

...onnectionManagement/FaserAuthentication/data/dblookup.xml
DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx 2 additions, 0 deletions

DetectorDescription/DetDescrCnvSvc/src/DetDescrCnvSvc.cxx
DetectorDescription/FaserDetDescr/FaserDetDescr/FaserDetTechnology.h 12 additions, 11 deletions

...cription/FaserDetDescr/FaserDetDescr/FaserDetTechnology.h
DetectorDescription/FaserDetDescr/FaserDetDescr/FaserDetectorID.h 26 additions, 0 deletions

...Description/FaserDetDescr/FaserDetDescr/FaserDetectorID.h
DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx 56 additions, 0 deletions

DetectorDescription/FaserDetDescr/src/FaserDetectorID.cxx
Event/FaserByteStreamCnvSvcBase/python/FaserByteStreamCnvSvcBaseConfig.py 1 addition, 0 deletions

...treamCnvSvcBase/python/FaserByteStreamCnvSvcBaseConfig.py

with 269 additions and 58 deletions

Please register or to comment