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
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@
authenticationPath = cms.untracked.string('')
),
timetype = cms.untracked.string('runnumber'),
connect = cms.string('sqlite_file:SiStripBadStripPhase2_T33_v0.db'),
connect = cms.string('sqlite_file:SiStripBadStripPhase2_T35_v0.db'),
toPut = cms.VPSet(cms.PSet(
record = cms.string('SiStripBadStripRcd'),
tag = cms.string('SiStripBadStripPhase2_T33')
tag = cms.string('SiStripBadStripPhase2_T35')
))
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#process.SiPhase2OTFakeBadStripsESSource.printDebug = cms.untracked.bool(True) # this makes it verbose
process.SiPhase2OTFakeBadStripsESSource.badComponentsFraction = cms.double(0.05) # bad components fraction is 5%
else:
tag = 'SiStripBadStripPhase2_T33'
tag = 'SiStripBadStripPhase2_T35'
suffix = 'v0'
inFile = tag+'_'+suffix+'.db'
inDB = 'sqlite_file:'+inFile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
process.mySiPhase2OTFakeLorentzAngleESSource = SiPhase2OTFakeLorentzAngleESSource.clone(LAValue = cms.double(0.14))
process.es_prefer_fake_LA = cms.ESPrefer("SiPhase2OuterTrackerFakeLorentzAngleESSource","mySiPhase2OTFakeLorentzAngleESSource")
else:
tag = 'SiPhase2OuterTrackerLorentzAngle_T33'
tag = 'SiPhase2OuterTrackerLorentzAngle_T35'
suffix = 'v0'
inFile = tag+'_'+suffix+'.db'
inDB = 'sqlite_file:'+inFile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
SiPhase2OuterTrackerLorentzAngle = cms.untracked.PSet( limit = cms.untracked.int32(-1)),
)

tag = 'SiPhase2OuterTrackerLorentzAngle_T33'
tag = 'SiPhase2OuterTrackerLorentzAngle_T35'
suffix = 'v0'
outfile = tag+'_'+suffix+'.db'
outdb = 'sqlite_file:'+outfile
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@
elif tGeometry == 'T33':
geometry_cff = 'GeometryExtendedRun4D110_cff'
recoGeometry_cff = 'GeometryExtendedRun4D110Reco_cff'
elif tGeometry == 'T35':
geometry_cff = 'GeometryExtendedRun4D121_cff'
recoGeometry_cff = 'GeometryExtendedRun4D121Reco_cff'
else:
print("Unknown tracker geometry")
print("What are you doing ?!?!?!?!")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,16 +94,9 @@
process.load(recoGeometry_cff)
process.load(geometry_cff)

# trick to get the T33 GT instead
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_'+effectiveGeometry, '')
process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_'+tGeometry, '')

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@
elif tGeometry == 'T33':
geometry_cff = 'GeometryExtendedRun4D110_cff'
recoGeometry_cff = 'GeometryExtendedRun4D110Reco_cff'
elif tGeometry == 'T35':
geometry_cff = 'GeometryExtendedRun4D121_cff'
recoGeometry_cff = 'GeometryExtendedRun4D121Reco_cff'
else:
print("Unknown tracker geometry")
print("What are you doing ?!?!?!?!")
Expand Down
4 changes: 2 additions & 2 deletions CondTools/SiPixel/test/createTestDBObjects.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ 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_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" $?
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=T35 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_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" $?
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=T35 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" $?
Expand Down
Loading