Clean up some non-GPU-related pixel tracking code

Cleanup whitespaces and indenttion, plugin definitions, includes, and file names. Backport from the Patatrack fork: #49, #122, #134.
cms-patatrack · Oct 19, 2020 · b6b3540 · b6b3540
1 parent 061050d
commit b6b3540
Show file tree

Hide file tree

Showing 14 changed files with 11 additions and 85 deletions.
diff --git a/CalibTracker/SiPixelESProducers/BuildFile.xml b/CalibTracker/SiPixelESProducers/BuildFile.xml
@@ -7,9 +7,7 @@
 <use   name="DataFormats/SiPixelDigi"/>
 <use   name="CalibTracker/Records"/>
 <use   name="MagneticField/VolumeBasedEngine"/>
-<use   name="HeterogeneousCore/CUDACore"/>
 <use   name="boost"/>
-<use   name="cuda-api-wrappers"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml b/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml
@@ -6,8 +6,6 @@
 <use   name="Geometry/Records"/>
 <use   name="Geometry/TrackerGeometryBuilder"/>
 <use   name="CalibTracker/SiPixelESProducers"/>
-<use   name="HeterogeneousCore/CUDACore"/>
-<use   name="cuda-api-wrappers"/>
 <library   file="*.cc" name="CalibTrackerSiPixelESProducersPlugins">
   <flags   EDM_PLUGIN="1"/>
 </library>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -3,16 +3,7 @@
 <use   name="DataFormats/SiPixelDetId"/>
 <use   name="DataFormats/SiPixelCluster"/>
 <use   name="boost_serialization"/>
-<use   name="RecoLocalTracker/SiPixelClusterizer"/>
-<use   name="RecoTracker/Record"/>
 <use   name="CalibTracker/SiPixelESProducers"/>
-<use   name="EventFilter/SiPixelRawToDigi"/>
-<use   name="HeterogeneousCore/Producer"/>
-<use   name="HeterogeneousCore/Product"/>
-<use   name="HeterogeneousCore/CUDACore"/>
-<use   name="cuda"/>
-<use   name="cuda-api-wrappers"/>
-<use   name="cub"/>
-<library   file="*.cc *.cu" name="RecoLocalTrackerSiPixelClusterizerPlugins">
+<library   file="*.cc" name="RecoLocalTrackerSiPixelClusterizerPlugins">
   <flags   EDM_PLUGIN="1"/>
 </library>
diff --git 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/python/SiPixelClusterizer_cfi.py b/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizer_cfi.py
@@ -27,10 +27,6 @@
     maxNumberOfClusters = cms.int32(-1), # -1 means no limit.
 )
 
-# *only for the cms-patatrack repository*
-# ensure reproducibility for CPU <--> GPU comparisons
-siPixelClusters.payloadType = "HLT"
-
 # phase1 pixel
 from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
 phase1Pixel.toModify(siPixelClusters,
@@ -56,7 +52,3 @@
 (premix_stage2 & phase2_tracker).toModify(siPixelClusters,
     src = "mixData:Pixel"
 )
-
-from Configuration.ProcessModifiers.gpu_cff import gpu
-from RecoLocalTracker.SiPixelClusterizer.siPixelClusterHeterogeneousConverter_cfi import siPixelClusterHeterogeneousConverter as _siPixelClusterHeterogeneousConverter
-gpu.toReplaceWith(siPixelClusters, _siPixelClusterHeterogeneousConverter.clone())
diff --git a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml
@@ -31,9 +31,3 @@
 <library file="Triplet.cc" name="Triplet">
   <flags EDM_PLUGIN="1"/>
 </library>
-
-<bin file="gpuClustering.cu" name="gpuClustering_t">
-  <use name="cuda"/>
-  <use name="cuda-api-wrappers"/>
-  <flags CXXFLAGS="-g"/>
-</bin>
diff --git a/RecoLocalTracker/SiPixelRecHits/BuildFile.xml b/RecoLocalTracker/SiPixelRecHits/BuildFile.xml
@@ -12,10 +12,6 @@
 <use   name="boost"/>
 <use   name="vdt_headers"/>
 
-<use   name="cuda"/>
-<use   name="cuda-api-wrappers"/>
-<use   name="HeterogeneousCore/CUDAServices"/>
-
 <export>
   <lib   name="1"/>
 </export>
diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml
@@ -1,12 +1,7 @@
-<use name="DataFormats/TrackerCommon"/>
-<use name="HeterogeneousCore/CUDACore"/>
-<use name="HeterogeneousCore/Producer"/>
-<use name="HeterogeneousCore/Product"/>
-<use name="RecoLocalTracker/ClusterParameterEstimator"/>
-<use name="RecoLocalTracker/Records"/>
-<use name="RecoLocalTracker/SiPixelRecHits"/>
-<library file="*.cc *.cu" name="RecoLocalTrackerSiPixelRecHitsPlugins">
-  <use name="cuda"/>
-  <use name="cuda-api-wrappers"/>
-  <flags EDM_PLUGIN="1"/>
+<use   name="RecoLocalTracker/ClusterParameterEstimator"/>
+<use   name="RecoLocalTracker/Records"/>
+<use   name="RecoLocalTracker/SiPixelRecHits"/>
+<use   name="DataFormats/TrackerCommon"/>
+<library   file="*.cc" name="RecoLocalTrackerSiPixelRecHitsPlugins">
+  <flags   EDM_PLUGIN="1"/>
 </library>
diff --git 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
@@ -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(