Skip to content

Commit f76f302

Browse files
authored
Merge pull request #49147 from AdrianoDee/fix_npairs_160X
Fix for `startingPairs` for Pixel Tracks CA
2 parents 751e2f0 + 2e4ddec commit f76f302

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

HLTrigger/Configuration/python/customizeHLTforCMSSW.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,21 @@ def customiseForOffline(process):
3636
]
3737

3838
return process
39+
def customizeHLTFor49147(process):
40+
ca_producers_pp = ['CAHitNtupletAlpakaPhase1@alpaka','alpaka_serial_sync::CAHitNtupletAlpakaPhase1']
41+
for ca_producer in ca_producers_pp:
42+
for prod in producers_by_type(process, ca_producer):
43+
if hasattr(prod, 'geometry'):
44+
g = getattr(prod, 'geometry')
45+
g.startingPairs = cms.vuint32( [i for i in range(8)] + [i for i in range(13,19)])
46+
setattr(prod, 'geometry', g)
47+
return process
3948

4049
# CMSSW version specific customizations
4150
def customizeHLTforCMSSW(process, menuType="GRun"):
4251

4352
process = customiseForOffline(process)
44-
53+
process = customizeHLTFor49147(process)
4554
# add call to action function in proper order: newest last!
4655
# process = customiseFor12718(process)
4756

RecoTracker/Configuration/python/customizePixelTracksForTriplets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def customizePixelTracksForTriplets(process):
2727
9, 0, 2, 1, 3,
2828
0, 5, 0, 8,
2929
4, 6, 7, 9 ]
30-
producer.geometry.startingPairs = [i for i in range(8)] + [13, 14, 15, 16, 17, 18, 19]
30+
producer.geometry.startingPairs = [i for i in range(8)] + [13, 14, 15, 16, 17, 18]
3131
producer.geometry.phiCuts = [522, 730, 730, 522, 626,
3232
626, 522, 522, 626, 626,
3333
626, 522, 522, 522, 522,

RecoTracker/PixelSeeding/plugins/alpaka/CAHitNtuplet.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ namespace ALPAKA_ACCELERATOR_NAMESPACE {
120120
#endif
121121

122122
assert(int(n_pairs) == int(iCache->minZ_.size()));
123-
assert(int(*std::max_element(iCache->startingPairs_.begin(), iCache->startingPairs_.end())) <= n_pairs);
123+
assert(int(*std::max_element(iCache->startingPairs_.begin(), iCache->startingPairs_.end())) < n_pairs);
124124
assert(int(*std::max_element(iCache->pairGraph_.begin(), iCache->pairGraph_.end())) < n_layers);
125125

126126
const auto& trackerGeometry = iSetup.getData(iCache->tokenGeometry_);

0 commit comments

Comments
 (0)