Skip to content

Commit

Permalink
code-format
Browse files Browse the repository at this point in the history
  • Loading branch information
smorovic committed Feb 24, 2022
1 parent 1e446de commit 533f84a
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion EventFilter/Utilities/plugins/GlobalEvFOutputModule.cc
Expand Up @@ -276,7 +276,8 @@ namespace evf {
}

std::unique_ptr<edm::StreamerOutputModuleCommon> GlobalEvFOutputModule::beginStream(edm::StreamID) const {
return std::make_unique<edm::StreamerOutputModuleCommon>(ps_, &keptProducts()[edm::InEvent], description().moduleLabel());
return std::make_unique<edm::StreamerOutputModuleCommon>(
ps_, &keptProducts()[edm::InEvent], description().moduleLabel());
}

std::shared_ptr<GlobalEvFOutputJSONDef> GlobalEvFOutputModule::globalBeginRun(edm::RunForOutput const& run) const {
Expand Down
3 changes: 2 additions & 1 deletion EventFilter/Utilities/src/EvFOutputModule.cc
Expand Up @@ -148,7 +148,8 @@ namespace evf {

void EvFOutputModule::beginRun(edm::RunForOutput const& run) {
//create run Cache holding JSON file writer and variables
jsonWriter_ = std::make_unique<EvFOutputJSONWriter>(ps_, &keptProducts()[edm::InEvent], streamLabel_, description().moduleLabel());
jsonWriter_ = std::make_unique<EvFOutputJSONWriter>(
ps_, &keptProducts()[edm::InEvent], streamLabel_, description().moduleLabel());

//output INI file (non-const). This doesn't require globalBeginRun to be finished
const std::string openIniFileName = edm::Service<evf::EvFDaqDirector>()->getOpenInitFilePath(streamLabel_);
Expand Down
4 changes: 3 additions & 1 deletion IOPool/Streamer/interface/StreamerOutputModuleCommon.h
Expand Up @@ -20,7 +20,9 @@ namespace edm {

class StreamerOutputModuleCommon {
public:
explicit StreamerOutputModuleCommon(ParameterSet const& ps, SelectedProducts const* selections, std::string const& moduleLabel);
explicit StreamerOutputModuleCommon(ParameterSet const& ps,
SelectedProducts const* selections,
std::string const& moduleLabel);
~StreamerOutputModuleCommon();
static void fillDescription(ParameterSetDescription& desc);

Expand Down
5 changes: 3 additions & 2 deletions IOPool/Streamer/src/StreamerOutputModuleCommon.cc
Expand Up @@ -23,7 +23,9 @@
#include <zlib.h>

namespace edm {
StreamerOutputModuleCommon::StreamerOutputModuleCommon(ParameterSet const& ps, SelectedProducts const* selections, std::string const& moduleLabel)
StreamerOutputModuleCommon::StreamerOutputModuleCommon(ParameterSet const& ps,
SelectedProducts const* selections,
std::string const& moduleLabel)
:

serializer_(selections),
Expand Down Expand Up @@ -93,7 +95,6 @@ namespace edm {
Bytef const* buf = (Bytef const*)(moduleLabel.data());
crc = crc32(crc, buf, moduleLabel.length());
outputModuleId_ = static_cast<uint32>(crc);

}

StreamerOutputModuleCommon::~StreamerOutputModuleCommon() {}
Expand Down

0 comments on commit 533f84a

Please sign in to comment.