Skip to content

Commit 9f75c01

Browse files
cmsbuildcmsbuild
authored
Merge pull request cms-sw#41632 from AdrianoDee/more_configurable_ca_hion
More Configurable Pixel Tracks and HIon Template
2 parents 3408cbd + 0c04805 commit 9f75c01

File tree

64 files changed

+931
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+931
-291
lines changed

‎CUDADataFormats/SiPixelCluster/interface/gpuClusteringConstants.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ namespace gpuClustering {
1313
// tested on MC events with 55-75 pileup events
1414
constexpr uint32_t maxHitsInIter() { return 160; } //TODO better tuning for PU 140-200
1515
#endif
16-
constexpr uint32_t maxHitsInModule() { return 1024; }
1716

18-
constexpr uint32_t maxNumDigis = 3 * 256 * 1024; // @PU=200 µ=530k σ=50k this is >4σ away
17+
constexpr uint16_t clusterThresholdLayerOne = 2000;
18+
constexpr uint16_t clusterThresholdOtherLayers = 4000;
19+
20+
constexpr uint32_t maxNumDigis = 3 * 256 * 1024; // @PU=200 µ=530 σ=50k this is >4σ away
1921
constexpr uint16_t maxNumModules = 4000;
2022

21-
constexpr int32_t maxNumClustersPerModules = maxHitsInModule();
2223
constexpr uint16_t invalidModuleId = std::numeric_limits<uint16_t>::max() - 1;
2324
constexpr int invalidClusterId = -9999;
2425
static_assert(invalidModuleId > maxNumModules); // invalidModuleId must be > maxNumModules

‎CUDADataFormats/Track/interface/TrackSoAHeterogeneousDevice.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ namespace pixelTrack {
3030

3131
using TrackSoADevicePhase1 = TrackSoAHeterogeneousDevice<pixelTopology::Phase1>;
3232
using TrackSoADevicePhase2 = TrackSoAHeterogeneousDevice<pixelTopology::Phase2>;
33+
using TrackSoADeviceHIonPhase1 = TrackSoAHeterogeneousDevice<pixelTopology::HIonPhase1>;
3334

3435
} // namespace pixelTrack
3536

‎CUDADataFormats/Track/interface/TrackSoAHeterogeneousHost.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace pixelTrack {
2929

3030
using TrackSoAHostPhase1 = TrackSoAHeterogeneousHost<pixelTopology::Phase1>;
3131
using TrackSoAHostPhase2 = TrackSoAHeterogeneousHost<pixelTopology::Phase2>;
32-
32+
using TrackSoAHostHIonPhase1 = TrackSoAHeterogeneousHost<pixelTopology::HIonPhase1>;
3333
} // namespace pixelTrack
3434

3535
#endif // CUDADataFormats_Track_TrackHeterogeneousT_H

‎CUDADataFormats/Track/src/classes_def.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,10 @@
1212
<class name="cms::cuda::Product<pixelTrack::TrackSoADevicePhase2>" persistent="false"/>
1313
<class name="edm::Wrapper<cms::cuda::Product<pixelTrack::TrackSoADevicePhase2>>" persistent="false"/>
1414

15+
<class name="pixelTrack::TrackSoAHostHIonPhase1" persistent="false"/>
16+
<class name="edm::Wrapper<pixelTrack::TrackSoAHostHIonPhase1>" persistent="false"/>
17+
<class name="pixelTrack::TrackSoADeviceHIonPhase1" persistent="false"/>
18+
<class name="cms::cuda::Product<pixelTrack::TrackSoADeviceHIonPhase1>" persistent="false"/>
19+
<class name="edm::Wrapper<cms::cuda::Product<pixelTrack::TrackSoADeviceHIonPhase1>>" persistent="false"/>
20+
1521
</lcgdict>

‎CUDADataFormats/TrackingRecHit/interface/TrackingRecHitSoADevice.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ class TrackingRecHitSoADevice : public cms::cuda::PortableDeviceCollection<Track
7777
//Classes definition for Phase1/Phase2, to make the classes_def lighter. Not actually used in the code.
7878
using TrackingRecHitSoADevicePhase1 = TrackingRecHitSoADevice<pixelTopology::Phase1>;
7979
using TrackingRecHitSoADevicePhase2 = TrackingRecHitSoADevice<pixelTopology::Phase2>;
80+
using TrackingRecHitSoADeviceHIonPhase1 = TrackingRecHitSoADevice<pixelTopology::HIonPhase1>;
8081

8182
#endif // CUDADataFormats_Track_TrackHeterogeneousT_H

‎CUDADataFormats/TrackingRecHit/interface/TrackingRecHitSoAHost.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,6 @@ class TrackingRecHitSoAHost : public cms::cuda::PortableHostCollection<TrackingR
6767

6868
using TrackingRecHitSoAHostPhase1 = TrackingRecHitSoAHost<pixelTopology::Phase1>;
6969
using TrackingRecHitSoAHostPhase2 = TrackingRecHitSoAHost<pixelTopology::Phase2>;
70+
using TrackingRecHitSoAHostHIonPhase1 = TrackingRecHitSoAHost<pixelTopology::HIonPhase1>;
7071

7172
#endif // CUDADataFormats_Track_TrackHeterogeneousT_H

‎CUDADataFormats/TrackingRecHit/src/classes_def.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@
33
<class name="TrackingRecHitSoAHostPhase1" persistent="false"/>
44
<class name="edm::Wrapper<TrackingRecHitSoAHostPhase1>" persistent="false"/>
55

6+
<class name="TrackingRecHitSoAHostHIonPhase1" persistent="false"/>
7+
<class name="edm::Wrapper<TrackingRecHitSoAHostHIonPhase1>" persistent="false"/>
8+
69
<class name="TrackingRecHitSoAHostPhase2" persistent="false"/>
710
<class name="edm::Wrapper<TrackingRecHitSoAHostPhase2>" persistent="false"/>
811

9-
<class name="TrackingRecHitSoADevicePhase1" persistent="false"/>
1012
<class name="cms::cuda::Product<TrackingRecHitSoADevicePhase1>" persistent="false"/>
1113
<class name="edm::Wrapper<cms::cuda::Product<TrackingRecHitSoADevicePhase1>>" persistent="false"/>
1214

1315
<class name="cms::cuda::Product<TrackingRecHitSoADevicePhase2>" persistent="false"/>
1416
<class name="edm::Wrapper<cms::cuda::Product<TrackingRecHitSoADevicePhase2>>" persistent="false"/>
1517

18+
<class name="cms::cuda::Product<TrackingRecHitSoADeviceHIonPhase1>" persistent="false"/>
19+
<class name="edm::Wrapper<cms::cuda::Product<TrackingRecHitSoADeviceHIonPhase1>>" persistent="false"/>
20+
1621
</lcgdict>

‎Configuration/PyReleaseValidation/python/relval_gpu.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@
6767
# data 2023 Patatrack pixel-only triplets: RunJetMET2022D on GPU (optional)
6868
# Patatrack ECAL-only: RunJetMET2022D on GPU (optional)
6969
# Patatrack HCAL-only: RunJetMET2022D on GPU (optional)
70-
7170
workflows[141.008506] = ['Run3-2023_JetMET2023B_RecoPixelOnlyTripletsGPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_Patatrack_PixelOnlyTripletsGPU','HARVESTRUN3_pixelTrackingOnly']]
7271
workflows[141.008512] = ['Run3-2023_JetMET2023B_RecoECALOnlyGPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_ECALOnlyGPU','HARVESTRUN3_ECALOnly']]
7372
workflows[141.008522] = ['Run3-2023_JetMET2023B_RecoHCALOnlyGPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_HCALOnlyGPU','HARVESTRUN3_HCALOnly']]
73+
#2023 HIon MC Patatrack pixel-only quadruplets on HydjetQ_MinBias_5362GeV_2023_ppReco on GPU (optional)
74+
workflows[160.502] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackGPU','MINIHI2023PROD']]

‎Configuration/PyReleaseValidation/python/relval_standard.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -824,6 +824,8 @@
824824
workflows[160.2] = ['',['PhotonJets_Pt_10_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']]
825825
workflows[160.3] = ['',['ZMM_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']]
826826
workflows[160.4] = ['',['ZEE_5362_HI_2023','DIGIHI2023PPRECO','RECOHI2023PPRECO','HARVESTHI2023PPRECO']]
827+
# Patatrack Pixel Tracks on CPU
828+
workflows[160.501] = ['',['HydjetQ_MinBias_5362GeV_2023_ppReco','DIGIHI2023PPRECO','RAWPRIMESIMHI18','RECOHI2023PPRECOMB_PatatrackCPU','MINIHI2023PROD']]
827829

828830
### pp reference test ###
829831
workflows[149] = ['',['QCD_Pt_80_120_13_PPREF','DIGIPPREF2017','RECOPPREF2017','HARVESTPPREF2017']]

‎Configuration/PyReleaseValidation/python/relval_steps.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3013,6 +3013,18 @@ def gen2023HiMix(fragment,howMuch):
30133013
'--era':'Run3_pp_on_PbPb_2023',
30143014
'--procModifiers':'genJetSubEvent',
30153015
},step3Up2015Defaults])
3016+
steps['RECOHI2023PPRECOMB_PatatrackGPU']=merge([hiDefaults2023_ppReco,step3_pixel_ntuplet_gpu,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
3017+
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
3018+
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
3019+
'--era':'Run3_pp_on_PbPb',
3020+
'--procModifiers':'genJetSubEvent',
3021+
},step3Up2015Defaults])
3022+
steps['RECOHI2023PPRECOMB_PatatrackCPU']=merge([hiDefaults2023_ppReco,step3_pixel_ntuplet_cpu,{'-s':'RAW2DIGI,L1Reco,RECO,PAT,VALIDATION:@standardValidationNoHLT+@miniAODValidation,DQM:@standardDQMFakeHLT+@miniAODDQM',
3023+
'--datatier':'GEN-SIM-RECO,MINIAODSIM,DQMIO',
3024+
'--eventcontent':'RECOSIM,MINIAODSIM,DQM',
3025+
'--era':'Run3_pp_on_PbPb',
3026+
'--procModifiers':'genJetSubEvent',
3027+
},step3Up2015Defaults])
30163028
steps['REMINIAODHI2023PPRECOMB']=merge([{'-s':'PAT,VALIDATION:@miniAODValidation,DQM:@miniAODDQM',
30173029
'--datatier':'MINIAODSIM,DQMIO',
30183030
'--eventcontent':'MINIAODSIM,DQM',

0 commit comments

Comments
 (0)