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

Running code-format for hlt #26984

Merged
merged 1 commit into from
May 29, 2019
Merged

Running code-format for hlt #26984

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
100 changes: 47 additions & 53 deletions RecoEgamma/EgammaHLTProducers/interface/ESListOfFEDSProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <FWCore/Framework/interface/MakerMacros.h>
#include <FWCore/Framework/interface/EDProducer.h>

#include <DataFormats/Common/interface/Handle.h>
#include <FWCore/Framework/interface/Event.h>
#include <FWCore/Framework/interface/stream/EDProducer.h>
Expand All @@ -29,61 +29,55 @@ namespace edm {
}

class ESListOfFEDSProducer : public edm::stream::EDProducer<> {

public:
ESListOfFEDSProducer(const edm::ParameterSet& pset);
~ESListOfFEDSProducer() override;
void produce(edm::Event & e, const edm::EventSetup& c) override;
void Egamma(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
void Muon(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
void Jets(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
ESListOfFEDSProducer(const edm::ParameterSet& pset);
~ESListOfFEDSProducer() override;
void produce(edm::Event& e, const edm::EventSetup& c) override;
void Egamma(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
void Muon(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
void Jets(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
//edm::InputTag Pi0ListToIgnore_;
bool EGamma_;
edm::EDGetTokenT<l1extra::L1EmParticleCollection> EMl1TagIsolated_;
edm::EDGetTokenT<l1extra::L1EmParticleCollection> EMl1TagNonIsolated_;
bool EMdoIsolated_;
bool EMdoNonIsolated_;
double EMregionEtaMargin_;
double EMregionPhiMargin_;
double Ptmin_iso_ ;
double Ptmin_noniso_;

bool Muon_ ;
double MUregionEtaMargin_;
double MUregionPhiMargin_;
double Ptmin_muon_ ;
edm::EDGetTokenT<l1extra::L1MuonParticleCollection> MuonSource_ ;

bool Jets_ ;
bool JETSdoCentral_ ;
bool JETSdoForward_ ;
bool JETSdoTau_ ;
double JETSregionEtaMargin_;
double JETSregionPhiMargin_;
double Ptmin_jets_ ;
edm::EDGetTokenT<l1extra::L1JetParticleCollection> CentralSource_;
edm::EDGetTokenT<l1extra::L1JetParticleCollection> ForwardSource_;
edm::EDGetTokenT<l1extra::L1JetParticleCollection> TauSource_;

std::string OutputLabel_;
EcalElectronicsMapping* TheMapping;

/// ESElectronicsMapping* TheESMapping;
ESElectronicsMapper *TheESMapping;

bool first_ ;
bool debug_ ;

std::vector<int> ListOfFEDS(double etaLow, double etaHigh, double phiLow,
double phiHigh, double etamargin, double phimargin);



//edm::InputTag Pi0ListToIgnore_;
bool EGamma_;
edm::EDGetTokenT<l1extra::L1EmParticleCollection> EMl1TagIsolated_;
edm::EDGetTokenT<l1extra::L1EmParticleCollection> EMl1TagNonIsolated_;
bool EMdoIsolated_;
bool EMdoNonIsolated_;
double EMregionEtaMargin_;
double EMregionPhiMargin_;
double Ptmin_iso_;
double Ptmin_noniso_;

bool Muon_;
double MUregionEtaMargin_;
double MUregionPhiMargin_;
double Ptmin_muon_;
edm::EDGetTokenT<l1extra::L1MuonParticleCollection> MuonSource_;

bool Jets_;
bool JETSdoCentral_;
bool JETSdoForward_;
bool JETSdoTau_;
double JETSregionEtaMargin_;
double JETSregionPhiMargin_;
double Ptmin_jets_;
edm::EDGetTokenT<l1extra::L1JetParticleCollection> CentralSource_;
edm::EDGetTokenT<l1extra::L1JetParticleCollection> ForwardSource_;
edm::EDGetTokenT<l1extra::L1JetParticleCollection> TauSource_;

std::string OutputLabel_;
EcalElectronicsMapping* TheMapping;

/// ESElectronicsMapping* TheESMapping;
ESElectronicsMapper* TheESMapping;

bool first_;
bool debug_;

std::vector<int> ListOfFEDS(
double etaLow, double etaHigh, double phiLow, double phiHigh, double etamargin, double phimargin);
};

#endif


43 changes: 19 additions & 24 deletions RecoEgamma/EgammaHLTProducers/interface/ESRecHitsMerger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <FWCore/Framework/interface/MakerMacros.h>
#include <FWCore/Framework/interface/global/EDProducer.h>

#include <DataFormats/Common/interface/Handle.h>
#include <FWCore/Framework/interface/Event.h>
#include <FWCore/Framework/interface/EDProducer.h>
Expand All @@ -19,32 +19,27 @@ namespace edm {
}

class ESRecHitsMerger : public edm::global::EDProducer<> {

public:
ESRecHitsMerger(const edm::ParameterSet& pset);
~ESRecHitsMerger() override;
void produce(edm::StreamID sid, edm::Event & e, const edm::EventSetup& c) const override;
void beginJob(void) override;
void endJob(void) override;
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
ESRecHitsMerger(const edm::ParameterSet& pset);
~ESRecHitsMerger() override;
void produce(edm::StreamID sid, edm::Event& e, const edm::EventSetup& c) const override;
void beginJob(void) override;
void endJob(void) override;
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
edm::InputTag EgammaSourceES_;
edm::InputTag MuonsSourceES_ ;
edm::InputTag TausSourceES_ ;
edm::InputTag JetsSourceES_ ;
edm::InputTag RestSourceES_ ;
edm::InputTag Pi0SourceES_ ;
edm::InputTag EtaSourceES_ ;
std::string OutputLabelES_;

std::string InputRecHitES_;


bool debug_ ;

edm::InputTag EgammaSourceES_;
edm::InputTag MuonsSourceES_;
edm::InputTag TausSourceES_;
edm::InputTag JetsSourceES_;
edm::InputTag RestSourceES_;
edm::InputTag Pi0SourceES_;
edm::InputTag EtaSourceES_;
std::string OutputLabelES_;

std::string InputRecHitES_;

bool debug_;
};

#endif


49 changes: 23 additions & 26 deletions RecoEgamma/EgammaHLTProducers/interface/EcalListOfFEDSProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <FWCore/Framework/interface/MakerMacros.h>
#include <FWCore/Framework/interface/EDProducer.h>

#include <DataFormats/Common/interface/Handle.h>
#include <FWCore/Framework/interface/Event.h>
#include <FWCore/Framework/interface/stream/EDProducer.h>
Expand All @@ -18,7 +18,7 @@
#include "DataFormats/L1Trigger/interface/L1MuonParticleFwd.h"
#include "DataFormats/L1Trigger/interface/L1JetParticle.h"
#include "DataFormats/L1Trigger/interface/L1JetParticleFwd.h"

#include <iostream>
#include <string>
#include <vector>
Expand All @@ -28,54 +28,51 @@ namespace edm {
}

class EcalListOfFEDSProducer : public edm::stream::EDProducer<> {

public:
public:
EcalListOfFEDSProducer(const edm::ParameterSet& pset);
~EcalListOfFEDSProducer() override;
void produce(edm::Event & e, const edm::EventSetup& c) override;
void produce(edm::Event& e, const edm::EventSetup& c) override;

void Egamma(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
void Muon(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
void Jets(edm::Event& e, const edm::EventSetup& es, std::vector<int>& done, std::vector<int>& FEDs);
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
edm::InputTag Pi0ListToIgnore_;
private:
edm::InputTag Pi0ListToIgnore_;
bool EGamma_;
edm::EDGetTokenT<l1extra::L1EmParticleCollection> EMl1TagIsolated_;
edm::EDGetTokenT<l1extra::L1EmParticleCollection> EMl1TagNonIsolated_;
bool EMdoIsolated_;
bool EMdoNonIsolated_;
double EMregionEtaMargin_;
double EMregionPhiMargin_;
double Ptmin_iso_ ;
double Ptmin_iso_;
double Ptmin_noniso_;
bool Muon_ ;

bool Muon_;
double MUregionEtaMargin_;
double MUregionPhiMargin_;
double Ptmin_muon_ ;
edm::EDGetTokenT<l1extra::L1MuonParticleCollection> MuonSource_ ;
bool Jets_ ;
bool JETSdoCentral_ ;
bool JETSdoForward_ ;
bool JETSdoTau_ ;
double Ptmin_muon_;
edm::EDGetTokenT<l1extra::L1MuonParticleCollection> MuonSource_;

bool Jets_;
bool JETSdoCentral_;
bool JETSdoForward_;
bool JETSdoTau_;
double JETSregionEtaMargin_;
double JETSregionPhiMargin_;
double Ptmin_jets_ ;
double Ptmin_jets_;
edm::EDGetTokenT<l1extra::L1JetParticleCollection> CentralSource_;
edm::EDGetTokenT<l1extra::L1JetParticleCollection> ForwardSource_;
edm::EDGetTokenT<l1extra::L1JetParticleCollection> TauSource_;

std::string OutputLabel_;
EcalElectronicsMapping* TheMapping;
bool first_ ;
bool debug_ ;
std::vector<int> ListOfFEDS(double etaLow, double etaHigh, double phiLow,
double phiHigh, double etamargin, double phimargin);
bool first_;
bool debug_;

std::vector<int> ListOfFEDS(
double etaLow, double etaHigh, double phiLow, double phiHigh, double etamargin, double phimargin);
};
#endif


59 changes: 27 additions & 32 deletions RecoEgamma/EgammaHLTProducers/interface/EcalRecHitsMerger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <FWCore/Framework/interface/MakerMacros.h>
#include <FWCore/Framework/interface/global/EDProducer.h>

#include <DataFormats/Common/interface/Handle.h>
#include <FWCore/Framework/interface/Event.h>
#include <FWCore/Framework/interface/EDProducer.h>
Expand All @@ -19,40 +19,35 @@ namespace edm {
}

class EcalRecHitsMerger : public edm::global::EDProducer<> {

public:
EcalRecHitsMerger(const edm::ParameterSet& pset);
~EcalRecHitsMerger() override;
void produce(edm::StreamID sid, edm::Event & e, const edm::EventSetup& c) const override;
void beginJob(void) override;
void endJob(void) override;
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);
EcalRecHitsMerger(const edm::ParameterSet& pset);
~EcalRecHitsMerger() override;
void produce(edm::StreamID sid, edm::Event& e, const edm::EventSetup& c) const override;
void beginJob(void) override;
void endJob(void) override;
static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

private:
edm::InputTag EgammaSourceEB_;
edm::InputTag MuonsSourceEB_ ;
edm::InputTag TausSourceEB_ ;
edm::InputTag JetsSourceEB_ ;
edm::InputTag RestSourceEB_ ;
edm::InputTag Pi0SourceEB_ ;
std::string OutputLabelEB_;

edm::InputTag EgammaSourceEE_;
edm::InputTag MuonsSourceEE_ ;
edm::InputTag TausSourceEE_ ;
edm::InputTag JetsSourceEE_ ;
edm::InputTag RestSourceEE_ ;
edm::InputTag Pi0SourceEE_ ;
std::string OutputLabelEE_;

std::string InputRecHitEB_;
std::string InputRecHitEE_;


bool debug_ ;

edm::InputTag EgammaSourceEB_;
edm::InputTag MuonsSourceEB_;
edm::InputTag TausSourceEB_;
edm::InputTag JetsSourceEB_;
edm::InputTag RestSourceEB_;
edm::InputTag Pi0SourceEB_;
std::string OutputLabelEB_;

edm::InputTag EgammaSourceEE_;
edm::InputTag MuonsSourceEE_;
edm::InputTag TausSourceEE_;
edm::InputTag JetsSourceEE_;
edm::InputTag RestSourceEE_;
edm::InputTag Pi0SourceEE_;
std::string OutputLabelEE_;

std::string InputRecHitEB_;
std::string InputRecHitEE_;

bool debug_;
};

#endif