Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 16 additions & 2 deletions CondTools/SiPixel/test/SiPixelLorentzAngleDBLoader_Phase2_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@
has3DinL1 = True
LA_value = 0.0503
tag = 'SiPixelLorentzAngle_Phase2_T33_v1'

elif tGeometry == 'T35':
geometry_cff = 'GeometryExtendedRun4D110_cff'
recoGeometry_cff = 'GeometryExtendedRun4D110Reco_cff'
has3DinL1 = True
LA_value = 0.0503
tag = 'SiPixelLorentzAngle_Phase2_T35_v1'

else:
print("Unknown tracker geometry")
print("What are you doing ?!?!?!?!")
Expand All @@ -83,13 +91,19 @@
geometry_cff = 'Configuration.Geometry.' + geometry_cff
recoGeometry_cff = 'Configuration.Geometry.' + recoGeometry_cff


process.load(recoGeometry_cff)
process.load(geometry_cff)

# trick to get the T33 GT instead
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you @mmusich for having provided the fix.
Is this trick really needed, after you have changed T33 with T35 in CondTools/SiPixel/test/createTestDBObjects.sh?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perrotta

yes because the GT key phase2_realistic_T35 does not exist, but I am planning to add it in #49790 (draft for now)
I would propose to merge this to get IBs running and then we can revisit it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perrotta

FYI, this is now undone at 896e606.

I will un-draft the PR once it passes integration tests.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perrotta

FYI, this is now undone at 896e606.

I will un-draft the PR once it passes integration tests.

Thank you!

geomSwap = {
"T35": "T33",
}

effectiveGeometry = geomSwap.get(tGeometry, tGeometry)

process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff")
from Configuration.AlCa.GlobalTag import GlobalTag
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_'+tGeometry, '')
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_'+effectiveGeometry, '')

process.load("FWCore.MessageService.MessageLogger_cfi")

Expand Down
2 changes: 1 addition & 1 deletion CondTools/SiPixel/test/createTestDBObjects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ echo -e "TESTING Pixel Template DB Object Reader ... \n\n"
cmsRun ${SCRAM_TEST_PATH}/SiPixelTemplateDBObjectReader_cfg.py MagField=3.8 readFromGT=True || die "Failure running SiPixelTemplateDBObjectReader_cfg.py MagField=3.8 readFromGT=True" $?

echo -e "TESTING Pixel LorentzAngle DB for Phase-2 ... \n\n"
cmsRun ${SCRAM_TEST_PATH}/SiPixelLorentzAngleDBLoader_Phase2_cfg.py geometry=T33 || die "Failure running SiPixelLorentzAngleDBLoader_Phase2_cfg.py geometry=T33" $?
cmsRun ${SCRAM_TEST_PATH}/SiPixelLorentzAngleDBLoader_Phase2_cfg.py geometry=T35 || die "Failure running SiPixelLorentzAngleDBLoader_Phase2_cfg.py geometry=T35" $?

echo -e "TESTING SiPixelVCal DB codes ... \n\n"

Expand Down