From 64d0c247e555e34942fe67485008049f1de50ffa Mon Sep 17 00:00:00 2001 From: cmsbuild Date: Tue, 25 Sep 2018 15:54:17 +0200 Subject: [PATCH] Merge pull request #24530 from thomreis/l1t_dqm_hi_conf_fix_v2_102x L1T DQM - Add missing HI rawDataRepacker changes - 102x --- .../beampixel_dqm_sourceclient-live_cfg.py | 230 ++++++++++-------- .../l1tstage2_dqm_sourceclient-live_cfg.py | 11 +- ...tage2emulator_dqm_sourceclient-live_cfg.py | 9 +- .../SiPixelRawToDigi/plugins/BuildFile.xml | 6 +- .../python/SiPixelRecHits_cfi.py | 3 +- 5 files changed, 153 insertions(+), 106 deletions(-) diff --git a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py index b5c92413c1cf5..422e28c40a4bf 100644 --- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py @@ -63,51 +63,32 @@ #---------------------------- -# Tracking Configuration -#---------------------------- -process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker") -process.csctfDigis.producer = cms.InputTag("rawDataRepacker") -process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataRepacker") -process.ecalDigis.InputLabel = cms.InputTag("rawDataRepacker") -process.ecalPreshowerDigis.sourceTag = cms.InputTag("rawDataRepacker") -process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker") -process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker") -process.hcalDigis.InputLabel = cms.InputTag("rawDataRepacker") -process.muonCSCDigis.InputObjects = cms.InputTag("rawDataRepacker") -process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker") -process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker") -process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker") -process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker") -process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker") - -process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") -process.load("RecoLocalTracker.Configuration.RecoLocalTracker_cff") -process.load("TrackingTools.TransientTrack.TransientTrackBuilder_cfi") - - -#---------------------------- -# Pixel-Tracks&Vertices Config -#---------------------------- -from RecoPixelVertexing.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import * -process.siPixelClusterShapeCachePreSplitting = siPixelClusterShapeCache.clone(src = 'siPixelClustersPreSplitting') -process.load("RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi") -process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff") -process.pixelVertices.TkFilterParameters.minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin -process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4 -process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 15. -process.pixelTracksTrackingRegions.RegionPSet.originXPos = 0.08 -process.pixelTracksTrackingRegions.RegionPSet.originYPos = -0.03 -process.pixelTracksTrackingRegions.RegionPSet.originZPos = 0. - - -#---------------------------- -# Proton-Proton Specific Section +# Proton-Proton Specific Part #---------------------------- if (process.runType.getRunType() == process.runType.pp_run or process.runType.getRunType() == process.runType.pp_run_stage1 or process.runType.getRunType() == process.runType.cosmic_run or process.runType.getRunType() == process.runType.cosmic_run_stage1 or process.runType.getRunType() == process.runType.hpu_run): print "[beampixel_dqm_sourceclient-live_cfg]::running pp" + process.castorDigis.InputLabel = cms.InputTag("rawDataCollector") + process.csctfDigis.producer = cms.InputTag("rawDataCollector") + process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataCollector") + process.ecalDigis.InputLabel = cms.InputTag("rawDataCollector") + process.ecalPreshowerDigis.sourceTag = cms.InputTag("rawDataCollector") + process.gctDigis.inputLabel = cms.InputTag("rawDataCollector") + process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataCollector") + process.hcalDigis.InputLabel = cms.InputTag("rawDataCollector") + process.muonCSCDigis.InputObjects = cms.InputTag("rawDataCollector") + process.muonDTDigis.inputLabel = cms.InputTag("rawDataCollector") + process.muonRPCDigis.InputLabel = cms.InputTag("rawDataCollector") + process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataCollector") + process.siPixelDigis.InputLabel = cms.InputTag("rawDataCollector") + process.siStripDigis.ProductLabel = cms.InputTag("rawDataCollector") + + process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") + process.load("RecoLocalTracker.Configuration.RecoLocalTracker_cff") + process.load("TrackingTools.TransientTrack.TransientTrackBuilder_cfi") + #---------------------------- # pixelVertexDQM Config @@ -134,20 +115,80 @@ minVxDoF = cms.double(10.0), minVxWgt = cms.double(0.5), fileName = cms.string("/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt")) + if process.dqmRunConfig.type.value() is "production": + process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmpro/BeamMonitorDQM/BeamPixelResults.txt") + else: + process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt") + print "[beampixel_dqm_sourceclient-live_cfg]::saving DIP file into " + str(process.pixelVertexDQM.fileName) + + + #---------------------------- + # Pixel-Tracks&Vertices Config + #---------------------------- + from RecoPixelVertexing.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import * + process.siPixelClusterShapeCachePreSplitting = siPixelClusterShapeCache.clone(src = 'siPixelClustersPreSplitting') + process.load("RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi") + process.load("RecoPixelVertexing.Configuration.RecoPixelVertexing_cff") + process.pixelVertices.TkFilterParameters.minPt = process.pixelTracksTrackingRegions.RegionPSet.ptMin + process.pixelTracksTrackingRegions.RegionPSet.originRadius = 0.4 + process.pixelTracksTrackingRegions.RegionPSet.originHalfLength = 15. + process.pixelTracksTrackingRegions.RegionPSet.originXPos = 0.08 + process.pixelTracksTrackingRegions.RegionPSet.originYPos = -0.03 + process.pixelTracksTrackingRegions.RegionPSet.originZPos = 0. + + + #---------------------------- + # Pixel-Tracks&Vertices Reco + #---------------------------- + process.reconstructionStep = cms.Sequence(process.siPixelDigis* + process.siStripDigis* + process.striptrackerlocalreco* + process.offlineBeamSpot* + process.siPixelClustersPreSplitting* + process.siPixelRecHitsPreSplitting* + process.siPixelClusterShapeCachePreSplitting* + process.recopixelvertexing) + + + #---------------------------- + # Define Path + #---------------------------- + process.p = cms.Path(process.scalersRawToDigi*process.physTrigger*process.reconstructionStep*process.pixelVertexDQM*process.dqmModules) + + #---------------------------- -# Heavy Ion Specific Section +# Heavy Ion Specific Part #---------------------------- if (process.runType.getRunType() == process.runType.hi_run): print "[beampixel_dqm_sourceclient-live_cfg]::running HI" + process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.csctfDigis.producer = cms.InputTag("rawDataRepacker") + process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataRepacker") + process.ecalDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.ecalPreshowerDigis.sourceTag = cms.InputTag("rawDataRepacker") + process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker") + process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker") + process.hcalDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.muonCSCDigis.InputObjects = cms.InputTag("rawDataRepacker") + process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker") + process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker") + process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker") + + process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi") + process.load("Configuration.StandardSequences.ReconstructionHeavyIons_cff") + process.load("RecoLocalTracker.Configuration.RecoLocalTrackerHeavyIons_cff") + #---------------------------- # pixelVertexDQM Config #---------------------------- process.pixelVertexDQM = DQMEDAnalyzer('Vx3DHLTAnalyzer', - vertexCollection = cms.untracked.InputTag("pixelVertices"), + vertexCollection = cms.untracked.InputTag("hiSelectedVertexPreSplitting"), pixelHitCollection = cms.untracked.InputTag("siPixelRecHitsPreSplitting"), debugMode = cms.bool(True), nLumiFit = cms.uint32(5), @@ -168,66 +209,57 @@ minVxDoF = cms.double(10.0), minVxWgt = cms.double(0.5), fileName = cms.string("/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt")) + if process.dqmRunConfig.type.value() is "production": + process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmpro/BeamMonitorDQM/BeamPixelResults.txt") + else: + process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt") + print "[beampixel_dqm_sourceclient-live_cfg]::saving DIP file into " + str(process.pixelVertexDQM.fileName) #---------------------------- # Pixel-Tracks&Vertices Config #---------------------------- - from RecoVertex.PrimaryVertexProducer.TkClusParameters_cff import DA_vectParameters - offlinePrimaryVertices = cms.EDProducer( - "PrimaryVertexProducer", - verbose = cms.untracked.bool(False), - TrackLabel = cms.InputTag("generalTracks"), - beamSpotLabel = cms.InputTag("offlineBeamSpot"), - TkFilterParameters = cms.PSet( - algorithm = cms.string('filter'), - maxNormalizedChi2 = cms.double(10.0), - minPixelLayersWithHits = cms.int32(2), - minSiliconLayersWithHits = cms.int32(5), - maxD0Significance = cms.double(4.0), - minPt = cms.double(0.0), - maxEta = cms.double(2.4), - trackQuality = cms.string("any")), - TkClusParameters = DA_vectParameters, - vertexCollections = cms.VPSet( - [cms.PSet(label = cms.string(""), - algorithm = cms.string("AdaptiveVertexFitter"), - chi2cutoff = cms.double(2.5), - minNdof = cms.double(0.0), - useBeamConstraint = cms.bool(False), - maxDistanceToBeam = cms.double(1.0)), - cms.PSet(label = cms.string("WithBS"), - algorithm = cms.string('AdaptiveVertexFitter'), - chi2cutoff = cms.double(2.5), - minNdof = cms.double(2.0), - useBeamConstraint = cms.bool(True), - maxDistanceToBeam = cms.double(1.0))])) - - -#---------------------------- -# File to save beamspot info -#---------------------------- -if process.dqmRunConfig.type.value() is "production": - process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmpro/BeamMonitorDQM/BeamPixelResults.txt") -else: - process.pixelVertexDQM.fileName = cms.string("/nfshome0/dqmdev/BeamMonitorDQM/BeamPixelResults.txt") -print "[beampixel_dqm_sourceclient-live_cfg]::saving DIP file into " + str(process.pixelVertexDQM.fileName) - - -#---------------------------- -# Pixel-Tracks&Vertices Reco -#---------------------------- -process.reconstructionStep = cms.Sequence(process.siPixelDigis* - process.siStripDigis* - process.striptrackerlocalreco* - process.offlineBeamSpot* - process.siPixelClustersPreSplitting* - process.siPixelRecHitsPreSplitting* - process.siPixelClusterShapeCachePreSplitting* - process.recopixelvertexing) - - -#---------------------------- -# Define Path -#---------------------------- -process.p = cms.Path(process.scalersRawToDigi*process.physTrigger*process.reconstructionStep*process.pixelVertexDQM*process.dqmModules) + from RecoPixelVertexing.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import * + from RecoPixelVertexing.PixelLowPtUtilities.siPixelClusterShapeCache_cfi import * + siPixelClusterShapeCachePreSplitting = siPixelClusterShapeCache.clone(src = 'siPixelClustersPreSplitting') + + from RecoHI.HiTracking.HIPixelVerticesPreSplitting_cff import * + process.PixelLayerTriplets.BPix.HitProducer = cms.string("siPixelRecHitsPreSplitting") + process.PixelLayerTriplets.FPix.HitProducer = cms.string("siPixelRecHitsPreSplitting") + + process.hiPixel3PrimTracksFilter = process.hiFilter.clone(VertexCollection = cms.InputTag("hiSelectedVertexPreSplitting"), + clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCachePreSplitting")) + process.hiPixel3PrimTracks.Filter = cms.InputTag("hiPixel3PrimTracksFilter") + process.hiPixel3PrimTracks.ComponentName = cms.string("GlobalTrackingRegionWithVerticesProducer") + process.hiPixel3PrimTracks.VertexCollection = cms.InputTag("hiSelectedVertexPreSplitting") + process.hiPixel3PrimTracks.ptMin = cms.double(0.9) + process.hiPixel3PrimTracks.clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCachePreSplitting") + process.hiPixel3ProtoTracksPreSplitting.originRadius = cms.double(0.4) + process.hiPixelAdaptiveVertexPreSplitting.vertexCollections.useBeamConstraint = cms.bool(False) + + process.hiPixel3ProtoTracksPreSplitting.RegionFactoryPSet.RegionPSet.originRadius = 0.2 # default 0.2 + process.hiPixel3ProtoTracksPreSplitting.RegionFactoryPSet.RegionPSet.fixedError = 0.5 # default 3.0 + process.hiSelectedProtoTracksPreSplitting.maxD0Significance = 100 # default 5.0 + process.hiPixelAdaptiveVertexPreSplitting.TkFilterParameters.maxD0Significance = 100 # default 3.0 + process.hiPixelAdaptiveVertexPreSplitting.vertexCollections.useBeamConstraint = False # default False + process.hiPixelAdaptiveVertexPreSplitting.vertexCollections.maxDistanceToBeam = 1.0 # default 0.1 + + + #---------------------------- + # Pixel-Tracks&Vertices Reco + #---------------------------- + process.reconstructionStep = cms.Sequence(process.siPixelDigis* + process.offlineBeamSpot* + process.pixeltrackerlocalreco* + process.siPixelClusterShapeCachePreSplitting* + process.hiPixelVerticesPreSplitting* + process.PixelLayerTriplets* + process.pixelFitterByHelixProjections* + process.hiPixel3PrimTracksFilter* + process.hiPixel3PrimTracks) + + + #---------------------------- + # Define Path + #---------------------------- + process.p = cms.Path(process.scalersRawToDigi*process.physTrigger*process.reconstructionStep*process.pixelVertexDQM*process.dqmModules) diff --git a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py index 01beee9fca4f5..bb57bd794d842 100644 --- a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py @@ -114,15 +114,18 @@ # Heavy-Ion run if (process.runType.getRunType() == process.runType.hi_run): process.DQMStore.referenceFileName = "/dqmdata/dqm/reference/l1t_reference_hi.root" + process.onlineMetaDataDigis.onlineMetaDataInputLabel = cms.InputTag("rawDataRepacker") + process.onlineMetaDataRawToDigi.onlineMetaDataInputLabel = cms.InputTag("rawDataRepacker") process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker") process.ctppsDiamondRawToDigi.rawDataTag = cms.InputTag("rawDataRepacker") - process.ctppsPixelDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.ctppsPixelDigis.inputLabel = cms.InputTag("rawDataRepacker") process.ecalDigis.InputLabel = cms.InputTag("rawDataRepacker") process.ecalPreshowerDigis.sourceTag = cms.InputTag("rawDataRepacker") process.hcalDigis.InputLabel = cms.InputTag("rawDataRepacker") process.muonCSCDigis.InputObjects = cms.InputTag("rawDataRepacker") process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker") process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.muonGEMDigis.InputLabel = cms.InputTag("rawDataRepacker") process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker") process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker") process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker") @@ -130,20 +133,26 @@ process.tcdsRawToDigi.InputLabel = cms.InputTag("rawDataRepacker") process.totemRPRawToDigi.rawDataTag = cms.InputTag("rawDataRepacker") process.totemTriggerRawToDigi.rawDataTag = cms.InputTag("rawDataRepacker") + process.totemTimingRawToDigi.rawDataTag = cms.InputTag("rawDataRepacker") process.csctfDigis.producer = cms.InputTag("rawDataRepacker") process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataRepacker") process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker") process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker") process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker") + process.RPCTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker") process.bmtfDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker") process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.gmtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") + process.caloLayer1Digis.InputLabel = cms.InputTag("rawDataRepacker") process.caloStage1Digis.InputLabel = cms.InputTag("rawDataRepacker") process.caloStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.gtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.l1tStage2CaloLayer1.fedRawDataLabel = cms.InputTag("rawDataRepacker") process.l1tStage2uGMTZeroSupp.rawData = cms.InputTag("rawDataRepacker") process.l1tStage2uGMTZeroSuppFatEvts.rawData = cms.InputTag("rawDataRepacker") + process.l1tStage2BmtfZeroSupp.rawData = cms.InputTag("rawDataRepacker") + process.l1tStage2BmtfZeroSuppFatEvts.rawData = cms.InputTag("rawDataRepacker") process.selfFatEventFilter.rawInput = cms.InputTag("rawDataRepacker") #-------------------------------------------------- diff --git a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py index 0f467719e6f8d..735e5d534a9e5 100644 --- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py @@ -110,15 +110,18 @@ # Heavy-Ion run if (process.runType.getRunType() == process.runType.hi_run): + process.onlineMetaDataDigis.onlineMetaDataInputLabel = cms.InputTag("rawDataRepacker") + process.onlineMetaDataRawToDigi.onlineMetaDataInputLabel = cms.InputTag("rawDataRepacker") process.castorDigis.InputLabel = cms.InputTag("rawDataRepacker") process.ctppsDiamondRawToDigi.rawDataTag = cms.InputTag("rawDataRepacker") - process.ctppsPixelDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.ctppsPixelDigis.inputLabel = cms.InputTag("rawDataRepacker") process.ecalDigis.InputLabel = cms.InputTag("rawDataRepacker") process.ecalPreshowerDigis.sourceTag = cms.InputTag("rawDataRepacker") process.hcalDigis.InputLabel = cms.InputTag("rawDataRepacker") process.muonCSCDigis.InputObjects = cms.InputTag("rawDataRepacker") process.muonDTDigis.inputLabel = cms.InputTag("rawDataRepacker") process.muonRPCDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.muonGEMDigis.InputLabel = cms.InputTag("rawDataRepacker") process.scalersRawToDigi.scalersInputTag = cms.InputTag("rawDataRepacker") process.siPixelDigis.InputLabel = cms.InputTag("rawDataRepacker") process.siStripDigis.ProductLabel = cms.InputTag("rawDataRepacker") @@ -126,14 +129,18 @@ process.tcdsRawToDigi.InputLabel = cms.InputTag("rawDataRepacker") process.totemRPRawToDigi.rawDataTag = cms.InputTag("rawDataRepacker") process.totemTriggerRawToDigi.rawDataTag = cms.InputTag("rawDataRepacker") + process.totemTimingRawToDigi.rawDataTag = cms.InputTag("rawDataRepacker") process.csctfDigis.producer = cms.InputTag("rawDataRepacker") process.dttfDigis.DTTF_FED_Source = cms.InputTag("rawDataRepacker") process.gctDigis.inputLabel = cms.InputTag("rawDataRepacker") process.gtDigis.DaqGtInputTag = cms.InputTag("rawDataRepacker") process.twinMuxStage2Digis.DTTM7_FED_Source = cms.InputTag("rawDataRepacker") + process.RPCTwinMuxRawToDigi.inputTag = cms.InputTag("rawDataRepacker") process.bmtfDigis.InputLabel = cms.InputTag("rawDataRepacker") + process.omtfStage2Digis.inputLabel = cms.InputTag("rawDataRepacker") process.emtfStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.gmtStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") + process.caloLayer1Digis.InputLabel = cms.InputTag("rawDataRepacker") process.caloStage1Digis.InputLabel = cms.InputTag("rawDataRepacker") process.caloStage2Digis.InputLabel = cms.InputTag("rawDataRepacker") process.simHcalTriggerPrimitiveDigis.InputTagFEDRaw = cms.InputTag("rawDataRepacker") diff --git a/EventFilter/SiPixelRawToDigi/plugins/BuildFile.xml b/EventFilter/SiPixelRawToDigi/plugins/BuildFile.xml index 90fea254b67c4..f92aa68373927 100644 --- a/EventFilter/SiPixelRawToDigi/plugins/BuildFile.xml +++ b/EventFilter/SiPixelRawToDigi/plugins/BuildFile.xml @@ -1,4 +1,4 @@ - - - + + + diff --git a/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py index 4697f508948a6..465aa0bb346ce 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/SiPixelRecHits_cfi.py @@ -3,8 +3,7 @@ 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(