Skip to content
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.

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

add necessary changes to run the uploads of the Combined High Granularity SiPixel alignment in the PCL #43794

Merged
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
3 changes: 2 additions & 1 deletion Calibration/TkAlCaRecoProducers/test/parseFwkJobReport.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
'SiStripBadStripRcdHitEff_pcl',
'SiStripLA_pcl',
'SiPixelAli_pcl', # Alignment
'SiPixelAliHG_pcl']
'SiPixelAliHG_pcl',
'SiPixelAliHGCombined_pcl']
TARGET_DQM_FILES=1
TARGET_DQM_FILENAME='./DQM_V0001_R000325022__Express__PCLTest__ALCAPROMPT.root'
TARGET_DB_FILES=len(TARGET_LIST_OF_TAGS)
Expand Down
3 changes: 3 additions & 0 deletions Calibration/TkAlCaRecoProducers/test/testPCLAlCaHarvesting.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ def findRunStopTime(run_number):
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiStripHitEff_dbOutput)
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelAli_dbOutput)
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelAliHG_dbOutput)
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelAliHGCombined_dbOutput)
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelLA_dbOutput)
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiPixelLAMCS_dbOutput)
process.PoolDBOutputService.toPut.append(process.ALCAHARVESTSiStripLA_dbOutput)
Expand All @@ -106,6 +107,7 @@ def findRunStopTime(run_number):
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiStripHitEff_metadata)
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelAli_metadata)
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelAliHG_metadata)
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelAliHGCombined_metadata)
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelLA_metadata)
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiPixelLAMCS_metadata)
process.pclMetadataWriter.recordsToMap.append(process.ALCAHARVESTSiStripLA_metadata)
Expand Down Expand Up @@ -164,6 +166,7 @@ def findRunStopTime(run_number):
process.SiStripHitEff,
process.SiPixelAli,
process.SiPixelAliHG,
process.SiPixelAliHGCombined,
process.SiPixelLA,
process.SiPixelLAMCS,
process.SiStripLA,
Expand Down
10 changes: 10 additions & 0 deletions CondFormats/Common/data/SiPixelAliHGCombRcd_prep.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS",
"destinationTags": {
"SiPixelAliHGCombined_PCL_v0_hlt": {},
"SiPixelAliHGCombined_PCL_v0_prompt": {}
},
"inputTag": "SiPixelAliHGCombined_pcl",
"since": null,
"userText": "T0 PCL Upload for SiPixel HG Combined (MiBias + Z->mm) Ali. (prep)"
}
10 changes: 10 additions & 0 deletions CondFormats/Common/data/SiPixelAliHGCombRcd_prod.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS",
"destinationTags": {
"SiPixelAliHGCombined_PCL_v0_hlt": {},
"SiPixelAliHGCombined_PCL_v0_prompt": {}
},
"inputTag": "SiPixelAliHGCombined_pcl",
"since": null,
"userText": "T0 PCL Upload for SiPixel HG Combined (MinBias + Z->mm) Ali. (prod)"
}
3 changes: 2 additions & 1 deletion CondFormats/Common/test/DropBoxMetadataReader.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
'SiStripApvGainRcd',
'TrackerAlignmentRcd',
'TrackerAlignmentHGRcd',
'TrackerAlignmentHGCombinedRcd',
'SiStripApvGainRcdAAG',
'EcalPedestalsRcd',
"LumiCorrectionsRcd",
Expand All @@ -49,7 +50,7 @@
"CTPPSRPAlignmentCorrectionsDataRcd",
"PPSTimingCalibrationRcd_HPTDC",
"PPSTimingCalibrationRcd_SAMPIC",
"SiStripLorentzAngleRcd",
"SiStripLorentzAngleRcd",
) # same strings as fType
)

Expand Down
10 changes: 10 additions & 0 deletions CondFormats/Common/test/ProduceDropBoxMetadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ def encodeJsonInString(filename):
SiPixelAliHGRcd_prod_str = encodeJsonInString("SiPixelAliHGRcd_prod.json")
SiPixelAliHGRcd_prep_str = encodeJsonInString("SiPixelAliHGRcd_prep.json")

#SiPixelAliHGComb
SiPixelAliHGCombRcd_prod_str = encodeJsonInString("SiPixelAliHGCombRcd_prod.json")
SiPixelAliHGCombRcd_prep_str = encodeJsonInString("SiPixelAliHGCombRcd_prep.json")

#EcalPedestalsRcd
EcalPedestalsRcd_prod_str = encodeJsonInString("EcalPedestal_prod.json")
EcalPedestalsRcd_prep_str = encodeJsonInString("EcalPedestal_prep.json")
Expand Down Expand Up @@ -174,6 +178,12 @@ def encodeJsonInString(filename):
prodMetaData = cms.untracked.string(SiPixelAliHGRcd_prod_str),
prepMetaData = cms.untracked.string(SiPixelAliHGRcd_prep_str),
),
cms.PSet(record = cms.untracked.string('TrackerAlignmentHGCombinedRcd'),
Source = cms.untracked.string("AlcaHarvesting"),
FileClass = cms.untracked.string("ALCA"),
prodMetaData = cms.untracked.string(SiPixelAliHGCombRcd_prod_str),
prepMetaData = cms.untracked.string(SiPixelAliHGCombRcd_prep_str),
),
cms.PSet(record = cms.untracked.string('SiStripApvGainRcdAAG'),
Source = cms.untracked.string("AlcaHarvesting"),
FileClass = cms.untracked.string("ALCA"),
Expand Down