diff --git a/Configuration/PyReleaseValidation/README.md b/Configuration/PyReleaseValidation/README.md index 3448afa7351bf..0ca7f5e505ed3 100644 --- a/Configuration/PyReleaseValidation/README.md +++ b/Configuration/PyReleaseValidation/README.md @@ -66,7 +66,9 @@ The offsets currently in use are: * 0.758 HLT phase-2 timing menu ticl_barrel variant * 0.759: HLT phase-2 timing menu, with NANO:@Phase2HLT * 0.77: HLT phase-2 NGT Scouting menu -* 0.771: HLT phase-2 NGT Scouting menu, with NANO:@NGTScouting +* 0.771: HLT phase-2 NGT Scouting menu, Alpaka, TICL-v5, TICL-Barrel +* 0.772: HLT phase-2 NGT Scouting menu, with NANO:@NGTScouting +* 0.773: HLT phase-2 NGT Scouting menu, with NANO:@NGTScoutingVal * 0.778 L3 Tracker Muons reconstruction Outside-In first, HLT Muon NanoAOD * 0.78: Complete L1 workflow * 0.781: Complete L1 workflow, producing FEVT and NANO output L1/P2GT objects @@ -121,4 +123,4 @@ The offsets currently in use are: * 0.113: Activate OuterTracker inefficiency (PS-p: bias rails inefficiency; PS-s and SS: 5% bad strips) * 0.114: Activate OuterTracker inefficiency (PS-p: bias rails inefficiency; PS-s and SS: 10% bad strips) * 0.141: Activate emulation of the signal shape of the InnerTracker FE chip (CROC) -* 0.186: Run-3 goodEdgeAlgo CPE \ No newline at end of file +* 0.186: Run-3 goodEdgeAlgo CPE diff --git a/Configuration/PyReleaseValidation/python/relval_Run4.py b/Configuration/PyReleaseValidation/python/relval_Run4.py index 157f2eb6b4a51..087a05daa5e63 100644 --- a/Configuration/PyReleaseValidation/python/relval_Run4.py +++ b/Configuration/PyReleaseValidation/python/relval_Run4.py @@ -80,8 +80,9 @@ numWFIB.extend([prefixDet+34.758]) # HLTTiming75e33, ticl_barrel numWFIB.extend([prefixDet+34.759]) # HLTTiming75e33 + NANO numWFIB.extend([prefixDet+34.77]) # NGTScouting -numWFIB.extend([prefixDet+34.771]) # NGTScouting + NANO -numWFIB.extend([prefixDet+34.772]) # NGTScouting + NANO (including validation) +numWFIB.extend([prefixDet+34.771]) # NGTScouting + alpaka + TICL-v5 + TICL-Barrel +numWFIB.extend([prefixDet+34.772]) # NGTScouting + NANO +numWFIB.extend([prefixDet+34.773]) # NGTScouting + NANO (including validation) for numWF in numWFIB: workflows[numWF] = _upgrade_workflows[numWF] diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index ab8a766fd070d..eadad1af3ed82 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -2046,7 +2046,7 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeWFs['NGTScoutingWithNano'] = deepcopy(upgradeWFs['HLTPhaseWithNano']) upgradeWFs['NGTScoutingWithNano'].suffix = '_NGTScoutingWithNano' -upgradeWFs['NGTScoutingWithNano'].offset = 0.771 +upgradeWFs['NGTScoutingWithNano'].offset = 0.772 upgradeWFs['NGTScoutingWithNano'].step2 = { '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:NGTScouting,NANO:@NGTScouting', '--datatier':'GEN-SIM-DIGI-RAW,NANOAODSIM', @@ -2056,7 +2056,7 @@ def condition(self, fragment, stepList, key, hasHarvest): upgradeWFs['NGTScoutingWithNanoValid'] = deepcopy(upgradeWFs['HLTPhaseWithNano']) upgradeWFs['NGTScoutingWithNanoValid'].suffix = '_NGTScoutingWithNanoVal' -upgradeWFs['NGTScoutingWithNanoValid'].offset = 0.772 +upgradeWFs['NGTScoutingWithNanoValid'].offset = 0.773 upgradeWFs['NGTScoutingWithNanoValid'].step2 = { '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:NGTScouting,VALIDATION:@hltValidation,NANO:@NGTScoutingVal', '--datatier':'GEN-SIM-DIGI-RAW,NANOAODSIM', @@ -2127,6 +2127,20 @@ def condition(self, fragment, stepList, key, hasHarvest): '-s':'HARVESTING:@hltValidation' } +upgradeWFs['NGTScoutingAll'] = deepcopy(upgradeWFs['NGTScouting']) +upgradeWFs['NGTScoutingAll'].suffix = '_NGTScoutingAll' +upgradeWFs['NGTScoutingAll'].offset = 0.771 +upgradeWFs['NGTScoutingAll'].step2 = { + '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:NGTScouting,VALIDATION:@hltValidation', + '--procModifiers': 'ngtScouting,alpaka,ticl_v5,ticl_barrel', + '--datatier':'GEN-SIM-DIGI-RAW,DQMIO', + '--eventcontent':'FEVTDEBUGHLT,DQMIO' +} +upgradeWFs['NGTScoutingAll'].step3 = { + '--procModifiers': 'ngtScouting,alpaka,ticl_v5,ticl_barrel', + '-s':'HARVESTING:@hltValidation' +} + class UpgradeWorkflow_L1Complete(UpgradeWorkflow): def setup_(self, step, stepName, stepDict, k, properties): if 'Digi' in step and 'NoHLT' not in step: diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 8782e5ea9b472..ffab3a02ead88 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -165,8 +165,9 @@ def runSelected(opt): 29634.758, # HLT phase-2 timing menu ticl_barrel variant 29634.759, # HLT phase-2 timing menu Alpaka, single tracking iteration, LST seeding + CKF building variant 29634.77, # HLT phase-2 NGT Scouting menu - 29634.771, # HLT phase-2 NGT Scouting menu, with NANO:@NGTScouting - 29634.772] # HLT phase-2 NGT Scouting menu, with NANO:@NGTScoutingVal + 29634.771, # HLT phase-2 NGT Scouting menu, Alpaka, TICL-v5, TICL-Barrel + 29634.772, # HLT phase-2 NGT Scouting menu, with NANO:@NGTScouting + 29634.773] # HLT phase-2 NGT Scouting menu, with NANO:@NGTScoutingVal } predefinedSet['limited'] = (