Commit 545cf167 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'overlay/muoncond' into 'master'

Fix muon conditions scheduling issues related to overlay

See merge request !30541
parents 83773702 6809f317
...@@ -40,8 +40,8 @@ StatusCode Muon::CscRawDataProvider::initialize() { ...@@ -40,8 +40,8 @@ StatusCode Muon::CscRawDataProvider::initialize() {
// We only need the region selector in RoI seeded mode // We only need the region selector in RoI seeded mode
if(m_seededDecoding) ATH_CHECK( m_regionSelector.retrieve() ); if(m_seededDecoding) ATH_CHECK( m_regionSelector.retrieve() );
ATH_CHECK( m_ALineKey.initialize() ); // !!! REMOVEME: when MuonDetectorManager in cond store ATH_CHECK( m_ALineKey.initialize(m_seededDecoding) ); // !!! REMOVEME: when MuonDetectorManager in cond store
return StatusCode::SUCCESS; return StatusCode::SUCCESS;
} }
......
...@@ -36,7 +36,7 @@ CscCondDbAlg::initialize(){ ...@@ -36,7 +36,7 @@ CscCondDbAlg::initialize(){
} }
} }
ATH_CHECK(m_readKey_folder_da_hv .initialize()); ATH_CHECK(m_readKey_folder_da_hv .initialize(!m_readKey_folder_da_hv.empty()));
ATH_CHECK(m_readKey_folder_da_f001 .initialize()); ATH_CHECK(m_readKey_folder_da_f001 .initialize());
ATH_CHECK(m_readKey_folder_da_noise .initialize()); ATH_CHECK(m_readKey_folder_da_noise .initialize());
ATH_CHECK(m_readKey_folder_da_ped .initialize()); ATH_CHECK(m_readKey_folder_da_ped .initialize());
......
...@@ -29,17 +29,17 @@ MdtCondDbAlg::initialize(){ ...@@ -29,17 +29,17 @@ MdtCondDbAlg::initialize(){
ATH_CHECK(m_condSvc .retrieve()); ATH_CHECK(m_condSvc .retrieve());
ATH_CHECK(m_idHelperSvc.retrieve()); ATH_CHECK(m_idHelperSvc.retrieve());
ATH_CHECK(m_writeKey.initialize()); ATH_CHECK(m_writeKey.initialize());
ATH_CHECK(m_readKey_folder_da_pshv.initialize()); ATH_CHECK(m_readKey_folder_da_pshv.initialize(!m_readKey_folder_da_pshv.empty()));
ATH_CHECK(m_readKey_folder_da_psv0.initialize()); ATH_CHECK(m_readKey_folder_da_psv0.initialize(!m_readKey_folder_da_psv0.empty()));
ATH_CHECK(m_readKey_folder_da_psv1.initialize()); ATH_CHECK(m_readKey_folder_da_psv1.initialize(!m_readKey_folder_da_psv1.empty()));
ATH_CHECK(m_readKey_folder_da_pslv.initialize()); ATH_CHECK(m_readKey_folder_da_pslv.initialize(!m_readKey_folder_da_pslv.empty()));
ATH_CHECK(m_readKey_folder_da_hv .initialize()); ATH_CHECK(m_readKey_folder_da_hv .initialize(!m_readKey_folder_da_hv.empty()));
ATH_CHECK(m_readKey_folder_da_lv .initialize()); ATH_CHECK(m_readKey_folder_da_lv .initialize(!m_readKey_folder_da_lv.empty()));
ATH_CHECK(m_readKey_folder_da_droppedChambers.initialize()); ATH_CHECK(m_readKey_folder_da_droppedChambers.initialize(!m_readKey_folder_da_droppedChambers.empty()));
ATH_CHECK(m_readKey_folder_mc_droppedChambers.initialize()); ATH_CHECK(m_readKey_folder_mc_droppedChambers.initialize(!m_readKey_folder_mc_droppedChambers.empty()));
ATH_CHECK(m_readKey_folder_mc_deadElements .initialize()); ATH_CHECK(m_readKey_folder_mc_deadElements .initialize(!m_readKey_folder_mc_deadElements.empty()));
ATH_CHECK(m_readKey_folder_mc_deadTubes .initialize()); ATH_CHECK(m_readKey_folder_mc_deadTubes .initialize(!m_readKey_folder_mc_deadTubes.empty()));
ATH_CHECK(m_readKey_folder_mc_noisyChannels .initialize()); ATH_CHECK(m_readKey_folder_mc_noisyChannels .initialize(!m_readKey_folder_mc_noisyChannels.empty()));
if(m_condSvc->regHandle(this, m_writeKey).isFailure()) { if(m_condSvc->regHandle(this, m_writeKey).isFailure()) {
ATH_MSG_FATAL("Unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc"); ATH_MSG_FATAL("Unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
......
...@@ -25,9 +25,9 @@ RpcCondDbAlg::initialize(){ ...@@ -25,9 +25,9 @@ RpcCondDbAlg::initialize(){
ATH_CHECK(m_condSvc .retrieve()); ATH_CHECK(m_condSvc .retrieve());
ATH_CHECK(m_idHelperSvc.retrieve()); ATH_CHECK(m_idHelperSvc.retrieve());
ATH_CHECK(m_writeKey.initialize()); ATH_CHECK(m_writeKey.initialize());
ATH_CHECK(m_readKey_folder_da_deadPanels .initialize()); ATH_CHECK(m_readKey_folder_da_deadPanels .initialize(!m_readKey_folder_da_deadPanels.empty()));
ATH_CHECK(m_readKey_folder_da_offPanels .initialize()); ATH_CHECK(m_readKey_folder_da_offPanels .initialize(!m_readKey_folder_da_offPanels.empty()));
ATH_CHECK(m_readKey_folder_mc_deadElements.initialize()); ATH_CHECK(m_readKey_folder_mc_deadElements.initialize(!m_readKey_folder_mc_deadElements.empty()));
if(m_condSvc->regHandle(this, m_writeKey).isFailure()) { if(m_condSvc->regHandle(this, m_writeKey).isFailure()) {
ATH_MSG_FATAL("Unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc"); ATH_MSG_FATAL("Unable to register WriteCondHandle " << m_writeKey.fullKey() << " with CondSvc");
......
...@@ -12,22 +12,61 @@ def MdtCondDbAlgCfg(flags, **kwargs): ...@@ -12,22 +12,61 @@ def MdtCondDbAlgCfg(flags, **kwargs):
folders = [] folders = []
if flags.Common.isOnline: if flags.Common.isOnline:
return result ## avoid adding algo to the component accumulator return result ## avoid adding algo to the component accumulator
kwargs["isOnline"] = True
else: else:
kwargs["isOnline"] = False kwargs["isOnline"] = False
if flags.Input.isMC: if flags.Input.isMC:
kwargs['isData'] = False kwargs['isData'] = False
folders = ["/MDT/DCS/DROPPEDCH", "/MDT/DCS/PSLVCHSTATE"] folders = ["/MDT/DCS/DROPPEDCH", "/MDT/DCS/PSLVCHSTATE"]
# TODO: probably will be used in the future but disable for now
kwargs['ReadKey_MC_DE'] = ''
kwargs['ReadKey_MC_DT'] = ''
# disable the rest
kwargs['ReadKey_DataR1_DC'] = ''
kwargs['ReadKey_DataR1_HV'] = ''
kwargs['ReadKey_DataR1_LV'] = ''
kwargs['ReadKey_DataR1_V0'] = ''
kwargs['ReadKey_DataR1_V1'] = ''
kwargs['ReadKey_DataR2_HV'] = ''
kwargs['ReadKey_DataR2_LV'] = ''
else: else:
kwargs['isData'] = True kwargs['isData'] = True
kwargs['isRun1'] = flags.IOVDb.DatabaseInstance == 'COMP200' kwargs['isRun1'] = flags.IOVDb.DatabaseInstance == 'COMP200'
kwargs['useRun1SetPoints'] = False kwargs['useRun1SetPoints'] = False
if kwargs['isRun1'] and kwargs['useRun1SetPoints']: if kwargs['isRun1'] and kwargs['useRun1SetPoints']:
folders = ["/MDT/DCS/PSV0SETPOINTS", "/MDT/DCS/PSV1SETPOINTS"] folders = ["/MDT/DCS/PSV0SETPOINTS", "/MDT/DCS/PSV1SETPOINTS"]
# disable the rest
kwargs['ReadKey_DataR1_DC'] = ''
kwargs['ReadKey_DataR1_HV'] = ''
kwargs['ReadKey_DataR1_LV'] = ''
kwargs['ReadKey_DataR2_HV'] = ''
kwargs['ReadKey_DataR2_LV'] = ''
if kwargs['isRun1']: if kwargs['isRun1']:
folders = ["/MDT/DCS/PSHVMLSTATE", "/MDT/DCS/PSLVCHSTATE", "/MDT/DCS/DROPPEDCH"] folders = ["/MDT/DCS/PSHVMLSTATE", "/MDT/DCS/PSLVCHSTATE", "/MDT/DCS/DROPPEDCH"]
# disable the rest
kwargs['ReadKey_DataR1_V0'] = ''
kwargs['ReadKey_DataR1_V1'] = ''
kwargs['ReadKey_DataR2_HV'] = ''
kwargs['ReadKey_DataR2_LV'] = ''
else: else:
folders = ["/MDT/DCS/HV", "/MDT/DCS/LV"] folders = ["/MDT/DCS/HV", "/MDT/DCS/LV"]
# disable the rest
kwargs['ReadKey_DataR1_DC'] = ''
kwargs['ReadKey_DataR1_HV'] = ''
kwargs['ReadKey_DataR1_LV'] = ''
kwargs['ReadKey_DataR1_V0'] = ''
kwargs['ReadKey_DataR1_V1'] = ''
# disable MC folders
kwargs['ReadKey_MC_DC'] = ''
kwargs['ReadKey_MC_DE'] = ''
kwargs['ReadKey_MC_DT'] = ''
kwargs['ReadKey_MC_NC'] = ''
alg = MdtCondDbAlg(**kwargs) alg = MdtCondDbAlg(**kwargs)
result.merge( addFolders(flags, folders , detDb="DCS_OFL", className='CondAttrListCollection') ) result.merge( addFolders(flags, folders , detDb="DCS_OFL", className='CondAttrListCollection') )
result.addCondAlgo(alg) result.addCondAlgo(alg)
...@@ -43,6 +82,8 @@ def RpcCondDbAlgCfg(flags, **kwargs): ...@@ -43,6 +82,8 @@ def RpcCondDbAlgCfg(flags, **kwargs):
kwargs["isOnline"] = False kwargs["isOnline"] = False
if flags.Input.isMC: if flags.Input.isMC:
kwargs['isData'] = False kwargs['isData'] = False
kwargs['ReadKey_DA_DP'] = ''
kwargs['ReadKey_DA_OP'] = ''
else: else:
kwargs['isData'] = True kwargs['isData'] = True
kwargs['isRun1'] = flags.IOVDb.DatabaseInstance == 'COMP200' kwargs['isRun1'] = flags.IOVDb.DatabaseInstance == 'COMP200'
...@@ -72,9 +113,11 @@ def CscCondDbAlgCfg(flags, **kwargs): ...@@ -72,9 +113,11 @@ def CscCondDbAlgCfg(flags, **kwargs):
kwargs["isOnline"] = False kwargs["isOnline"] = False
if flags.Input.isMC: if flags.Input.isMC:
kwargs['isData'] = False kwargs['isData'] = False
kwargs['ReadKey_HV'] = ''
else: else:
kwargs['isData'] = True kwargs['isData'] = True
kwargs['isRun1'] = flags.IOVDb.DatabaseInstance == 'COMP200' kwargs['isRun1'] = flags.IOVDb.DatabaseInstance == 'COMP200'
kwargs['ReadKey_HV'] = '' # TODO: probably this should be removed once this folder is available
alg = CscCondDbAlg(**kwargs) alg = CscCondDbAlg(**kwargs)
result.merge( addFolders(flags, folders , detDb=scheme, className='CondAttrListCollection') ) result.merge( addFolders(flags, folders , detDb=scheme, className='CondAttrListCollection') )
result.addCondAlgo(alg) result.addCondAlgo(alg)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment