Merge branch 'master-bfield-condfix' into 'master' (464c270c) · Commits · Charlotte Cavanagh / calypso · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

calypso
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

464c270c

Commit 464c270c authored 5 years ago by Dave Casper

Downloads
- Plain Diff

Merge branch 'master-bfield-condfix' into 'master'

Remove references to DCS field conditions

See merge request faser/calypso!47

parents e3e3ee65 8aa42111

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

Control/CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py 23 additions, 8 deletions

.../CalypsoExample/GeoModelTest/python/GeoModelTestConfig.py
MagneticField/MagFieldServices/python/MagFieldServicesConfig.py 3 additions, 3 deletions

...icField/MagFieldServices/python/MagFieldServicesConfig.py
Tracker/TrackerConditions/FaserSCT_ConditionsData/data/SCT_Conditions.py 14 additions, 93 deletions

...Conditions/FaserSCT_ConditionsData/data/SCT_Conditions.py
Tracker/TrackerConditions/FaserSiLorentzAngleTool/python/FaserSCT_LorentzAngleConfig.py 1 addition, 1 deletion

...rSiLorentzAngleTool/python/FaserSCT_LorentzAngleConfig.py
Tracker/TrackerConditions/FaserSiLorentzAngleTool/src/FaserSCT_SiLorentzAngleCondAlg.cxx 39 additions, 38 deletions

...SiLorentzAngleTool/src/FaserSCT_SiLorentzAngleCondAlg.cxx
Tracker/TrackerConditions/FaserSiLorentzAngleTool/src/FaserSCT_SiLorentzAngleCondAlg.h 3 additions, 3 deletions

...erSiLorentzAngleTool/src/FaserSCT_SiLorentzAngleCondAlg.h

with 83 additions and 146 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment