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.

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

Jump to bottom

Update PPS DMD tag, remove deprecated SiStrip DMD tag #39380

Merged
merged 2 commits into from Sep 14, 2022
Merged

Update PPS DMD tag, remove deprecated SiStrip DMD tag #39380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b987d43
Update DropBoxMetadata scripts
francescobrivio Sep 13, 2022
72ac336
update PPS DMD tags
francescobrivio Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prep.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS",
"destinationTags": {
"CTPPSRPAlignment_byPCL_v0_prompt": {}
"CTPPSRPAlignment_byPCL_v1_prompt": {}
},
"inputTag": "CTPPSRPAlignment_real_pcl",
"since": null,
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/Common/data/CTPPSRPAlignmentCorrectionsDataRcd_prod.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS",
"destinationTags": {
"CTPPSRPAlignment_byPCL_v0_prompt": {}
"CTPPSRPAlignment_byPCL_v1_prompt": {}
},
"inputTag": "CTPPSRPAlignment_real_pcl",
"since": null,
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prep.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"destinationDatabase": "oracle://cms_orcoff_prep/CMS_CONDITIONS",
"destinationTags": {
"CTPPPSTimingCalibration_SAMPIC_byPCL_v0_prompt": {}
"CTPPPSTimingCalibration_SAMPIC_byPCL_v1_prompt": {}
},
"inputTag": "PPSDiamondSampicCalibration_pcl",
"since": null,
Expand Down
2 changes: 1 addition & 1 deletion CondFormats/Common/data/PPSTimingCalibrationRcd_Sampic_prod.json
View file
Open in desktop
@@ -1,7 +1,7 @@
{
"destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS",
"destinationTags": {
"CTPPPSTimingCalibration_SAMPIC_byPCL_v0_prompt": {}
"CTPPPSTimingCalibration_SAMPIC_byPCL_v1_prompt": {}
},
"inputTag": "PPSDiamondSampicCalibration_pcl",
"since": null,
Expand Down
10 changes: 0 additions & 10 deletions CondFormats/Common/data/SiStripApvGainRcdAfterAbortGap_prep.json
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions CondFormats/Common/data/SiStripApvGainRcdAfterAbortGap_prod.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions CondFormats/Common/test/DropBoxMetadataReader.py
View file
Open in desktop
Expand Up @@ -38,7 +38,6 @@
'SiStripApvGainRcd',
'TrackerAlignmentRcd',
'TrackerAlignmentHGRcd',
'SiStripApvGainRcdAfterAbortGap',
'SiStripApvGainRcdAAG',
'EcalPedestalsRcd',
"LumiCorrectionsRcd",
Expand All @@ -47,7 +46,8 @@
"SiPixelQualityFromDbRcd_other",
"SiPixelLorentzAngleRcd",
"CTPPSRPAlignmentCorrectionsDataRcd",
"PPSTimingCalibrationRcd"
"PPSTimingCalibrationRcd_HPTDC",
"PPSTimingCalibrationRcd_SAMPIC"
) # same strings as fType
)

Expand Down
14 changes: 3 additions & 11 deletions CondFormats/Common/test/ProduceDropBoxMetadata.py
View file
Open in desktop
Expand Up @@ -53,14 +53,12 @@ def encodeJsonInString(filename):
#SiStripApvGainRcd
SiStripApvGainRcd_prod_str = encodeJsonInString("SiStripApvGainRcd_prod.json")
SiStripApvGainRcd_multirun_prod_str = encodeJsonInString("SiStripApvGainRcd_multirun_prod.json")
SiStripApvGainRcdAfterAbortGap_prod_str = encodeJsonInString("SiStripApvGainRcdAfterAbortGap_prod.json") # can be removed, once 92x deployed
SiStripApvGainRcdAAG_prod_str = encodeJsonInString("SiStripApvGainRcdAAG_prod.json") # will take over
SiStripApvGainRcdAAG_prod_str = encodeJsonInString("SiStripApvGainRcdAAG_prod.json")
SiStripApvGainRcdAAG_multirun_prod_str = encodeJsonInString("SiStripApvGainRcdAAG_multirun_prod.json")

SiStripApvGainRcd_prep_str = encodeJsonInString("SiStripApvGainRcd_prep.json")
SiStripApvGainRcd_multirun_prep_str = encodeJsonInString("SiStripApvGainRcd_multirun_prep.json")
SiStripApvGainRcdAfterAbortGap_prep_str = encodeJsonInString("SiStripApvGainRcdAfterAbortGap_prep.json") # can be removed, once 92x deployed
SiStripApvGainRcdAAG_prep_str = encodeJsonInString("SiStripApvGainRcdAAG_prep.json") # will take over
SiStripApvGainRcdAAG_prep_str = encodeJsonInString("SiStripApvGainRcdAAG_prep.json")
SiStripApvGainRcdAAG_multirun_prep_str = encodeJsonInString("SiStripApvGainRcdAAG_multirun_prep.json")

#SiPixelAli
Expand Down Expand Up @@ -165,13 +163,7 @@ def encodeJsonInString(filename):
prodMetaData = cms.untracked.string(SiPixelAliHGRcd_prod_str),
prepMetaData = cms.untracked.string(SiPixelAliHGRcd_prep_str),
),
cms.PSet(record = cms.untracked.string('SiStripApvGainRcdAfterAbortGap'), # can be removed, once 92x deployed...
Source = cms.untracked.string("AlcaHarvesting"),
FileClass = cms.untracked.string("ALCA"),
prodMetaData = cms.untracked.string(SiStripApvGainRcdAfterAbortGap_prod_str),
prepMetaData = cms.untracked.string(SiStripApvGainRcdAfterAbortGap_prep_str),
),
cms.PSet(record = cms.untracked.string('SiStripApvGainRcdAAG'), # ... will take over
cms.PSet(record = cms.untracked.string('SiStripApvGainRcdAAG'),
Source = cms.untracked.string("AlcaHarvesting"),
FileClass = cms.untracked.string("ALCA"),
prodMetaData = cms.untracked.string(SiStripApvGainRcdAAG_prod_str),
Expand Down