-
Notifications
You must be signed in to change notification settings - Fork 4.6k
More Configurable Pixel Tracks and HIon Template #41632
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -824,6 +824,8 @@ | |
| workflows[160.2] = ['',['PhotonJets_Pt_10_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']] | ||
| workflows[160.3] = ['',['ZMM_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']] | ||
| workflows[160.4] = ['',['ZEE_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']] | ||
| # Patatrack Pixel Tracks on CPU | ||
| workflows[160.501] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackCPU','MINIHI2023PROD']] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. does this include the same changes as the
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes (see here).
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK for me. I was surprised to see a
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Right, @cms-sw/pdmv-l2 does it sound to you? Or shall I move it to |
||
|
|
||
| ### pp reference test ### | ||
| workflows[149] = ['',['QCD_Pt_80_120_13_PPREF','DIGIPPREF2017','RECOPPREF2017','HARVESTPPREF2017']] | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,10 @@ | |
| '2021postEEPU', | ||
| '2023FS', | ||
| '2023FSPU', | ||
| '2022HI', | ||
| '2022HIRP', #RawPrime | ||
| '2023HI', | ||
| '2023HIRP', #RawPrime | ||
| ] | ||
|
|
||
| upgradeKeys[2026] = [ | ||
|
|
@@ -249,7 +253,7 @@ def __init__(self, steps, PU, suffix, offset): | |
| steps = steps + ["ALCA","Nano"] | ||
| super().__init__(steps, PU, suffix, offset) | ||
| def condition(self, fragment, stepList, key, hasHarvest): | ||
| result = (fragment=="TTbar_13" or fragment=="TTbar_14TeV") and not 'PU' in key and hasHarvest and self.condition_(fragment, stepList, key, hasHarvest) | ||
| result = (fragment=="TTbar_13" or fragment=="TTbar_14TeV" or 'Hydjet' in fragment) and not 'PU' in key and hasHarvest and self.condition_(fragment, stepList, key, hasHarvest) | ||
| return result | ||
| def condition_(self, fragment, stepList, key, hasHarvest): | ||
| return True | ||
|
|
@@ -370,7 +374,7 @@ def setup__(self, step, stepName, stepDict, k, properties): | |
| elif 'ALCA' in step: stepDict[stepName][k] = None | ||
| elif 'HARVEST' in step: stepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, stepDict[step][k]]) | ||
| def condition_(self, fragment, stepList, key, hasHarvest): | ||
| return ('2017' in key or '2018' in key or '2021' in key or '2026' in key) and ('FS' not in key) | ||
| return ('2017' in key or '2018' in key or '2021' in key or '2026' in key or 'HI' in key) and ('FS' not in key) | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Just my curiosity, this includes almost all the keys except 2022, 2023, and 2024. Why? However, not a showstopper for this PR. It can enable later.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think it's because this has grown one piece at a time... I guess by now we could drop Run-2, and enable it for all the Run-3 and Phase-2 workflows.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Agree, thx. |
||
| upgradeWFs['pixelTrackingOnly'] = UpgradeWorkflow_pixelTrackingOnly( | ||
| steps = [ | ||
| 'Reco', | ||
|
|
@@ -831,7 +835,8 @@ def condition(self, fragment, stepList, key, hasHarvest): | |
| ('2018' in key and fragment == "ZMM_13"), | ||
| ('2021' in key and fragment == "ZMM_14" and 'FS' not in key), | ||
| ('2023' in key and fragment == "ZMM_14" and 'FS' not in key), | ||
| ('2026D88' in key and fragment == "TTbar_14TeV" and "PixelOnly" in self.suffix) | ||
| ('2026D88' in key and fragment == "TTbar_14TeV" and "PixelOnly" in self.suffix), | ||
AdrianoDee marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| (('HI' in key) and 'Hydjet' in fragment and "PixelOnly" in self.suffix ) | ||
| ] | ||
| result = any(selected) and hasHarvest | ||
|
|
||
|
|
@@ -2403,9 +2408,10 @@ def condition(self, fragment, stepList, key, hasHarvest): | |
|
|
||
| class UpgradeWorkflow_DDDDB(UpgradeWorkflow): | ||
| def setup_(self, step, stepName, stepDict, k, properties): | ||
| if 'Run3' in stepDict[step][k]['--era'] and '2023' not in stepDict[step][k]['--era'] and 'Fast' not in stepDict[step][k]['--era']: | ||
| the_era = stepDict[step][k]['--era'] | ||
| if 'Run3' in the_era and '2023' not in the_era and 'Fast' not in the_era and "Pb" not in the_era: | ||
| # retain any other eras | ||
| tmp_eras = stepDict[step][k]['--era'].split(',') | ||
| tmp_eras = the_era.split(',') | ||
| tmp_eras[tmp_eras.index("Run3")] = 'Run3_DDD' | ||
| tmp_eras = ','.join(tmp_eras) | ||
| stepDict[stepName][k] = merge([{'--conditions': 'auto:phase1_2022_realistic_ddd', '--geometry': 'DB:Extended', '--era': tmp_eras}, stepDict[step][k]]) | ||
|
|
@@ -2580,6 +2586,38 @@ def condition(self, fragment, stepList, key, hasHarvest): | |
| 'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision', | ||
| 'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'], | ||
| }, | ||
| '2022HI' : { | ||
| 'Geom' : 'DB:Extended', | ||
| 'GT':'auto:phase1_2022_realistic_hi', | ||
| 'HLTmenu': '@fake2', | ||
| 'Era':'Run3_pp_on_PbPb', | ||
| 'BeamSpot': 'Realistic2022PbPbCollision', | ||
| 'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'], | ||
| }, | ||
| '2022HIRP' : { | ||
| 'Geom' : 'DB:Extended', | ||
| 'GT':'auto:phase1_2022_realistic_hi', | ||
| 'HLTmenu': '@fake2', | ||
| 'Era':'Run3_pp_on_PbPb_approxSiStripClusters', | ||
| 'BeamSpot': 'Realistic2022PbPbCollision', | ||
| 'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'], | ||
| }, | ||
| '2023HI' : { | ||
| 'Geom' : 'DB:Extended', | ||
| 'GT':'auto:phase1_2023_realistic_hi', | ||
| 'HLTmenu': '@fake2', | ||
| 'Era':'Run3_pp_on_PbPb', | ||
| 'BeamSpot': 'Realistic2022PbPbCollision', | ||
| 'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'], | ||
| }, | ||
| '2023HIRP' : { | ||
| 'Geom' : 'DB:Extended', | ||
| 'GT':'auto:phase1_2023_realistic_hi', | ||
| 'HLTmenu': '@fake2', | ||
| 'Era':'Run3_pp_on_PbPb_approxSiStripClusters', | ||
| 'BeamSpot': 'Realistic2022PbPbCollision', | ||
| 'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'], | ||
| } | ||
| } | ||
|
|
||
| # standard PU sequences | ||
|
|
@@ -2858,4 +2896,6 @@ def __init__(self, howMuch, dataset): | |
| ('LbToJpsiLambda_JMM_Filter_DGamma0_TuneCP5_13p6TeV-pythia8-evtgen_cfi',UpgradeFragment(Mby(66,660000),'LbToJpsiLambda_DGamma0_13p6TeV')), #0.3% | ||
| ('LbToJpsiXiK0sPi_JMM_Filter_DGamma0_TuneCP5_13p6TeV-pythia8-evtgen_cfi',UpgradeFragment(Mby(50,500000),'LbToJpsiXiK0sPr_DGamma0_13p6TeV')), #0.6% | ||
| ('OmegaMinus_13p6TeV_SoftQCDInel_TuneCP5_cfi',UpgradeFragment(Mby(100,1000000),'OmegaMinus_13p6TeV')), #0.1% | ||
| ('Hydjet_Quenched_MinBias_5020GeV_cfi', UpgradeFragment(Kby(9,100),'HydjetQMinBias_5020GeV')), | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| ('Hydjet_Quenched_MinBias_5362GeV_cfi', UpgradeFragment(Kby(9,100),'HydjetQMinBias_5362GeV')) | ||
| ]) | ||
Uh oh!
There was an error while loading. Please reload this page.