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

Fix ODR problems and includes in Selections.h #19353

Merged
merged 1 commit into from Jun 28, 2017
Merged

Fix ODR problems and includes in Selections.h #19353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 16 additions & 15 deletions PhysicsTools/UtilAlgos/interface/Selections.h
View file
Open in desktop
@@ -1,6 +1,7 @@
#ifndef Selections_H
#define Selections_H

#include "FWCore/MessageLogger/interface/MessageLogger.h"
#include "CommonTools/UtilAlgos/interface/EventSelector.h"
#include <cstdlib>
#include <iomanip>
Expand Down Expand Up @@ -130,14 +131,14 @@ class FilterOR : public Filter{


//forward declaration for friendship
class Selections;
class FilterSelections;

class Selection : public Filter {
class FilterSelection : public Filter {
public:
typedef std::vector<SFilter>::iterator iterator;
friend class Selections;
friend class FilterSelections;

Selection(std::string name, const edm::ParameterSet& iConfig) :
FilterSelection(std::string name, const edm::ParameterSet& iConfig) :
name_(name),
ntuplize_(iConfig.getParameter<bool>("ntuplize")),
makeContentPlots_(iConfig.getParameter<bool>("makeContentPlots")),
Expand Down Expand Up @@ -308,11 +309,11 @@ class Selection : public Filter {
std::string detailledPrintoutCategory_;
};

class Selections {
class FilterSelections {
public:
typedef std::vector<Selection>::iterator iterator;
typedef std::vector<FilterSelection>::iterator iterator;

Selections(const edm::ParameterSet& iConfig, edm::ConsumesCollector && iC) :
FilterSelections(const edm::ParameterSet& iConfig, edm::ConsumesCollector && iC) :
filtersPSet_(iConfig.getParameter<edm::ParameterSet>("filters")),
selectionPSet_(iConfig.getParameter<edm::ParameterSet>("selections"))
{
Expand All @@ -333,7 +334,7 @@ class Selections {
for (unsigned int iS=0;iS!=nS;iS++){
edm::ParameterSet pset=selectionPSet_.getParameter<edm::ParameterSet>(selectionNames[iS]);
// JR-2014 : the filters are not expanded here
selections_.push_back(Selection(selectionNames[iS],pset));
selections_.push_back(FilterSelection(selectionNames[iS],pset));
// selections_.insert(std::make_pair(selectionNames[iS],Selection(selectionNames[iS],pset)));
//keep track of list of filters for this selection for further dependency resolution
selectionFilters[selectionNames[iS]]=pset.getParameter<std::vector<std::string> >("filterOrder");
Expand Down Expand Up @@ -382,12 +383,12 @@ class Selections {

//finally, configure the Selections
//loop the selections instanciated
// for (std::map<std::string, Selection>::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt)
// for (std::map<std::string, FilterSelection>::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt)
// const std::string & sName=sIt->first;
//Selection & selection =sIt->second;
for (std::vector<Selection>::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt){
//FilterSelection & selection =sIt->second;
for (std::vector<FilterSelection>::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt){
const std::string & sName=sIt->name();
Selection & selection =*sIt;
FilterSelection & selection =*sIt;

//parse the vector of filterNames
std::vector<std::string> & listOfFilters=selectionFilters[sName];
Expand All @@ -404,7 +405,7 @@ class Selections {
// JR-2014 include the selection here, directly !
bool replaceBySelection=false;
//find an existing selection that match that name
for ( std::vector<Selection>::iterator sit=selections_.begin(); sit!= selections_.end() ; ++sit){
for ( std::vector<FilterSelection>::iterator sit=selections_.begin(); sit!= selections_.end() ; ++sit){
if (fOsName == sit->name_){
selection.filters_.push_back( SFilter(& (*sit), inverted));
replaceBySelection=true;
Expand All @@ -431,14 +432,14 @@ class Selections {
iterator end() { return selections_.end();}

//print each selection
void print(){ for (std::vector<Selection>::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt) sIt->print();}
void print(){ for (std::vector<FilterSelection>::iterator sIt=selections_.begin();sIt!=selections_.end();++sIt) sIt->print();}

private:
edm::ParameterSet filtersPSet_;
std::map<std::string, Filter*> filters_; // the global collection of available filters to pick from

edm::ParameterSet selectionPSet_;
std::vector<Selection> selections_;
std::vector<FilterSelection> selections_;
};


Expand Down
8 changes: 4 additions & 4 deletions PhysicsTools/UtilAlgos/plugins/ConfigurableAnalysis.cc
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ class ConfigurableAnalysis : public edm::EDFilter {
virtual bool filter(edm::Event&, const edm::EventSetup&) override;
virtual void endJob() override ;

Selections * selections_;
FilterSelections * selections_;
Plotter * plotter_;
NTupler * ntupler_;

Expand Down Expand Up @@ -85,7 +85,7 @@ ConfigurableAnalysis::ConfigurableAnalysis(const edm::ParameterSet& iConfig) :
edm::Service<VariableHelperService>()->init(moduleLabel,iConfig.getParameter<edm::ParameterSet>("Variables"), consumesCollector());

//list of selections
selections_ = new Selections(iConfig.getParameter<edm::ParameterSet>("Selections"), consumesCollector());
selections_ = new FilterSelections(iConfig.getParameter<edm::ParameterSet>("Selections"), consumesCollector());

//plotting device
edm::ParameterSet plotPset = iConfig.getParameter<edm::ParameterSet>("Plotter");
Expand Down Expand Up @@ -134,7 +134,7 @@ bool ConfigurableAnalysis::filter(edm::Event& iEvent, const edm::EventSetup& iSe
bool filledOnce=false;

// loop the requested selections
for (Selections::iterator selection=selections_->begin(); selection!=selections_->end();++selection){
for (FilterSelections::iterator selection=selections_->begin(); selection!=selections_->end();++selection){
//was this flow of filter actually asked for
bool skip=true;
unsigned int iFlow=0;
Expand All @@ -158,7 +158,7 @@ bool ConfigurableAnalysis::filter(edm::Event& iEvent, const edm::EventSetup& iSe
plotter_->fill(fullContent,iEvent);

//loop the filters to make cumulative and allButOne job
for (Selection::iterator filterIt=selection->begin(); filterIt!=selection->end();++filterIt){
for (FilterSelection::iterator filterIt=selection->begin(); filterIt!=selection->end();++filterIt){
SFilter & filter = (*filterIt);
// bool lastCut=((filterIt+1)==selection->end());

Expand Down