Merge branch 'master-sct-digi' into 'master' (7eb931fc) · Commits · Charlotte Cavanagh / calypso

Commit 7eb931fc authored 5 years ago by Dave Casper

Merge branch 'master-sct-digi' into 'master'

First running version of digitization

See merge request faser/calypso!40

parents b2f7c075 e640b8a1

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

Control/CalypsoExample/GeoModelTest/CMakeLists.txt 1 addition, 1 deletion

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

.../CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py
Control/CalypsoExample/GeoModelTest/share/geoDebug.py 0 additions, 52 deletions

Control/CalypsoExample/GeoModelTest/share/geoDebug.py
Database/ConnectionManagement/FaserAuthentication/data/dblookup.xml 10 additions, 0 deletions

...onnectionManagement/FaserAuthentication/data/dblookup.xml
DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql 12 additions, 0 deletions

DetectorDescription/GeoModel/FaserGeoModel/data/geomDB.sql
MagneticField/MagFieldServices/python/MagFieldServicesConfig.py 12 additions, 7 deletions

...icField/MagFieldServices/python/MagFieldServicesConfig.py
Simulation/G4Faser/G4FaserApp/test/runG4.py 2 additions, 0 deletions

Simulation/G4Faser/G4FaserApp/test/runG4.py
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/CMakeLists.txt 107 additions, 0 deletions

...erConditions/FaserSCT_ConditionsAlgorithms/CMakeLists.txt
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_AlignCondAlg.cxx 163 additions, 0 deletions

...serSCT_ConditionsAlgorithms/src/FaserSCT_AlignCondAlg.cxx
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_AlignCondAlg.h 61 additions, 0 deletions

...FaserSCT_ConditionsAlgorithms/src/FaserSCT_AlignCondAlg.h
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_DCSConditionsHVCondAlg.cxx 107 additions, 0 deletions

...ditionsAlgorithms/src/FaserSCT_DCSConditionsHVCondAlg.cxx
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_DCSConditionsHVCondAlg.h 40 additions, 0 deletions

...onditionsAlgorithms/src/FaserSCT_DCSConditionsHVCondAlg.h
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_DCSConditionsStatCondAlg.cxx 177 additions, 0 deletions

...tionsAlgorithms/src/FaserSCT_DCSConditionsStatCondAlg.cxx
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_DCSConditionsStatCondAlg.h 51 additions, 0 deletions

...ditionsAlgorithms/src/FaserSCT_DCSConditionsStatCondAlg.h
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_DCSConditionsTempCondAlg.cxx 107 additions, 0 deletions

...tionsAlgorithms/src/FaserSCT_DCSConditionsTempCondAlg.cxx
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_DCSConditionsTempCondAlg.h 40 additions, 0 deletions

...ditionsAlgorithms/src/FaserSCT_DCSConditionsTempCondAlg.h
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_DetectorElementCondAlg.cxx 137 additions, 0 deletions

...ditionsAlgorithms/src/FaserSCT_DetectorElementCondAlg.cxx
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_DetectorElementCondAlg.h 44 additions, 0 deletions

...onditionsAlgorithms/src/FaserSCT_DetectorElementCondAlg.h
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_ReadCalibChipGainCondAlg.cxx 127 additions, 0 deletions

...tionsAlgorithms/src/FaserSCT_ReadCalibChipGainCondAlg.cxx
Tracker/TrackerConditions/FaserSCT_ConditionsAlgorithms/src/FaserSCT_ReadCalibChipGainCondAlg.h 49 additions, 0 deletions

...ditionsAlgorithms/src/FaserSCT_ReadCalibChipGainCondAlg.h

with 1251 additions and 62 deletions

Please register or to comment