Merge pull request #4413 from Martin-Grunewald/MoreCfiFileFixes

More cfi file fixes (auto-port to 72X as well)
cms-sw · Jul 3, 2014 · 1936681 · 1936681
2 parents bf4c30c + 4e1799c
commit 1936681
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/DQM/EcalMonitorClient/python/EcalCalibMonitorClient_cfi.py b/DQM/EcalMonitorClient/python/EcalCalibMonitorClient_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-from DQM.EcalCommon.CalibCommonParams_cfi import ecalCommonParams
+from DQM.EcalCommon.CommonParams_cfi import ecalCommonParams
 
 from DQM.EcalMonitorClient.IntegrityClient_cfi import ecalIntegrityClient
 from DQM.EcalMonitorClient.RawDataClient_cfi import ecalRawDataClient

diff --git a/EventFilter/Utilities/python/EvFOutputModule_cfi.py b/EventFilter/Utilities/python/EvFOutputModule_cfi.py
@@ -1,10 +1,9 @@
 import FWCore.ParameterSet.Config as cms
 
-process.EvFOutputModule = cms.Service("EvFOutputModule",
+evfOutputModule = cms.OutputModule("EvFOutputModule",
     fileName = cms.untracked.string(""),
     SelectEvents = cms.untracked.PSet(
         SelectEvents = cms.vstring(),
         outputCommands = cms.untracked.vstring()
     )
 )
-
diff --git a/RecoTauTag/TauTagTools/python/TauRecoTruthMatchers_cfi.py b/RecoTauTag/TauTagTools/python/TauRecoTruthMatchers_cfi.py
@@ -25,7 +25,7 @@
 )
 
 matchMCTausShrinkingCone = matchMCTausInsideOut.clone(
-    tauTruthMatchingReqs,
+#   tauTruthMatchingReqs,
     src = cms.InputTag("makeMCTauDecayModes"),
     matched = cms.InputTag("shrinkingConePFTauProducer")
 )
@@ -36,14 +36,14 @@
 #  QCD Truth matchers   #
 #########################
 
-matchMCQCDInsideOut = matchMCTausInsideOut.clone(
+matchMCQCDInsideOut = cms.EDProducer("PFTauDecayModeTruthMatcher",
     qcdTruthMatchingReqs,
     src = cms.InputTag("makeMCQCDTauDecayModes"),
     matched = cms.InputTag("pfRecoTauProducerInsideOut")
 )
 
-matchMCQCDShrinkingCone = matchMCTausInsideOut.clone(
-    qcdTruthMatchingReqs,
+matchMCQCDShrinkingCone = matchMCQCDInsideOut.clone(
+#   qcdTruthMatchingReqs,
     src = cms.InputTag("makeMCQCDTauDecayModes"),
     matched = cms.InputTag("shrinkingConePFTauProducer")
 )