diff --git a/CondTools/Geometry/test/calogeometryRun4writer.py b/CondTools/Geometry/test/calogeometryRun4writer.py index 083decafcfc8b..3fde7ef6ae37a 100644 --- a/CondTools/Geometry/test/calogeometryRun4writer.py +++ b/CondTools/Geometry/test/calogeometryRun4writer.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 -process = cms.Process("CaloGeometryWriter",Phase2C22I13M9) +from Configuration.Eras.Era_Phase2C26I13M9_cff import Phase2C26I13M9 +process = cms.Process("CaloGeometryWriter",Phase2C26I13M9) process.load('CondCore.CondDB.CondDB_cfi') -process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D127_cff') process.load('Geometry.CaloEventSetup.CaloGeometryRun4DBWriter_cfi') process.load('CondTools.Geometry.HcalParametersWriter_cff') diff --git a/CondTools/Geometry/test/hgcalgeometrywriter.py b/CondTools/Geometry/test/hgcalgeometrywriter.py index f552dae277bd8..3d49c9ee21a8f 100644 --- a/CondTools/Geometry/test/hgcalgeometrywriter.py +++ b/CondTools/Geometry/test/hgcalgeometrywriter.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 -process = cms.Process("HGCalGeometryWriter",Phase2C22I13M9) +from Configuration.Eras.Era_Phase2C26I13M9_cff import Phase2C26I13M9 +process = cms.Process("HGCalGeometryWriter",Phase2C26I13M9) process.load('CondCore.CondDB.CondDB_cfi') -process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D127_cff') process.source = cms.Source("EmptyIOVSource", lastValue = cms.uint64(1), diff --git a/CondTools/Geometry/test/me0geometrywriter.py b/CondTools/Geometry/test/me0geometrywriter.py index 92159c1b35743..e2d86217cc8a0 100644 --- a/CondTools/Geometry/test/me0geometrywriter.py +++ b/CondTools/Geometry/test/me0geometrywriter.py @@ -1,9 +1,9 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9 -process = cms.Process("ME0GeometryWriter",Phase2C22I13M9) +from Configuration.Eras.Era_Phase2C26I13M9_cff import Phase2C26I13M9 +process = cms.Process("ME0GeometryWriter",Phase2C26I13M9) process.load('CondCore.CondDB.CondDB_cfi') -process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D127_cff') process.load('Geometry.MuonNumbering.muonNumberingInitialization_cfi') process.load("Geometry.MuonNumbering.muonGeometryConstants_cff") process.load('Configuration.StandardSequences.DD4hep_GeometrySimPhase2_cff') diff --git a/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_writer.py b/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_writer.py index 7ccee858a6207..30af530cb4406 100644 --- a/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_writer.py +++ b/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_writer.py @@ -9,7 +9,7 @@ # 2) GEM, if Configuration.Geometry.GeometryExtendedRun4D77_cff is used (ScenarioRun4D77 has to be set in DD4hep_GeometrySimPhase2_cff) # Please add the right Scenario (D110 or ..) also in geometryExtendedRun4_xmlwriter.py and in splitExtendedRun4Database.sh # -process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D127_cff') process.load('Geometry.MuonNumbering.muonNumberingInitialization_cfi') process.load("Geometry.MuonNumbering.muonGeometryConstants_cff") process.load('Configuration.StandardSequences.DD4hep_GeometrySimPhase2_cff') @@ -24,7 +24,7 @@ ) process.XMLGeometryWriter = cms.EDAnalyzer("XMLGeometryBuilder", - XMLFileName = cms.untracked.string("./geD49SingleBigFile.xml"), + XMLFileName = cms.untracked.string("./geD127SingleBigFile.xml"), ZIP = cms.untracked.bool(True) ) diff --git a/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_xmlwriter.py b/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_xmlwriter.py index e92c573877ef0..82cc3c9de25e1 100644 --- a/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_xmlwriter.py +++ b/CondTools/Geometry/test/writehelpers/geometryExtendedRun4_xmlwriter.py @@ -2,7 +2,7 @@ process = cms.Process("GeometryXMLWriter") -process.load('Configuration.Geometry.GeometryExtendedRun4D121_cff') +process.load('Configuration.Geometry.GeometryExtendedRun4D127_cff') process.source = cms.Source("EmptyIOVSource", lastValue = cms.uint64(1), @@ -13,7 +13,7 @@ process.BigXMLWriter = cms.EDAnalyzer("OutputDDToDDL", rotNumSeed = cms.int32(0), - fileName = cms.untracked.string("./geD121SingleBigFile.xml") + fileName = cms.untracked.string("./geD127SingleBigFile.xml") ) diff --git a/CondTools/Geometry/test/writehelpers/splitExtendedRun4Database.sh b/CondTools/Geometry/test/writehelpers/splitExtendedRun4Database.sh index 093186562357e..d305c1c550168 100755 --- a/CondTools/Geometry/test/writehelpers/splitExtendedRun4Database.sh +++ b/CondTools/Geometry/test/writehelpers/splitExtendedRun4Database.sh @@ -1,6 +1,6 @@ #!/bin/sh -conddb -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtendedRun4D121.db -t XMLFILE_Geometry_TagXX_ExtendedRun4D121_mc -i XMLFILE_Geometry_TagXX_ExtendedRun4D121_mc +conddb -f sqlite_file:myfile.db -c sqlite_file:GeometryFileExtendedRun4D127.db -t XMLFILE_Geometry_TagXX_ExtendedRun4D127_mc -i XMLFILE_Geometry_TagXX_ExtendedRun4D127_mc conddb -f sqlite_file:myfile.db -c sqlite_file:TKRECO_Geometry.db -t TKRECO_Geometry_TagXX -i TKRECO_Geometry_TagXX conddb -f sqlite_file:myfile.db -c sqlite_file:TKParameters_Geometry.db -t TKParameters_Geometry_TagXX -i TKParameters_Geometry_TagXX conddb -f sqlite_file:myfile.db -c sqlite_file:EBRECO_Geometry.db -t EBRECO_Geometry_TagXX -i EBRECO_Geometry_TagXX diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md index 71d01076cabac..7caec9d46b5cf 100644 --- a/Configuration/Geometry/README.md +++ b/Configuration/Geometry/README.md @@ -147,10 +147,10 @@ Several detector combinations have been generated: * D114 = T39+C25+M15+I17+O10+F9 * D115 = T35+C20+M14+I17+O9+F8 * D120 = T35+C26+M16+I20+O11+F9 -* D121 = T35+C25+M16+I18+O10+F9 (Current Phase-2 baseline from CMSSW_15_1_0_pre4) +* D121 = T35+C25+M16+I18+O10+F9 * D122 = T35+C27+M16+I18+O11+F9 * D123 = T35+C28+M16+I18+O11+F9 * D124 = T35+C25+M16+I21+O10+F9 * D125 = T35+C25+M16+I22+O10+F9 * D126 = T37+C27+M17+I21+O11+F10 -* D127 = T35+C27+M17+I21+O11+F10 +* D127 = T35+C27+M17+I21+O11+F10 (Phase-2 baseline from CMSSW_20_1_0_pre2) diff --git a/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py b/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py index 26f89c8037016..d37c1c29f373f 100644 --- a/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py +++ b/Configuration/Geometry/python/defaultPhase2ConditionsEra_cff.py @@ -2,7 +2,7 @@ from Configuration.AlCa.autoCond import autoCond from Configuration.StandardSequences.Eras import eras -DEFAULT_VERSION = "Run4D121" +DEFAULT_VERSION = "Run4D127" def get_era_and_conditions(version_key): """Retrieve the era and global tag for a given version key. diff --git a/Configuration/Geometry/python/dictRun4Geometry.py b/Configuration/Geometry/python/dictRun4Geometry.py index 488fc2f8f2170..ac3caa2976c49 100644 --- a/Configuration/Geometry/python/dictRun4Geometry.py +++ b/Configuration/Geometry/python/dictRun4Geometry.py @@ -3,7 +3,7 @@ commonDict = { "abbrev" : "O", "name" : "common", - "default" : 10, + "default" : 11, "O9" : { 1 : [ 'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml', @@ -279,7 +279,7 @@ caloDict = { "abbrev" : "C", "name" : "calo", - "default" : 25, + "default" : 27, "C18" : { 1 : [ 'Geometry/EcalCommonData/data/eregalgo/2030/v2/eregalgo.xml', @@ -1085,7 +1085,7 @@ forwardDict = { "abbrev" : "F", "name" : "forward", - "default" : 9, + "default" : 10, "F8" : { 1 : [ 'Geometry/ForwardCommonData/data/forwardshield/2030/v4/forwardshield.xml', @@ -1160,7 +1160,7 @@ timingDict = { "abbrev" : "I", "name" : "timing", - "default" : 18, + "default" : 21, "I17" : { 1 : [ 'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml', diff --git a/Configuration/PyReleaseValidation/python/relval_Run4.py b/Configuration/PyReleaseValidation/python/relval_Run4.py index eae7d482a658f..f914534521f19 100644 --- a/Configuration/PyReleaseValidation/python/relval_Run4.py +++ b/Configuration/PyReleaseValidation/python/relval_Run4.py @@ -12,7 +12,7 @@ from Configuration.PyReleaseValidation.relval_upgrade import workflows as _upgrade_workflows #just define all of them -prefixDet = 34400 #update this line when change the default version +prefixDet = 37600 #update this line when change the default version #Run4 WFs to run in IB (TTbar) numWFIB = [] diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 3eaa1d4f4d364..3cce565055cb7 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -1167,9 +1167,9 @@ def genS(fragment,howMuch): steps['CosmicsSPLoose_UP17']=merge([{'cfg':'UndergroundCosmicSPLooseMu_cfi.py','-n':'2000','--conditions':'auto:phase1_2017_cosmics','--scenario':'cosmics','--era':'Run2_2017'},Kby(5000,500000),step1Up2015Defaults]) steps['CosmicsSPLoose_UP18']=merge([{'cfg':'UndergroundCosmicSPLooseMu_cfi.py','-n':'2000','--conditions':'auto:phase1_2018_cosmics','--scenario':'cosmics','--era':'Run2_2018'},Kby(5000,500000),step1Up2015Defaults]) -# Phase2 cosmics with geometry D121 +# Phase2 cosmics with geometry D127 from Configuration.PyReleaseValidation.upgradeWorkflowComponents import upgradeProperties -phase2CosInfo=upgradeProperties['Run4']['Run4D121'] # so if the default changes, change wf only here +phase2CosInfo=upgradeProperties['Run4']['Run4D127'] # so if the default changes, change wf only here steps['Cosmics_Phase2']=merge([{'cfg':'UndergroundCosmicMu_cfi.py', '-n':'500', @@ -4703,9 +4703,10 @@ def gen2024HiMix(fragment,howMuch): defaultDataSets['2025FS']='CMSSW_13_0_11-130X_mcRun3_2023_realistic_withEarly2023BS_v1_FastSim-v' #To replace with new dataset # Run4 -defaultRun4Geometry = 'D121' +defaultRun4Geometry = 'D127' defaultDataSets['Run4D110']='CMSSW_15_1_0_pre5-150X_mcRun4_realistic_v1_STD_RegeneratedGS_Run4D110_noPU-v' defaultDataSets['Run4D121']='CMSSW_20_0_0_pre1-150X_mcRun4_realistic_v1_STD_RegeneratedGS_D121_noPU-v' +defaultDataSets['Run4D127']='' ## HIN defaultDataSets['2023HIN']='CCMSSW_14_1_0-PU_140X_mcRun3_2023_realistic_HI_v4_STD_2023HIN_PU-v' diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 1c0b29f3b2b77..f1f040ef05860 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -129,14 +129,14 @@ def runSelected(opt): 'phase2' : [ ###### MC (generated from scratch or from RelVals) # Phase2 - prefixDet+34.0, # RelValTTbar_14TeV phase2_realistic_T35 ExtendedRun4D121 (Phase-2 baseline) - prefixDet+234.0, # RelValTTbar_14TeV phase2_realistic_T35 ExtendedRun4D121 AVE_200_BX_25ns (Phase-2 baseline with PU) - prefixDet+34.911, # TTbar_14TeV_TuneCP5 phase2_realistic_T35 DD4hepExtendedRun4D121 DD4Hep (HLLHC14TeV BeamSpot) - #prefixDet+234.999, # RelValTTbar_14TeV (PREMIX) phase2_realistic_T35 ExtendedRun4D121 AVE_50_BX_25ns_m3p3 COMMENT: reads old format file - prefixDet+96.0, # RelValCloseByPGun_CE_E_Front_120um phase2_realistic_T35 ExtendedRun4D121 - prefixDet+100.0, # RelValCloseByPGun_CE_H_Coarse_Scint phase2_realistic_T35 ExtendedRun4D121 + prefixDet+34.0, # RelValTTbar_14TeV phase2_realistic_T35 ExtendedRun4D127 (Phase-2 baseline) + prefixDet+234.0, # RelValTTbar_14TeV phase2_realistic_T35 ExtendedRun4D127 AVE_200_BX_25ns (Phase-2 baseline with PU) + prefixDet+34.911, # TTbar_14TeV_TuneCP5 phase2_realistic_T35 DD4hepExtendedRun4D127 DD4Hep (HLLHC14TeV BeamSpot) + #prefixDet+234.999, # RelValTTbar_14TeV (PREMIX) phase2_realistic_T35 ExtendedRun4D127 AVE_50_BX_25ns_m3p3 COMMENT: reads old format file + prefixDet+96.0, # RelValCloseByPGun_CE_E_Front_120um phase2_realistic_T35 ExtendedRun4D127 + prefixDet+100.0, # RelValCloseByPGun_CE_H_Coarse_Scint phase2_realistic_T35 ExtendedRun4D127 #23234.0, # Need new workflow with HFNose - prefixDet+34.75, # RelValTTbar_14TeV phase2_realistic_T35 ExtendedRun4D121 (Phase-2 baseline - but using timing menu, and only up to step 2) + prefixDet+34.75, # RelValTTbar_14TeV phase2_realistic_T35 ExtendedRun4D127 (Phase-2 baseline - but using timing menu, and only up to step 2) ], 'heavyIons' : [ diff --git a/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py b/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py index 57760c7cd16d9..49737456f2164 100644 --- a/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py +++ b/Configuration/StandardSequences/python/DD4hep_GeometrySimPhase2_cff.py @@ -1,3 +1,3 @@ import FWCore.ParameterSet.Config as cms -from Configuration.Geometry.GeometryDD4hepExtendedRun4D121_cff import * +from Configuration.Geometry.GeometryDD4hepExtendedRun4D127_cff import * diff --git a/DetectorDescription/DDCMS/src/DDFilteredView.cc b/DetectorDescription/DDCMS/src/DDFilteredView.cc index a0cd77ee36d70..7ea6956799b7a 100644 --- a/DetectorDescription/DDCMS/src/DDFilteredView.cc +++ b/DetectorDescription/DDCMS/src/DDFilteredView.cc @@ -6,6 +6,7 @@ #include "DD4hep/Shapes.h" #include #include +#include #include using namespace cms; @@ -552,6 +553,9 @@ const std::vector DDFilteredView::parameters() const { double param[4]; pcon->GetBoundingCylinder(param); return {param[0], param[1], param[2], param[3]}; + } else if (boolean->GetLeftShape()->IsA() == TGeoTrd1::Class()) { + const TGeoTrd1* trd1 = static_cast(boolean->GetLeftShape()); + return {trd1->GetDx1(), trd1->GetDx2(), trd1->GetDy(), trd1->GetDz()}; } else { throw cms::Exception("DDFilteredView") << "Unknown boolean solid component"; }