Merge pull request #41116 from mmusich/postPhase2AlignmentFollowUp

Fix several unit test post-merge of #41075
cms-sw · Mar 22, 2023 · 7530dfd · 7530dfd
2 parents 9d9b54f + 9ba4905
commit 7530dfd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py b/Alignment/OfflineValidation/test/testPrimaryVertexRelatedValidations_cfg.py
@@ -118,7 +118,7 @@ class RefitType(Enum):
 ####################################################################
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
-process.GlobalTag = GlobalTag(process.GlobalTag, ('auto:phase2_realistic' if options.isPhase2 else 'auto:phase1_2022_realistic'), '')
+process.GlobalTag = GlobalTag(process.GlobalTag, ('auto:phase2_realistic_T21' if options.isPhase2 else 'auto:phase1_2022_realistic'), '')
 
 if _allFromGT:
      print("############ testPVValidation_cfg.py: msg%-i: All is taken from GT")

diff --git a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py
@@ -46,7 +46,7 @@
 				 opts.VarParsing.varType.string,
 				 'Location of template files')
 options.register('GlobalTag',
-				 'auto:phase2_realistic',
+				 'auto:phase2_realistic_T21', # as needed by the unit test
 				 opts.VarParsing.multiplicity.singleton,
 				 opts.VarParsing.varType.string,
 				 'Global tag for this run')

diff --git a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py
@@ -46,7 +46,7 @@
     			 opts.VarParsing.varType.string,
     			 'Location of template files')
 options.register('GlobalTag',
-    			 'auto:phase2_realistic',
+                         'auto:phase2_realistic',
     			 opts.VarParsing.multiplicity.singleton,
     			 opts.VarParsing.varType.string,
     			 'Global tag for this run')

diff --git a/RecoTracker/MkFit/test/dumpMkFitGeometryPhase2.py b/RecoTracker/MkFit/test/dumpMkFitGeometryPhase2.py
@@ -14,9 +14,8 @@
 process.load('Configuration.StandardSequences.MagneticField_cff')
 process.load('Configuration.StandardSequences.Reconstruction_cff')
 process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
-
-from Configuration.AlCa.autoCond import autoCond
-process.GlobalTag.globaltag = autoCond['phase2_realistic']
+from Configuration.AlCa.GlobalTag import GlobalTag
+process.GlobalTag = GlobalTag(process.GlobalTag, "auto:phase2_realistic_T21", '')
 
 process.MessageLogger.cerr.threshold = "INFO"
 process.MessageLogger.cerr.MkFitGeometryESProducer = dict(limit=-1)

diff --git a/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/listIds_PhaseII.py
@@ -23,6 +23,7 @@
    process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '')
 else:
    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+   process.trackerGeometry.applyAlignment = False # needed to avoid to pass the Global Position Record
 
 process.load('FWCore.MessageService.MessageLogger_cfi')