Skip to content

Change Phase-2 CPE unit test to use T21 geom #39572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cmsbuild merged 1 commit into from
Oct 4, 2022
Merged

Change Phase-2 CPE unit test to use T21 geom #39572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions CondTools/SiPixel/data/phase2_T21_mapping.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
24 changes: 24 additions & 0 deletions CondTools/SiPixel/data/phase2_T21_mapping_den.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions CondTools/SiPixel/test/SiPixel2DTemplateDBObjectUploader_Phase2_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, '')
Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiPixel/test/SiPixelGenErrorDBObjectUploader_Phase2_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?!?!?!?!")
Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiPixel/test/SiPixelTemplateDBObjectUploader_Phase2_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?!?!?!?!")
Expand Down
6 changes: 3 additions & 3 deletions CondTools/SiPixel/test/createTestDBObjects.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down