Merge pull request #32136 from MilanoBicocca-pix/BSforOnlineHLT_PR4_fix

Update BeamSpot DQM client configurations
cms-sw · Nov 17, 2020 · 8ebdaa0 · 8ebdaa0
2 parents 8d6455e + 3a6ac19
commit 8ebdaa0
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 37 deletions.
diff --git a/DQM/BeamMonitor/plugins/BeamMonitor.cc b/DQM/BeamMonitor/plugins/BeamMonitor.cc
@@ -1394,9 +1394,6 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
             << " [epoch in microseconds]";
         try {
           onlineDbService_->writeForNextLumisection(BSOnline, recordName_);
-          onlineDbService_->logger().logInfo()
-              << "BeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly";
-          DBloggerReturn_ = 2;
         } catch (const std::exception& e) {
           onlineDbService_->logger().logError() << "BeamMonitor - Error writing record: " << recordName_
                                                 << " for Run: " << frun << " - Lumi: " << fitLS.second;
@@ -1405,6 +1402,8 @@ void BeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi, int&
           onlineDbService_->logger().logError() << "\n" << bs;
           DBloggerReturn_ = -1;
         }
+        onlineDbService_->logger().logInfo()
+            << "BeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly";
       }
       edm::LogInfo("BeamMonitor") << "FitAndFill::[PayloadCreation] BeamSpotOnline payload created \n" << std::endl;
 

diff --git a/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc b/DQM/BeamMonitor/plugins/FakeBeamMonitor.cc
@@ -1416,9 +1416,6 @@ void FakeBeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi,
                                          << creationTime << " [epoch in microseconds]";
     try {
       onlineDbService_->writeForNextLumisection(BSOnline, recordName_);
-      onlineDbService_->logger().logInfo()
-          << "FakeBeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly";
-      DBloggerReturn_ = 2;
     } catch (const std::exception& e) {
       onlineDbService_->logger().logError() << "FakeBeamMonitor - Error writing record: " << recordName_
                                             << " for Run: " << frun << " - Lumi: " << fitLS.second;
@@ -1427,6 +1424,8 @@ void FakeBeamMonitor::FitAndFill(const LuminosityBlock& lumiSeg, int& lastlumi,
       onlineDbService_->logger().logError() << "\n" << bs;
       DBloggerReturn_ = -1;
     }
+    onlineDbService_->logger().logInfo()
+        << "FakeBeamMonitor::FitAndFill - [PayloadCreation] writeForNextLumisection executed correctly";
   }
   edm::LogInfo("FakeBeamMonitor") << "FitAndFill::[PayloadCreation] BeamSpotOnline payload created \n" << std::endl;
 

diff --git a/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beam_dqm_sourceclient-live_cfg.py
@@ -356,7 +356,7 @@
 
     DBParameters = cms.PSet(
                             messageLevel = cms.untracked.int32(0),
-                            authenticationPath = cms.untracked.string('')
+                            authenticationPath = cms.untracked.string('.')
                            ),
 
     # Upload to CondDB
@@ -366,7 +366,10 @@
     runNumber = cms.untracked.uint64(options.runNumber),
     lastLumiFile = cms.untracked.string(''),
     writeTransactionDelay = cms.untracked.uint32(options.transDelay),
+    latency = cms.untracked.uint32(2),
     autoCommit = cms.untracked.bool(True),
+    saveLogsOnDB = cms.untracked.bool(True),
+    jobName = cms.untracked.string("BeamSpotOnlineLegacyTest"), # name of the DB log record
     toPut = cms.VPSet(cms.PSet(
         record = cms.string(BSOnlineRecordName),
         tag = cms.string('BSOnlineLegacy_tag'),
@@ -379,6 +382,7 @@
 if not live or noDB:
     process.OnlineDBOutputService.connect = cms.string('sqlite_file:BeamSpotOnlineLegacy.db')
     process.OnlineDBOutputService.preLoadConnectionString = cms.untracked.string('sqlite_file:BeamSpotOnlineLegacy.db')
+    process.OnlineDBOutputService.saveLogsOnDB = cms.untracked.bool(False)
 
 #---------
 # Final path

diff --git a/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamfake_dqm_sourceclient-live_cfg.py
@@ -52,9 +52,13 @@
 process.load("DQM.Integration.config.environment_cfi")
 process.dqmEnv.subSystemFolder = 'FakeBeamMonitor'
 process.dqmSaver.tag           = 'FakeBeamMonitor'
+process.dqmSaver.runNumber     = options.runNumber
+process.dqmSaverPB.tag         = 'FakeBeamMonitor'
+process.dqmSaverPB.runNumber   = options.runNumber
 
 
 #---------------
+"""
 # Conditions
 if (live):
     process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
@@ -63,16 +67,16 @@
     from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
     process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
     # you may need to set manually the GT in the line below
-    process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10'
-
+    #process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10'
+"""
 #----------------------------
 # BeamMonitor
 process.load("DQM.BeamMonitor.FakeBeamMonitor_cff")
 
 
 #----------------
 # Setup tracking
-process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
+#process.load("Configuration.StandardSequences.GeometryRecoDB_cff")
 #process.load('Configuration.StandardSequences.MagneticField_AutoFromDBCurrent_cff')
 #process.load("Configuration.StandardSequences.RawToDigi_Data_cff")
 #process.load("RecoLocalTracker.Configuration.RecoLocalTracker_cff")
@@ -81,7 +85,7 @@
 #-----------------
 
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                               * process.dqmSaver)
+                               * process.dqmSaver * process.dqmSaverPB)
 
 #
 process.monitor = cms.Sequence(process.dqmFakeBeamMonitor
@@ -142,6 +146,8 @@
         writeTransactionDelay = cms.untracked.uint32(options.transDelay),
         latency = cms.untracked.uint32(2),
         autoCommit = cms.untracked.bool(True),
+        saveLogsOnDB = cms.untracked.bool(True),
+        jobName = cms.untracked.string("BeamSpotOnlineLegacyTest"), # name of the DB log record
         toPut = cms.VPSet(cms.PSet(
             record = cms.string(BSOnlineRecordName),
             tag = cms.string('BeamSpotOnlineTestLegacy'),

diff --git a/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhlt_dqm_sourceclient-live_cfg.py
@@ -64,10 +64,10 @@
 # DQM Live Environment
 #-----------------------------
 process.load("DQM.Integration.config.environment_cfi")
-process.dqmEnv.subSystemFolder = 'TrackingHLTBeamspotStream'
-process.dqmSaver.tag           = 'TrackingHLTBeamspotStream'
+process.dqmEnv.subSystemFolder = 'BeamMonitor'
+process.dqmSaver.tag           = 'BeamMonitor'
 process.dqmSaver.runNumber     = options.runNumber
-process.dqmSaverPB.tag         = 'TrackingHLTBeamspotStream'
+process.dqmSaverPB.tag         = 'BeamMonitor'
 process.dqmSaverPB.runNumber   = options.runNumber
 
 #-----------------------------
@@ -79,7 +79,7 @@
 # Calibration
 #---------------
 # Condition for P5 cluster
-process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
+#process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
 # Condition for lxplus: change and possibly customise the GT
 #from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
 #process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
@@ -121,7 +121,7 @@
 
     process.load("RecoVertex.BeamSpotProducer.BeamSpot_cfi")
 
-    process.dqmBeamMonitor.monitorName = 'TrackingHLTBeamspotStream'
+    process.dqmBeamMonitor.monitorName = 'BeamMonitor'
 
     process.dqmBeamMonitor.OnlineMode = True              
     process.dqmBeamMonitor.recordName = BSOnlineRecordName
@@ -160,7 +160,7 @@
 
         DBParameters = cms.PSet(
                                 messageLevel = cms.untracked.int32(0),
-                                authenticationPath = cms.untracked.string('')
+                                authenticationPath = cms.untracked.string('.')
                                ),
 
         # Upload to CondDB
@@ -170,7 +170,10 @@
         runNumber = cms.untracked.uint64(options.runNumber),
         lastLumiFile = cms.untracked.string(''),
         writeTransactionDelay = cms.untracked.uint32(options.transDelay),
+        latency = cms.untracked.uint32(2),
         autoCommit = cms.untracked.bool(True),
+        saveLogsOnDB = cms.untracked.bool(True),
+        jobName = cms.untracked.string("BeamSpotOnlineHLTTest"), # name of the DB log record
         toPut = cms.VPSet(cms.PSet(
             record = cms.string(BSOnlineRecordName),
             tag = cms.string('BSOnlineHLT_tag'),
@@ -183,6 +186,7 @@
     if unitTest or noDB:
       process.OnlineDBOutputService.connect = cms.string('sqlite_file:BeamSpotOnlineHLT.db')
       process.OnlineDBOutputService.preLoadConnectionString = cms.untracked.string('sqlite_file:BeamSpotOnlineHLT.db')
+      process.OnlineDBOutputService.saveLogsOnDB = cms.untracked.bool(False)
 
     process.p = cms.Path( process.hltTriggerTypeFilter
                         * process.dqmcommon

diff --git a/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/beamhltfake_dqm_sourceclient-live_cfg.py
@@ -9,25 +9,29 @@
 from Configuration.Eras.Era_Run2_2018_cff import Run2_2018
 process = cms.Process("FakeBeamMonitor", Run2_2018)
 
+# switch
+live = True # FIXME
+unitTest = False
 
-unitTest=False
 if 'unitTest=True' in sys.argv:
+  live=False
   unitTest=True
 
 
-
 # Common part for PP and H.I Running
 #-----------------------------
 if unitTest:
   process.load("DQM.Integration.config.unittestinputsource_cfi")
   from DQM.Integration.config.unittestinputsource_cfi import options
-else:
-  # for live online DQM in P5
+elif live:
   process.load("DQM.Integration.config.inputsource_cfi")
   from DQM.Integration.config.inputsource_cfi import options
+else:
+  process.load("DQM.Integration.config.fileinputsource_cfi")
+  from DQM.Integration.config.fileinputsource_cfi import options
 
-  # new stream label
-  process.source.streamLabel = cms.untracked.string('streamDQMOnlineBeamspot')
+# new stream label
+#process.source.streamLabel = cms.untracked.string('streamDQMOnlineBeamspot')
 
 # for testing in lxplus
 #process.load("DQM.Integration.config.fileinputsource_cfi")
@@ -47,7 +51,22 @@
 process.load("DQM.Integration.config.environment_cfi")
 process.dqmEnv.subSystemFolder = 'FakeBeamMonitor'
 process.dqmSaver.tag           = 'FakeBeamMonitor'
+process.dqmSaver.runNumber     = options.runNumber
+process.dqmSaverPB.tag         = 'FakeBeamMonitor'
+process.dqmSaverPB.runNumber   = options.runNumber
 
+#---------------
+"""
+# Conditions
+if (live):
+  process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
+else:
+  process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
+  from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
+  process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run2_data', '')
+  # you may need to set manually the GT in the line below
+  #process.GlobalTag.globaltag = '100X_upgrade2018_realistic_v10'
+"""
 #-----------------------------
 # BeamMonitor
 #-----------------------------
@@ -58,9 +77,9 @@
 # Calibration
 #---------------
 # Condition for P5 cluster
-process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
+#process.load("DQM.Integration.config.FrontierCondition_GT_cfi")
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                               * process.dqmSaver)
+                               * process.dqmSaver * process.dqmSaverPB)
 
 process.monitor = cms.Sequence(process.dqmBeamMonitor)
 
@@ -69,7 +88,13 @@
 from DQM.Integration.config.online_customizations_cfi import *
 process = customise(process)
 
-process.dqmBeamMonitor.monitorName = 'TrackingHLTBeamspotStream'
+# Set rawDataRepacker (HI and live) or rawDataCollector (for all the rest)
+if (process.runType.getRunType() == process.runType.hi_run and live):
+  rawDataInputTag = cms.InputTag("rawDataRepacker")
+else:
+  rawDataInputTag = cms.InputTag("rawDataCollector")
+
+process.dqmBeamMonitor.monitorName = 'FakeBeamMonitor'
 process.dqmBeamMonitor.OnlineMode = True              
 process.dqmBeamMonitor.recordName = BSOnlineRecordName
 
@@ -83,7 +108,7 @@
 
       DBParameters = cms.PSet(
                               messageLevel = cms.untracked.int32(0),
-                              authenticationPath = cms.untracked.string('')
+                              authenticationPath = cms.untracked.string('.')
                               ),
 
       # Upload to CondDB
@@ -93,7 +118,10 @@
       #lastLumiFile = cms.untracked.string('last_lumi.txt'),
       lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'),
       writeTransactionDelay = cms.untracked.uint32(options.transDelay),
+      latency = cms.untracked.uint32(2),
       autoCommit = cms.untracked.bool(True),
+      saveLogsOnDB = cms.untracked.bool(True),
+      jobName = cms.untracked.string("BeamSpotOnlineHLTTest"), # name of the DB log record
       toPut = cms.VPSet(cms.PSet(
           record = cms.string(BSOnlineRecordName),
           tag = cms.string('BeamSpotOnlineTestHLT'),
@@ -106,7 +134,7 @@
   process.OnlineDBOutputService = cms.Service("OnlineDBOutputService",
     DBParameters = cms.PSet(
                             messageLevel = cms.untracked.int32(0),
-                            authenticationPath = cms.untracked.string('')
+                            authenticationPath = cms.untracked.string('.')
                             ),
 
     # Upload to CondDB
@@ -117,6 +145,7 @@
     lastLumiFile = cms.untracked.string('last_lumi.txt'),
     #lastLumiUrl = cms.untracked.string('http://ru-c2e14-11-01.cms:11100/urn:xdaq-application:lid=52/getLatestLumiSection'),
     writeTransactionDelay = cms.untracked.uint32(options.transDelay),
+    latency = cms.untracked.uint32(2),
     autoCommit = cms.untracked.bool(True),
     toPut = cms.VPSet(cms.PSet(
         record = cms.string(BSOnlineRecordName),

diff --git a/DQM/Integration/python/clients/onlinebeammonitor_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/onlinebeammonitor_dqm_sourceclient-live_cfg.py
@@ -113,7 +113,7 @@
   from DQM.Integration.config.inputsource_cfi import options
   # for live online DQM in P5
   # new stream label
-  process.source.streamLabel = cms.untracked.string('streamDQMOnlineBeamspot')
+  #process.source.streamLabel = cms.untracked.string('streamDQMOnlineBeamspot')
 
 #ESProducer
 process.load("CondCore.CondDB.CondDB_cfi")
@@ -135,19 +135,19 @@
 
 )
 process.BeamSpotESProducer = cms.ESProducer("OnlineBeamSpotESProducer")
-if unitTest == True:
-  process.BeamSpotDBSource.connect = cms.string('frontier://FrontierProd/CMS_CONDITIONS') 
-else:
-  process.BeamSpotDBSource.connect = cms.string('oracle://cms_orcon_prod/CMS_CONDITIONS') 
+#if unitTest == True:
+process.BeamSpotDBSource.connect = cms.string('frontier://FrontierProd/CMS_CONDITIONS')
+#else:
+#  process.BeamSpotDBSource.connect = cms.string('oracle://cms_orcon_prod/CMS_CONDITIONS')
 #-----------------------------
 # DQM Live Environment
 #-----------------------------
 process.load("DQM.Integration.config.environment_cfi")
 process.dqmEnv.subSystemFolder = 'TrackingHLTBeamspotStream'
 process.dqmSaver.tag           = 'TrackingHLTBeamspotStream'
-#process.dqmSaver.runNumber     = options.runNumber
-#process.dqmSaverPB.tag         = 'TrackingHLTBeamspotStream'
-#process.dqmSaverPB.runNumber   = options.runNumber
+process.dqmSaver.runNumber     = options.runNumber
+process.dqmSaverPB.tag         = 'TrackingHLTBeamspotStream'
+process.dqmSaverPB.runNumber   = options.runNumber
 
 #-----------------------------
 # BeamMonitor
@@ -167,7 +167,7 @@
 
 
 process.dqmcommon = cms.Sequence(process.dqmEnv
-                               * process.dqmSaver)
+                               * process.dqmSaver * process.dqmSaverPB)
 
 process.monitor = cms.Sequence(process.dqmOnlineBeamMonitor)