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

Cleanup of Cellular Automaton seeding code #20177

Merged
merged 6 commits into from Aug 31, 2017
Merged

Cleanup of Cellular Automaton seeding code #20177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
39caddb
Remove unused pieces of CAHit{Quadruplet,Triplet}Generator
makortel Aug 11, 2017
8eb42df
Add missing header
makortel Aug 11, 2017
38c4329
Remove virtual destructors as they became unnecessary
makortel Aug 28, 2017
b5bee5b
Remove CAOnlyOneLastHitPerLayerFilter parameter as obsolete
makortel Aug 28, 2017
b6c8021
Code style checks
makortel Aug 28, 2017
2be23e0
Remove obsolete python configuration and customisation files
makortel Aug 28, 2017
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
6 changes: 3 additions & 3 deletions RecoPixelVertexing/PixelTriplets/interface/HitQuadrupletGenerator.h
View file
Open in desktop
Expand Up @@ -19,15 +19,15 @@ class HitQuadrupletGenerator : public OrderedHitsGenerator {

HitQuadrupletGenerator(unsigned int size=500);

virtual ~HitQuadrupletGenerator() { }
~HitQuadrupletGenerator() override { }

virtual const OrderedHitSeeds & run(
const OrderedHitSeeds & run(
const TrackingRegion& region, const edm::Event & ev, const edm::EventSetup& es) final;

virtual void hitQuadruplets( const TrackingRegion& reg, OrderedHitSeeds& prs,
const edm::Event & ev, const edm::EventSetup& es) = 0;

virtual void clear() final;
void clear() final;

private:
OrderedHitSeeds theQuadruplets;
Expand Down
10 changes: 6 additions & 4 deletions RecoPixelVertexing/PixelTriplets/interface/HitTripletEDProducerT.h
View file
Open in desktop
Expand Up @@ -17,17 +17,19 @@
#include "RecoPixelVertexing/PixelTriplets/interface/IntermediateHitTriplets.h"
#include "RecoPixelVertexing/PixelTriplets/interface/LayerTriplets.h"

#include <numeric>

namespace hitTripletEDProducerT { class ImplBase; }

template <typename T_HitTripletGenerator>
class HitTripletEDProducerT: public edm::stream::EDProducer<> {
public:
HitTripletEDProducerT(const edm::ParameterSet& iConfig);
~HitTripletEDProducerT() = default;
~HitTripletEDProducerT() override = default;

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

virtual void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;

private:
edm::EDGetTokenT<IntermediateHitDoublets> doubletToken_;
Expand Down Expand Up @@ -56,7 +58,7 @@ namespace hitTripletEDProducerT {
ImplGeneratorBase(const edm::ParameterSet& iConfig, edm::ConsumesCollector& iC):
generator_(iConfig, iC)
{}
~ImplGeneratorBase() = default;
~ImplGeneratorBase() override = default;

protected:
T_HitTripletGenerator generator_;
Expand All @@ -69,7 +71,7 @@ namespace hitTripletEDProducerT {
public:
Impl(const edm::ParameterSet& iConfig, edm::ConsumesCollector& iC):
ImplGeneratorBase<T_HitTripletGenerator>(iConfig, iC) {}
~Impl() = default;
~Impl() override = default;

void produces(edm::ProducerBase& producer) const override {
T_SeedingHitSets::produces(producer);
Expand Down
6 changes: 3 additions & 3 deletions RecoPixelVertexing/PixelTriplets/interface/HitTripletGenerator.h
View file
Open in desktop
Expand Up @@ -21,9 +21,9 @@ class HitTripletGenerator : public OrderedHitsGenerator {
HitTripletGenerator(unsigned int size=500);
HitTripletGenerator(HitTripletGenerator const & other) : localRA(other.localRA.mean()){}

virtual ~HitTripletGenerator() { }
~HitTripletGenerator() override { }

virtual const OrderedHitTriplets & run(
const OrderedHitTriplets & run(
const TrackingRegion& region, const edm::Event & ev, const edm::EventSetup& es) final;

// temporary interface, for bckwd compatibility
Expand All @@ -33,7 +33,7 @@ class HitTripletGenerator : public OrderedHitsGenerator {
virtual void hitTriplets( const TrackingRegion& reg, OrderedHitTriplets & prs,
const edm::Event & ev, const edm::EventSetup& es) = 0;

virtual void clear() final;
void clear() final;

private:
OrderedHitTriplets theTriplets;
Expand Down
6 changes: 3 additions & 3 deletions RecoPixelVertexing/PixelTriplets/interface/OrderedHitSeeds.h
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@
class OrderedHitSeeds : public std::vector<SeedingHitSet>, public OrderedSeedingHits {
public:

virtual ~OrderedHitSeeds(){}
~OrderedHitSeeds() override{}

virtual unsigned int size() const { return std::vector<SeedingHitSet>::size(); }
unsigned int size() const override { return std::vector<SeedingHitSet>::size(); }

virtual const SeedingHitSet & operator[](unsigned int i) const {
const SeedingHitSet & operator[](unsigned int i) const override {
return std::vector<SeedingHitSet>::operator[](i);
}

Expand Down
6 changes: 3 additions & 3 deletions RecoPixelVertexing/PixelTriplets/interface/OrderedHitTriplets.h
View file
Open in desktop
Expand Up @@ -9,11 +9,11 @@
class OrderedHitTriplets : public std::vector<OrderedHitTriplet>, public OrderedSeedingHits {
public:

virtual ~OrderedHitTriplets(){}
~OrderedHitTriplets() override{}

virtual unsigned int size() const { return std::vector<OrderedHitTriplet>::size(); }
unsigned int size() const override { return std::vector<OrderedHitTriplet>::size(); }

virtual const OrderedHitTriplet & operator[](unsigned int i) const {
const OrderedHitTriplet & operator[](unsigned int i) const override {
return std::vector<OrderedHitTriplet>::operator[](i);
}

Expand Down
2 changes: 1 addition & 1 deletion RecoPixelVertexing/PixelTriplets/interface/ThirdHitPredictionFromCircle.h
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ class ThirdHitPredictionFromCircle {
// using Vector2D=ThirdHitPredictionFromCircle::VectorF2D;
// using Scalar=float;

HelixRZ() : circle(0) {}
HelixRZ() : circle(nullptr) {}
HelixRZ(const ThirdHitPredictionFromCircle *icircle,
double iz1, double z2, double curv);

Expand Down
9 changes: 4 additions & 5 deletions RecoPixelVertexing/PixelTriplets/plugins/CAHitNtupletEDProducerT.cc
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@
#include "FWCore/Utilities/interface/RunningAverage.h"

#include "RecoTracker/TkHitPairs/interface/RegionsSeedingHitSets.h"
#include "RecoPixelVertexing/PixelTriplets/interface/OrderedHitTriplets.h"
#include "RecoPixelVertexing/PixelTriplets/interface/OrderedHitSeeds.h"
#include "RecoTracker/TkHitPairs/interface/IntermediateHitDoublets.h"

Expand All @@ -26,11 +25,11 @@ template <typename T_Generator>
class CAHitNtupletEDProducerT: public edm::stream::EDProducer<> {
public:
CAHitNtupletEDProducerT(const edm::ParameterSet& iConfig);
~CAHitNtupletEDProducerT() = default;
~CAHitNtupletEDProducerT() override = default;

static void fillDescriptions(edm::ConfigurationDescriptions& descriptions);

virtual void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;
void produce(edm::Event& iEvent, const edm::EventSetup& iSetup) override;

private:
edm::EDGetTokenT<IntermediateHitDoublets> doubletToken_;
Expand All @@ -43,7 +42,7 @@ class CAHitNtupletEDProducerT: public edm::stream::EDProducer<> {
template <typename T_Generator>
CAHitNtupletEDProducerT<T_Generator>::CAHitNtupletEDProducerT(const edm::ParameterSet& iConfig):
doubletToken_(consumes<IntermediateHitDoublets>(iConfig.getParameter<edm::InputTag>("doublets"))),
generator_(iConfig, consumesCollector(), false)
generator_(iConfig, consumesCollector())
{
produces<RegionsSeedingHitSets>();
}
Expand Down Expand Up @@ -79,7 +78,7 @@ void CAHitNtupletEDProducerT<T_Generator>::produce(edm::Event& iEvent, const edm
generator_.initEvent(iEvent, iSetup);

LogDebug("CAHitNtupletEDProducer") << "Creating ntuplets for " << regionDoublets.regionSize() << " regions, and " << regionDoublets.layerPairsSize() << " layer pairs";
std::vector<typename T_Generator::ResultType> ntuplets;
std::vector<OrderedHitSeeds> ntuplets;
ntuplets.resize(regionDoublets.regionSize());
for(auto& ntuplet : ntuplets) ntuplet.reserve(localRA_.upper());

Expand Down