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

[Draft] Update HGCAL pset for Phase-2 HLT menu #39450

Closed
wants to merge 5 commits into from
Closed

[Draft] Update HGCAL pset for Phase-2 HLT menu #39450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef42a40
update HGCAL pset for HLT
Sep 19, 2022
ed93067
upadte L1VertexFinderEmulator
Sep 20, 2022
bac93e5
correct trigger used for D88
Sep 20, 2022
616d539
Update HLT siPhase2Clusters
Sep 20, 2022
96908ae
first try to get validation
Sep 22, 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
27 changes: 27 additions & 0 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,6 +1358,33 @@ def condition(self, fragment, stepList, key, hasHarvest):
offset = 0.75,
)

class UpgradeWorkflow_HLTwDIGI75e33(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'DigiTrigger' in step:
stepDict[stepName][k] = merge([{'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,DIGI2RAW,HLT:@relval2026'}, stepDict[step][k]])
elif 'RecoGlobal' in step:
stepDict[stepName][k] = merge([{'-s':'RAW2DIGI,RECO,RECOSIM,PAT,VALIDATION:@phase2Validation+@miniAODValidation,DQM:@phase2+@miniAODDQM'}, stepDict[step][k]])
elif 'HARVESTGlobal' in step:
stepDict[stepName][k] = merge([{'-s':'HARVESTING:@phase2Validation+@phase2+@miniAODValidation+@miniAODDQM'}, stepDict[step][k]])
else:
stepDict[stepName][k] = merge([stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return fragment=="TTbar_14TeV" and '2026' in key
upgradeWFs['HLTwDIGI75e33'] = UpgradeWorkflow_HLTwDIGI75e33(
steps = [
'DigiTrigger',
'RecoGlobal',
'HARVESTGlobal',
],
PU = [
'DigiTrigger',
'RecoGlobal',
'HARVESTGlobal',
],
suffix = '_HLTwDIGI75e33',
offset = 0.76,
)

class UpgradeWorkflow_Neutron(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
if 'GenSim' in step:
Expand Down
3 changes: 3 additions & 0 deletions HLTrigger/Configuration/python/HLT_75e33/modules/siPhase2Clusters_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
maxNumberClusters = cms.uint32(0),
src = cms.InputTag("mix","Tracker")
)

from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2
premix_stage2.toModify(siPhase2Clusters, src = "mixData:Tracker")
Copy link
Contributor

Choose a reason for hiding this comment

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

The following

import FWCore.ParameterSet.Config as cms

from RecoLocalTracker.SiPhase2Clusterizer.phase2TrackerClusterizer_cfi import siPhase2Clusters as _siPhase2Clusters
siPhase2Clusters = _siPhase2Clusters.clone()

should be equivalent, and would be easier to maintain, and less error-prone.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I can do that. Thanks for suggestion.

I tried to make very minimal change as much as possible without touching original code. I assume we have hard-copy coding around for 75e33 menu. I will fix it together with configuration when this comment, #39450 (comment), is confirmed.

1 change: 1 addition & 0 deletions HLTrigger/Configuration/python/HLT_75e33/psets/HGCAL_noise_fC_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
doseMap = cms.string(''),
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0),
scaleByDoseFactor = cms.double(1),
values = cms.vdouble(0.32041012, 0.384492144, 0.32041012)
)
6 changes: 5 additions & 1 deletion HLTrigger/Configuration/python/HLT_75e33/psets/HGCAL_noise_heback_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,9 @@
doseMap = cms.string(''),
noise_MIP = cms.double(0.01),
scaleByDose = cms.bool(False),
scaleByDoseAlgo = cms.uint32(0)
scaleByDoseAlgo = cms.uint32(0),
scaleByDoseFactor = cms.double(1),
sipmMap = cms.string(""),
referenceIdark = cms.double(-1),
referenceXtalk = cms.double(-1)
)
3 changes: 3 additions & 0 deletions HLTriggerOffline/Common/python/HLTValidation_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
+hltHCALdigisAnalyzer+hltHCALRecoAnalyzer+hltHCALNoiseRates # HCAL
)

from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
phase2_common.toReplaceWith(hltvalidationWithMC, hltvalidationWithMC.copyAndExclude([hltHCALdigisAnalyzer,hltHCALRecoAnalyzer,hltHCALNoiseRates]))

hltvalidationWithData = cms.Sequence(
)

Expand Down
2 changes: 1 addition & 1 deletion HLTriggerOffline/JetMET/python/Validation/SingleJetValidation_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
SingleJetMetPaths = DQMEDAnalyzer('HLTJetMETValidation',
triggerEventObject = cms.untracked.InputTag("hltTriggerSummaryRAW","","HLT"),
DQMFolder = cms.untracked.string(foldernm),
PatternJetTrg = cms.untracked.string("HLT_PF(NoPU)?Jet([0-9])+(_v[0-9]+)?$"),
PatternJetTrg = cms.untracked.string("HLT_(AK4)?PF(NoPU|Puppi)?Jet([0-9])+(_v[0-9]+)?$"), #was "HLT_PF(NoPU)?Jet([0-9])+(_v[0-9]+)?$"),
PatternMetTrg = cms.untracked.string("HLT_+[Calo|PF]+MET([0-9])+[_NotCleaned|_BeamHaloCleaned]+(_v[0-9]+)?$"),
PatternMuTrg = cms.untracked.string("HLT_Mu([0-9])+(_v[0-9]+)?$"),
LogFileName = cms.untracked.string('JetMETSingleJetValidation.log'),
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/Phase2L1Taus/plugins/HPSPFTauProducer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ void HPSPFTauProducer::fillDescriptions(edm::ConfigurationDescriptions& descript
desc.add<double>("maxSeedChargedPFCandEta", 2.4);
desc.add<bool>("applyPreselection", false);
desc.add<double>("isolationConeSize", 0.4);
desc.add<edm::InputTag>("srcL1Vertices", edm::InputTag("L1VertexFinderEmulator", "l1verticesEmulation"));
desc.add<edm::InputTag>("srcL1Vertices", edm::InputTag("l1tVertexFinderEmulator", "l1verticesEmulation"));
desc.add<double>("maxChargedIso", 1000.0);
{
edm::ParameterSetDescription psd0;
Expand Down
5 changes: 5 additions & 0 deletions Validation/Configuration/python/globalValidation_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
from Validation.SiOuterTrackerV.OuterTrackerSourceConfigV_cff import *
from Validation.Configuration.ecalSimValid_cff import *
from Validation.SiTrackerPhase2V.Phase2TrackerValidationFirstStep_cff import *
from HLTriggerOffline.Common.HLTValidation_cff import *

# filter/producer "pre-" sequence for globalValidation
globalPrevalidationTracking = cms.Sequence(
Expand Down Expand Up @@ -127,6 +128,10 @@
baseCommonPreValidation = cms.Sequence(cms.SequencePlaceholder("mix"))
baseCommonValidation = cms.Sequence()

from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
phase2_common.toReplaceWith(baseCommonPreValidation,cms.Sequence(cms.SequencePlaceholder("mix")*hltassociation))
phase2_common.toReplaceWith(baseCommonValidation,cms.Sequence(hltvalidation))

# Tracking-only validation
globalPrevalidationTrackingOnly = cms.Sequence(
simHitTPAssocProducer
Expand Down
4 changes: 4 additions & 0 deletions Validation/Configuration/python/postValidation_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@

postValidation_common = cms.Sequence()

from HLTriggerOffline.Common.HLTValidationHarvest_cff import *
from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
phase2_common.toReplaceWith(postValidation_common,cms.Sequence(hltpostvalidation))

postValidation_trackingOnly = cms.Sequence(
postProcessorTrackSequenceTrackingOnly
+ postProcessorVertexSequence
Expand Down