Skip to content

Miscellaneous improvements for DQM/Integration unit tests #42953

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

Merged
cmsbuild merged 4 commits into from
Oct 9, 2023
Merged

Miscellaneous improvements for DQM/Integration unit tests #42953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06dd05e
improve SiStripMonitorApproximateCluster logging
mmusich Oct 5, 2023
093de3f
add support for running unit test for sistrip_approx_dqm_sourceclient
mmusich Oct 5, 2023
13fa084
add unit test for sistrip_approx_dqm_sourceclient and refresh runs us…
mmusich Oct 5, 2023
9cb0dd8
SiPixelPhase1RawDataErrorComparator: demote LogPrint to LogDebug and …
mmusich Oct 5, 2023
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
22 changes: 13 additions & 9 deletions DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
)
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
7 changes: 4 additions & 3 deletions DQM/Integration/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@
<test name="TestDQMOnlineClient-rpc_dqm_sourceclient" command="runtest.sh rpc_dqm_sourceclient-live_cfg.py"/>
<test name="TestDQMOnlineClient-scal_dqm_sourceclient" command="runtest.sh scal_dqm_sourceclient-live_cfg.py"/>
<test name="TestDQMOnlineClient-sistrip_dqm_sourceclient" command="runtest.sh sistrip_dqm_sourceclient-live_cfg.py"/>
<test name="TestDQMOnlineClient-sistrip_approx_dqm_sourceclient" command="runtest.sh sistrip_approx_dqm_sourceclient-live_cfg.py 362321 hi_run"/>
<test name="TestDQMOnlineClient-onlinebeammonitor_dqm_sourceclient" command="runtest.sh onlinebeammonitor_dqm_sourceclient-live_cfg.py"/>
<test name="TestDQMOnlineClient-ecalgpu_dqm_sourceclient" command="runtest.sh ecalgpu_dqm_sourceclient-live_cfg.py 369956"/>
<test name="TestDQMOnlineClient-hcalgpu_dqm_sourceclient" command="runtest.sh hcalgpu_dqm_sourceclient-live_cfg.py 369956"/>
<test name="TestDQMOnlineClient-pixelgpu_dqm_sourceclient" command="runtest.sh pixelgpu_dqm_sourceclient-live_cfg.py 369956"/>
<test name="TestDQMOnlineClient-ecalgpu_dqm_sourceclient" command="runtest.sh ecalgpu_dqm_sourceclient-live_cfg.py 373710"/>
<test name="TestDQMOnlineClient-hcalgpu_dqm_sourceclient" command="runtest.sh hcalgpu_dqm_sourceclient-live_cfg.py 373710"/>
<test name="TestDQMOnlineClient-pixelgpu_dqm_sourceclient" command="runtest.sh pixelgpu_dqm_sourceclient-live_cfg.py 373710"/>
<!-- streamDQMCalibration is required -->
<!-- <test name="TestDQMOnlineClient-ecalcalib_dqm_sourceclient" command="runtest.sh ecalcalib_dqm_sourceclient-live_cfg.py" /> -->
<!-- streamDQMCalibration is required -->
Expand Down
5 changes: 4 additions & 1 deletion DQM/Integration/test/runtest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 7 additions & 7 deletions DQM/SiPixelHeterogeneous/plugins/SiPixelPhase1RawDataErrorComparator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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),
Expand Down
12 changes: 11 additions & 1 deletion DQM/SiStripMonitorApproximateCluster/plugins/SiStripMonitorApproximateCluster.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<SiStripCluster>::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<SiStripCluster> was found for detid " << detid << std::endl;
}
}

for (const auto& cluster : detClusters) {
Expand Down