Skip to content

Commit 8f41eb9

Browse files
author
Norraphat
committed
Squashed commit of the following:
commit 50b3133 Author: Norraphat <[email protected]> Date: Sat Nov 2 16:28:46 2024 +0100 fix 7: geometry check unittest commit 6a2149a Author: Norraphat <[email protected]> Date: Sat Nov 2 11:27:49 2024 +0100 fix 6: unittest commit 8bf2f5f Author: Norraphat <[email protected]> Date: Sat Nov 2 08:46:47 2024 +0100 fix 5: dd4hep and unittest commit fccd44c Author: Norraphat <[email protected]> Date: Sat Nov 2 02:20:34 2024 +0100 fix 4: runTheMatrix commit de59c0b Author: Norraphat <[email protected]> Date: Sat Nov 2 01:23:45 2024 +0100 fix 3: runTheMatrix commit 653062d Author: Norraphat <[email protected]> Date: Sat Nov 2 00:53:17 2024 +0100 fix 2 commit bcd9457 Author: Norraphat <[email protected]> Date: Sat Nov 2 00:37:15 2024 +0100 fix 1 commit 81d9a01 Author: Norraphat <[email protected]> Date: Sat Nov 2 00:32:46 2024 +0100 remove obsolete files commit 784fbdd Author: Norraphat <[email protected]> Date: Sat Nov 2 00:21:19 2024 +0100 update-1
1 parent d08538a commit 8f41eb9

File tree

389 files changed

+2452
-2836
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

389 files changed

+2452
-2836
lines changed

Alignment/OfflineValidation/test/inspectData_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
from Configuration.PyReleaseValidation.upgradeWorkflowComponents import upgradeProperties
7070
ConditionsInfo = {}
7171
if 'D' in options.Detector:
72-
ConditionsInfo = upgradeProperties[2026][options.Detector] # so if the default changes, change wf only here
72+
ConditionsInfo = upgradeProperties['Run4'][options.Detector] # so if the default changes, change wf only here
7373
else:
7474
ConditionsInfo = upgradeProperties[2017][options.Detector]
7575

Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class RefitType(Enum):
109109
# Standard loads
110110
###################################################################
111111
if(options.isPhase2):
112-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
112+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
113113
else:
114114
process.load("Configuration.Geometry.GeometryRecoDB_cff")
115115

Alignment/OfflineValidation/test/test_all_Phase2_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ class RefitType(Enum):
8181
# Standard loads
8282
###################################################################
8383
#process.load("Configuration.Geometry.GeometryRecoDB_cff")
84-
process.load('Configuration.Geometry.GeometryExtended2026D110Reco_cff')
84+
process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
8585

8686
####################################################################
8787
# Get the BeamSpot

Alignment/OfflineValidation/test/testingScripts/test_unitMiscellanea.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ echo "TESTING inspect ALCARECO data ..."
55
cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=True trackCollection=ALCARECOTkAlCosmicsCTF0T || die "Failure running inspectData_cfg.py" $?
66

77
echo "TESTING inspect Phase2 ALCARECO data ..."
8-
cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=False globalTag='' trackCollection=ALCARECOTkAlZMuMu isDiMuonData=True Detector='2026D98' || die "Failure running inspectData_cfg.py on Phase-2 input" $?
8+
cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/inspectData_cfg.py unitTest=True isCosmics=False globalTag='' trackCollection=ALCARECOTkAlZMuMu isDiMuonData=True Detector='Run4D98' || die "Failure running inspectData_cfg.py on Phase-2 input" $?
99

1010
echo "TESTING G4e refitter ..."
1111
cmsRun ${CMSSW_BASE}/src/Alignment/OfflineValidation/test/testG4Refitter_cfg.py maxEvents=10 || die "Failure running testG4Refitter_cfg.py" $?

Alignment/TrackerAlignment/test/Misalignments/createRandomlyMisalignedGeometry_Phase2_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
###################################################################
4949
# Ideal geometry producer and standard includes
5050
###################################################################
51-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
51+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
5252
process.trackerGeometry.applyAlignment = True
5353

5454
###################################################################

Alignment/TrackerAlignment/test/createTrackerAlignmentRcds_Phase2_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
process.load("Configuration.StandardSequences.MagneticField_cff") # B-field map
2424
if(options.Scenario == _settings.DEFAULT_VERSION):
2525
print("Loading default scenario: ", _settings.DEFAULT_VERSION)
26-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
26+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
2727
else:
2828
process.load('Configuration.Geometry.GeometryExtended'+options.Scenario+'Reco_cff')
2929
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") # Global tag

CalibCalorimetry/HcalPlugins/test/hbhedarkeninganalyzer_cfg.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
process.load("Configuration.StandardSequences.Services_cff")
99
process.load("Configuration.Geometry.GeometryExtended2018Reco_cff")
10-
#process.load("Configuration.Geometry.GeometryExtended2026D49Reco_cff")
10+
#process.load("Configuration.Geometry.GeometryExtendedRun4D49Reco_cff")
1111
process.load("CalibCalorimetry.HcalPlugins.HBHEDarkening_cff")
1212

1313
import CalibCalorimetry.HcalPlugins.Hcal_Conditions_forGlobalTag_cff

CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelBuilder_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
)
2525

2626
## specify the default phase2 detector
27-
process.load("Configuration.Geometry.GeometryExtended2026Default_cff")
28-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
27+
process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
28+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
2929

3030
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
3131
from Configuration.AlCa.GlobalTag import GlobalTag

CondTools/SiPhase2Tracker/test/SiPhase2BadStripChannelReader_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
# Input data
5555
###################################################################
5656
if(options.fromESSource):
57-
process.load("Configuration.Geometry.GeometryExtended2026Default_cff")
58-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
57+
process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
58+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
5959
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
6060
from Configuration.AlCa.GlobalTag import GlobalTag
6161
process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '')

CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleReader_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
# Input data
5454
###################################################################
5555
if(options.fromESSource):
56-
process.load("Configuration.Geometry.GeometryExtended2026Default_cff")
57-
process.load('Configuration.Geometry.GeometryExtended2026DefaultReco_cff')
56+
process.load("Configuration.Geometry.GeometryExtendedRun4Default_cff")
57+
process.load('Configuration.Geometry.GeometryExtendedRun4DefaultReco_cff')
5858
process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
5959
from Configuration.AlCa.GlobalTag import GlobalTag
6060
process.GlobalTag = GlobalTag(process.GlobalTag, _PH2_GLOBAL_TAG, '')

0 commit comments

Comments
 (0)