diff --git a/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py
index 92b9c2450119a..1708fc82aeae6 100644
--- a/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py
+++ b/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py
@@ -13,7 +13,8 @@
debugModules = cms.untracked.vstring('siStripDigis',
'siStripClusters',
'siStripZeroSuppression',
- 'SiStripClusterizer'),
+ 'SiStripClusterizer',
+ 'siStripApproximateClusterComparator'),
cout = cms.untracked.PSet(threshold = cms.untracked.string('ERROR')),
destinations = cms.untracked.vstring('cout')
)
@@ -35,15 +36,15 @@
#-----------------------------
# for live online DQM in P5
if (unitTest):
- process.load("DQM.Integration.config.unittestinputsource_cfi")
- from DQM.Integration.config.unittestinputsource_cfi import options
+ process.load("DQM.Integration.config.unitteststreamerinputsource_cfi")
+ from DQM.Integration.config.unitteststreamerinputsource_cfi import options
elif (live):
- process.load("DQM.Integration.config.inputsource_cfi")
- from DQM.Integration.config.inputsource_cfi import options
+ process.load("DQM.Integration.config.inputsource_cfi")
+ from DQM.Integration.config.inputsource_cfi import options
# for testing in lxplus
elif(offlineTesting):
- process.load("DQM.Integration.config.fileinputsource_cfi")
- from DQM.Integration.config.fileinputsource_cfi import options
+ process.load("DQM.Integration.config.fileinputsource_cfi")
+ from DQM.Integration.config.fileinputsource_cfi import options
#----------------------------
# DQM Live Environment
@@ -86,7 +87,10 @@
process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff')
from Configuration.AlCa.GlobalTag import GlobalTag as gtCustomise
#you may need to set manually the GT in the line below
- process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_data', '')
+ process.GlobalTag = gtCustomise(process.GlobalTag, 'auto:run3_hlt', '')
+
+
+print("Will process with GlobalTag %s",process.GlobalTag.globaltag.value())
#--------------------------------------------
# Patch to avoid using Run Info information in reconstruction
@@ -177,7 +181,7 @@
process.DQMCommon = cms.Sequence(process.dqmEnv*process.dqmEnvTr*process.dqmSaver*process.dqmSaverPB)
-print("Running with run type = ", process.runType.getRunType())
+print("Running with run type = ", process.runType.getRunTypeName())
### HEAVY ION SETTING
if process.runType.getRunType() == process.runType.hi_run:
diff --git a/DQM/Integration/test/BuildFile.xml b/DQM/Integration/test/BuildFile.xml
index fd4050d9d6e2a..be071297c9a86 100644
--- a/DQM/Integration/test/BuildFile.xml
+++ b/DQM/Integration/test/BuildFile.xml
@@ -22,10 +22,11 @@
+
-
-
-
+
+
+
diff --git a/DQM/Integration/test/runtest.sh b/DQM/Integration/test/runtest.sh
index b8a99f61ab9b2..b330023c59a61 100755
--- a/DQM/Integration/test/runtest.sh
+++ b/DQM/Integration/test/runtest.sh
@@ -19,7 +19,10 @@ mkdir -p $LOCAL_TEST_DIR/upload
if [[ $# -eq 1 ]]; then
cmsRun $CLIENTS_DIR/$1 unitTest=True
-else
+elif [[ $# -eq 2 ]]; then
echo "Will use streamers files for run $2"
cmsRun $CLIENTS_DIR/$1 unitTest=True runNumber=$2
+else
+ echo "Will use streamers files for run $2 and runkey $3"
+ cmsRun $CLIENTS_DIR/$1 unitTest=True runNumber=$2 runkey=$3
fi
diff --git a/DQM/SiPixelHeterogeneous/plugins/SiPixelPhase1RawDataErrorComparator.cc b/DQM/SiPixelHeterogeneous/plugins/SiPixelPhase1RawDataErrorComparator.cc
index 173e9cc381ff0..a63b05bbc68cd 100644
--- a/DQM/SiPixelHeterogeneous/plugins/SiPixelPhase1RawDataErrorComparator.cc
+++ b/DQM/SiPixelHeterogeneous/plugins/SiPixelPhase1RawDataErrorComparator.cc
@@ -224,7 +224,7 @@ void SiPixelPhase1RawDataErrorComparator::analyze(const edm::Event& iEvent, cons
}
}
- edm::LogPrint(kName) << " on gpu found: " << errorsOnGPU << " on cpu found: " << errorsOnCPU;
+ LogDebug(kName) << " on gpu found: " << errorsOnGPU << " on cpu found: " << errorsOnCPU;
h_totFEDErrors_->Fill(errorsOnCPU, errorsOnGPU);
@@ -274,14 +274,14 @@ void SiPixelPhase1RawDataErrorComparator::bookHistograms(DQMStore::IBooker& iBoo
h_totFEDErrors_ = make2DIfLog(iBook,
true,
true,
- "nTotalFEDError",
- "n. of total Pixel FEDError per event; CPU; GPU",
- 500,
+ "nTotalFEDErrors",
+ "n. of total Pixel FEDErrors per event; CPU; GPU",
+ 200,
log10(0.5),
- log10(5000.5),
- 500,
+ log10(1000.),
+ 200,
log10(0.5),
- log10(5000.5));
+ log10(1000.));
for (const auto& element : errorCodeToStringMap) {
h_nFEDErrors_[element.first] = iBook.book2I(fmt::sprintf("nFED%i_Errors", element.first),
diff --git a/DQM/SiStripMonitorApproximateCluster/plugins/SiStripMonitorApproximateCluster.cc b/DQM/SiStripMonitorApproximateCluster/plugins/SiStripMonitorApproximateCluster.cc
index e3fcb8eed3241..1281027ec8a46 100644
--- a/DQM/SiStripMonitorApproximateCluster/plugins/SiStripMonitorApproximateCluster.cc
+++ b/DQM/SiStripMonitorApproximateCluster/plugins/SiStripMonitorApproximateCluster.cc
@@ -221,12 +221,22 @@ void SiStripMonitorApproximateCluster::analyze(const edm::Event& iEvent, const e
// starts here comaparison with regular clusters
if (compareClusters_) {
+ if (stripClusterCollection_->empty()) {
+ edm::LogWarning("SiStripMonitorApproximateCluster")
+ << "Input SiStrip Cluster collecction was empty, skipping event! " << std::endl;
+ return;
+ }
+
edmNew::DetSetVector::const_iterator isearch =
stripClusterCollection_->find(detid); // search clusters of same detid
// protect against a missing match
- if (isearch != stripClusterCollection_->end())
+ if (isearch != stripClusterCollection_->end()) {
strip_clusters_detset = (*isearch);
+ } else {
+ edm::LogWarning("SiStripMonitorApproximateCluster")
+ << "No edmNew::DetSet was found for detid " << detid << std::endl;
+ }
}
for (const auto& cluster : detClusters) {