From 8ea8a0d0fae3d9ef56807b318bf84270cfad1c8e Mon Sep 17 00:00:00 2001 From: Andrea Bocci Date: Fri, 2 Oct 2020 14:38:40 +0200 Subject: [PATCH] Synchronise with CMSSW_11_2_0_pre7 --- .../clients/beam_dqm_sourceclient-live_cfg.py | 5 ++++- .../beampixel_dqm_sourceclient-live_cfg.py | 9 +++++++-- .../clients/csc_dqm_sourceclient-live_cfg.py | 10 ++++++++-- .../clients/fed_dqm_sourceclient-live_cfg.py | 6 ++++++ .../clients/l1t_dqm_sourceclient-live_cfg.py | 8 +++++++- .../l1temulator_dqm_sourceclient-live_cfg.py | 7 ++++++- .../l1tstage1_dqm_sourceclient-live_cfg.py | 8 +++++++- ...l1tstage1emulator_dqm_sourceclient-live_cfg.py | 7 ++++++- .../l1tstage2_dqm_sourceclient-live_cfg.py | 8 +++++++- ...l1tstage2emulator_dqm_sourceclient-live_cfg.py | 9 ++++++++- .../clients/lumi_dqm_sourceclient-live_cfg.py | 7 ++++++- .../clients/physics_dqm_sourceclient-live_cfg.py | 8 +++++++- .../clients/pixel_dqm_sourceclient-live_cfg.py | 8 +++++++- .../pixellumi_dqm_sourceclient-live_cfg.py | 9 ++++++++- .../clients/scal_dqm_sourceclient-live_cfg.py | 8 +++++++- .../clients/sistrip_dqm_sourceclient-live_cfg.py | 8 +++++++- .../SiPixelRecHits/interface/PixelCPEBase.h | 13 +++++++++++++ .../plugins/SiPixelRecHitSoAFromLegacy.cc | 2 +- .../SiPixelRecHits/plugins/gpuPixelRecHits.h | 2 +- .../python/PixelCPEESProducers_cff.py | 15 +++------------ 20 files changed, 126 insertions(+), 31 deletions(-) diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py index c19cd7d0ba69c..55a38db34d1b0 100644 --- a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py @@ -57,6 +57,9 @@ process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = 'BeamMonitor' process.dqmSaver.tag = 'BeamMonitor' +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = 'BeamMonitor' +process.dqmSaverPB.runNumber = options.runNumber process.dqmEnvPixelLess = process.dqmEnv.clone() process.dqmEnvPixelLess.subSystemFolder = 'BeamMonitor_PixelLess' @@ -228,7 +231,7 @@ # process.dqmcommon = cms.Sequence(process.dqmEnv - * process.dqmSaver) + * process.dqmSaver*process.dqmSaverPB) # process.monitor = cms.Sequence(process.dqmBeamMonitor 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 3b6584f309d2a..f909104a39834 100644 --- a/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/beampixel_dqm_sourceclient-live_cfg.py @@ -15,10 +15,13 @@ #---------------------------- if unitTest == True: process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options else: process.load("DQM.Integration.config.inputsource_cfi") + from DQM.Integration.config.inputsource_cfi import options # Use this to run locally (for testing purposes) #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options #---------------------------- @@ -34,7 +37,9 @@ process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = "BeamPixel" process.dqmSaver.tag = "BeamPixel" - +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = 'BeamPixel' +process.dqmSaverPB.runNumber = options.runNumber #---------------------------- # Conditions @@ -58,7 +63,7 @@ #---------------------------- # Define Sequences #---------------------------- -process.dqmModules = cms.Sequence(process.dqmEnv + process.dqmSaver) +process.dqmModules = cms.Sequence(process.dqmEnv + process.dqmSaver + process.dqmSaverPB) process.physTrigger = cms.Sequence(process.hltTriggerTypeFilter) diff --git a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py index 4cabf7a09bb19..747ec4d01b07a 100644 --- a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py @@ -40,12 +40,15 @@ if unitTest: process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options else: # for live online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") + from DQM.Integration.config.inputsource_cfi import options # for testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options #---------------------------- # DQM Environment @@ -58,6 +61,9 @@ process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = "CSC" process.dqmSaver.tag = "CSC" +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = "CSC" +process.dqmSaverPB.runNumber = options.runNumber #process.DQM.collectorHost = 'pccmsdqm02.cern.ch' @@ -166,8 +172,8 @@ # Sequences #-------------------------- -#process.p = cms.Path(process.dqmCSCClient+process.dqmEnv+process.dqmSaver) -process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver) +#process.p = cms.Path(process.dqmCSCClient+process.dqmEnv+process.dqmSaver+process.dqmSaverPB) +process.p = cms.Path(process.dqmCSCClient * process.muonCSCDigis * process.csc2DRecHits * process.cscSegments * process.cscMonitor + process.dqmEnv + process.dqmSaver + process.dqmSaverPB) process.castorDigis.InputLabel = cms.InputTag("rawDataCollector") diff --git a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py index 0d6d5c54d1d3a..b1da8dc477c4a 100644 --- a/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/fed_dqm_sourceclient-live_cfg.py @@ -25,11 +25,16 @@ # Input: if unitTest: process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options else: process.load('DQM.Integration.config.inputsource_cfi') + from DQM.Integration.config.inputsource_cfi import options # Output: process.dqmEnv.subSystemFolder = 'FED' process.dqmSaver.tag = 'FED' +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = 'FED' +process.dqmSaverPB.runNumber = options.runNumber # Subsystem sequences @@ -142,6 +147,7 @@ process.DQMmodulesPath = cms.Path( process.dqmEnv + process.dqmSaver + + process.dqmSaverPB ) process.schedule = cms.Schedule( diff --git a/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py index 85ce46d7f7ace..b2358e79a1bb6 100644 --- a/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1t_dqm_sourceclient-live_cfg.py @@ -16,9 +16,11 @@ # # for live online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") +from DQM.Integration.config.inputsource_cfi import options # # for testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options #---------------------------- # DQM Environment @@ -26,6 +28,9 @@ process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = 'L1T' process.dqmSaver.tag = 'L1T' +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = 'L1T' +process.dqmSaverPB.runNumber = options.runNumber # # references needed @@ -96,7 +101,8 @@ # process.dqmEndPath = cms.EndPath( process.dqmEnv * - process.dqmSaver + process.dqmSaver * + process.dqmSaverPB ) # diff --git a/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py index 9ca55cca06428..e2c9f057f04b1 100644 --- a/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1temulator_dqm_sourceclient-live_cfg.py @@ -16,9 +16,11 @@ # # for live online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") +from DQM.Integration.config.inputsource_cfi import options # # for testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options #---------------------------- # DQM Environment @@ -30,6 +32,9 @@ # for local test process.dqmEnv.subSystemFolder = 'L1TEMU' process.dqmSaver.tag = 'L1TEMU' +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = 'L1TEMU' +process.dqmSaverPB.runNumber = options.runNumber # # no references needed @@ -88,7 +93,7 @@ process.l1EmulatorMonitorClientPath = cms.Path(process.l1EmulatorMonitorClient) # -process.l1EmulatorMonitorEndPath = cms.EndPath(process.dqmEnv*process.dqmSaver) +process.l1EmulatorMonitorEndPath = cms.EndPath(process.dqmEnv*process.dqmSaver*process.dqmSaverPB) # process.valCscTriggerPrimitiveDigis.gangedME1a = cms.untracked.bool(False) diff --git a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py index ca0db40e25687..93df769c2dfe4 100644 --- a/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage1_dqm_sourceclient-live_cfg.py @@ -16,9 +16,11 @@ # # for live online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") +from DQM.Integration.config.inputsource_cfi import options # # for testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options #---------------------------- # DQM Environment @@ -27,6 +29,9 @@ process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = 'L1TStage1' process.dqmSaver.tag = 'L1TStage1' +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = 'L1TStage1' +process.dqmSaverPB.runNumber = options.runNumber # # references needed @@ -101,7 +106,8 @@ # process.dqmEndPath = cms.EndPath( process.dqmEnv * - process.dqmSaver + process.dqmSaver * + process.dqmSaverPB ) # diff --git a/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py index 9809652f90f3e..4ed9c5e298890 100644 --- a/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage1emulator_dqm_sourceclient-live_cfg.py @@ -16,9 +16,11 @@ # # for live online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") +from DQM.Integration.config.inputsource_cfi import options # # for testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options #---------------------------- # DQM Environment @@ -28,6 +30,9 @@ # for local test process.dqmEnv.subSystemFolder = 'L1TEMUStage1' process.dqmSaver.tag = 'L1TEMUStage1' +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = 'L1TEMUStage1' +process.dqmSaverPB.runNumber = options.runNumber # # no references needed @@ -88,7 +93,7 @@ process.l1EmulatorMonitorClientPath = cms.Path(process.l1EmulatorMonitorClient) # -process.l1EmulatorMonitorEndPath = cms.EndPath(process.dqmEnv*process.dqmSaver) +process.l1EmulatorMonitorEndPath = cms.EndPath(process.dqmEnv*process.dqmSaver*process.dqmSaverPB) # 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 4e8abe5391b2b..580d7a2136841 100644 --- a/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2_dqm_sourceclient-live_cfg.py @@ -13,12 +13,15 @@ if unitTest: process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options else: # Live Online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") + from DQM.Integration.config.inputsource_cfi import options # # Testing in lxplus # process.load("DQM.Integration.config.fileinputsource_cfi") +# from DQM.Integration.config.fileinputsource_cfi import options # process.load("FWCore.MessageLogger.MessageLogger_cfi") # process.MessageLogger.cerr.FwkReport.reportEvery = 1 @@ -39,8 +42,11 @@ process.dqmEnv.subSystemFolder = "L1T" process.dqmSaver.tag = "L1T" +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = "L1T" +process.dqmSaverPB.runNumber = options.runNumber -process.dqmEndPath = cms.EndPath(process.dqmEnv * process.dqmSaver) +process.dqmEndPath = cms.EndPath(process.dqmEnv * process.dqmSaver * process.dqmSaverPB) #-------------------------------------------------- # Standard Unpacking Path 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 8ae678f923620..1d868837300b0 100644 --- a/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/l1tstage2emulator_dqm_sourceclient-live_cfg.py @@ -13,12 +13,15 @@ if unitTest: process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options else: # Live Online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") + from DQM.Integration.config.inputsource_cfi import options # Testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options # Required to load Global Tag process.load("DQM.Integration.config.FrontierCondition_GT_cfi") @@ -35,10 +38,14 @@ process.dqmEnv.subSystemFolder = "L1TEMU" process.dqmSaver.tag = "L1TEMU" +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = "L1TEMU" +process.dqmSaverPB.runNumber = options.runNumber process.dqmEndPath = cms.EndPath( process.dqmEnv * - process.dqmSaver + process.dqmSaver * + process.dqmSaverPB ) #-------------------------------------------------- diff --git a/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py index e9fb481e5581b..e439454513880 100644 --- a/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/lumi_dqm_sourceclient-live_cfg.py @@ -8,6 +8,7 @@ # Event Source #---------------------------- process.load("DQM.Integration.config.inputsource_cfi") +from DQM.Integration.config.inputsource_cfi import options #process.DQMEventStreamHttpReader.consumerName = 'DQM Luminosity Consumer' #process.DQMEventStreamHttpReader.SelectHLTOutput = cms.untracked.string('hltOutputALCALUMIPIXELS') @@ -17,6 +18,9 @@ process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = "Info/Lumi" process.dqmSaver.tag = "Lumi" +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = "Lumi" +process.dqmSaverPB.runNumber = options.runNumber #--------------------------------------------- # Global Tag @@ -63,7 +67,8 @@ process.dqmmodules = cms.Sequence(process.dqmEnv + process.expressLumiProducer + process.dqmLumiMonitor - + process.dqmSaver) + + process.dqmSaver + + process.dqmSaverPB) #---------------------------- # Proton-Proton Running Stuff #---------------------------- diff --git a/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py index 5638bc8ef940a..fef661979c427 100644 --- a/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/physics_dqm_sourceclient-live_cfg.py @@ -11,9 +11,11 @@ # for live online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") +from DQM.Integration.config.inputsource_cfi import options # for testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options #---------------------------- # DQM Environment @@ -22,6 +24,9 @@ process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = 'Physics' process.dqmSaver.tag = 'Physics' +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = 'Physics' +process.dqmSaverPB.runNumber = options.runNumber # 0=random, 1=physics, 2=calibration, 3=technical process.hltTriggerTypeFilter = cms.EDFilter("HLTTriggerTypeFilter", @@ -47,7 +52,8 @@ # process.dump * process.qcdLowPtDQM * process.dqmEnv * - process.dqmSaver + process.dqmSaver * + process.dqmSaverPB ) process.siPixelDigis.cpu.InputLabel = cms.InputTag("rawDataCollector") diff --git a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py index 5a24247036339..10477ddfcec84 100644 --- a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py @@ -34,13 +34,16 @@ if (unitTest): process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options elif (live): process.load("DQM.Integration.config.inputsource_cfi") + from DQM.Integration.config.inputsource_cfi import options # for testing in lxplus elif(offlineTesting): process.load("DQM.Integration.config.fileinputsource_cfi") + from DQM.Integration.config.fileinputsource_cfi import options #----------------------------- # DQM Environment @@ -56,6 +59,9 @@ process.dqmEnv.subSystemFolder = TAG process.dqmSaver.tag = TAG +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = TAG +process.dqmSaverPB.runNumber = options.runNumber #----------------------------- @@ -160,7 +166,7 @@ # Scheduling #-------------------------- -process.DQMmodules = cms.Sequence(process.dqmEnv* process.dqmSaver) +process.DQMmodules = cms.Sequence(process.dqmEnv* process.dqmSaver*process.dqmSaverPB) process.RecoForDQM_LocalReco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.gtDigis*process.trackerlocalreco) diff --git a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py index 2770834fe7cb7..50213e303b8de 100644 --- a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py @@ -21,12 +21,15 @@ if unitTest: process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options else: # for live online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") + from DQM.Integration.config.inputsource_cfi import options # for testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options ## #---------------------------- @@ -40,6 +43,9 @@ process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = "PixelLumi" process.dqmSaver.tag = "PixelLumi" +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = "PixelLumi" +process.dqmSaverPB.runNumber = options.runNumber if not unitTest: process.source.SelectEvents = cms.untracked.vstring("HLT_ZeroBias*","HLT_L1AlwaysTrue*", "HLT_PAZeroBias*", "HLT_PAL1AlwaysTrue*") @@ -128,7 +134,8 @@ process.Reco = cms.Sequence(process.siPixelDigis*process.siPixelClusters) process.DQMmodules = cms.Sequence(process.dqmEnv* process.pixel_lumi_dqm* - process.dqmSaver) + process.dqmSaver* + process.dqmSaverPB) process.p = cms.Path(process.Reco*process.DQMmodules) diff --git a/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py index 103dd87c720fb..2decc1b774251 100644 --- a/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/scal_dqm_sourceclient-live_cfg.py @@ -13,12 +13,15 @@ if unitTest: process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options else: # for live online DQM in P5 process.load("DQM.Integration.config.inputsource_cfi") + from DQM.Integration.config.inputsource_cfi import options # for testing in lxplus #process.load("DQM.Integration.config.fileinputsource_cfi") +#from DQM.Integration.config.fileinputsource_cfi import options #---------------------------- #### DQM Environment @@ -26,6 +29,9 @@ process.load("DQM.Integration.config.environment_cfi") process.dqmEnv.subSystemFolder = 'Scal' process.dqmSaver.tag = 'Scal' +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = 'Scal' +process.dqmSaverPB.runNumber = options.runNumber #----------------------------- process.load("DQMServices.Components.DQMScalInfo_cfi") @@ -68,7 +74,7 @@ process.dump = cms.EDAnalyzer('EventContentAnalyzer') # DQM Modules -process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver) +process.dqmmodules = cms.Sequence(process.dqmEnv + process.dqmSaver + process.dqmSaverPB) process.evfDQMmodulesPath = cms.Path( process.l1GtUnpack* process.gtDigis* diff --git a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py index f8da312461d40..77d21710d1ed3 100644 --- a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py @@ -32,11 +32,14 @@ # for live online DQM in P5 if (unitTest): process.load("DQM.Integration.config.unittestinputsource_cfi") + from DQM.Integration.config.unittestinputsource_cfi import options elif (live): process.load("DQM.Integration.config.inputsource_cfi") + from DQM.Integration.config.inputsource_cfi import options # for testing in lxplus elif(offlineTesting): process.load("DQM.Integration.config.fileinputsource_cfi") + from DQM.Integration.config.fileinputsource_cfi import options #---------------------------- # DQM Live Environment @@ -52,6 +55,9 @@ process.dqmEnv.subSystemFolder = "SiStrip" process.dqmSaver.tag = "SiStrip" process.dqmSaver.backupLumiCount = 30 +process.dqmSaver.runNumber = options.runNumber +process.dqmSaverPB.tag = "SiStrip" +process.dqmSaverPB.runNumber = options.runNumber from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer process.dqmEnvTr = DQMEDAnalyzer('DQMEventInfo', @@ -208,7 +214,7 @@ # Scheduling #-------------------------- process.SiStripSources_LocalReco = cms.Sequence(process.siStripFEDMonitor*process.SiStripMonitorDigi*process.SiStripMonitorClusterReal) -process.DQMCommon = cms.Sequence(process.stripQTester*process.trackingQTester*process.dqmEnv*process.dqmEnvTr*process.dqmSaver) +process.DQMCommon = cms.Sequence(process.stripQTester*process.trackingQTester*process.dqmEnv*process.dqmEnvTr*process.dqmSaver*process.dqmSaverPB) if (process.runType.getRunType() == process.runType.hi_run): process.RecoForDQM_LocalReco = cms.Sequence(process.siPixelDigis*process.siStripDigis*process.trackerlocalreco) else : diff --git a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h index 80cc68d3db85f..4b569438aa130 100644 --- a/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h +++ b/RecoLocalTracker/SiPixelRecHits/interface/PixelCPEBase.h @@ -253,6 +253,19 @@ class PixelCPEBase : public PixelClusterParameterEstimator { bool DoLorentz_; bool LoadTemplatesFromDB_; + //errors for template reco for edge hits, based on observed residuals from + //studies likely done in 2011... + static constexpr float xEdgeXError_ = 23.0f; + static constexpr float xEdgeYError_ = 39.0f; + + static constexpr float yEdgeXError_ = 24.0f; + static constexpr float yEdgeYError_ = 96.0f; + + static constexpr float bothEdgeXError_ = 31.0f; + static constexpr float bothEdgeYError_ = 90.0f; + + static constexpr float clusterSplitMaxError_ = 7777.7f; + //--------------------------------------------------------------------------- // Geometrical services to subclasses. //--------------------------------------------------------------------------- diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitSoAFromLegacy.cc b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitSoAFromLegacy.cc index d33e488344142..2afe12753097b 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitSoAFromLegacy.cc +++ b/RecoLocalTracker/SiPixelRecHits/plugins/SiPixelRecHitSoAFromLegacy.cc @@ -92,7 +92,7 @@ void SiPixelRecHitSoAFromLegacy::produce(edm::StreamID streamID, edm::Event& iEv const reco::BeamSpot& bs = iEvent.get(bsGetToken_); - BeamSpotCUDA::Data bsHost; + BeamSpotPOD bsHost; bsHost.x = bs.x0(); bsHost.y = bs.y0(); bsHost.z = bs.z0(); diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/gpuPixelRecHits.h b/RecoLocalTracker/SiPixelRecHits/plugins/gpuPixelRecHits.h index fd1cd8c0cdd91..17cd5aad4db52 100644 --- a/RecoLocalTracker/SiPixelRecHits/plugins/gpuPixelRecHits.h +++ b/RecoLocalTracker/SiPixelRecHits/plugins/gpuPixelRecHits.h @@ -14,7 +14,7 @@ namespace gpuPixelRecHits { __global__ void getHits(pixelCPEforGPU::ParamsOnGPU const* __restrict__ cpeParams, - BeamSpotCUDA::Data const* __restrict__ bs, + BeamSpotPOD const* __restrict__ bs, SiPixelDigisCUDA::DeviceConstView const* __restrict__ pdigis, int numElements, SiPixelClustersCUDA::DeviceConstView const* __restrict__ pclusters, diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEESProducers_cff.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEESProducers_cff.py index 8e28bbb175181..ea9fab563d164 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEESProducers_cff.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEESProducers_cff.py @@ -3,25 +3,16 @@ # # Load all Pixel Cluster Position Estimator ESProducers # -# -# 1. RecHits using angles from module position -# -from RecoLocalTracker.SiPixelRecHits.PixelCPEInitial_cfi import * -# -# 2. TrackingRechits using angles from tracks -# -from RecoLocalTracker.SiPixelRecHits.PixelCPEParmError_cfi import * -# -# 3. Template algorithm +# 1. Template algorithm # from RecoLocalTracker.SiPixelRecHits.PixelCPETemplateReco_cfi import * # -# 4. Pixel Generic CPE +# 2. Pixel Generic CPE # from RecoLocalTracker.SiPixelRecHits.PixelCPEGeneric_cfi import * from RecoLocalTracker.SiPixelRecHits.PixelCPEFast_cfi import * # -# 5. ESProducer for the Magnetic-field dependent template records +# 3. ESProducer for the Magnetic-field dependent template records # from CalibTracker.SiPixelESProducers.SiPixelTemplateDBObjectESProducer_cfi import * from CalibTracker.SiPixelESProducers.SiPixel2DTemplateDBObjectESProducer_cfi import *