From 66b7bb575d0e6b73833c2377f1b52c47e1fcc84e Mon Sep 17 00:00:00 2001 From: mmusich Date: Thu, 29 Sep 2022 13:26:26 +0200 Subject: [PATCH] fix failing unit tests after #38702 --- .../test/python/testPixelTopologyMapTest_cfg.py | 4 ++-- Geometry/TrackerGeometryBuilder/test/runTest.sh | 2 +- .../Geometry/test/phase2_digi_reco_pixelntuple_cfg.py | 10 +++++----- .../Geometry/test/writeFile_phase2_cfg.py | 4 ++-- .../TrackerMaterialAnalysis/test/listIds_PhaseII.py | 4 ++-- .../test/trackingMaterialAnalyser_ForPhaseII.py | 4 ++-- ...trackingMaterialProducer10GeVNeutrino_ForPhaseII.py | 4 ++-- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Geometry/TrackerGeometryBuilder/test/python/testPixelTopologyMapTest_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testPixelTopologyMapTest_cfg.py index 22b429ebd350c..742f31436de35 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testPixelTopologyMapTest_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testPixelTopologyMapTest_cfg.py @@ -30,8 +30,8 @@ process.load("Configuration.StandardSequences.Services_cff") if 'phase2' in options.globalTag: - process.load("Configuration.Geometry.GeometryExtended2026D49_cff") - process.load("Configuration.Geometry.GeometryExtended2026D49Reco_cff") + process.load("Configuration.Geometry.GeometryExtended2026D92_cff") + process.load("Configuration.Geometry.GeometryExtended2026D92Reco_cff") else: process.load("Configuration.StandardSequences.GeometryRecoDB_cff") diff --git a/Geometry/TrackerGeometryBuilder/test/runTest.sh b/Geometry/TrackerGeometryBuilder/test/runTest.sh index 28786aef5b388..f9d9eee4e3abd 100755 --- a/Geometry/TrackerGeometryBuilder/test/runTest.sh +++ b/Geometry/TrackerGeometryBuilder/test/runTest.sh @@ -20,7 +20,7 @@ do done cmsRun ${LOCAL_TEST_DIR}/python/testPixelTopologyMapTest_cfg.py runNumber=300000 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py runNumber=300000" $? -cmsRun ${LOCAL_TEST_DIR}/python/testPixelTopologyMapTest_cfg.py globalTag=auto:phase2_realistic_T15 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py globalTag=auto:phase2_realistic_T15" $? +cmsRun ${LOCAL_TEST_DIR}/python/testPixelTopologyMapTest_cfg.py globalTag=auto:phase2_realistic_T21 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py globalTag=auto:phase2_realistic_T21" $? FILE1=trackerParametersDD4hep.log FILE2=trackerParametersDDD.log diff --git a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py index ff6c957046537..c91de646881e6 100644 --- a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py @@ -1,8 +1,8 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C9_cff import Phase2C9 -process = cms.Process('USER',Phase2C9) +from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 +process = cms.Process('USER',Phase2C17I13M9) # import of standard configurations process.load('Configuration.StandardSequences.Services_cff') @@ -11,7 +11,7 @@ process.load('Configuration.EventContent.EventContent_cff') process.load('SimGeneral.MixingModule.mixNoPU_cfi') #process.load('SimGeneral.MixingModule.mix_POISSON_average_cfi') -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff') process.load('Configuration.StandardSequences.MagneticField_cff') process.load('Configuration.StandardSequences.Digi_cff') process.load('Configuration.StandardSequences.SimL1Emulator_cff') @@ -29,7 +29,7 @@ process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( - '/store/relval/CMSSW_11_2_0_pre1/RelValSingleMuPt10/GEN-SIM/110X_mcRun4_realistic_v3_2026D49noPU-v1/10000/743B02CC-F5B9-5642-A7EF-EE222E18C54F.root' + '/store/relval/CMSSW_12_3_0_pre6/RelValSingleMuPt10/GEN-SIM/123X_mcRun4_realistic_v8_2026D88noPU-v1/10000/a7e6521e-e026-447b-8bf9-38a09e97916f.root' ) ) @@ -95,7 +95,7 @@ # They need pixel RecHits where the charge is stored with high-granularity and large dinamic range from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T15', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') # Path and EndPath definitions process.digitisation_step = cms.Path(process.pdigi_valid) diff --git a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py index 4a5a369520862..6379bb03737b5 100644 --- a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py @@ -2,13 +2,13 @@ process = cms.Process("ICALIB") process.load("Configuration.StandardSequences.Services_cff") -process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') +process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff') process.trackerGeometry.applyAlignment = cms.bool(False) process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T15', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') process.source = cms.Source("EmptyIOVSource", firstValue = cms.uint64(1), diff --git a/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py index 6ab44cffe1f03..15a9b666b7a58 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py @@ -20,9 +20,9 @@ if options.fromDB : process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag - process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') + process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') else: - process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') + process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py index c46eb10ad1f06..17f24c7f148a1 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py @@ -20,9 +20,9 @@ if options.fromDB : process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag - process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') + process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') else: - process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') + process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.files.LogTrackingMaterialAnalysis = dict() diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py index ce1861eeb249c..4c7db3e62bed1 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py @@ -51,9 +51,9 @@ if options.fromDB : process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag - process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') + process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') else: - process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') + process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(options.nEvents)