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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Tulay Cuhadar Donszelmann
athena
Commits
6c09bfb7
Commit
6c09bfb7
authored
8 years ago
by
Francisco Javier Sanchez Martinez
Committed by
Graeme Stewart
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Tagging the 00.02.12 release (EventIndexProducer-00-02-12)
parent
01d6ea51
No related branches found
Branches containing commit
Tags
1.6.2
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Database/EventIndex/EventIndexProducer/python/POOL2EI_Lib.py
+3
-3
3 additions, 3 deletions
Database/EventIndex/EventIndexProducer/python/POOL2EI_Lib.py
Database/EventIndex/EventIndexProducer/share/POOL2EI_joboptions.py
+7
-5
7 additions, 5 deletions
...EventIndex/EventIndexProducer/share/POOL2EI_joboptions.py
with
10 additions
and
8 deletions
Database/EventIndex/EventIndexProducer/python/POOL2EI_Lib.py
+
3
−
3
View file @
6c09bfb7
...
...
@@ -146,9 +146,9 @@ class POOL2EI(PyAthena.Alg):
self
.
trigDec
=
PyAthena
.
py_tool
(
'
Trig::TrigDecisionTool/TrigDecisionTool
'
)
self
.
trigDec
.
ExperimentalAndExpertMethods
().
enable
()
if
self
.
HaveXHlt
:
self
.
trigDec
.
setProperty
(
"
TrigDecisionKey
"
,
"
xTrigDecision
"
)
;
self
.
trigDec
.
setProperty
(
"
TrigDecisionKey
"
,
"
xTrigDecision
"
)
else
:
self
.
trigDec
.
setProperty
(
"
TrigDecisionKey
"
,
"
TrigDecision
"
)
;
self
.
trigDec
.
setProperty
(
"
TrigDecisionKey
"
,
"
TrigDecision
"
)
else
:
if
self
.
HaveHlt
:
_info
(
"
Switch HaveHlt to False
"
)
...
...
@@ -619,7 +619,7 @@ class POOL2EI(PyAthena.Alg):
eirec
[
'
EFPassedTrigMask
'
]
=
trigEF
## f
o
rm Metadata
## fr
o
m Metadata
SMK
=
self
.
_iov
.
get
(
'
SMK
'
,(
run_number
,
event_number
))
L1PSK
=
self
.
_iov
.
get
(
'
L1PSK
'
,(
run_number
,
lumi_block
))
HLTPSK
=
self
.
_iov
.
get
(
'
HLTPSK
'
,(
run_number
,
lumi_block
))
...
...
This diff is collapsed.
Click to expand it.
Database/EventIndex/EventIndexProducer/share/POOL2EI_joboptions.py
+
7
−
5
View file @
6c09bfb7
...
...
@@ -149,14 +149,16 @@ except:
if
inputFileSummary
.
has_key
(
'
metadata
'
)
and
inputFileSummary
[
'
metadata
'
].
has_key
(
'
/TRIGGER/HLT/HltConfigKeys
'
):
# we should search for 'xAOD::TrigDecision' in eventdata_items but 'zero events' files do not
# contain eventdata_items, so we look for 'xAOD::TriggerMenuContainer' in metadata_items instead
# we should search for 'xAOD::TrigDecision' in eventdata_items but 'zero events' files do not
# contain eventdata_items, so we look also for 'xAOD::TriggerMenuContainer' in metadata_items
job
.
pool2ei
.
HaveXHlt
=
False
if
inputFileSummary
.
has_key
(
'
eventdata_items
'
)
and
'
xAOD::TrigDecision
'
\
in
[
x
[
0
]
for
x
in
inputFileSummary
[
'
eventdata_items
'
]
]:
job
.
pool2ei
.
HaveXHlt
=
True
if
inputFileSummary
.
has_key
(
'
metadata_items
'
)
and
'
xAOD::TriggerMenuContainer
'
\
in
[
x
[
0
]
for
x
in
inputFileSummary
[
'
metadata_items
'
]
]:
job
.
pool2ei
.
HaveXHlt
=
True
else
:
job
.
pool2ei
.
HaveXHlt
=
False
from
TriggerJobOpts.TriggerConfigGetter
import
TriggerConfigGetter
cfg
=
TriggerConfigGetter
(
"
ReadPool
"
)
...
...
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