diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py index ed2bab7e97e33..5c0a1b4d3fa5e 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py @@ -67,10 +67,10 @@ authenticationPath = cms.untracked.string('') ), timetype = cms.untracked.string('runnumber'), - connect = cms.string('sqlite_file:SiStripBadStripPhase2_T33_v0.db'), + connect = cms.string('sqlite_file:SiStripBadStripPhase2_T35_v0.db'), toPut = cms.VPSet(cms.PSet( record = cms.string('SiStripBadStripRcd'), - tag = cms.string('SiStripBadStripPhase2_T33') + tag = cms.string('SiStripBadStripPhase2_T35') )) ) diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py index aee3e655fb363..c7ef0caac6baf 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py @@ -63,7 +63,7 @@ #process.SiPhase2OTFakeBadStripsESSource.printDebug = cms.untracked.bool(True) # this makes it verbose process.SiPhase2OTFakeBadStripsESSource.badComponentsFraction = cms.double(0.05) # bad components fraction is 5% else: - tag = 'SiStripBadStripPhase2_T33' + tag = 'SiStripBadStripPhase2_T35' suffix = 'v0' inFile = tag+'_'+suffix+'.db' inDB = 'sqlite_file:'+inFile diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py index 08427d021ca07..7f31c6027effb 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py @@ -68,7 +68,7 @@ process.mySiPhase2OTFakeLorentzAngleESSource = SiPhase2OTFakeLorentzAngleESSource.clone(LAValue = cms.double(0.14)) process.es_prefer_fake_LA = cms.ESPrefer("SiPhase2OuterTrackerFakeLorentzAngleESSource","mySiPhase2OTFakeLorentzAngleESSource") else: - tag = 'SiPhase2OuterTrackerLorentzAngle_T33' + tag = 'SiPhase2OuterTrackerLorentzAngle_T35' suffix = 'v0' inFile = tag+'_'+suffix+'.db' inDB = 'sqlite_file:'+inFile diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py index 883dd42f30611..d248032aa6090 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py @@ -30,7 +30,7 @@ SiPhase2OuterTrackerLorentzAngle = cms.untracked.PSet( limit = cms.untracked.int32(-1)), ) -tag = 'SiPhase2OuterTrackerLorentzAngle_T33' +tag = 'SiPhase2OuterTrackerLorentzAngle_T35' suffix = 'v0' outfile = tag+'_'+suffix+'.db' outdb = 'sqlite_file:'+outfile diff --git a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py index 10167359ca115..af8a7feb11242 100644 --- a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py @@ -198,6 +198,9 @@ elif tGeometry == 'T33': geometry_cff = 'GeometryExtendedRun4D110_cff' recoGeometry_cff = 'GeometryExtendedRun4D110Reco_cff' +elif tGeometry == 'T35': + geometry_cff = 'GeometryExtendedRun4D121_cff' + recoGeometry_cff = 'GeometryExtendedRun4D121Reco_cff' else: print("Unknown tracker geometry") print("What are you doing ?!?!?!?!") diff --git a/CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py index 08d396f0fb371..540e2d0c7ae08 100644 --- a/CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py @@ -94,16 +94,9 @@ process.load(recoGeometry_cff) process.load(geometry_cff) -# trick to get the T33 GT instead -geomSwap = { - "T35": "T33", -} - -effectiveGeometry = geomSwap.get(tGeometry, tGeometry) - process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_'+effectiveGeometry, '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_'+tGeometry, '') process.load("FWCore.MessageService.MessageLogger_cfi") diff --git a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py index a81b44a76a480..e9c660884ec0e 100644 --- a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py +++ b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py @@ -198,6 +198,9 @@ elif tGeometry == 'T33': geometry_cff = 'GeometryExtendedRun4D110_cff' recoGeometry_cff = 'GeometryExtendedRun4D110Reco_cff' +elif tGeometry == 'T35': + geometry_cff = 'GeometryExtendedRun4D121_cff' + recoGeometry_cff = 'GeometryExtendedRun4D121Reco_cff' else: print("Unknown tracker geometry") print("What are you doing ?!?!?!?!") diff --git a/CondTools/SiPixel/test/createTestDBObjects.sh b/CondTools/SiPixel/test/createTestDBObjects.sh index 190c502f83a87..f3c68bc0a1cbb 100755 --- a/CondTools/SiPixel/test/createTestDBObjects.sh +++ b/CondTools/SiPixel/test/createTestDBObjects.sh @@ -11,10 +11,10 @@ echo -e "TESTING Pixel 1D GenErr DB code ..." cmsRun ${SCRAM_TEST_PATH}/SiPixelGenErrorDBObjectUploader_cfg.py MagField=0.0 Fullname=SiPixelGenErrorDBObject_phase1_0T_mc_BoR3_v1_bugfix Map=${SCRAM_TEST_PATH}/../data/phaseI_mapping.csv GenErrFilePath=CalibTracker/SiPixelESProducers/data/SiPixelTemplateDBObject_0T_phase1_BoR3_v1 || die "Failure running SiPixelGenErrorDBObjectUploader_cfg.py" $? echo -e "TESTING Pixel 1D Template DB code for Phase-2 ..." -cmsRun ${SCRAM_TEST_PATH}/SiPixelTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT711 Map=${SCRAM_TEST_PATH}/../data/phase2_T33_mapping.csv geometry=T33 TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v7.1.1_25x100_v1_mc || die "Failure running SiPixelTemplateDBObjectUploader_Phase2_cfg.py" $? +cmsRun ${SCRAM_TEST_PATH}/SiPixelTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT711 Map=${SCRAM_TEST_PATH}/../data/phase2_T33_mapping.csv geometry=T35 TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v7.1.1_25x100_v1_mc || die "Failure running SiPixelTemplateDBObjectUploader_Phase2_cfg.py" $? echo -e "TESTING Pixel 1D GenErr DB code for Phase-2 ..." -cmsRun ${SCRAM_TEST_PATH}/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT711 Map=${SCRAM_TEST_PATH}/../data/phase2_T33_mapping.csv geometry=T33 GenErrFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v7.1.1_25x100_v1_mc || die "Failure running SiPixelGenErrorDBObjectUploader_Phase2_cfg.py" $? +cmsRun ${SCRAM_TEST_PATH}/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT711 Map=${SCRAM_TEST_PATH}/../data/phase2_T33_mapping.csv geometry=T35 GenErrFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v7.1.1_25x100_v1_mc || die "Failure running SiPixelGenErrorDBObjectUploader_Phase2_cfg.py" $? #echo -e "TESTING Pixel 2D Template DB code for Phase-2 ..." #cmsRun ${SCRAM_TEST_PATH}/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping_den.csv TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_mc denominator=True || die "Failure running SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py" $? diff --git a/Configuration/AlCa/python/autoCondPhase2.py b/Configuration/AlCa/python/autoCondPhase2.py index 24e0f841d60a4..051315f61ea35 100644 --- a/Configuration/AlCa/python/autoCondPhase2.py +++ b/Configuration/AlCa/python/autoCondPhase2.py @@ -15,100 +15,68 @@ ## ## Active geometries: https://github.com/cms-sw/cmssw/blob/master/Configuration/Geometry/README.md ## -## T21: Phase2 tilted tracker. Outer Tracker (v8.0.0): TBPS update in Layer 1 (facilitate IT insertion) + In all TEDD, update sensors Z inter-spacing. Inner Tracker: (v6.1.5) from previous T17 -## (TFPX: Changed sensors spacing within all double-disks + Increased distance between Disks 6 and 7 + TBPX portcards between Disks 6 and 7.) -## T25: Phase2 tilted tracker. Outer Tracker (v8.0.0): same as T24/T21. Inner Tracker (v7.0.2): Based on (v6.1.5) (T24/T21), but with 3D sensors in TBPX L1. -## T30: Phase2 tilted tracker, exploratory geometry *only to be used in D91 for now*. Outer Tracker (v8.0.1): based on v8.0.0 with updated TB2S spacing. Inner Tracker (v6.4.0): based on v6.1.5 but TFPX with more realistic module positions -## T33: Phase2 tilted tracker. As T25 - OT v8.0.0 (but with BTL overlap removed). IT: v7.1.1 - as in T25, except with more realistic description of 3D sensors. #combines in a single dict of dict the tags defined below allTags={} allTags["LA"] = { - 'T21' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_v5_mc' ,SiPixelLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T25' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T25_v0_mc' ,SiPixelLARecord,connectionString, "", "2021-03-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) - 'T30' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v6.4.0_25x100_v1_mc' ,SiPixelLARecord,connectionString, "", "2021-11-22 21:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T33' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.1.1_25x100_v1_mc' ,SiPixelLARecord,connectionString, "", "2023-05-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) + 'T35' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.1.1_25x100_v1_mc' ,SiPixelLARecord,connectionString, "", "2023-05-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) 'T36' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelLARecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) 'T37' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelLARecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) 'T38' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelLARecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) } allTags["LAWidth"] = { - 'T21' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) - 'T25' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) - 'T30' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v6.4.0_25x100_empty_mc' ,SiPixelLARecord,connectionString, "forWidth", "2021-11-29 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) - 'T33' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.1.1_25x100_empty_mc' ,SiPixelLARecord,connectionString, "forWidth", "2023-12-02 15:55:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T35' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.1.1_25x100_empty_mc' ,SiPixelLARecord,connectionString, "forWidth", "2023-12-02 15:55:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T36' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.4.1_25x100_empty_v2_mc' ,SiPixelLARecord,connectionString, "forWidth", "2024-04-08 16:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T37' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.4.1_25x100_empty_v2_mc' ,SiPixelLARecord,connectionString, "forWidth", "2024-04-08 16:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T38' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.4.1_25x100_empty_v2_mc' ,SiPixelLARecord,connectionString, "forWidth", "2024-04-08 16:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) } allTags["LAfromAlignment"] = { - 'T21' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) - 'T25' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (not in use) - 'T30' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v6.4.0_25x100_empty_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2021-11-29 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) - 'T33' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.1.1_25x100_empty_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2023-12-02 15:55:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T35' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.1.1_25x100_empty_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2023-12-02 15:55:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T36' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.4.1_25x100_empty_v2_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2024-04-08 16:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T37' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.4.1_25x100_empty_v2_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2024-04-08 16:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T38' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_IT_v7.4.1_25x100_empty_v2_mc' ,SiPixelLARecord,connectionString, "fromAlignment", "2024-04-08 16:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) } allTags["SimLA"] = { - 'T21' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T15_v5_mc' ,SiPixelSimLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T25' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T25_v0_mc' ,SiPixelSimLARecord,connectionString, "", "2021-03-16 20:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) - 'T30' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_IT_v6.4.0_25x100_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2021-12-03 16:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T33' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_IT_v7.1.1_25x100_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2024-03-07 21:00:00.000"] ), ),#uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) + 'T35' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_IT_v7.1.1_25x100_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2024-03-07 21:00:00.000"] ), ),#uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) 'T36' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) 'T37' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) 'T38' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelSimLARecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), #uH = 0.053/T (TBPX L2,L3,L4), uH=0.0/T (TBPX L1 TEPX+TFPX) } allTags["GenError"] = { - 'T21' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v6.1.5_25x100_v3_mc',SiPixelGenErrorRecord,connectionString, "", "2021-01-27 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T25' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v7.0.2_25x100_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2021-04-17 20:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y), VBias=350V, 3D pixels in TBPX L1 - 'T30' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v6.4.0_25x100_v1_mc',SiPixelGenErrorRecord,connectionString, "", "2021-11-22 21:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T33' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v7.1.1_25x100_v1_mc' ,SiPixelGenErrorRecord,connectionString, "", "2023-05-16 20:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 + 'T35' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v7.1.1_25x100_v1_mc' ,SiPixelGenErrorRecord,connectionString, "", "2023-05-16 20:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 'T36' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 'T37' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 'T38' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 } allTags["Template"] = { - 'T21' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v6.1.5_25x100_v3_mc',SiPixelTemplatesRecord,connectionString, "", "2021-01-27 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T25' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v7.0.2_25x100_v2_mc' ,SiPixelTemplatesRecord,connectionString, "", "2021-04-17 20:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y), VBias=350V, 3D pixels in TBPX L1 - 'T30' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v6.4.0_25x100_v1_mc',SiPixelTemplatesRecord,connectionString, "", "2021-11-22 21:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T33' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v7.1.1_25x100_v1_mc' ,SiPixelTemplatesRecord,connectionString, "", "2023-05-16 20:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 + 'T35' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v7.1.1_25x100_v1_mc' ,SiPixelTemplatesRecord,connectionString, "", "2023-05-16 20:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 'T36' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelTemplatesRecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 'T37' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelTemplatesRecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 'T38' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v7.4.1_25x100_v2_mc' ,SiPixelTemplatesRecord,connectionString, "", "2024-04-08 16:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V, 3D pixels in TBPX L1 } allTags["TkAlignment"] = { - 'T21' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T21_design_v0' ,TkAlRecord, connectionString, "", "2023-03-16 15:30:00"] ), ), - 'T25' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T25_design_v0' ,TkAlRecord, connectionString, "", "2023-03-16 15:30:00"] ), ), - 'T30' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T30_design_v0' ,TkAlRecord, connectionString, "", "2023-03-16 15:30:00"] ), ), - 'T33' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T33_design_v1' ,TkAlRecord, connectionString, "", "2024-09-12 15:37:00"] ), ), + 'T35' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T33_design_v1' ,TkAlRecord, connectionString, "", "2024-09-12 15:37:00"] ), ), 'T36' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T36_design_v1' ,TkAlRecord, connectionString, "", "2024-09-12 15:37:00"] ), ), 'T37' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T37_design_v1' ,TkAlRecord, connectionString, "", "2024-09-12 15:37:00"] ), ), 'T38' : ( ','.join( [ 'TrackerAlignment_Upgrade2026_T38_design_v1' ,TkAlRecord, connectionString, "", "2024-09-12 15:37:00"] ), ), } allTags["TkAPE"] = { - 'T21' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T21_design_v0' ,TkAPERecord, connectionString, "", "2023-03-16 15:30:00"] ), ), - 'T25' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T25_design_v0' ,TkAPERecord, connectionString, "", "2023-03-16 15:30:00"] ), ), - 'T30' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T30_design_v0' ,TkAPERecord, connectionString, "", "2023-03-16 15:30:00"] ), ), - 'T33' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T33_design_v1' ,TkAPERecord, connectionString, "", "2024-09-12 15:37:00"] ), ), + 'T35' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T33_design_v1' ,TkAPERecord, connectionString, "", "2024-09-12 15:37:00"] ), ), 'T36' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T36_design_v1' ,TkAPERecord, connectionString, "", "2024-09-12 15:37:00"] ), ), 'T37' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T36_design_v1' ,TkAPERecord, connectionString, "", "2024-09-12 15:37:00"] ), ), 'T38' : ( ','.join( [ 'TrackerAlignmentErrorsExtended_Upgrade2026_T36_design_v1' ,TkAPERecord, connectionString, "", "2024-09-12 15:37:00"] ), ), } allTags["TkSurf"] = { - 'T21' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-03-16 15:30:00"] ), ), - 'T25' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-03-16 15:30:00"] ), ), - 'T30' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-03-16 15:30:00"] ), ), - 'T33' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-03-16 15:30:00"] ), ), + 'T35' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-03-16 15:30:00"] ), ), 'T36' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-04-14 15:00:00"] ), ), 'T37' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-04-14 15:00:00"] ), ), 'T38' : ( ','.join( [ 'TrackerSurfaceDeformations_Upgrade2026_Zero' ,TkSurfRecord, connectionString, "", "2023-04-14 15:00:00"] ), ), @@ -120,17 +88,11 @@ ''' allTags["OTLA"] = { - 'T21' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T25' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T30' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T33' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T35' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T } allTags["SimOTLA"] = { - 'T21' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T25' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T30' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T33' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T35' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T } ''' @@ -150,7 +112,7 @@ activeKeys = ["LA", "LAWidth", "SimLA", "LAfromAlignment", "GenError", "Template", "TkAlignment", "TkAPE", "TkSurf"] #,"SimOTLA","OTLA"] # list of geometries supported -activeDets = ["T21","T25","T30","T33","T36","T37","T38"] +activeDets = ["T35","T36","T37","T38"] phase2GTs = {} for det in activeDets: appendedTags = () diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 4323ebcb580df..857cdef447b26 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -3647,14 +3647,14 @@ def condition(self, fragment, stepList, key, hasHarvest): 'Run4D104' : { 'Geom' : 'ExtendedRun4D104', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, 'Run4D110' : { 'Geom' : 'ExtendedRun4D110', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, @@ -3682,14 +3682,14 @@ def condition(self, fragment, stepList, key, hasHarvest): 'Run4D114' : { 'Geom' : 'ExtendedRun4D114', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, 'Run4D110GenOnly' : { 'Geom' : 'ExtendedRun4D110', 'BeamSpot' : 'DBrealisticHLLHC', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenHLBeamSpot'], }, @@ -3697,56 +3697,56 @@ def condition(self, fragment, stepList, key, hasHarvest): 'Geom' : 'ExtendedRun4D110', 'HLTmenu': '@relvalRun4', 'BeamSpot' : 'DBrealisticHLLHC', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C17I13M9', 'ScenToRun' : ['GenHLBeamSpot','Sim','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, 'Run4D115' : { 'Geom' : 'ExtendedRun4D115', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C20I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, 'Run4D120' : { 'Geom' : 'ExtendedRun4D120', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C26I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, 'Run4D121' : { 'Geom' : 'ExtendedRun4D121', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, 'Run4D122' : { 'Geom' : 'ExtendedRun4D122', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C26I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, 'Run4D123' : { 'Geom' : 'ExtendedRun4D123', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C26I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, 'Run4D124' : { 'Geom' : 'ExtendedRun4D124', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, 'Run4D125' : { 'Geom' : 'ExtendedRun4D125', 'HLTmenu': '@relvalRun4', - 'GT' : 'auto:phase2_realistic_T33', + 'GT' : 'auto:phase2_realistic_T35', 'Era' : 'Phase2C22I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, diff --git a/Configuration/PyReleaseValidation/scripts/README.md b/Configuration/PyReleaseValidation/scripts/README.md index d0a82f0a8a17c..c504fd63d0c3f 100644 --- a/Configuration/PyReleaseValidation/scripts/README.md +++ b/Configuration/PyReleaseValidation/scripts/README.md @@ -336,7 +336,7 @@ MC workflows for pp collisions: | **Phase2** | | | | **Geometry** | | | | | | | | 24834.0 | RelValTTbar_14TeV | phase2_realistic_T25 | Phase2C17I13M9 | ExtendedRun4D98 | (Phase-2 baseline) -| 29634.911 | TTbar_14TeV_TuneCP5 | phase2_realistic_T33 | Phase2C17I13M9 | DD4hepExtendedRun4D110 | DD4Hep (HLLHC14TeV BeamSpot) +| 29634.911 | TTbar_14TeV_TuneCP5 | phase2_realistic_T35 | Phase2C17I13M9 | DD4hepExtendedRun4D110 | DD4Hep (HLLHC14TeV BeamSpot) | 25034.999 | RelValTTbar_14TeV (PREMIX) | phase2_realistic_T25 | Phase2C17I13M9 | ExtendedRun4D98 | AVE_50_BX_25ns_m3p3 | 24896.0 | RelValCloseByPGun_CE_E_Front_120um | phase2_realistic_T25 | Phase2C17I13M9 | ExtendedRun4D98 | | 24900.0 | RelValCloseByPGun_CE_H_Coarse_Scint | phase2_realistic_T25 | Phase2C17I13M9 | ExtendedRun4D98 | diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 13bf2b127bb95..d4605e6fa5f9e 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -136,14 +136,14 @@ def runSelected(opt): 'phase2' : [ ###### MC (generated from scratch or from RelVals) # Phase2 - prefixDet+34.0, # RelValTTbar_14TeV phase2_realistic_T33 ExtendedRun4D121 (Phase-2 baseline) - prefixDet+34.911, # TTbar_14TeV_TuneCP5 phase2_realistic_T33 DD4hepExtendedRun4D121 DD4Hep (HLLHC14TeV BeamSpot) + prefixDet+34.0, # RelValTTbar_14TeV phase2_realistic_T35 ExtendedRun4D121 (Phase-2 baseline) + prefixDet+34.911, # TTbar_14TeV_TuneCP5 phase2_realistic_T35 DD4hepExtendedRun4D121 DD4Hep (HLLHC14TeV BeamSpot) # TODO: Temporarily disabled until new MinBias files get produced. See https://github.com/cms-sw/cmssw/issues/49795 - #prefixDet+234.999, # RelValTTbar_14TeV (PREMIX) phase2_realistic_T33 ExtendedRun4D121 AVE_50_BX_25ns_m3p3 - prefixDet+96.0, # RelValCloseByPGun_CE_E_Front_120um phase2_realistic_T33 ExtendedRun4D121 - prefixDet+100.0, # RelValCloseByPGun_CE_H_Coarse_Scint phase2_realistic_T33 ExtendedRun4D121 + #prefixDet+234.999, # RelValTTbar_14TeV (PREMIX) phase2_realistic_T35 ExtendedRun4D121 AVE_50_BX_25ns_m3p3 + prefixDet+96.0, # RelValCloseByPGun_CE_E_Front_120um phase2_realistic_T35 ExtendedRun4D121 + prefixDet+100.0, # RelValCloseByPGun_CE_H_Coarse_Scint phase2_realistic_T35 ExtendedRun4D121 #23234.0, # Need new workflow with HFNose - prefixDet+34.75, # RelValTTbar_14TeV phase2_realistic_T33 ExtendedRun4D121 (Phase-2 baseline - but using timing menu, and only up to step 2) + prefixDet+34.75, # RelValTTbar_14TeV phase2_realistic_T35 ExtendedRun4D121 (Phase-2 baseline - but using timing menu, and only up to step 2) ], 'heavyIons' : [ diff --git a/DPGAnalysis/Phase2L1TNanoAOD/README.md b/DPGAnalysis/Phase2L1TNanoAOD/README.md index 3a88bbe68ecab..cd0dcedc3a249 100644 --- a/DPGAnalysis/Phase2L1TNanoAOD/README.md +++ b/DPGAnalysis/Phase2L1TNanoAOD/README.md @@ -27,7 +27,7 @@ It is mostly created for workflow tests. An example `cmsDriver` command for 14x files: ```bash cmsDriver.py -s L1,L1TrackTrigger,L1P2GT,NANO:@Phase2L1DPGwithGen \ ---conditions auto:phase2_realistic_T33 \ +--conditions auto:phase2_realistic_T35 \ --geometry ExtendedRun4D110 \ --era Phase2C17I13M9 \ --eventcontent NANOAOD \ diff --git a/Geometry/HGCalCommonData/test/python/testHGCalPartialIDTester2_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalPartialIDTester2_cfg.py index 4f50960d08629..f4d8ecd33dc7c 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalPartialIDTester2_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalPartialIDTester2_cfg.py @@ -41,7 +41,7 @@ process = cms.Process('SimRun4',Phase2C22I13M9) geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" -globalTag = "auto:phase2_realistic_T33" +globalTag = "auto:phase2_realistic_T35" inFile = "partial" + options.geometry + ".txt" print("Geometry file: ", geomFile) diff --git a/Geometry/TrackerGeometryBuilder/test/runTest.sh b/Geometry/TrackerGeometryBuilder/test/runTest.sh index 29dd73d21d8fa..354dd1c93134b 100755 --- a/Geometry/TrackerGeometryBuilder/test/runTest.sh +++ b/Geometry/TrackerGeometryBuilder/test/runTest.sh @@ -20,7 +20,7 @@ do done cmsRun ${SCRAM_TEST_PATH}/python/testPixelTopologyMapTest_cfg.py runNumber=300000 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py runNumber=300000" $? -cmsRun ${SCRAM_TEST_PATH}/python/testPixelTopologyMapTest_cfg.py globalTag=auto:phase2_realistic_T33 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py globalTag=auto:phase2_realistic_T33" $? +cmsRun ${SCRAM_TEST_PATH}/python/testPixelTopologyMapTest_cfg.py globalTag=auto:phase2_realistic_T35 || die "Failure using cmsRun testPixelTopologyMapTest_cfg.py globalTag=auto:phase2_realistic_T35" $? FILE1=trackerParametersDD4hep.log FILE2=trackerParametersDDD.log diff --git a/HLTrigger/Configuration/python/HLT_75e33/test/runHLTTiming.sh b/HLTrigger/Configuration/python/HLT_75e33/test/runHLTTiming.sh index b468d08c8fe36..b791a2c3e4b61 100755 --- a/HLTrigger/Configuration/python/HLT_75e33/test/runHLTTiming.sh +++ b/HLTrigger/Configuration/python/HLT_75e33/test/runHLTTiming.sh @@ -38,7 +38,7 @@ echo "Discovered files: $ALL_FILES" # run timing menu HLT:75e33_timing (use GPU if available) cmsDriver.py Phase2 -s L1P2GT,HLT:75e33_timing --processName=HLTX \ - --conditions auto:phase2_realistic_T33 --geometry ExtendedRun4D110 \ + --conditions auto:phase2_realistic_T35 --geometry ExtendedRun4D110 \ --era Phase2C17I13M9 \ --customise SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000 \ --eventcontent FEVTDEBUGHLT \ @@ -75,7 +75,7 @@ fi # run NGT scouting menu (currently used modifiers ngtScouting,phase2CAExtension) cmsDriver.py NGTScouting -s L1P2GT,HLT:NGTScouting --processName=NLTX \ - --conditions auto:phase2_realistic_T33 --geometry ExtendedRun4D110 \ + --conditions auto:phase2_realistic_T35 --geometry ExtendedRun4D110 \ --era Phase2C17I13M9 \ --procModifiers ngtScouting,phase2CAExtension \ --customise SLHCUpgradeSimulations/Configuration/aging.customise_aging_1000 \ diff --git a/HLTrigger/NGTScouting/test/testNanohltDQM.sh b/HLTrigger/NGTScouting/test/testNanohltDQM.sh index 4555234b7de42..1f6dde9dcd7b4 100755 --- a/HLTrigger/NGTScouting/test/testNanohltDQM.sh +++ b/HLTrigger/NGTScouting/test/testNanohltDQM.sh @@ -21,7 +21,7 @@ echo "Discovered files: $ALL_FILES" ## Step 2: reHLT, NANO, DQM cmsDriver.py step2 -s L1P2GT,HLT:NGTScouting,NANO:@NGTScouting,DQM:@nanohltDQM \ - --conditions auto:phase2_realistic_T33 \ + --conditions auto:phase2_realistic_T35 \ --datatier DQMIO,NANOAODSIM \ -n 10 \ --eventcontent DQMIO,NANOAODSIM \ @@ -37,7 +37,7 @@ cmsDriver.py step2 -s L1P2GT,HLT:NGTScouting,NANO:@NGTScouting,DQM:@nanohltDQM \ ## Step 2: harvesting cmsDriver.py step3 -s HARVESTING:@nanohltDQM \ - --conditions auto:phase2_realistic_T33 \ + --conditions auto:phase2_realistic_T35 \ --mc \ --geometry ExtendedRun4D110 \ --scenario pp \ diff --git a/L1Trigger/Configuration/python/Phase2GTMenus/README.md b/L1Trigger/Configuration/python/Phase2GTMenus/README.md index d66d25f1e2cbd..5a87d088f4f20 100644 --- a/L1Trigger/Configuration/python/Phase2GTMenus/README.md +++ b/L1Trigger/Configuration/python/Phase2GTMenus/README.md @@ -17,7 +17,7 @@ These menus can be specified via the cmsDriver configuration as `-s L1P2GT:step1 Note that the full menu expanded configuration can be inspected using `edmConfigDump` on a `cmsRun` config that executes the `L1P2GT` step: 1. Produce the config via ``` -cmsDriver.py -s L1P2GT --conditions auto:phase2_realistic_T33 --filein file:file.root --no_exec --python_filename l1pgt_cfg.py +cmsDriver.py -s L1P2GT --conditions auto:phase2_realistic_T35 --filein file:file.root --no_exec --python_filename l1pgt_cfg.py ``` 2. Dump the config via ``` diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py index 7872ae8c86507..e213efc31a4b6 100644 --- a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py +++ b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferDigi_cfg.py @@ -9,7 +9,7 @@ process.load('RecoLocalCalo.HGCalRecAlgos.hgcalRecHitToolsPartialWafer_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') if hasattr(process,'MessageLogger'): process.MessageLogger.HGCalSim=dict() diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py index 797b0421538c5..c53a70c8f6c5a 100644 --- a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py +++ b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferRecHit_cfg.py @@ -9,7 +9,7 @@ process.load('RecoLocalCalo.HGCalRecAlgos.hgcalRecHitToolsPartialWafer_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') if hasattr(process,'MessageLogger'): process.MessageLogger.HGCalSim=dict() diff --git a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py index 8513c9b74b9a5..e5bd80b859fd9 100644 --- a/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py +++ b/RecoLocalCalo/HGCalRecAlgos/test/testHGCalPartialWaferSimHit_cfg.py @@ -13,7 +13,7 @@ process.load('RecoLocalCalo.HGCalRecAlgos.hgcalToolTesterPartialWafer_cff') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') if hasattr(process,'MessageLogger'): process.MessageLogger.HGCalGeom=dict() diff --git a/RecoMTD/TimingIDTools/test/mvaTrainingSaveNtuple_cfg.py b/RecoMTD/TimingIDTools/test/mvaTrainingSaveNtuple_cfg.py index 8308fa2575d79..721235a2f5b4a 100644 --- a/RecoMTD/TimingIDTools/test/mvaTrainingSaveNtuple_cfg.py +++ b/RecoMTD/TimingIDTools/test/mvaTrainingSaveNtuple_cfg.py @@ -13,7 +13,7 @@ process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) ) diff --git a/SimG4CMS/Calo/test/python/minbias.py b/SimG4CMS/Calo/test/python/minbias.py index 22e89b0111090..9fa26aa7ee78e 100644 --- a/SimG4CMS/Calo/test/python/minbias.py +++ b/SimG4CMS/Calo/test/python/minbias.py @@ -52,7 +52,7 @@ from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 process = cms.Process('Sim',Phase2C22I13M9) geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D121Reco_cff" - globalTag = "auto:phase2_realistic_T33" + globalTag = "auto:phase2_realistic_T35" else: process = cms.Process('Sim') geomFile = "Configuration.Geometry.GeometryExtendedReco_cff" diff --git a/SimG4CMS/Calo/test/python/runHGC10_cfg.py b/SimG4CMS/Calo/test/python/runHGC10_cfg.py index 5081d2cd7db9d..6bbab68f64d33 100644 --- a/SimG4CMS/Calo/test/python/runHGC10_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC10_cfg.py @@ -14,7 +14,7 @@ process.load('SimG4CMS.Calo.hgcalHitScintillator_cfi') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') if hasattr(process,'MessageLogger'): process.MessageLogger.HGCalGeom=dict() diff --git a/SimG4CMS/Calo/test/python/runHGC9_cfg.py b/SimG4CMS/Calo/test/python/runHGC9_cfg.py index 466964a233f16..0abc8164c4c0a 100644 --- a/SimG4CMS/Calo/test/python/runHGC9_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC9_cfg.py @@ -15,7 +15,7 @@ process.load('SimG4CMS.Calo.hgcalHitScintillator_cfi') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') if hasattr(process,'MessageLogger'): process.MessageLogger.HGCalGeom=dict() diff --git a/SimG4CMS/Calo/test/python/ttbar.py b/SimG4CMS/Calo/test/python/ttbar.py index d8796886aa331..d946b611b3024 100644 --- a/SimG4CMS/Calo/test/python/ttbar.py +++ b/SimG4CMS/Calo/test/python/ttbar.py @@ -52,7 +52,7 @@ from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I131M9 process = cms.Process('Sim',Phase2C22I13M9) geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "D121Reco_cff" - globalTag = "auto:phase2_realistic_T33" + globalTag = "auto:phase2_realistic_T35" else: process = cms.Process('Sim') geomFile = "Configuration.Geometry.GeometryExtendedReco_cff" diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTB231May_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTB231May_cfg.py index 7e5ffe1912963..4dc92f9ef4b46 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTB231May_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTB231May_cfg.py @@ -13,7 +13,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') if hasattr(process,'MessageLogger'): process.MessageLogger.HGCalGeom=dict() diff --git a/SimG4Core/Configuration/test/dd4hepTTBarRun4D121_cfg.py b/SimG4Core/Configuration/test/dd4hepTTBarRun4D121_cfg.py index 4a3ff2a27485d..6d6128f2c3edb 100644 --- a/SimG4Core/Configuration/test/dd4hepTTBarRun4D121_cfg.py +++ b/SimG4Core/Configuration/test/dd4hepTTBarRun4D121_cfg.py @@ -59,7 +59,7 @@ # Other statements process.genstepfilter.triggerConditions=cms.vstring("generation_step") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') process.generator = cms.EDFilter("Pythia8GeneratorFilter", PythiaParameters = cms.PSet( diff --git a/SimG4Core/Configuration/test/dd4hep_ttbar_Run4D121_Step1_cfg.py b/SimG4Core/Configuration/test/dd4hep_ttbar_Run4D121_Step1_cfg.py index 85904a1504f43..7df6b5570e53a 100644 --- a/SimG4Core/Configuration/test/dd4hep_ttbar_Run4D121_Step1_cfg.py +++ b/SimG4Core/Configuration/test/dd4hep_ttbar_Run4D121_Step1_cfg.py @@ -86,7 +86,7 @@ # Other statements process.genstepfilter.triggerConditions=cms.vstring("generation_step") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') process.generator = cms.EDFilter("Pythia8GeneratorFilter", PythiaParameters = cms.PSet( diff --git a/SimGeneral/Debugging/python/caloParticleDebugger_cfg.py b/SimGeneral/Debugging/python/caloParticleDebugger_cfg.py index 6aeba3fa022d2..8396a608d6e19 100644 --- a/SimGeneral/Debugging/python/caloParticleDebugger_cfg.py +++ b/SimGeneral/Debugging/python/caloParticleDebugger_cfg.py @@ -13,7 +13,7 @@ process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, "auto:phase2_realistic_T33", "") +process.GlobalTag = GlobalTag(process.GlobalTag, "auto:phase2_realistic_T35", "") process.maxEvents = cms.untracked.PSet(input=cms.untracked.int32(-1)) diff --git a/Validation/HGCalValidation/scripts/testHGCalDigi_cfg.py b/Validation/HGCalValidation/scripts/testHGCalDigi_cfg.py index c29f9d5608357..98edab1f74528 100644 --- a/Validation/HGCalValidation/scripts/testHGCalDigi_cfg.py +++ b/Validation/HGCalValidation/scripts/testHGCalDigi_cfg.py @@ -78,7 +78,7 @@ process = cms.Process('SingleMuonSim',Phase2C17I13M9) geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" -globalTag = "auto:phase2_realistic_T33" +globalTag = "auto:phase2_realistic_T35" inFile = "file:step1" + options.type + options.geometry + options.data + ".root" outFile = "file:step2" + options.type + options.geometry + options.data + ".root" diff --git a/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py b/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py index 2481912ea64e4..1fd1eb411b084 100644 --- a/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py +++ b/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py @@ -67,7 +67,7 @@ process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') process.MessageLogger.cerr.FwkReport.reportEvery = 100 diff --git a/Validation/HGCalValidation/scripts/testHGCalReco_cfg.py b/Validation/HGCalValidation/scripts/testHGCalReco_cfg.py index 57c41cf4149ae..ca542a56d42ff 100644 --- a/Validation/HGCalValidation/scripts/testHGCalReco_cfg.py +++ b/Validation/HGCalValidation/scripts/testHGCalReco_cfg.py @@ -70,7 +70,7 @@ process = cms.Process('SingleMuonSim',Phase2C17I13M9) geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" -globalTag = "auto:phase2_realistic_T33" +globalTag = "auto:phase2_realistic_T35" inFile = "file:step2" + options.type + options.geometry + options.data + ".root" outFile = "file:step3" + options.type + options.geometry + options.data + ".root" fileName = "missing" + options.type + options.geometry + options.data + options.tag + ".root" diff --git a/Validation/HGCalValidation/scripts/testHGCalSimSingleMuonPt100_cfg.py b/Validation/HGCalValidation/scripts/testHGCalSimSingleMuonPt100_cfg.py index ad5ea73ed1174..120ee9b32414d 100644 --- a/Validation/HGCalValidation/scripts/testHGCalSimSingleMuonPt100_cfg.py +++ b/Validation/HGCalValidation/scripts/testHGCalSimSingleMuonPt100_cfg.py @@ -60,7 +60,7 @@ process = cms.Process('SingleMuonSim',Phase2C17I13M9) geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" -globalTag = "auto:phase2_realistic_T33" +globalTag = "auto:phase2_realistic_T35" outFile = "file:step1" + options.type + options.geometry + "mu.root" print("Geometry file: ", geomFile) diff --git a/Validation/HGCalValidation/scripts/testHGCalSimTTBar_cfg.py b/Validation/HGCalValidation/scripts/testHGCalSimTTBar_cfg.py index 61fdd4d348612..b41cdd5ca4a78 100644 --- a/Validation/HGCalValidation/scripts/testHGCalSimTTBar_cfg.py +++ b/Validation/HGCalValidation/scripts/testHGCalSimTTBar_cfg.py @@ -60,7 +60,7 @@ process = cms.Process('SingleMuonSim',Phase2C22I13M9) geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" -globalTag = "auto:phase2_realistic_T33" +globalTag = "auto:phase2_realistic_T35" outFile = "file:step1" + options.type + options.geometry + "tt.root" print("Geometry file: ", geomFile) diff --git a/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py b/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py index 5e08970c8b688..d0f6c2e22db67 100644 --- a/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py +++ b/Validation/HGCalValidation/test/python/standalone_onlyTICL_HARVESTING.py @@ -6,7 +6,7 @@ options = VarParsing.VarParsing ('standard') options.register('inputFile', 'step3_inDQM.root', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Input file") -options.register ('globalTag', 'auto:phase2_realistic_T33', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "GlobalTag") +options.register ('globalTag', 'auto:phase2_realistic_T35', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "GlobalTag") options.parseArguments() print("Input file: ", options.inputFile) diff --git a/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py b/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py index 970e323043f52..35cb3e5cfe014 100644 --- a/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py +++ b/Validation/HGCalValidation/test/python/standalone_onlyTICL_fromRECO.py @@ -7,7 +7,7 @@ options = VarParsing.VarParsing ('standard') options.register('inputFile', 'step3.root', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Input file") options.register('outputFile', 'step3_reReco_ticlOnly.root', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "Output file") -options.register ('globalTag', 'auto:phase2_realistic_T33', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "GlobalTag") +options.register ('globalTag', 'auto:phase2_realistic_T35', VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, "GlobalTag") options.parseArguments() print("Input file: ", options.inputFile) diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py index c4eedf31c7d60..0390e81a44831 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17N_cfg.py @@ -96,7 +96,7 @@ # Other statements process.genstepfilter.triggerConditions=cms.vstring("generation_step") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') process.generator = cms.EDProducer("FlatRandomPtGunProducer", PGunParameters = cms.PSet( diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py index 5956d54e9fd0d..8c34522c696be 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV17_cfg.py @@ -96,7 +96,7 @@ # Other statements process.genstepfilter.triggerConditions=cms.vstring("generation_step") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') process.generator = cms.EDProducer("FlatRandomPtGunProducer", PGunParameters = cms.PSet( diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py index 804910c27275b..fa6ba83e62cb0 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV18_cfg.py @@ -96,7 +96,7 @@ # Other statements process.genstepfilter.triggerConditions=cms.vstring("generation_step") from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') process.generator = cms.EDProducer("FlatRandomPtGunProducer", PGunParameters = cms.PSet( diff --git a/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py b/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py index 4610fd0bb12f7..0b104c44b7e93 100644 --- a/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py +++ b/Validation/HGCalValidation/test/python/testValidationHGCalTrigPrim_RelVal_cfg.py @@ -87,7 +87,7 @@ # Other statements from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') # load HGCAL TPG simulation process.load('L1Trigger.L1THGCal.hgcalTriggerPrimitives_cff') diff --git a/Validation/MtdValidation/test/mtdValidation_cfg.py b/Validation/MtdValidation/test/mtdValidation_cfg.py index ddb3c89bb5d57..e8fb4fab6d329 100644 --- a/Validation/MtdValidation/test/mtdValidation_cfg.py +++ b/Validation/MtdValidation/test/mtdValidation_cfg.py @@ -25,7 +25,7 @@ # process.mix.input.fileNames = cms.untracked.vstring([]) # MinBias, from step3 confif file from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') process.load('RecoLocalFastTime.FTLClusterizer.MTDCPEESProducer_cfi') process.load("Configuration.StandardSequences.Reconstruction_cff") diff --git a/Validation/RecoTrack/test/SimpleTrackValidation_cfg.py b/Validation/RecoTrack/test/SimpleTrackValidation_cfg.py index f9fa1c7d96146..c34de2c2aad11 100644 --- a/Validation/RecoTrack/test/SimpleTrackValidation_cfg.py +++ b/Validation/RecoTrack/test/SimpleTrackValidation_cfg.py @@ -37,7 +37,7 @@ ### conditions process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') ### standard includes process.load('Configuration/StandardSequences/Services_cff') diff --git a/Validation/TrackingMCTruth/test/simDoubletsPhase2_HARVESTING.py b/Validation/TrackingMCTruth/test/simDoubletsPhase2_HARVESTING.py index 1b57cd83aa472..9e5476b31074f 100644 --- a/Validation/TrackingMCTruth/test/simDoubletsPhase2_HARVESTING.py +++ b/Validation/TrackingMCTruth/test/simDoubletsPhase2_HARVESTING.py @@ -48,7 +48,7 @@ # Other statements from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') # Path and EndPath definitions process.load('Validation.TrackingMCTruth.PostProcessorSimDoublets_cff') # load harvesting config for SimDoublets diff --git a/Validation/TrackingMCTruth/test/simDoubletsPhase2_TEST.py b/Validation/TrackingMCTruth/test/simDoubletsPhase2_TEST.py index a7c881f82278d..d85fafba63062 100644 --- a/Validation/TrackingMCTruth/test/simDoubletsPhase2_TEST.py +++ b/Validation/TrackingMCTruth/test/simDoubletsPhase2_TEST.py @@ -37,7 +37,7 @@ ### conditions process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T33', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T35', '') ### standard includes process.load('Configuration/StandardSequences/Services_cff')