From 8c966d5b7f3a409b3851e322407204a8222c6fc7 Mon Sep 17 00:00:00 2001
From: Tamas <Tamas.Almos.Vami@cern.ch>
Date: Sun, 2 Oct 2022 22:43:36 +0200
Subject: [PATCH] Change Phase2 CPE to T21 geom

---
 CondTools/SiPixel/data/phase2_T21_mapping.csv | 24 +++++++++++++++++++
 .../SiPixel/data/phase2_T21_mapping_den.csv   | 24 +++++++++++++++++++
 ...el2DTemplateDBObjectUploader_Phase2_cfg.py |  4 ++--
 ...ixelGenErrorDBObjectUploader_Phase2_cfg.py |  6 ++---
 ...ixelTemplateDBObjectUploader_Phase2_cfg.py |  6 ++---
 CondTools/SiPixel/test/createTestDBObjects.sh |  6 ++---
 6 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 CondTools/SiPixel/data/phase2_T21_mapping.csv
 create mode 100644 CondTools/SiPixel/data/phase2_T21_mapping_den.csv

diff --git a/CondTools/SiPixel/data/phase2_T21_mapping.csv b/CondTools/SiPixel/data/phase2_T21_mapping.csv
new file mode 100644
index 0000000000000..b7b43039ca4c9
--- /dev/null
+++ b/CondTools/SiPixel/data/phase2_T21_mapping.csv
@@ -0,0 +1,24 @@
+RULES,,,,
+,,,,
+BARREL,,,,
+,,,,
+TEMPLATE ID ,LAYER,LADDER,MODULE,
+303,1,1-12,1-9,
+303,2,1-28,1-9,
+303,3,1-24,1-9,
+303,4,1-32,1-9,
+,,,,
+ENDCAP,,,,
+,,,,
+TEMPLATE ID ,DISK,BLADE,SIDE,PANEL
+313,1-12,1-05,1-2,1
+,,,,
+EXCEPTIONS,,,,
+,,,,
+BARREL,,,,
+,,,,
+TEMPLATE ID ,LAYER,LADDER,MODULE,
+,,,,
+ENDCAP,,,,
+,,,,
+TEMPLATE ID ,DISK,BLADE,SIDE,PANEL
diff --git a/CondTools/SiPixel/data/phase2_T21_mapping_den.csv b/CondTools/SiPixel/data/phase2_T21_mapping_den.csv
new file mode 100644
index 0000000000000..2fd503f3c462b
--- /dev/null
+++ b/CondTools/SiPixel/data/phase2_T21_mapping_den.csv
@@ -0,0 +1,24 @@
+RULES,,,,
+,,,,
+BARREL,,,,
+,,,,
+TEMPLATE ID ,LAYER,LADDER,MODULE,
+310,1,1-12,1-9,
+310,2,1-28,1-9,
+310,3,1-24,1-9,
+310,4,1-32,1-9,
+,,,,
+ENDCAP,,,,
+,,,,
+TEMPLATE ID ,DISK,BLADE,SIDE,PANEL
+314,1-12,1-05,1-2,1
+,,,,
+EXCEPTIONS,,,,
+,,,,
+BARREL,,,,
+,,,,
+TEMPLATE ID ,LAYER,LADDER,MODULE,
+,,,,
+ENDCAP,,,,
+,,,,
+TEMPLATE ID ,DISK,BLADE,SIDE,PANEL
diff --git a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py
index 6b3cca60e1546..2c33871e78b53 100644
--- a/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py
+++ b/CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py
@@ -186,8 +186,8 @@
 process.load("FWCore.MessageService.MessageLogger_cfi")
 process.MessageLogger = cms.Service("MessageLogger",
                                     destinations = cms.untracked.vstring('SiPixel2DTemplateDBObjectUploader_Phase2.log'))
-process.load('Configuration.Geometry.GeometryExtended2026D49_cff')
-process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D88_cff')
+process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
 process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
 from Configuration.AlCa.GlobalTag import GlobalTag
 process.GlobalTag = GlobalTag(process.GlobalTag, options.GlobalTag, '')
diff --git a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py
index a88ada30679bc..0658715e072d7 100644
--- a/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py
+++ b/CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py
@@ -192,9 +192,9 @@
 elif tGeometry == 'T15':
     geometry_cff = 'GeometryExtended2026D49_cff'
     recoGeometry_cff = 'GeometryExtended2026D49Reco_cff'
-elif tGeometry == 'T16':
-    geometry_cff = 'GeometryExtended2026D48_cff'
-    recoGeometry_cff = 'GeometryExtended2026D48Reco_cff'
+elif tGeometry == 'T21':
+    geometry_cff = 'GeometryExtended2026D88_cff'
+    recoGeometry_cff = 'GeometryExtended2026D88Reco_cff'
 else:
     print("Unknown tracker geometry")
     print("What are you doing ?!?!?!?!")
diff --git a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py
index a5c6e358932ef..094511525722f 100644
--- a/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py
+++ b/CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py
@@ -192,9 +192,9 @@
 elif tGeometry == 'T15':
     geometry_cff = 'GeometryExtended2026D49_cff'
     recoGeometry_cff = 'GeometryExtended2026D49Reco_cff'
-elif tGeometry == 'T16':
-    geometry_cff = 'GeometryExtended2026D48_cff'
-    recoGeometry_cff = 'GeometryExtended2026D48Reco_cff'
+elif tGeometry == 'T21':
+    geometry_cff = 'GeometryExtended2026D92_cff'
+    recoGeometry_cff = 'GeometryExtended2026D92Reco_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 60aa17b778ef4..3bcbce6b5c5b1 100755
--- a/CondTools/SiPixel/test/createTestDBObjects.sh
+++ b/CondTools/SiPixel/test/createTestDBObjects.sh
@@ -11,13 +11,13 @@ echo -e "TESTING Pixel 1D GenErr DB code ..."
 cmsRun ${LOCAL_TEST_DIR}/SiPixelGenErrorDBObjectUploader_cfg.py MagField=0.0 Fullname=SiPixelGenErrorDBObject_phase1_0T_mc_BoR3_v1_bugfix Map=${LOCAL_TEST_DIR}/../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 ${LOCAL_TEST_DIR}/SiPixelTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=7 Append=mc_25x100 Map=${LOCAL_TEST_DIR}/../data/phase2_T15_mapping.csv geometry=T15 TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_25by100_templates_2020October || die "Failure running SiPixelTemplateDBObjectUploader_Phase2_cfg.py" $? 
+cmsRun ${LOCAL_TEST_DIR}/SiPixelTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${LOCAL_TEST_DIR}/../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" $? 
 
 echo -e "TESTING Pixel 1D GenErr DB code for Phase-2 ..."
-cmsRun ${LOCAL_TEST_DIR}/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=7 Append=mc_25x100 Map=${LOCAL_TEST_DIR}/../data/phase2_T15_mapping.csv geometry=T15 GenErrFilePath=CalibTracker/SiPixelESProducers/data/Phase2_25by100_templates_2020October || die "Failure running SiPixelGenErrorDBObjectUploader_Phase2_cfg.py" $? 
+cmsRun ${LOCAL_TEST_DIR}/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${LOCAL_TEST_DIR}/../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" $? 
 
 echo -e "TESTING Pixel 2D Template DB code for Phase-2 ..."
-cmsRun  ${LOCAL_TEST_DIR}/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=7 Append=mc_25x100 Map=${LOCAL_TEST_DIR}/../data/phase2_T15_mapping.csv TemplateFilePath=CalibTracker/SiPixelESProducers/data/Phase2_25by100_templates_2020October denominator=True || die "Failure running SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py" $? 
+cmsRun  ${LOCAL_TEST_DIR}/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py MagField=3.8 Version=1 Append=mc_25x100_IT615 Map=${LOCAL_TEST_DIR}/../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 SiPixelVCal DB codes ... \n\n"