Skip to content

Commit 1c9e009

Browse files
fwyzardfwyzard
committed
Synchronise with CMSSW_11_0_0_pre13
1 parent 86d4af0 commit 1c9e009

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎Configuration/PyReleaseValidation/python/relval_steps.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -960,15 +960,15 @@ def genS(fragment,howMuch):
960960
#### fastsim section ####
961961
##no forseen to do things in two steps GEN-SIM then FASTIM->end: maybe later
962962
#step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@fake,VALIDATION:@standardValidation,DQM:@standardDQM',
963-
step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
963+
step1FastDefaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
964964
'--fast':'',
965965
'--beamspot' : 'Realistic8TeVCollision',
966966
'--eventcontent':'FEVTDEBUGHLT,DQM',
967967
'--datatier':'GEN-SIM-DIGI-RECO,DQMIO',
968968
'--relval':'27000,3000'},
969969
step1Defaults])
970970
#step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,HLT:@relval2016,VALIDATION:@standardValidation,DQM:@standardDQM',
971-
step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
971+
step1FastUpg2015Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
972972
'--fast':'',
973973
'--conditions' :'auto:run2_mc',
974974
'--beamspot' : 'Realistic50ns13TeVCollision',
@@ -984,7 +984,7 @@ def genS(fragment,howMuch):
984984
step1FastUpg2015_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'},
985985
step1FastUpg2015Defaults])
986986

987-
step1FastUpg2017Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
987+
step1FastUpg2017Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
988988
'--fast':'',
989989
'--conditions' :'auto:phase1_2017_realistic',
990990
'--beamspot' : 'Realistic25ns13TeVEarly2017Collision',
@@ -1000,7 +1000,7 @@ def genS(fragment,howMuch):
10001000
step1FastUpg2017_trackingOnlyValidation = merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,RECO,VALIDATION:@trackingOnlyValidation'},
10011001
step1FastUpg2017Defaults])
10021002

1003-
step1FastUpg2018Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQM',
1003+
step1FastUpg2018Defaults =merge([{'-s':'GEN,SIM,RECOBEFMIX,DIGI:pdigi_valid,L1,DIGI2RAW,L1Reco,RECO,EI,VALIDATION:@standardValidation,DQM:@standardDQMFS',
10041004
'--fast':'',
10051005
'--conditions' :'auto:phase1_2018_realistic',
10061006
'--beamspot' :'Realistic25ns13TeVEarly2018Collision',
@@ -1578,7 +1578,7 @@ def lhegensim2018ml(fragment,howMuch):
15781578
}
15791579
step2Upg2015Defaults50ns = merge([{'-s':'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval50ns','--conditions':'auto:run2_mc_50ns','--era':'Run2_50ns'},step2Upg2015Defaults])
15801580

1581-
step2Upg2015DefaultsAPVSimu = merge([{'--customise': 'SimTracker/SiStripDigitizer/customizeSiStripAPVDynamicGainSimulation.activateSiStripAPVDynamicGain'},step2Upg2015Defaults])
1581+
step2Upg2015DefaultsAPVSimu = merge([{'--era': 'Run2_2016_HIPM'},step2Upg2015Defaults])
15821582

15831583
#for 2017
15841584
step2Upg2017Defaults = {'-s' :'DIGI:pdigi_valid,L1,DIGI2RAW,HLT:@relval2017',
@@ -1602,7 +1602,7 @@ def lhegensim2018ml(fragment,howMuch):
16021602

16031603

16041604
steps['DIGIUP15']=merge([step2Upg2015Defaults])
1605-
steps['DIGIUP15APVSimu']=merge([{'--customise': 'SimTracker/SiStripDigitizer/customizeSiStripAPVDynamicGainSimulation.activateSiStripAPVDynamicGain'},step2Upg2015Defaults])
1605+
steps['DIGIUP15APVSimu']=merge([{'--era': 'Run2_2016_HIPM'},step2Upg2015Defaults])
16061606

16071607
steps['DIGIUP15PROD1']=merge([{'-s':'DIGI,L1,DIGI2RAW,HLT:@relval2016','--eventcontent':'RAWSIM','--datatier':'GEN-SIM-RAW'},step2Upg2015Defaults])
16081608
steps['DIGIUP15_PU25']=merge([PU25,step2Upg2015Defaults])
@@ -1741,9 +1741,9 @@ def lhegensim2018ml(fragment,howMuch):
17411741
digiPremixUp2018Defaults25ns])
17421742

17431743
steps['DIGIPRMXUP15_PU25']=merge([digiPremixUp2015Defaults25ns])
1744-
steps['DIGIPRMXUP15APVSimu_PU25']=merge([{'--customise': 'SimTracker/SiStripDigitizer/customizeSiStripAPVDynamicGainSimulation.activateSiStripAPVDynamicGain'},digiPremixUp2015Defaults25ns])
1744+
steps['DIGIPRMXUP15APVSimu_PU25']=merge([{'--era': 'Run2_2016_HIPM'},digiPremixUp2015Defaults25ns])
17451745
steps['DIGIPRMXLOCALUP15_PU25']=merge([digiPremixLocalPileupUp2015Defaults25ns])
1746-
steps['DIGIPRMXLOCALUP15APVSimu_PU25']=merge([{'--customise': 'SimTracker/SiStripDigitizer/customizeSiStripAPVDynamicGainSimulation.activateSiStripAPVDynamicGain'},digiPremixLocalPileupUp2015Defaults25ns])
1746+
steps['DIGIPRMXLOCALUP15APVSimu_PU25']=merge([{'--era': 'Run2_2016_HIPM'},digiPremixLocalPileupUp2015Defaults25ns])
17471747

17481748
steps['DIGIPRMXUP15_PU50']=merge([digiPremixUp2015Defaults50ns])
17491749
steps['DIGIPRMXUP17_PU25']=merge([digiPremixUp2017Defaults25ns])
@@ -2556,7 +2556,7 @@ def gen2018HiMix(fragment,howMuch):
25562556

25572557

25582558
#data
2559-
steps['HARVESTD']={'-s':'HARVESTING:@standardDQM+@ExtraHLT+@miniAODDQM',
2559+
steps['HARVESTD']={'-s':'HARVESTING:@standardDQMFakeHLT+@miniAODDQM',
25602560
'--conditions':'auto:run1_data',
25612561
'--data':'',
25622562
'--filetype':'DQM',

‎Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -620,63 +620,63 @@ def condition(self, fragment, stepList, key, hasHarvest):
620620
'Geom' : 'Extended2026D35',
621621
'HLTmenu': '@fake2',
622622
'GT' : 'auto:phase2_realistic_T6',
623-
'Era' : 'Phase2C4_timing_layer_bar',
623+
'Era' : 'Phase2C4',
624624
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
625625
},
626626
'2026D41' : {
627627
'Geom' : 'Extended2026D41',
628628
'HLTmenu': '@fake2',
629629
'GT' : 'auto:phase2_realistic_T14',
630-
'Era' : 'Phase2C8_timing_layer_bar',
630+
'Era' : 'Phase2C8',
631631
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
632632
},
633633
'2026D43' : {
634634
'Geom' : 'Extended2026D43',
635635
'HLTmenu': '@fake2',
636636
'GT' : 'auto:phase2_realistic_T14',
637-
'Era' : 'Phase2C4_timing_layer_bar',
637+
'Era' : 'Phase2C4',
638638
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
639639
},
640640
'2026D44' : {
641641
'Geom' : 'Extended2026D44',
642642
'HLTmenu': '@fake2',
643643
'GT' : 'auto:phase2_realistic_T14',
644-
'Era' : 'Phase2C6_timing_layer_bar',
644+
'Era' : 'Phase2C6',
645645
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
646646
},
647647
'2026D45' : {
648648
'Geom' : 'Extended2026D45',
649649
'HLTmenu': '@fake2',
650650
'GT' : 'auto:phase2_realistic_T15',
651-
'Era' : 'Phase2C8_timing_layer_bar',
651+
'Era' : 'Phase2C8',
652652
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
653653
},
654654
'2026D46' : {
655655
'Geom' : 'Extended2026D46',
656656
'HLTmenu': '@fake2',
657657
'GT' : 'auto:phase2_realistic_T15',
658-
'Era' : 'Phase2C9_timing_layer_bar',
658+
'Era' : 'Phase2C9',
659659
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
660660
},
661661
'2026D47' : {
662662
'Geom' : 'Extended2026D47',
663663
'HLTmenu': '@fake2',
664664
'GT' : 'auto:phase2_realistic_T15',
665-
'Era' : 'Phase2C10_timing_layer_bar',
665+
'Era' : 'Phase2C10',
666666
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
667667
},
668668
'2026D48' : {
669669
'Geom' : 'Extended2026D48',
670670
'HLTmenu': '@fake2',
671671
'GT' : 'auto:phase2_realistic_T15',
672-
'Era' : 'Phase2C9_timing_layer_bar',
672+
'Era' : 'Phase2C9',
673673
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
674674
},
675675
'2026D49' : {
676676
'Geom' : 'Extended2026D49',
677677
'HLTmenu': '@fake2',
678678
'GT' : 'auto:phase2_realistic_T15',
679-
'Era' : 'Phase2C9_timing_layer_bar',
679+
'Era' : 'Phase2C9',
680680
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
681681
},
682682
}

0 commit comments

Comments
 (0)