Synchronise with CMSSW_11_1_0_pre5

cms-patatrack · Dec 25, 2020 · b8e29b0 · b8e29b0
1 parent a3ad5cb
commit b8e29b0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCRandom_cff.py
@@ -21,8 +21,8 @@
 
 from Calibration.LumiAlCaRecoProducers.alcaPCCProducer_cfi import alcaPCCProducer
 alcaPCCProducerRandom = alcaPCCProducer.clone()
-alcaPCCProducerRandom.AlcaPCCProducerParameters.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiR")
-alcaPCCProducerRandom.AlcaPCCProducerParameters.trigstring        = cms.untracked.string("alcaPCCRandom")
+alcaPCCProducerRandom.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiR")
+alcaPCCProducerRandom.trigstring        = cms.untracked.string("alcaPCCRandom")
 
 # Sequence #
 seqALCARECOAlCaPCCRandom = cms.Sequence(ALCARECORandomHLT + siPixelDigisForLumiR + siPixelClustersForLumiR + alcaPCCProducerRandom)
diff --git a/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_cff.py b/Calibration/LumiAlCaRecoProducers/python/ALCARECOAlCaPCCZeroBias_cff.py
@@ -21,8 +21,8 @@
 
 from Calibration.LumiAlCaRecoProducers.alcaPCCProducer_cfi import alcaPCCProducer
 alcaPCCProducerZeroBias = alcaPCCProducer.clone()
-alcaPCCProducerZeroBias.AlcaPCCProducerParameters.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiZB")
-alcaPCCProducerZeroBias.AlcaPCCProducerParameters.trigstring        = cms.untracked.string("alcaPCCZeroBias")
+alcaPCCProducerZeroBias.pixelClusterLabel = cms.InputTag("siPixelClustersForLumiZB")
+alcaPCCProducerZeroBias.trigstring        = cms.untracked.string("alcaPCCZeroBias")
 
 # Sequence #
 seqALCARECOAlCaPCCZeroBias = cms.Sequence(ALCARECOZeroBiasHLT + siPixelDigisForLumiZB + siPixelClustersForLumiZB + alcaPCCProducerZeroBias)
diff --git a/RecoLocalTracker/SiPixelRecHits/BuildFile.xml b/RecoLocalTracker/SiPixelRecHits/BuildFile.xml
@@ -1,14 +1,13 @@
 <use   name="FWCore/Framework"/>
-
 <use   name="FWCore/ParameterSet"/>
-
 <use   name="CondFormats/SiPixelObjects"/>
 <use   name="CalibTracker/SiPixelESProducers"/>
 <use   name="DataFormats/TrackerCommon"/>
 <use   name="DataFormats/SiPixelCluster"/>
 <use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="TrackingTools/TrajectoryState"/>
 <use   name="CondFormats/SiPixelTransient"/>
+<use   name="RecoLocalTracker/ClusterParameterEstimator"/>
+
 <use   name="boost"/>
 <use   name="vdt_headers"/>