Merge pull request #7620 from davidlange6/Fix_geometry_in_tests

Fix broken unit tests in analysis tools area
cms-sw · Feb 8, 2015 · a25825b · a25825b
2 parents 1fc37be + a34da67
commit a25825b
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 26 deletions.
diff --git a/JetMETCorrections/Type1MET/python/testInputFiles_cff.py b/JetMETCorrections/Type1MET/python/testInputFiles_cff.py
@@ -4,11 +4,11 @@
 from PhysicsTools.PatAlgos.tools.cmsswVersionTools import pickRelValInputFiles
 corrMETtestInputFiles = pickRelValInputFiles(
     useDAS = True,
-    cmsswVersion = 'CMSSW_7_2_0_pre7',
+    cmsswVersion = 'CMSSW_7_4_0_pre6',
     dataTier = 'GEN-SIM-RECO',
     relVal = 'RelValTTbar_13',
-    globalTag = 'PU50ns_PRE_LS172_V12',
-    maxVersions = 1
+    globalTag = 'PU50ns_MCRUN2_74_V0',
+    maxVersions = 3,
     )
 
 # corrMETtestInputFiles = [

diff --git a/JetMETCorrections/Type1MET/test/corrMET_caloMet_cfg.py b/JetMETCorrections/Type1MET/test/corrMET_caloMet_cfg.py
@@ -6,7 +6,7 @@
 ##____________________________________________________________________________||
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 
-process.load("Configuration.StandardSequences.Geometry_cff")
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 
 ##____________________________________________________________________________||

diff --git a/JetMETCorrections/Type1MET/test/corrMET_pfMet_cfg.py b/JetMETCorrections/Type1MET/test/corrMET_pfMet_cfg.py
@@ -6,7 +6,7 @@
 ##____________________________________________________________________________||
 process.load("FWCore.MessageLogger.MessageLogger_cfi")
 
-process.load("Configuration.StandardSequences.Geometry_cff")
+process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.MagneticField_cff")
 
 ##____________________________________________________________________________||

diff --git a/PhysicsTools/PatAlgos/python/patTemplate_cfg.py b/PhysicsTools/PatAlgos/python/patTemplate_cfg.py
@@ -16,7 +16,7 @@
 process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) )
 
 ## Geometry and Detector Conditions (needed for a few patTuple production steps)
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/PhysicsTools/PatAlgos/test/patTuple_data_cfg.py b/PhysicsTools/PatAlgos/test/patTuple_data_cfg.py
@@ -13,7 +13,7 @@
 #process.Tracer = cms.Service("Tracer")
 
 ## Conditions
-process.load( "Configuration.Geometry.GeometryIdeal_cff" )
+process.load( "Configuration.Geometry.GeometryRecoDB_cff" )
 process.load( "Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff" )
 process.load( "Configuration.StandardSequences.FrontierConditions_GlobalTag_cff" )
 from Configuration.AlCa.GlobalTag import GlobalTag

diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopElectron_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopElectron_cfg.py
@@ -25,7 +25,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopHypotheses_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopHypotheses_cfg.py
@@ -32,7 +32,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopJet_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopJet_cfg.py
@@ -25,7 +25,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopMuon_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopMuon_cfg.py
@@ -25,7 +25,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopTau_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopTau_cfg.py
@@ -25,7 +25,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopEventProducers/test/tqaf_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/tqaf_cfg.py
@@ -22,7 +22,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopEventProducers/test/tqaf_woGeneratorInfo_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/tqaf_woGeneratorInfo_cfg.py
@@ -22,7 +22,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:com10_7E33v4')

diff --git a/TopQuarkAnalysis/TopEventProducers/test/ttFullHadEvtBuilder_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/ttFullHadEvtBuilder_cfg.py
@@ -28,7 +28,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopEventProducers/test/ttFullLepEvtBuilder_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/ttFullLepEvtBuilder_cfg.py
@@ -28,7 +28,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopEventProducers/test/ttSemiLepEvtBuilder_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/ttSemiLepEvtBuilder_cfg.py
@@ -30,7 +30,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopEventSelection/test/ttFullHadSignalSelMVAComputer_cfg.py b/TopQuarkAnalysis/TopEventSelection/test/ttFullHadSignalSelMVAComputer_cfg.py
@@ -72,7 +72,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopEventSelection/test/ttFullHadSignalSelMVATrainTreeSaver_cfg.py b/TopQuarkAnalysis/TopEventSelection/test/ttFullHadSignalSelMVATrainTreeSaver_cfg.py
@@ -30,7 +30,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopEventSelection/test/ttSemiLepSignalSelMVAComputer_cfg.py b/TopQuarkAnalysis/TopEventSelection/test/ttSemiLepSignalSelMVAComputer_cfg.py
@@ -24,7 +24,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopEventSelection/test/ttSemiLepSignalSelMVATrainTreeSaver_cfg.py b/TopQuarkAnalysis/TopEventSelection/test/ttSemiLepSignalSelMVATrainTreeSaver_cfg.py
@@ -24,7 +24,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopJetCombination/test/ttSemiLepJetCombMVAComputer_cfg.py b/TopQuarkAnalysis/TopJetCombination/test/ttSemiLepJetCombMVAComputer_cfg.py
@@ -24,7 +24,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopJetCombination/test/ttSemiLepJetCombMVATrainTreeSaver_cfg.py b/TopQuarkAnalysis/TopJetCombination/test/ttSemiLepJetCombMVATrainTreeSaver_cfg.py
@@ -28,7 +28,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopKinFitter/test/ttFullHadKinFitProducer_cfg.py b/TopQuarkAnalysis/TopKinFitter/test/ttFullHadKinFitProducer_cfg.py
@@ -32,7 +32,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopKinFitter/test/ttFullLepKinSolutionProducer_cfg.py b/TopQuarkAnalysis/TopKinFitter/test/ttFullLepKinSolutionProducer_cfg.py
@@ -24,7 +24,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')

diff --git a/TopQuarkAnalysis/TopKinFitter/test/ttSemiLepKinFitProducer_cfg.py b/TopQuarkAnalysis/TopKinFitter/test/ttSemiLepKinFitProducer_cfg.py
@@ -32,7 +32,7 @@
 )
 
 ## configure geometry & conditions
-process.load("Configuration.Geometry.GeometryIdeal_cff")
+process.load("Configuration.Geometry.GeometryRecoDB_cff")
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')