From b6b0c11c4fd2b515f2b6ef06dfed0d43d97f02a3 Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Tue, 14 Aug 2018 17:30:35 +0200 Subject: [PATCH] Clean up some non-GPU-related pixel tracking code Cleanup whitespaces and indenttion, plugin definitions, includes, and file names. Backport from the Patatrack fork: cms-patatrack#49, cms-patatrack#122, cms-patatrack#134. --- CalibTracker/SiPixelESProducers/BuildFile.xml | 2 -- .../SiPixelESProducers/plugins/BuildFile.xml | 2 -- .../StandardSequences/python/RawToDigi_cff.py | 3 +-- .../python/SiPixelRawToDigi_cfi.py | 8 -------- .../interface/phase1PixelTopology.h | 9 --------- .../python/RecoLocalTracker_cff.py | 17 ----------------- .../SiPixelClusterizer/plugins/BuildFile.xml | 11 +---------- .../SiPixelClusterizerPreSplitting_cfi.py | 5 ++--- .../SiPixelClusterizer/test/BuildFile.xml | 6 ------ RecoLocalTracker/SiPixelRecHits/BuildFile.xml | 4 ---- .../SiPixelRecHits/plugins/BuildFile.xml | 17 ++++++----------- .../python/PixelCPEESProducers_cff.py | 1 - .../SiPixelRecHits/python/SiPixelRecHits_cfi.py | 3 +-- 13 files changed, 11 insertions(+), 77 deletions(-) diff --git a/CalibTracker/SiPixelESProducers/BuildFile.xml b/CalibTracker/SiPixelESProducers/BuildFile.xml index 69d258da21ed1..e9d22b32f0afb 100644 --- a/CalibTracker/SiPixelESProducers/BuildFile.xml +++ b/CalibTracker/SiPixelESProducers/BuildFile.xml @@ -7,9 +7,7 @@ - - diff --git a/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml b/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml index b33657e273036..44db9d9ba0582 100644 --- a/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml +++ b/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml @@ -6,8 +6,6 @@ - - diff --git a/Configuration/StandardSequences/python/RawToDigi_cff.py b/Configuration/StandardSequences/python/RawToDigi_cff.py index 4380d33f134cc..e36243fc32f16 100644 --- a/Configuration/StandardSequences/python/RawToDigi_cff.py +++ b/Configuration/StandardSequences/python/RawToDigi_cff.py @@ -76,8 +76,7 @@ RawToDigi_pixelOnly = cms.Sequence(siPixelDigis) scalersRawToDigi.scalersInputTag = 'rawDataCollector' -from Configuration.ProcessModifiers.gpu_cff import gpu -(~gpu).toModify(siPixelDigis, InputLabel = 'rawDataCollector') +siPixelDigis.InputLabel = 'rawDataCollector' #false by default anyways ecalDigis.DoRegional = False ecalDigis.InputLabel = 'rawDataCollector' ecalPreshowerDigis.sourceTag = 'rawDataCollector' diff --git a/EventFilter/SiPixelRawToDigi/python/SiPixelRawToDigi_cfi.py b/EventFilter/SiPixelRawToDigi/python/SiPixelRawToDigi_cfi.py index 528ffa2683fa8..fda0b69fa46a1 100644 --- a/EventFilter/SiPixelRawToDigi/python/SiPixelRawToDigi_cfi.py +++ b/EventFilter/SiPixelRawToDigi/python/SiPixelRawToDigi_cfi.py @@ -1,6 +1,5 @@ import FWCore.ParameterSet.Config as cms import EventFilter.SiPixelRawToDigi.siPixelRawToDigi_cfi -import RecoLocalTracker.SiPixelClusterizer.siPixelDigiHeterogeneousConverter_cfi siPixelDigis = EventFilter.SiPixelRawToDigi.siPixelRawToDigi_cfi.siPixelRawToDigi.clone() siPixelDigis.Timing = cms.untracked.bool(False) @@ -21,10 +20,3 @@ from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel phase1Pixel.toModify(siPixelDigis, UsePhase1=True) - -_siPixelDigis_gpu = RecoLocalTracker.SiPixelClusterizer.siPixelDigiHeterogeneousConverter_cfi.siPixelDigiHeterogeneousConverter.clone() -_siPixelDigis_gpu.includeErrors = cms.bool(True) - -from Configuration.ProcessModifiers.gpu_cff import gpu -gpu.toReplaceWith(siPixelDigis, _siPixelDigis_gpu) - diff --git a/Geometry/TrackerGeometryBuilder/interface/phase1PixelTopology.h b/Geometry/TrackerGeometryBuilder/interface/phase1PixelTopology.h index 37c97a92a3eaa..455de58ce3408 100644 --- a/Geometry/TrackerGeometryBuilder/interface/phase1PixelTopology.h +++ b/Geometry/TrackerGeometryBuilder/interface/phase1PixelTopology.h @@ -20,15 +20,6 @@ namespace phase1PixelTopology { constexpr uint32_t numPixsInModule = uint32_t(numRowsInModule)* uint32_t(numColsInModule); - constexpr uint32_t numberOfModules = 1856; - - constexpr uint32_t layerStart[11] = {0,96,320,672,1184,1296,1408,1520,1632,1744,1856}; - constexpr char const * layerName[10] = {"BL1","BL2","BL3","BL4", - "E+1", "E+2", "E+3", - "E-1", "E-2", "E-3" - }; - - // this is for the ROC n<512 (upgrade 1024) constexpr inline uint16_t divu52(uint16_t n) { diff --git a/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py b/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py index 6d803d40bc870..0692d49f0068f 100644 --- a/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py +++ b/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py @@ -17,23 +17,6 @@ striptrackerlocalreco = cms.Sequence(siStripZeroSuppression*siStripClusters*siStripMatchedRecHits) trackerlocalreco = cms.Sequence(pixeltrackerlocalreco*striptrackerlocalreco*clusterSummaryProducer) - -from RecoLocalTracker.SiPixelClusterizer.siPixelClustersHeterogeneous_cfi import * -from RecoLocalTracker.SiPixelClusterizer.siPixelFedCablingMapGPUWrapper_cfi import * -from CalibTracker.SiPixelESProducers.siPixelGainCalibrationForHLTGPU_cfi import * - -from RecoLocalTracker.SiPixelRecHits.siPixelRecHitHeterogeneous_cfi import * -from RecoLocalTracker.SiPixelRecHits.siPixelRecHitHeterogeneousConverter_cfi import siPixelRecHitHeterogeneousConverter as _siPixelRecHitHeterogeneousConverter -gpu.toReplaceWith(siPixelRecHitsPreSplitting, _siPixelRecHitHeterogeneousConverter.clone()) - - - -from Configuration.ProcessModifiers.gpu_cff import gpu -_pixeltrackerlocalreco_gpu = pixeltrackerlocalreco.copy() -_pixeltrackerlocalreco_gpu.replace(siPixelClustersPreSplitting, siPixelClustersHeterogeneous+siPixelClustersPreSplitting) -_pixeltrackerlocalreco_gpu.replace(siPixelRecHitsPreSplitting, siPixelRecHitHeterogeneous+siPixelRecHitsPreSplitting) -gpu.toReplaceWith(pixeltrackerlocalreco, _pixeltrackerlocalreco_gpu) - from RecoLocalTracker.SiPhase2Clusterizer.phase2TrackerClusterizer_cfi import * from RecoLocalTracker.Phase2TrackerRecHits.Phase2StripCPEGeometricESProducer_cfi import * diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml index 9db4a46f367b3..f6958151bdb91 100644 --- a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml +++ b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml @@ -3,16 +3,7 @@ - - - - - - - - - - + diff --git a/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizerPreSplitting_cfi.py b/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizerPreSplitting_cfi.py index 4e6ff591fb78a..ba8d492c5f610 100644 --- a/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizerPreSplitting_cfi.py +++ b/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizerPreSplitting_cfi.py @@ -1,8 +1,7 @@ + import FWCore.ParameterSet.Config as cms +# from CondTools.SiPixel.SiPixelGainCalibrationService_cfi import * from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizer_cfi import siPixelClusters as _siPixelClusters siPixelClustersPreSplitting = _siPixelClusters.clone() - -# In principle we could remove `siPixelClustersPreSplitting` from the `pixeltrackerlocalreco` -# sequence when the `gpu` modufier is active; for the time being we keep it for simplicity. diff --git a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml index 3fc830883ca58..3445783781551 100644 --- a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml +++ b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml @@ -31,9 +31,3 @@ - - - - - - diff --git a/RecoLocalTracker/SiPixelRecHits/BuildFile.xml b/RecoLocalTracker/SiPixelRecHits/BuildFile.xml index c52545a601341..4fc33a07b7477 100644 --- a/RecoLocalTracker/SiPixelRecHits/BuildFile.xml +++ b/RecoLocalTracker/SiPixelRecHits/BuildFile.xml @@ -12,10 +12,6 @@ - - - - diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml index a8af0c8a7c4f9..0b477d0fb2d34 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml +++ b/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml @@ -1,12 +1,7 @@ - - - - - - - - - - - + + + + + + diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEESProducers_cff.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEESProducers_cff.py index 8e28bbb175181..a1ff25af2e697 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEESProducers_cff.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEESProducers_cff.py @@ -19,7 +19,6 @@ # 4. Pixel Generic CPE # from RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi import * -from RecoLocalTracker.SiPixelRecHits.PixelCPEFast_cfi import * # # 5. ESProducer for the Magnetic-field dependent template records # diff --git a/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py index 5844235e29596..465aa0bb346ce 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py @@ -1,10 +1,9 @@ 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), + VerboseLevel = cms.untracked.int32(0) ) siPixelRecHitsPreSplitting = siPixelRecHits.clone(