Merge pull request #45775 from mmusich/mm_dev_update_createTestDBObjects_T33

update `createTestDBObjects` unit test to use Tracker geometry T33

Author: cmsbuild

CondTools/SiPixel/data/phase2_T33_mapping.csv

@@ -0,0 +1,26 @@
+RULES,,,,
+,,,,
+BARREL,,,,
+,,,,
+TEMPLATE ID ,LAYER,LADDER,MODULE,
+411,1,1-12,1-9,
+2293,2,1-28,1-9,
+2293,3,1-24,1-9,
+2293,4,1-32,1-9,
+,,,,
+ENDCAP,,,,
+,,,,
+TEMPLATE ID ,DISK,BLADE,SIDE,PANEL
+2295,1-8,1-01,1-2,1
+2295,1-8,2-05,1-2,1
+2295,9-12,1-05,1-2,1
+,,,,
+EXCEPTIONS,,,,
+,,,,
+BARREL,,,,
+,,,,
+TEMPLATE ID ,LAYER,LADDER,MODULE,
+,,,,
+ENDCAP,,,,
+,,,,
+TEMPLATE ID ,DISK,BLADE,SIDE,PANEL

CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py

@@ -195,6 +195,9 @@
 elif tGeometry == 'T21':
     geometry_cff = 'GeometryExtended2026D88_cff'
     recoGeometry_cff = 'GeometryExtended2026D88Reco_cff'
+elif tGeometry == 'T33':
+    geometry_cff = 'GeometryExtended2026D110_cff'
+    recoGeometry_cff = 'GeometryExtended2026D110Reco_cff'
 else:
     print("Unknown tracker geometry")
     print("What are you doing ?!?!?!?!")
@@ -205,7 +208,6 @@
 process.load(recoGeometry_cff)
 
 global_tag_name = options.GlobalTag+'_'+tGeometry
-#global_tag_name = options.GlobalTag+'_T15'
 
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag

CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py

@@ -195,6 +195,9 @@
 elif tGeometry == 'T21':
     geometry_cff = 'GeometryExtended2026D92_cff'
     recoGeometry_cff = 'GeometryExtended2026D92Reco_cff'
+elif tGeometry == 'T33':
+    geometry_cff = 'GeometryExtended2026D110_cff'
+    recoGeometry_cff = 'GeometryExtended2026D110Reco_cff'
 else:
     print("Unknown tracker geometry")
     print("What are you doing ?!?!?!?!")
@@ -205,7 +208,6 @@
 process.load(recoGeometry_cff)
 
 global_tag_name = options.GlobalTag+'_'+tGeometry
-#global_tag_name = options.GlobalTag+'_T15'
 
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag

CondTools/SiPixel/test/createTestDBObjects.sh

@@ -11,16 +11,16 @@ 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_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping.csv geometry=T21 TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_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=T33 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_IT615 Map=${SCRAM_TEST_PATH}/../data/phase2_T21_mapping.csv geometry=T21 GenErrFilePath=CalibTracker/SiPixelESProducers/data/Phase2_IT_v6.1.5_25x100_irradiated_v2_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=T33 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" $?
+#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" $?
 
 echo -e "TESTING Pixel LorentzAngle DB for Phase-2 ..."
-cmsRun  ${SCRAM_TEST_PATH}/SiPixelLorentzAngleDBLoader_Phase2_cfg.py geometry=T25
+cmsRun  ${SCRAM_TEST_PATH}/SiPixelLorentzAngleDBLoader_Phase2_cfg.py geometry=T33
 
 echo -e "TESTING SiPixelVCal DB codes ... \n\n"