Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use the gpu modifier to read the pixel clusters from the unpacker #31

Merged
merged 1 commit into from
Mar 1, 2018
Merged

Use the gpu modifier to read the pixel clusters from the unpacker #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion Configuration/StandardSequences/python/Reconstruction_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
from RecoPixelVertexing.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import *

from Configuration.Eras.Modifier_fastSim_cff import fastSim
from Configuration.ProcessModifiers.gpu_cff import gpu

siPixelClusterShapeCachePreSplitting = siPixelClusterShapeCache.clone(
src = 'siPixelClustersPreSplitting'
)
)
gpu.toModify(siPixelClusterShapeCachePreSplitting, src = "siPixelDigis")

# Global reco
from RecoEcal.Configuration.RecoEcal_cff import *
Expand Down
2 changes: 2 additions & 0 deletions DQM/TrackingMonitorSource/python/pixelTracksMonitoring_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import FWCore.ParameterSet.Config as cms
from Configuration.ProcessModifiers.gpu_cff import gpu

import DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi
pixelTracksMonitoring = DQM.TrackingMonitor.TrackerCollisionTrackingMonitor_cfi.TrackerCollisionTrackMon.clone()
Expand All @@ -21,3 +22,4 @@
pixelTracksMonitoring.doPlotsVsLUMI = True
pixelTracksMonitoring.doPlotsVsBX = True

gpu.toModify(pixelTracksMonitoring, pixelCluster4lumi = "siPixelDigis")
6 changes: 4 additions & 2 deletions RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizerPreSplitting_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@

import FWCore.ParameterSet.Config as cms

#
from CondTools.SiPixel.SiPixelGainCalibrationService_cfi import *
from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizer_cfi import siPixelClusters as _siPixelClusters
siPixelClustersPreSplitting = _siPixelClusters.clone()

# *only for the cms-patatrack repository*
# ensure reproducibility for CPU <--> GPU comparisons
siPixelClustersPreSplitting.payloadType = 'HLT'
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd expect this to get automatically propagated from SiPixelClusterizer_cfi.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, indeed.

8 changes: 1 addition & 7 deletions RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHitsGPU_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

siPixelRecHits = cms.EDProducer("SiPixelRecHitGPU",
src = cms.InputTag("siPixelDigis"),
# src = cms.InputTag("siPixelClusters"),
CPE = cms.string('PixelCPEFast'), # Generic'),
CPE = cms.string('PixelCPEFast'), # Generic
VerboseLevel = cms.untracked.int32(0),

)

siPixelRecHitsPreSplitting = siPixelRecHits.clone(
src = 'siPixelClustersPreSplitting'
)
4 changes: 2 additions & 2 deletions RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import FWCore.ParameterSet.Config as cms
from Configuration.ProcessModifiers.gpu_cff import gpu

siPixelRecHits = cms.EDProducer("SiPixelRecHitConverter",
src = cms.InputTag("siPixelClusters"),
CPE = cms.string('PixelCPEGeneric'),
VerboseLevel = cms.untracked.int32(0),

)

from RecoLocalTracker.SiPixelRecHits.SiPixelRecHitsGPU_cfi import siPixelRecHits as _siPixelRecHitsGPU
from Configuration.ProcessModifiers.gpu_cff import gpu
gpu.toReplaceWith(siPixelRecHits, _siPixelRecHitsGPU)

siPixelRecHitsPreSplitting = siPixelRecHits.clone(
src = 'siPixelClustersPreSplitting'
)
gpu.toModify(siPixelRecHitsPreSplitting, src = 'siPixelDigis')
3 changes: 3 additions & 0 deletions Validation/RecoTrack/python/TrackValidation_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg
import RecoTracker.IterativeTracking.iterativeTkUtils as _utils
from Configuration.Eras.Modifier_fastSim_cff import fastSim
from Configuration.ProcessModifiers.gpu_cff import gpu

### First define the stuff for the standard validation sequence
## Track selectors
Expand Down Expand Up @@ -712,6 +713,8 @@ def _uniqueFirstLayers(layerList):
tpClusterProducerPixelTrackingOnly = tpClusterProducer.clone(
pixelClusterSrc = "siPixelClustersPreSplitting"
)
gpu.toModify(tpClusterProducerPixelTrackingOnly, pixelClusterSrc = "siPixelDigis")

quickTrackAssociatorByHitsPixelTrackingOnly = quickTrackAssociatorByHits.clone(
cluster2TPSrc = "tpClusterProducerPixelTrackingOnly"
)
Expand Down