fix conflicts

cms-sw · Jun 29, 2015 · 806e9cd · 806e9cd
1 parent f744df2
commit 806e9cd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/DQM/Physics/BuildFile.xml b/DQM/Physics/BuildFile.xml
@@ -20,4 +20,5 @@
 <use   name="CondFormats/EcalObjects"/>
 <use   name="RecoJets/JetProducers"/>
 <use   name="RecoJets/JetAlgorithms"/>
+<use   name="DQM/PhysicsHWW"/>
 <flags   EDM_PLUGIN="1"/> 
diff --git a/DQM/Physics/python/DQMPhysics_cff.py b/DQM/Physics/python/DQMPhysics_cff.py
@@ -14,7 +14,7 @@
 from DQM.Physics.HiggsDQM_cfi import *
 from DQM.Physics.ExoticaDQM_cfi import *
 from DQM.Physics.B2GDQM_cfi import *
-#from DQM.PhysicsHWW.hwwDQM_cfi import *
+from DQM.PhysicsHWW.hwwDQM_cfi import *
 from DQM.Physics.CentralityDQM_cfi import *
 from DQM.Physics.topJetCorrectionHelper_cfi import *
 
@@ -34,7 +34,7 @@
                            *HiggsDQM
                            *ExoticaDQM
                            *B2GDQM
-#                           *hwwDQM
+                           *hwwDQM
                            )
 
 bphysicsOniaDQMHI = bphysicsOniaDQM.clone(vertex=cms.InputTag("hiSelectedVertex"))
@@ -43,4 +43,4 @@
 from DQM.Physics.qcdPhotonsCosmicDQM_cff import *
 dqmPhysicsCosmics = cms.Sequence(dqmPhysics)
 dqmPhysicsCosmics.replace(qcdPhotonsDQM, qcdPhotonsCosmicDQM)
-#dqmPhysicsCosmics.replace(hwwDQM, hwwCosmicDQM)
+dqmPhysicsCosmics.replace(hwwDQM, hwwCosmicDQM)
diff --git a/DQMOffline/Configuration/python/DQMOfflineCosmics_cff.py b/DQMOffline/Configuration/python/DQMOfflineCosmics_cff.py
@@ -52,6 +52,6 @@
 
 DQMOfflineCosmicsPhysics = cms.Sequence( dqmPhysicsCosmics )
 
-#DQMOfflineCosmicsNoHWW = cms.Sequence(DQMOfflineCosmics)
-#DQMOfflineCosmicsNoHWW.remove(hwwCosmicDQM)
+DQMOfflineCosmicsNoHWW = cms.Sequence(DQMOfflineCosmics)
+DQMOfflineCosmicsNoHWW.remove(hwwCosmicDQM)
 
diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py
@@ -123,3 +123,6 @@
 DQMOfflineBTag = cms.Sequence( bTagPlotsDATA )
 
 DQMOfflineMiniAOD = cms.Sequence( miniAODDQMSequence*jetMETDQMOfflineSourceMiniAOD*tracksDQMMiniAOD )
+
+DQMOfflineNoHWW = cms.Sequence(DQMOffline)
+DQMOfflineNoHWW.remove(hwwAnalyzer)