Merge remote-tracking branch 'upstream/master' (727e8684) · Commits · Charlotte Cavanagh / calypso

Commit 727e8684 authored 2 years ago by Eric Torrence

Browse files

Merge remote-tracking branch 'upstream/master'

parents 46f7f2ef 63122471

No related branches found

No related tags found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Control/CalypsoExample/Reconstruction/CMakeLists.txt 9 additions, 0 deletions

Control/CalypsoExample/Reconstruction/CMakeLists.txt
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
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
Generators/FlukaReader/python/FlukaReaderAlg.py 22 additions, 5 deletions

Generators/FlukaReader/python/FlukaReaderAlg.py
Scintillator/ScintDetDescr/ScintIdDictFiles/data/IdDictScintillator.xml 10 additions, 1 deletion

...cintDetDescr/ScintIdDictFiles/data/IdDictScintillator.xml
Scintillator/ScintDetDescr/ScintIdDictFiles/data/IdDictScintillator_TB00.xml 8 additions, 2 deletions

...etDescr/ScintIdDictFiles/data/IdDictScintillator_TB00.xml
Scintillator/ScintDetDescr/ScintIdentifier/CMakeLists.txt 1 addition, 0 deletions

Scintillator/ScintDetDescr/ScintIdentifier/CMakeLists.txt
Scintillator/ScintDetDescr/ScintIdentifier/ScintIdentifier/ScintIdentifierDict.h 1 addition, 0 deletions

...scr/ScintIdentifier/ScintIdentifier/ScintIdentifierDict.h
Scintillator/ScintDetDescr/ScintIdentifier/ScintIdentifier/VetoNuID.h 541 additions, 0 deletions

.../ScintDetDescr/ScintIdentifier/ScintIdentifier/VetoNuID.h
Scintillator/ScintDetDescr/ScintIdentifier/ScintIdentifier/selection.xml 1 addition, 0 deletions

...intDetDescr/ScintIdentifier/ScintIdentifier/selection.xml
Scintillator/ScintDetDescr/ScintIdentifier/src/VetoNuID.cxx 1030 additions, 0 deletions

Scintillator/ScintDetDescr/ScintIdentifier/src/VetoNuID.cxx
Scintillator/ScintDetDescrCnv/ScintIdCnv/src/ScintIdCnv_entries.cxx 2 additions, 0 deletions

...or/ScintDetDescrCnv/ScintIdCnv/src/ScintIdCnv_entries.cxx
Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx 239 additions, 0 deletions

...r/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.cxx
Scintillator/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.h 71 additions, 0 deletions

...tor/ScintDetDescrCnv/ScintIdCnv/src/VetoNuIDDetDescrCnv.h
Waveform/WaveEventCnv/WaveByteStream/python/WaveByteStreamConfig.py 4 additions, 1 deletion

...aveEventCnv/WaveByteStream/python/WaveByteStreamConfig.py

with 2036 additions and 20 deletions

Please register or to comment