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

Commit 8ebde01e authored 2 years ago by Eric Torrence

Browse files

Merge remote-tracking branch 'upstream/master'

parents baec6973 35c4b0bd

No related branches found

No related tags found

2 merge requests!230Mdc digi/reco update,!223MC reco fixes

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Database/ConnectionManagement/FaserAuthentication/data/dblookup.xml 5 additions, 0 deletions

...onnectionManagement/FaserAuthentication/data/dblookup.xml
Waveform/WaveRawEvent/WaveRawEvent/RawWaveform.h 1 addition, 0 deletions

Waveform/WaveRawEvent/WaveRawEvent/RawWaveform.h
Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py 3 additions, 0 deletions

Waveform/WaveRecAlgs/python/WaveRecAlgsConfig.py
Waveform/WaveRecAlgs/src/RawWaveformRecAlg.cxx 23 additions, 7 deletions

Waveform/WaveRecAlgs/src/RawWaveformRecAlg.cxx
Waveform/WaveRecAlgs/src/RawWaveformRecAlg.h 5 additions, 0 deletions

Waveform/WaveRecAlgs/src/RawWaveformRecAlg.h
Waveform/WaveRecTools/CMakeLists.txt 5 additions, 2 deletions

Waveform/WaveRecTools/CMakeLists.txt
Waveform/WaveRecTools/WaveRecTools/IWaveformReconstructionTool.h 11 additions, 9 deletions

...m/WaveRecTools/WaveRecTools/IWaveformReconstructionTool.h
Waveform/WaveRecTools/src/ClockReconstructionTool.cxx 4 additions, 4 deletions

Waveform/WaveRecTools/src/ClockReconstructionTool.cxx
Waveform/WaveRecTools/src/ClockReconstructionTool.h 2 additions, 2 deletions

Waveform/WaveRecTools/src/ClockReconstructionTool.h
Waveform/WaveRecTools/src/WaveformReconstructionTool.cxx 318 additions, 298 deletions

Waveform/WaveRecTools/src/WaveformReconstructionTool.cxx
Waveform/WaveRecTools/src/WaveformReconstructionTool.h 43 additions, 35 deletions

Waveform/WaveRecTools/src/WaveformReconstructionTool.h
Waveform/WaveformConditions/WaveCondUtils/CMakeLists.txt 9 additions, 0 deletions

Waveform/WaveformConditions/WaveCondUtils/CMakeLists.txt
Waveform/WaveformConditions/WaveCondUtils/scripts/makeTimingDB.py 221 additions, 0 deletions

.../WaveformConditions/WaveCondUtils/scripts/makeTimingDB.py
Waveform/WaveformConditions/WaveCondUtils/scripts/wave_timing_check.py 337 additions, 0 deletions

...formConditions/WaveCondUtils/scripts/wave_timing_check.py
Waveform/WaveformConditions/WaveformConditionsTools/WaveformConditionsTools/IWaveformCableMappingTool.h 4 additions, 0 deletions

...Tools/WaveformConditionsTools/IWaveformCableMappingTool.h
Waveform/WaveformConditions/WaveformConditionsTools/WaveformConditionsTools/IWaveformTimingTool.h 50 additions, 0 deletions

...itionsTools/WaveformConditionsTools/IWaveformTimingTool.h
Waveform/WaveformConditions/WaveformConditionsTools/python/WaveformTimingConfig.py 32 additions, 0 deletions

...ns/WaveformConditionsTools/python/WaveformTimingConfig.py
Waveform/WaveformConditions/WaveformConditionsTools/src/WaveformCableMappingTool.cxx 93 additions, 0 deletions

.../WaveformConditionsTools/src/WaveformCableMappingTool.cxx
Waveform/WaveformConditions/WaveformConditionsTools/src/WaveformCableMappingTool.h 5 additions, 0 deletions

...ns/WaveformConditionsTools/src/WaveformCableMappingTool.h
Waveform/WaveformConditions/WaveformConditionsTools/src/WaveformTimingTool.cxx 130 additions, 0 deletions

...itions/WaveformConditionsTools/src/WaveformTimingTool.cxx

with 1301 additions and 357 deletions

Please register or to comment