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

Commit 98ba9a4a authored 3 years ago by Dave Casper

Browse files

Merge remote-tracking branch 'upstream/master'

parents 29fd2cef 4dedea5a

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Control/CalypsoConfiguration/python/GeoModelConfigFlags.py 2 additions, 0 deletions

Control/CalypsoConfiguration/python/GeoModelConfigFlags.py
Control/CalypsoExample/GeoModelTest/CMakeLists.txt 8 additions, 2 deletions

Control/CalypsoExample/GeoModelTest/CMakeLists.txt
Control/CalypsoExample/GeoModelTest/python/Faser01TestConfig.py 4 additions, 2 deletions

...l/CalypsoExample/GeoModelTest/python/Faser01TestConfig.py
Control/CalypsoExample/GeoModelTest/python/Faser02TestConfig.py 66 additions, 0 deletions

...l/CalypsoExample/GeoModelTest/python/Faser02TestConfig.py
Control/CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py 1 addition, 1 deletion

.../CalypsoExample/GeoModelTest/python/TestBeamTestConfig.py
Control/CalypsoExample/TrackerDataAccessExample/python/TrackerDataAccessExampleConfig.py 7 additions, 1 deletion

...ataAccessExample/python/TrackerDataAccessExampleConfig.py
Control/CalypsoExample/TriggerDataAccessExample/python/TriggerDataAccessExampleConfig.py 7 additions, 1 deletion

...ataAccessExample/python/TriggerDataAccessExampleConfig.py
Control/CalypsoExample/WaveformDataAccessExample/python/WaveformDataAccessExampleConfig.py 7 additions, 1 deletion

...taAccessExample/python/WaveformDataAccessExampleConfig.py
Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig_Faser01.py 11 additions, 10 deletions

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser01.py
Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig_Faser02.py 73 additions, 0 deletions

...ple/WriteAlignment/python/WriteAlignmentConfig_Faser02.py
Control/CalypsoExample/WriteAlignment/python/WriteAlignmentConfig_FaserTB00.py 73 additions, 0 deletions

...e/WriteAlignment/python/WriteAlignmentConfig_FaserTB00.py
Control/CalypsoExample/WriteAlignment/scripts/CopyAlignFolder.sh 16 additions, 3 deletions

.../CalypsoExample/WriteAlignment/scripts/CopyAlignFolder.sh
Control/CalypsoExample/WriteAlignment/src/WriteAlignmentAlg.cxx 1 addition, 1 deletion

...l/CalypsoExample/WriteAlignment/src/WriteAlignmentAlg.cxx
Control/CalypsoExample/WriteAlignment/src/WriteAlignmentAlg.h 7 additions, 0 deletions

...rol/CalypsoExample/WriteAlignment/src/WriteAlignmentAlg.h
Database/ConnectionManagement/FaserAuthentication/data/dblookup.xml 4 additions, 0 deletions

...onnectionManagement/FaserAuthentication/data/dblookup.xml
Tracker/TrackerAlignTools/TrackerAlignGenTools/src/TrackerAlignDBTool.cxx 7 additions, 18 deletions

...lignTools/TrackerAlignGenTools/src/TrackerAlignDBTool.cxx
Tracker/TrackerAlignTools/TrackerAlignGenTools/src/TrackerAlignDBTool.h 2 additions, 2 deletions

...rAlignTools/TrackerAlignGenTools/src/TrackerAlignDBTool.h
Tracker/TrackerConditions/FaserSCT_ConditionsData/CMakeLists.txt 1 addition, 1 deletion

.../TrackerConditions/FaserSCT_ConditionsData/CMakeLists.txt
Tracker/TrackerConditions/FaserSCT_ConditionsData/data/SCT_Conditions.py 10 additions, 0 deletions

...Conditions/FaserSCT_ConditionsData/data/SCT_Conditions.py
Tracker/TrackerDetDescr/FaserSCT_GeoModel/python/FaserSCT_GeoModelConfig.py 3 additions, 0 deletions

...Descr/FaserSCT_GeoModel/python/FaserSCT_GeoModelConfig.py

with 310 additions and 43 deletions

Please register or to comment