Skip to content

Commit 59c9798

Browse files
VourMaVourMa
committed
Remove alpaka procModfier from workflows in which it is no longer useful
1 parent c4a9b76 commit 59c9798

File tree

3 files changed

+55
-67
lines changed

3 files changed

+55
-67
lines changed

‎Configuration/PyReleaseValidation/README.md‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,14 @@ The offsets currently in use are:
5858
* 0.751: HLT phase-2 timing menu Alpaka variant
5959
* 0.7511: HLT phase-2 timing menu, with PixelTracks CA Extension
6060
* 0.752: HLT phase-2 timing menu ticl_v5 variant
61-
* 0.753: HLT phase-2 timing menu Alpaka, single tracking iteration variant
62-
* 0.754: HLT phase-2 timing menu Alpaka, single tracking iteration, LST building variant
63-
* 0.755: HLT phase-2 timing menu Alpaka, LST building variant
61+
* 0.753: HLT phase-2 timing menu single tracking iteration variant
62+
* 0.754: HLT phase-2 timing menu single tracking iteration, LST building variant
63+
* 0.755: HLT phase-2 timing menu LST building variant
6464
* 0.756 HLT phase-2 timing menu trimmed tracking
65-
* 0.7561 HLT phase-2 timing menu Alpaka, trimmed tracking
66-
* 0.7562 HLT phase-2 timing menu Alpaka, trimmed tracking, single tracking iteration variant
67-
* 0.757: HLT phase-2 timing menu Alpaka, single tracking iteration, LST seeding + CKF building variant
68-
* 0.7571: HLT phase-2 timing menu Alpaka, single tracking iteration, Phase2CAExtension+LST seeding + mkFit building variant
69-
* 0.7572: HLT phase-2 timing menu Alpaka, single tracking iteration, Phase2CAExtension+LST seeding + mkFit building and fitting variant
65+
* 0.7561 HLT phase-2 timing menu trimmed tracking, single tracking iteration variant
66+
* 0.757: HLT phase-2 timing menu single tracking iteration, LST seeding + CKF building variant
67+
* 0.7571: HLT phase-2 timing menu single tracking iteration, Phase2CAExtension+LST seeding + mkFit building variant
68+
* 0.7572: HLT phase-2 timing menu single tracking iteration, Phase2CAExtension+LST seeding + mkFit building and fitting variant
7069
* 0.758 HLT phase-2 timing menu ticl_barrel variant
7170
* 0.759: HLT phase-2 timing menu, with NANO:@Phase2HLT
7271
* 0.76: HLT phase-2 reduced menu, with DIGI step

‎Configuration/PyReleaseValidation/python/relval_Run4.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,14 @@
7474
numWFIB.extend([prefixDet+34.751]) # HLTTiming75e33, alpaka
7575
numWFIB.extend([prefixDet+34.7511])# HLTTiming75e33, phase2CAExtension
7676
numWFIB.extend([prefixDet+34.752]) # HLTTiming75e33, ticl_v5
77-
numWFIB.extend([prefixDet+34.753]) # HLTTiming75e33, alpaka,singleIterPatatrack
78-
numWFIB.extend([prefixDet+34.754]) # HLTTiming75e33, alpaka,singleIterPatatrack,trackingLST
79-
numWFIB.extend([prefixDet+34.755]) # HLTTiming75e33, alpaka,trackingLST
77+
numWFIB.extend([prefixDet+34.753]) # HLTTiming75e33, singleIterPatatrack
78+
numWFIB.extend([prefixDet+34.754]) # HLTTiming75e33, singleIterPatatrack,trackingLST
79+
numWFIB.extend([prefixDet+34.755]) # HLTTiming75e33, trackingLST
8080
numWFIB.extend([prefixDet+34.756]) # HLTTiming75e33, phase2_hlt_vertexTrimming
81-
numWFIB.extend([prefixDet+34.7561])# HLTTiming75e33, alpaka,phase2_hlt_vertexTrimming
82-
numWFIB.extend([prefixDet+34.7562])# HLTTiming75e33, alpaka,phase2_hlt_vertexTrimming,singleIterPatatrack
83-
numWFIB.extend([prefixDet+34.757]) # HLTTiming75e33, alpaka,singleIterPatatrack,trackingLST,seedingLST
84-
numWFIB.extend([prefixDet+34.7571]) # HLTTiming75e33, alpaka,singleIterPatatrack,Phase2CAExtension,trackingLST,seedingLST,buildingMkFit
85-
numWFIB.extend([prefixDet+34.7572]) # HLTTiming75e33, alpaka,singleIterPatatrack,Phase2CAExtension,trackingLST,seedingLST,buildingMkFit,fittingMkFit
81+
numWFIB.extend([prefixDet+34.7561])# HLTTiming75e33, phase2_hlt_vertexTrimming,singleIterPatatrack
82+
numWFIB.extend([prefixDet+34.757]) # HLTTiming75e33, singleIterPatatrack,trackingLST,seedingLST
83+
numWFIB.extend([prefixDet+34.7571]) # HLTTiming75e33, singleIterPatatrack,Phase2CAExtension,trackingLST,seedingLST,buildingMkFit
84+
numWFIB.extend([prefixDet+34.7572]) # HLTTiming75e33, singleIterPatatrack,Phase2CAExtension,trackingLST,seedingLST,buildingMkFit,fittingMkFit
8685
numWFIB.extend([prefixDet+34.758]) # HLTTiming75e33, ticl_barrel
8786
numWFIB.extend([prefixDet+34.759]) # HLTTiming75e33 + NANO
8887
numWFIB.extend([prefixDet+34.77]) # NGTScouting

‎Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py‎

Lines changed: 41 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1956,42 +1956,42 @@ def condition(self, fragment, stepList, key, hasHarvest):
19561956
'-s':'HARVESTING:@hltValidation'
19571957
}
19581958

1959-
upgradeWFs['HLTTiming75e33AlpakaSingleIter'] = deepcopy(upgradeWFs['HLTTiming75e33'])
1960-
upgradeWFs['HLTTiming75e33AlpakaSingleIter'].suffix = '_HLT75e33TimingAlpakaSingleIter'
1961-
upgradeWFs['HLTTiming75e33AlpakaSingleIter'].offset = 0.753
1962-
upgradeWFs['HLTTiming75e33AlpakaSingleIter'].step2 = {
1959+
upgradeWFs['HLTTiming75e33SingleIter'] = deepcopy(upgradeWFs['HLTTiming75e33'])
1960+
upgradeWFs['HLTTiming75e33SingleIter'].suffix = '_HLT75e33TimingSingleIter'
1961+
upgradeWFs['HLTTiming75e33SingleIter'].offset = 0.753
1962+
upgradeWFs['HLTTiming75e33SingleIter'].step2 = {
19631963
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
1964-
'--procModifiers': 'alpaka,singleIterPatatrack',
1964+
'--procModifiers': 'singleIterPatatrack',
19651965
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
19661966
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
19671967
}
1968-
upgradeWFs['HLTTiming75e33AlpakaSingleIter'].step3 = {
1968+
upgradeWFs['HLTTiming75e33SingleIter'].step3 = {
19691969
'-s':'HARVESTING:@hltValidation'
19701970
}
19711971

1972-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
1973-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLST'].suffix = '_HLT75e33TimingAlpakaSingleIterLST'
1974-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLST'].offset = 0.754
1975-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLST'].step2 = {
1972+
upgradeWFs['HLTTiming75e33SingleIterLST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
1973+
upgradeWFs['HLTTiming75e33SingleIterLST'].suffix = '_HLT75e33TimingSingleIterLST'
1974+
upgradeWFs['HLTTiming75e33SingleIterLST'].offset = 0.754
1975+
upgradeWFs['HLTTiming75e33SingleIterLST'].step2 = {
19761976
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
1977-
'--procModifiers': 'alpaka,singleIterPatatrack,trackingLST',
1977+
'--procModifiers': 'singleIterPatatrack,trackingLST',
19781978
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
19791979
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
19801980
}
1981-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLST'].step3 = {
1981+
upgradeWFs['HLTTiming75e33SingleIterLST'].step3 = {
19821982
'-s':'HARVESTING:@hltValidation'
19831983
}
19841984

1985-
upgradeWFs['HLTTiming75e33AlpakaLST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
1986-
upgradeWFs['HLTTiming75e33AlpakaLST'].suffix = '_HLT75e33TimingAlpakaLST'
1987-
upgradeWFs['HLTTiming75e33AlpakaLST'].offset = 0.755
1988-
upgradeWFs['HLTTiming75e33AlpakaLST'].step2 = {
1985+
upgradeWFs['HLTTiming75e33LST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
1986+
upgradeWFs['HLTTiming75e33LST'].suffix = '_HLT75e33TimingLST'
1987+
upgradeWFs['HLTTiming75e33LST'].offset = 0.755
1988+
upgradeWFs['HLTTiming75e33LST'].step2 = {
19891989
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
1990-
'--procModifiers': 'alpaka,trackingLST',
1990+
'--procModifiers': 'trackingLST',
19911991
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
19921992
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
19931993
}
1994-
upgradeWFs['HLTTiming75e33AlpakaLST'].step3 = {
1994+
upgradeWFs['HLTTiming75e33LST'].step3 = {
19951995
'-s':'HARVESTING:@hltValidation'
19961996
}
19971997

@@ -2005,62 +2005,52 @@ def condition(self, fragment, stepList, key, hasHarvest):
20052005
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
20062006
}
20072007

2008-
upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'] = deepcopy(upgradeWFs['HLTTiming75e33'])
2009-
upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'].suffix = '_HLT75e33TimingAlpakaTrimmedTracking'
2010-
upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'].offset = 0.7561
2011-
upgradeWFs['HLTTiming75e33AlpakaTrimmedTracking'].step2 = {
2008+
upgradeWFs['HLTTiming75e33TrimmedTrackingSingleIter'] = deepcopy(upgradeWFs['HLTTiming75e33'])
2009+
upgradeWFs['HLTTiming75e33TrimmedTrackingSingleIter'].suffix = '_HLT75e33TimingTrimmedTrackingSingleIter'
2010+
upgradeWFs['HLTTiming75e33TrimmedTrackingSingleIter'].offset = 0.7561
2011+
upgradeWFs['HLTTiming75e33TrimmedTrackingSingleIter'].step2 = {
20122012
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
2013-
'--procModifiers': 'alpaka,phase2_hlt_vertexTrimming',
2013+
'--procModifiers': 'phase2_hlt_vertexTrimming,singleIterPatatrack',
20142014
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
20152015
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
20162016
}
20172017

2018-
upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'] = deepcopy(upgradeWFs['HLTTiming75e33'])
2019-
upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'].suffix = '_HLT75e33TimingAlpakaTrimmedTrackingSingleIter'
2020-
upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'].offset = 0.7562
2021-
upgradeWFs['HLTTiming75e33AlpakaTrimmedTrackingSingleIter'].step2 = {
2018+
upgradeWFs['HLTTiming75e33SingleIterLSTSeeding'] = deepcopy(upgradeWFs['HLTTiming75e33'])
2019+
upgradeWFs['HLTTiming75e33SingleIterLSTSeeding'].suffix = '_HLT75e33TimingSingleIterLSTSeeding'
2020+
upgradeWFs['HLTTiming75e33SingleIterLSTSeeding'].offset = 0.757
2021+
upgradeWFs['HLTTiming75e33SingleIterLSTSeeding'].step2 = {
20222022
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
2023-
'--procModifiers': 'alpaka,phase2_hlt_vertexTrimming,singleIterPatatrack',
2023+
'--procModifiers': 'singleIterPatatrack,trackingLST,seedingLST',
20242024
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
20252025
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
20262026
}
2027-
2028-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeeding'] = deepcopy(upgradeWFs['HLTTiming75e33'])
2029-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeeding'].suffix = '_HLT75e33TimingAlpakaSingleIterLSTSeeding'
2030-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeeding'].offset = 0.757
2031-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeeding'].step2 = {
2032-
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
2033-
'--procModifiers': 'alpaka,singleIterPatatrack,trackingLST,seedingLST',
2034-
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
2035-
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
2036-
}
2037-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeeding'].step3 = {
2027+
upgradeWFs['HLTTiming75e33SingleIterLSTSeeding'].step3 = {
20382028
'-s':'HARVESTING:@hltValidation'
20392029
}
20402030

2041-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuilding'] = deepcopy(upgradeWFs['HLTTiming75e33'])
2042-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuilding'].suffix = '_HLT75e33TimingAlpakaSingleIterLSTSeedingMkFitBuilding'
2043-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuilding'].offset = 0.7571
2044-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuilding'].step2 = {
2031+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuilding'] = deepcopy(upgradeWFs['HLTTiming75e33'])
2032+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuilding'].suffix = '_HLT75e33TimingSingleIterCAExtLSTSeedingMkFitBuilding'
2033+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuilding'].offset = 0.7571
2034+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuilding'].step2 = {
20452035
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
2046-
'--procModifiers': 'alpaka,phase2CAExtension,singleIterPatatrack,trackingLST,seedingLST,trackingMkFitCommon,hltTrackingMkFitInitialStep',
2036+
'--procModifiers': 'phase2CAExtension,singleIterPatatrack,trackingLST,seedingLST,trackingMkFitCommon,hltTrackingMkFitInitialStep',
20472037
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
20482038
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
20492039
}
2050-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuilding'].step3 = {
2040+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuilding'].step3 = {
20512041
'-s':'HARVESTING:@hltValidation'
20522042
}
20532043

2054-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuildingFitting'] = deepcopy(upgradeWFs['HLTTiming75e33'])
2055-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuildingFitting'].suffix = '_HLT75e33TimingAlpakaSingleIterLSTSeedingMkFitBuildingFitting'
2056-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuildingFitting'].offset = 0.7572
2057-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuildingFitting'].step2 = {
2044+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuildingFitting'] = deepcopy(upgradeWFs['HLTTiming75e33'])
2045+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuildingFitting'].suffix = '_HLT75e33TimingSingleIterCAExtLSTSeedingMkFitBuildingFitting'
2046+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuildingFitting'].offset = 0.7572
2047+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuildingFitting'].step2 = {
20582048
'-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:@hltValidation',
2059-
'--procModifiers': 'alpaka,phase2CAExtension,singleIterPatatrack,trackingLST,seedingLST,trackingMkFitCommon,hltTrackingMkFitInitialStep,trackingMkFitFit',
2049+
'--procModifiers': 'phase2CAExtension,singleIterPatatrack,trackingLST,seedingLST,trackingMkFitCommon,hltTrackingMkFitInitialStep,trackingMkFitFit',
20602050
'--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
20612051
'--eventcontent':'FEVTDEBUGHLT,DQMIO'
20622052
}
2063-
upgradeWFs['HLTTiming75e33AlpakaSingleIterLSTSeedingMkFitBuilding'].step3 = {
2053+
upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuilding'].step3 = {
20642054
'-s':'HARVESTING:@hltValidation'
20652055
}
20662056

0 commit comments

Comments
 (0)