Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena_MET
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review 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
Alberto Plebani
athena_MET
Commits
7c1bbde7
Commit
7c1bbde7
authored
1 year ago
by
Frank Winklmeier
Browse files
Options
Downloads
Patches
Plain Diff
DerivationFrameworkPhys: fix mistake in conflict resolution
parent
3c2e1eb9
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
+0
-23
0 additions, 23 deletions
...erivationFramework/DerivationFrameworkPhys/python/PHYS.py
with
0 additions
and
23 deletions
PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhys/python/PHYS.py
+
0
−
23
View file @
7c1bbde7
...
...
@@ -67,29 +67,6 @@ def PHYSCoreCfg(flags, name_tag='PHYS', StreamName='StreamDAOD_PHYS', TriggerLis
acc
=
ComponentAccumulator
()
# Get the lists of triggers needed for trigger matching.
# This is needed at this scope (for the slimming) and further down in the config chain
# for actually configuring the matching, so we create it here and pass it down
# TODO: this should ideally be called higher up to avoid it being run multiple times in a train
from
DerivationFrameworkPhys.TriggerListsHelper
import
TriggerListsHelper
PHYSTriggerListsHelper
=
TriggerListsHelper
(
flags
)
# for AOD produced before 24.0.17, the electron removal tau is not available
TauJets_EleRM_in_input
=
(
flags
.
Input
.
TypedCollections
.
count
(
'
xAOD::TauJetContainer#TauJets_EleRM
'
)
>
0
)
if
TauJets_EleRM_in_input
:
logPHYS
.
info
(
"
TauJets_EleRM is in the input AOD. Relevant containers will be scheduled
"
)
else
:
logPHYS
.
info
(
"
TauJets_EleRM is Not in the input AOD. No relevant containers will be written
"
)
# Common augmentations
acc
.
merge
(
PHYSKernelCfg
(
flags
,
name
=
"
PHYSKernel
"
,
StreamName
=
stream_name
,
TriggerListsHelper
=
PHYSTriggerListsHelper
,
TauJets_EleRM_in_input
=
TauJets_EleRM_in_input
))
## Higgs augmentations - create 4l vertex
from
DerivationFrameworkHiggs.HiggsPhysContent
import
HiggsAugmentationAlgsCfg
acc
.
merge
(
HiggsAugmentationAlgsCfg
(
flags
))
...
...
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