Skip to content

Commit

Permalink
code format
Browse files Browse the repository at this point in the history
  • Loading branch information
plujan committed Mar 23, 2020
1 parent 562cb0f commit 321a67c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,18 @@ void LumiProducerFromBrilcalc::produce(edm::Event& iEvent, const edm::EventSetup
std::pair<int, int> runls = std::make_pair(iEvent.run(), iEvent.luminosityBlock());
if (lumiData_.count(runls) == 1) {
// if we have data for this run/LS, put it in the event
LogDebug("LumiProducerFromBrilcalc") << "Filling for run " << runls.first << " ls " << runls.second << " with delivered "
<< lumiData_[runls].first << " dt " << lumiData_[runls].second;
LogDebug("LumiProducerFromBrilcalc") << "Filling for run " << runls.first << " ls " << runls.second
<< " with delivered " << lumiData_[runls].first << " dt "
<< lumiData_[runls].second;
iEvent.put(std::make_unique<LumiInfo>(lumiData_[runls].second, bxlumi, lumiData_[runls].first), "brilcalc");
} else {
if (throwIfNotFound_) {
throw cms::Exception("LumiProducerFromBrilcalc")
<< "Failed to find luminosity for run " << runls.first << " LS " << runls.second;
} else {
// just put in zeroes
edm::LogWarning("LumiProducerFromBrilcalc") << "Failed to find luminosity for run " << runls.first << " ls " << runls.second;
edm::LogWarning("LumiProducerFromBrilcalc")
<< "Failed to find luminosity for run " << runls.first << " ls " << runls.second;
iEvent.put(std::make_unique<LumiInfo>(0, bxlumi, 0), "brilcalc");
}
}
Expand Down
15 changes: 5 additions & 10 deletions RecoLuminosity/LumiProducer/test/TestLumiProducerFromBrilcalc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
//
//


// system include files
#include <memory>
#include <iostream>
Expand Down Expand Up @@ -71,9 +70,7 @@ class TestLumiProducerFromBrilcalc : public edm::one::EDAnalyzer<> {
// constructors and destructor
//
TestLumiProducerFromBrilcalc::TestLumiProducerFromBrilcalc(const edm::ParameterSet& iConfig)
: inputTag_(iConfig.getUntrackedParameter<edm::InputTag>("inputTag")),
lumiToken_(consumes<LumiInfo>(inputTag_)) {
}
: inputTag_(iConfig.getUntrackedParameter<edm::InputTag>("inputTag")), lumiToken_(consumes<LumiInfo>(inputTag_)) {}

TestLumiProducerFromBrilcalc::~TestLumiProducerFromBrilcalc() {
// do anything here that needs to be done at destruction time
Expand All @@ -90,17 +87,15 @@ void TestLumiProducerFromBrilcalc::analyze(const edm::Event& iEvent, const edm::

const LumiInfo& lumi = iEvent.get(lumiToken_);

std::cout << "Luminosity for " << iEvent.run() << " LS " << iEvent.luminosityBlock() << " is " << lumi.getTotalInstLumi() << std::endl;
std::cout << "Luminosity for " << iEvent.run() << " LS " << iEvent.luminosityBlock() << " is "
<< lumi.getTotalInstLumi() << std::endl;
}


// ------------ method called once each job just before starting event loop ------------
void TestLumiProducerFromBrilcalc::beginJob() {
}
void TestLumiProducerFromBrilcalc::beginJob() {}

// ------------ method called once each job just after ending the event loop ------------
void TestLumiProducerFromBrilcalc::endJob() {
}
void TestLumiProducerFromBrilcalc::endJob() {}

// ------------ method fills 'descriptions' with the allowed parameters for the module ------------
void TestLumiProducerFromBrilcalc::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
Expand Down

0 comments on commit 321a67c

Please sign in to comment.