From f61b71e7eceeefbd188aededc7f1997e37ce69f0 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Tue, 20 Mar 2018 15:57:45 +0100 Subject: [PATCH 1/2] Add eras run2_nanoAOD_94XMiniAODv1 and run2_nanoAOD_94XMiniAODv2 --- .../Eras/python/Modifier_run2_nanoAOD_94XMiniAODv1_cff.py | 3 +++ .../Eras/python/Modifier_run2_nanoAOD_94XMiniAODv2_cff.py | 3 +++ Configuration/StandardSequences/python/Eras.py | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Configuration/Eras/python/Modifier_run2_nanoAOD_94XMiniAODv1_cff.py create mode 100644 Configuration/Eras/python/Modifier_run2_nanoAOD_94XMiniAODv2_cff.py diff --git a/Configuration/Eras/python/Modifier_run2_nanoAOD_94XMiniAODv1_cff.py b/Configuration/Eras/python/Modifier_run2_nanoAOD_94XMiniAODv1_cff.py new file mode 100644 index 0000000000000..58d63f11a5309 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run2_nanoAOD_94XMiniAODv1_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +run2_nanoAOD_94XMiniAODv1 = cms.Modifier() diff --git a/Configuration/Eras/python/Modifier_run2_nanoAOD_94XMiniAODv2_cff.py b/Configuration/Eras/python/Modifier_run2_nanoAOD_94XMiniAODv2_cff.py new file mode 100644 index 0000000000000..20e20cf100448 --- /dev/null +++ b/Configuration/Eras/python/Modifier_run2_nanoAOD_94XMiniAODv2_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +run2_nanoAOD_94XMiniAODv2 = cms.Modifier() diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index b0757d143e230..88977e7f087b0 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -44,7 +44,7 @@ def __init__(self): 'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_timing_layer','phase2_hcal', 'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'trackingPhase2PU140', - 'tracker_apv_vfp30_2016', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X', + 'tracker_apv_vfp30_2016', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X', 'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'hcalHardcodeConditions', 'hcalSkipPacker'] internalUseModChains = ['run2_2017_noTrackingModifier'] From 52e43f5ebd45993b3c49ae41d5af301a1781086a Mon Sep 17 00:00:00 2001 From: Andrea Date: Tue, 20 Mar 2018 16:22:40 +0100 Subject: [PATCH 2/2] Fix prepareDQM to follow 02d6001dc03cf273b763e05556d2a682469aa0fd --- PhysicsTools/NanoAOD/test/prepareDQM.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PhysicsTools/NanoAOD/test/prepareDQM.py b/PhysicsTools/NanoAOD/test/prepareDQM.py index 13064ee5e38ab..13ba04f061e1d 100644 --- a/PhysicsTools/NanoAOD/test/prepareDQM.py +++ b/PhysicsTools/NanoAOD/test/prepareDQM.py @@ -72,7 +72,8 @@ def append(self, sub): import FWCore.ParameterSet.Config as cms from PhysicsTools.NanoAOD.nanoDQM_tools_cff import * -nanoDQM = cms.EDAnalyzer("NanoAODDQM", +from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer +nanoDQM = DQMEDAnalyzer("NanoAODDQM", vplots = cms.PSet( """);