Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
James Catmore
athena
Commits
688977bb
Verified
Commit
688977bb
authored
2 years ago
by
Tadej Novak
Browse files
Options
Downloads
Patches
Plain Diff
Fix legacy config of BunchCrossingCondAlg
parent
afc02600
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgDefault.py
+25
-2
25 additions, 2 deletions
...lock/LumiBlockComps/python/BunchCrossingCondAlgDefault.py
with
25 additions
and
2 deletions
LumiBlock/LumiBlockComps/python/BunchCrossingCondAlgDefault.py
+
25
−
2
View file @
688977bb
...
@@ -44,9 +44,32 @@ def BunchCrossingCondAlgDefault():
...
@@ -44,9 +44,32 @@ def BunchCrossingCondAlgDefault():
elif
beamFlags
.
bunchStructureSource
()
==
2
:
elif
beamFlags
.
bunchStructureSource
()
==
2
:
bgkey
=
'
L1BunchGroup
'
# unless we use in file metadata...
bgkey
=
'
L1BunchGroup
'
# unless we use in file metadata...
from
AthenaCommon.AppMgr
import
ServiceMgr
as
svcMgr
from
AthenaCommon.AppMgr
import
ServiceMgr
as
svcMgr
if
getattr
(
svcMgr
,
'
xAODConfigSvc
'
):
if
getattr
(
svcMgr
,
'
xAODConfigSvc
'
)
and
svcMgr
.
xAODConfigSvc
.
UseInFileMetadata
:
if
svcMgr
.
xAODConfigSvc
.
UseInFileMetadata
:
from
AthenaConfiguration.AllConfigFlags
import
ConfigFlags
if
'
TriggerMenuJson_BG
'
not
in
ConfigFlags
.
Input
.
MetadataItems
:
# this is for when we need to configure the BunchGroupCondAlg with info extracted from converted JSON
# in this case avoid using the xAODConfigSvc, because it will be set up incorrectly
configFlags_with_DB
=
ConfigFlags
.
clone
()
configFlags_with_DB
.
Trigger
.
triggerConfig
=
'
FILE
'
from
AthenaCommon.Configurable
import
ConfigurableRun3Behavior
with
ConfigurableRun3Behavior
():
from
AthenaConfiguration.AllConfigFlags
import
ConfigFlags
from
AthenaConfiguration.ComponentAccumulator
import
ComponentAccumulator
,
appendCAtoAthena
from
TrigConfigSvc.TrigConfigSvcCfg
import
BunchGroupCondAlgCfg
acc
=
ComponentAccumulator
()
acc
.
merge
(
BunchGroupCondAlgCfg
(
configFlags_with_DB
))
appendCAtoAthena
(
acc
)
else
:
bgkey
=
''
bgkey
=
''
else
:
from
AthenaCommon.Configurable
import
ConfigurableRun3Behavior
with
ConfigurableRun3Behavior
():
from
AthenaConfiguration.AllConfigFlags
import
ConfigFlags
from
AthenaConfiguration.ComponentAccumulator
import
ComponentAccumulator
,
appendCAtoAthena
from
TrigConfigSvc.TrigConfigSvcCfg
import
BunchGroupCondAlgCfg
acc
=
ComponentAccumulator
()
acc
.
merge
(
BunchGroupCondAlgCfg
(
ConfigFlags
))
appendCAtoAthena
(
acc
)
# this probably fails for reading R21 ESD but not going to support that case
# this probably fails for reading R21 ESD but not going to support that case
elif
beamFlags
.
bunchStructureSource
()
==
0
:
elif
beamFlags
.
bunchStructureSource
()
==
0
:
folder
=
'
/TDAQ/OLC/LHC/FILLPARAMS
'
folder
=
'
/TDAQ/OLC/LHC/FILLPARAMS
'
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment