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

Added QTest support to Protobuf files in DQMFileSaverPB #30357

Merged
merged 2 commits into from
Jul 14, 2020
Merged

Added QTest support to Protobuf files in DQMFileSaverPB #30357

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
39dedc6
Added QTests to protobuf files in DQMFileSaverPB
Jun 24, 2020
ad7843b
Fixed code checks
Jun 24, 2020
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
5 changes: 5 additions & 0 deletions DQMServices/FileIO/plugins/DQMFileSaverBase.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "FWCore/MessageLogger/interface/JobReport.h"
#include "FWCore/Utilities/interface/TimeOfDay.h"
#include "DataFormats/Histograms/interface/DQMToken.h"

#include "DQMFileSaverBase.h"

Expand Down Expand Up @@ -37,6 +38,10 @@ DQMFileSaverBase::DQMFileSaverBase(const edm::ParameterSet &ps) {

std::unique_lock<std::mutex> lck(initial_fp_lock_);
initial_fp_ = fp;

// This makes sure a file saver runs in a very end
consumesMany<DQMToken, edm::InLumi>();
consumesMany<DQMToken, edm::InRun>();
}

DQMFileSaverBase::~DQMFileSaverBase() = default;
Expand Down
22 changes: 20 additions & 2 deletions DQMServices/FileIO/plugins/DQMFileSaverPB.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,26 @@ void DQMFileSaverPB::savePB(DQMStore* store, std::string const& filename, int ru
histo.set_size(buffer.Length());
histo.set_streamed_histo((void const*)buffer.Buffer(), buffer.Length());

// Save quality reports if this is not in reference section.
// XXX not supported by protobuf files.
// Save quality reports
for (QReport* qr : me->getQReports()) {
andrius-k marked this conversation as resolved.
Show resolved Hide resolved
std::string result;
// TODO: 64 is likely too short; memory corruption in the old code?
char buf[64];
std::snprintf(buf, sizeof(buf), "qr=st:%d:%.*g:", qr->getStatus(), DBL_DIG + 2, qr->getQTresult());
result = '<' + me->getName() + '.' + qr->getQRName() + '>';
result += buf;
result += qr->getAlgorithm() + ':' + qr->getMessage();
result += "</" + me->getName() + '.' + qr->getQRName() + '>';
TObjString str(result.c_str());

dqmstorepb::ROOTFilePB::Histo& qr_histo = *dqmstore_message.add_histo();
TBufferFile qr_buffer(TBufferFile::kWrite);
qr_buffer.WriteObject(&str);
qr_histo.set_full_pathname(me->getFullname() + '.' + qr->getQRName());
qr_histo.set_flags(static_cast<uint32_t>(MonitorElement::Kind::STRING));
qr_histo.set_size(qr_buffer.Length());
qr_histo.set_streamed_histo((void const*)qr_buffer.Buffer(), qr_buffer.Length());
}

// Save efficiency tag, if any.
// XXX not supported by protobuf files.
Expand Down