Merge pull request #23817 from lpernie/12X_HPBS_metadata

[10.2.X] HP BS
cms-sw · Jul 31, 2018 · c1d8bd2 · c1d8bd2
2 parents 1006786 + 5981885
commit c1d8bd2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/CondFormats/Common/test/BeamSpotObjectsRcdByLumi_prod.json b/CondFormats/Common/test/BeamSpotObjectsRcdByLumi_prod.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS", 
     "destinationTags": {
-        "BeamSpotObjects_PCL_byLumi_v0_prompt": {}
+        "BeamSpotObjects_LegacyPCL_byLumi_v0_prompt": {}
     }, 
     "inputTag": "BeamSpotObject_ByLumi", 
     "since": null, 

diff --git a/CondFormats/Common/test/BeamSpotObjectsRcdByRun_prod.json b/CondFormats/Common/test/BeamSpotObjectsRcdByRun_prod.json
@@ -1,9 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS", 
     "destinationTags": {
-        "BeamSpotObjects_2009_v1_express": {}, 
-        "BeamSpotObjects_PCL_byRun_v0_hlt": {}, 
-        "BeamSpotObjects_PCL_byRun_v0_prompt": {}
+        "BeamSpotObjects_LegacyPCL_byRun_v0_prompt": {}
     }, 
     "inputTag": "BeamSpotObject_ByRun", 
     "since": null, 

diff --git a/CondFormats/Common/test/BeamSpotObjectsRcdHPbyLumi_prod.json b/CondFormats/Common/test/BeamSpotObjectsRcdHPbyLumi_prod.json
@@ -1,7 +1,7 @@
 {
     "destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS", 
     "destinationTags": {
-        "BeamSpotObjectsHP_PCL_byLumi_v0_prompt": {}
+        "BeamSpotObjects_PCL_byLumi_v0_prompt": {}
     }, 
     "inputTag": "BeamSpotObjectHP_ByLumi", 
     "since": null, 

diff --git a/CondFormats/Common/test/BeamSpotObjectsRcdHPbyRun_prod.json b/CondFormats/Common/test/BeamSpotObjectsRcdHPbyRun_prod.json
@@ -1,9 +1,11 @@
 {
     "destinationDatabase": "oracle://cms_orcon_prod/CMS_CONDITIONS",
     "destinationTags": {
-        "BeamSpotObjectsHP_PCL_byRun_v0_prompt": {}
+        "BeamSpotObjects_2009_v1_express": {},
+        "BeamSpotObjects_PCL_byRun_v0_hlt": {},
+        "BeamSpotObjects_PCL_byRun_v0_prompt": {}
     },
     "inputTag": "BeamSpotObjectHP_ByRun",
     "since": null,
     "userText": "Tier0 PCL Upload for high performance BS byRun"
-}
+}
diff --git a/CondFormats/Common/test/ProduceDropBoxMetadata.py b/CondFormats/Common/test/ProduceDropBoxMetadata.py
@@ -186,7 +186,7 @@ def encodeJsonInString(filename):
 if process.mywriter.write:
 
     from CondCore.CondDB.CondDB_cfi import CondDB
-    CondDB.connect = "sqlite_file:DropBoxMetadata_SiPixelQuality.db"
+    CondDB.connect = "sqlite_file:DropBoxMetadata_HPBeamSpot.db"
 
     process.PoolDBOutputService = cms.Service("PoolDBOutputService",
                                               CondDB,