Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions Configuration/PyReleaseValidation/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
* 0.186: Run-3 goodEdgeAlgo CPE
5 changes: 3 additions & 2 deletions Configuration/PyReleaseValidation/python/relval_Run4.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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:
Expand Down
5 changes: 3 additions & 2 deletions Configuration/PyReleaseValidation/scripts/runTheMatrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'] = (
Expand Down