Merge pull request #130 from cms-nanoAOD/master10XwEras

Add eras and fix DQM header part
cms-sw · Mar 20, 2018 · c71f46e · c71f46e
2 parents 33d4247 + 52e43f5
commit c71f46e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/Configuration/Eras/python/Modifier_run2_nanoAOD_94XMiniAODv1_cff.py 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
@@ -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
@@ -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']
 

diff --git 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(
 """);