Fix merge conflicts from master (99d44e89) · Commits · Charlotte Cavanagh / calypso

Commit 99d44e89 authored 2 years ago by Eric Torrence

Browse files

Fix merge conflicts from master

parents 05ac1b04 b839a17e

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx 17 additions, 4 deletions

Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx
Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py 4 additions, 5 deletions

Calorimeter/CaloRecAlgs/python/CaloRecAlgsConfig.py
Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx 3 additions, 4 deletions

Calorimeter/CaloRecAlgs/src/CaloRecAlg.cxx
Calorimeter/CaloRecTools/python/CaloRecToolConfig.py 8 additions, 1 deletion

Calorimeter/CaloRecTools/python/CaloRecToolConfig.py
Control/CalypsoExample/Digitization/scripts/faser_digi_merge.py 29 additions, 13 deletions

...l/CalypsoExample/Digitization/scripts/faser_digi_merge.py
Control/CalypsoExample/Digitization/scripts/submit_faser_digi.sh 37 additions, 7 deletions

.../CalypsoExample/Digitization/scripts/submit_faser_digi.sh
Control/CalypsoExample/Digitization/scripts/submit_faser_digi_merge.sh 37 additions, 7 deletions

...soExample/Digitization/scripts/submit_faser_digi_merge.sh
Control/CalypsoExample/Generation/python/faser_parser.py 19 additions, 3 deletions

Control/CalypsoExample/Generation/python/faser_parser.py
Control/CalypsoExample/Generation/scripts/faser_particlegun.py 41 additions, 9 deletions

...ol/CalypsoExample/Generation/scripts/faser_particlegun.py
Control/CalypsoExample/Reconstruction/scripts/faser_reco.py 18 additions, 11 deletions

Control/CalypsoExample/Reconstruction/scripts/faser_reco.py
Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh 74 additions, 7 deletions

...alypsoExample/Reconstruction/scripts/submit_faser_reco.sh
Control/CalypsoExample/Simulation/scripts/submit_faser_simulate.sh 42 additions, 4 deletions

...alypsoExample/Simulation/scripts/submit_faser_simulate.sh
Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig_Faser02.py 4 additions, 4 deletions

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser02.py
Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig_Faser03.py 82 additions, 0 deletions

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser03.py
Generators/DIFGenerator/python/DIFSampler.py 2 additions, 3 deletions

Generators/DIFGenerator/python/DIFSampler.py
Generators/FaserParticleGun/python/FaserParticleGunConfig.py 31 additions, 4 deletions

Generators/FaserParticleGun/python/FaserParticleGunConfig.py
Generators/FaserParticleGun/python/RadialPosSampler.py 10 additions, 5 deletions

Generators/FaserParticleGun/python/RadialPosSampler.py
Generators/ForeseeGenerator/share/generate_forsee_events.py 4 additions, 4 deletions

Generators/ForeseeGenerator/share/generate_forsee_events.py
Generators/ForeseeGenerator/share/plot_validation.py 1 addition, 0 deletions

Generators/ForeseeGenerator/share/plot_validation.py
Generators/ForeseeGenerator/share/validate_grid.py 10 additions, 4 deletions

Generators/ForeseeGenerator/share/validate_grid.py

with 473 additions and 99 deletions

Please register or to comment