Skip to content

Commit

Permalink
Fix -Wunused-parameter warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
William Tanenbaum committed Apr 25, 2011
1 parent fb8fa70 commit ce89efc
Show file tree
Hide file tree
Showing 5 changed files with 370 additions and 411 deletions.
17 changes: 9 additions & 8 deletions IOMC/RandomEngine/src/RandomEngineStateProducer.cc
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@

#include "IOMC/RandomEngine/src/RandomEngineStateProducer.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
#include "SimDataFormats/RandomEngine/interface/RandomEngineStates.h"

#include "FWCore/Framework/interface/Event.h"
#include "FWCore/Framework/interface/LuminosityBlock.h"
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
#include "SimDataFormats/RandomEngine/interface/RandomEngineStates.h"

#include <memory>

RandomEngineStateProducer::RandomEngineStateProducer(edm::ParameterSet const& pset) {
RandomEngineStateProducer::RandomEngineStateProducer(edm::ParameterSet const&) {
produces<edm::RandomEngineStates, edm::InLumi>("beginLumi");
produces<edm::RandomEngineStates>();
}
Expand All @@ -19,19 +20,19 @@ RandomEngineStateProducer::~RandomEngineStateProducer() {
}

void
RandomEngineStateProducer::produce(edm::Event& ev, edm::EventSetup const& es) {
RandomEngineStateProducer::produce(edm::Event& ev, edm::EventSetup const&) {
edm::Service<edm::RandomNumberGenerator> randomService;
if (randomService.isAvailable()) {
if(randomService.isAvailable()) {
std::auto_ptr<edm::RandomEngineStates> states(new edm::RandomEngineStates);
states->setRandomEngineStates(randomService->getEventCache());
ev.put(states);
}
}

void
RandomEngineStateProducer::beginLuminosityBlock(edm::LuminosityBlock& lb, edm::EventSetup const& es) {
RandomEngineStateProducer::beginLuminosityBlock(edm::LuminosityBlock& lb, edm::EventSetup const&) {
edm::Service<edm::RandomNumberGenerator> randomService;
if (randomService.isAvailable()) {
if(randomService.isAvailable()) {
std::auto_ptr<edm::RandomEngineStates> states(new edm::RandomEngineStates);
states->setRandomEngineStates(randomService->getLumiCache());
lb.put(states, "beginLumi");
Expand Down
17 changes: 8 additions & 9 deletions IOMC/RandomEngine/src/RandomFilter.cc
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@

#include "IOMC/RandomEngine/src/RandomFilter.h"

#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "FWCore/ServiceRegistry/interface/Service.h"
#include "FWCore/Utilities/interface/Exception.h"
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"

#include "CLHEP/Random/RandFlat.h"
#include "FWCore/Utilities/interface/Exception.h"

using namespace edm;

RandomFilter::RandomFilter(edm::ParameterSet const& ps) :
acceptRate_(ps.getUntrackedParameter<double>("acceptRate")),
flatDistribution_()
{
flatDistribution_() {
Service<RandomNumberGenerator> rng;
if ( ! rng.isAvailable()) {
if(!rng.isAvailable()) {
throw cms::Exception("Configuration")
<< "RandomFilter requires the RandomNumberGeneratorService,\n"
"which is not present in the configuration file. You must add\n"
"the service in the configuration file or remove the modules that\n"
"require it.\n";
"require it.\n";
}

CLHEP::HepRandomEngine& engine = rng->getEngine();

flatDistribution_.reset(new CLHEP::RandFlat(engine, 0.0, 1.0));
}

RandomFilter::~RandomFilter()
{
RandomFilter::~RandomFilter() {
}

bool RandomFilter::filter(edm::Event& e, edm::EventSetup const& c)
{
bool RandomFilter::filter(edm::Event&, edm::EventSetup const&) {
if (flatDistribution_->fire() < acceptRate_) return true;
return false;
}
Loading

0 comments on commit ce89efc

Please sign in to comment.