Skip to content
Snippets Groups Projects
Commit 45e3bd4d authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'pixcalib-access-fix' into 'master'

Avoid hardcoding the PIXEL_OFL database instance in the configuration.

See merge request !23040
parents 8f8fad0d 4ed20de2
No related branches found
No related tags found
9 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!28528Revert 63f845ae,!27054Atr20369 210,!26342Monopole: Handle fractionally charged particles,!23040Avoid hardcoding the PIXEL_OFL database instance in the configuration.
...@@ -64,8 +64,7 @@ if DetFlags.haveRIO.pixel_on(): ...@@ -64,8 +64,7 @@ if DetFlags.haveRIO.pixel_on():
# Calibration Setup # # Calibration Setup #
##################### #####################
if not conddb.folderRequested("/PIXEL/PixCalib"): if not conddb.folderRequested("/PIXEL/PixCalib"):
conddb.addFolder("PIXEL_OFL", "/PIXEL/PixCalib", className="CondAttrListCollection") conddb.addFolderSplitOnline("PIXEL", "/PIXEL/Onl/PixCalib", "/PIXEL/PixCalib", className="CondAttrListCollection")
if not hasattr(condSeq, 'PixelChargeCalibCondAlg'): if not hasattr(condSeq, 'PixelChargeCalibCondAlg'):
from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeCalibCondAlg from PixelConditionsAlgorithms.PixelConditionsAlgorithmsConf import PixelChargeCalibCondAlg
condSeq += PixelChargeCalibCondAlg(name="PixelChargeCalibCondAlg", ReadKey="/PIXEL/PixCalib") condSeq += PixelChargeCalibCondAlg(name="PixelChargeCalibCondAlg", ReadKey="/PIXEL/PixCalib")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment