Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add hgcalv16 modifier and corresponding era #36753

Merged
merged 2 commits into from
Jan 31, 2022
Merged

Add hgcalv16 modifier and corresponding era #36753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba6a52e
add hgcalv16 modifier and corresponding era
Jan 19, 2022
1b09a9d
Updating Configuration/Geometry for C17
Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Configuration/Eras/python/Era_Phase2C17I13M9_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9
from Configuration.Eras.Modifier_phase2_hgcalV12_cff import phase2_hgcalV12
from Configuration.Eras.Modifier_phase2_hgcalV16_cff import phase2_hgcalV16

Phase2C17I13M9 = cms.ModifierChain(Phase2C11I13M9.copyAndExclude([phase2_hgcalV12]),phase2_hgcalV16)
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Modifier_phase2_hgcalV16_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

# This modifier is for HGCal V16 geometry-specific changes for sim, reco, etc.

phase2_hgcalV16 = cms.Modifier()

2 changes: 1 addition & 1 deletion Configuration/Geometry/python/dict2026Geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,7 @@
'from Geometry.EcalMapping.EcalMapping_cfi import *',
'from Geometry.EcalMapping.EcalMappingRecord_cfi import *',
],
"era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV12, phase2_hfnose",
"era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not this line that we need to keep V10,V11 and V12 or not. Will look into it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kpedro88 Do you have an idea what is the result of this era line? I think it does not change anything at the moment. Thanks in advance.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@srimanob indeed, right now it is just printed as a recommendation when a user runs the geometry script. The actual modifiers for a workflow have to be implemented manually.

},

}
Expand Down
4 changes: 2 additions & 2 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1564,7 +1564,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
'Geom' : 'Extended2026D86',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11I13M9',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D87' : {
Expand All @@ -1578,7 +1578,7 @@ def condition(self, fragment, stepList, key, hasHarvest):
'Geom' : 'Extended2026D88',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T21',
'Era' : 'Phase2C11I13M9',
'Era' : 'Phase2C17I13M9',
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D89' : {
Expand Down
3 changes: 2 additions & 1 deletion Configuration/StandardSequences/python/Eras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ def __init__(self):
'Phase2C11I13T23M9',
'Phase2C11I13T25M9',
'Phase2C11I13T26M9',
'Phase2C11I13T27M9'
'Phase2C11I13T27M9',
'Phase2C17I13M9'
]

internalUseMods = ['run2_common', 'run2_25ns_specific',
Expand Down