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

For HI HLT: migration of 5 HI tracking modules to stream modules #11603

Merged
merged 1 commit into from
Oct 6, 2015
Merged

For HI HLT: migration of 5 HI tracking modules to stream modules #11603

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions RecoHI/HiTracking/interface/HIBestVertexProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#ifndef HIBestVertexProducer_H
#define HIBestVertexProducer_H

#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "DataFormats/BeamSpot/interface/BeamSpot.h"
#include "DataFormats/VertexReco/interface/Vertex.h"
#include "DataFormats/VertexReco/interface/VertexFwd.h"

namespace edm { class Event; class EventSetup; }

class HIBestVertexProducer : public edm::EDProducer
class HIBestVertexProducer : public edm::stream::EDProducer<>
{
public:
explicit HIBestVertexProducer(const edm::ParameterSet& ps);
~HIBestVertexProducer();
virtual void produce(edm::Event& ev, const edm::EventSetup& es);
virtual void produce(edm::Event& ev, const edm::EventSetup& es) override;

private:
void beginJob();
Expand Down
4 changes: 2 additions & 2 deletions RecoHI/HiTracking/plugins/HIBestVertexSelector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "FWCore/Framework/interface/MakerMacros.h"

#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
#include "CommonTools/UtilAlgos/interface/SortCollectionSelector.h"
#include "RecoHI/HiTracking/interface/BestVertexComparator.h"

Expand All @@ -13,7 +13,7 @@ namespace reco
{

// define your producer name
typedef ObjectSelector<
typedef ObjectSelectorStream<
SortCollectionSelector<
reco::VertexCollection,
GreaterByTracksSize<reco::Vertex>
Expand Down
6 changes: 3 additions & 3 deletions RecoHI/HiTracking/plugins/HIPixelClusterVtxProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef HIPixelClusterVtxProducer_H
#define HIPixelClusterVtxProducer_H

#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DataFormats/TrackerRecHit2D/interface/SiPixelRecHitCollection.h"
Expand All @@ -10,7 +10,7 @@ namespace edm { class Run; class Event; class EventSetup; }

class TrackerGeometry;

class HIPixelClusterVtxProducer : public edm::EDProducer
class HIPixelClusterVtxProducer : public edm::stream::EDProducer<>
{
public:
explicit HIPixelClusterVtxProducer(const edm::ParameterSet& ps);
Expand All @@ -24,7 +24,7 @@ class HIPixelClusterVtxProducer : public edm::EDProducer
float w;
};

virtual void produce(edm::Event& ev, const edm::EventSetup& es);
virtual void produce(edm::Event& ev, const edm::EventSetup& es) override;
int getContainedHits(const std::vector<VertexHit> &hits, double z0, double &chi);

std::string srcPixelsString_; //pixel rec hits
Expand Down
6 changes: 3 additions & 3 deletions RecoHI/HiTracking/plugins/HIPixelMedianVtxProducer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#ifndef HIPixelMedianVtxProducer_H
#define HIPixelMedianVtxProducer_H

#include "FWCore/Framework/interface/EDProducer.h"
#include "FWCore/Framework/interface/stream/EDProducer.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"

#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"

namespace edm { class Event; class EventSetup; }

class HIPixelMedianVtxProducer : public edm::EDProducer
class HIPixelMedianVtxProducer : public edm::stream::EDProducer<>
{
public:
explicit HIPixelMedianVtxProducer(const edm::ParameterSet& ps);
~HIPixelMedianVtxProducer(){};
virtual void produce(edm::Event& ev, const edm::EventSetup& es);
virtual void produce(edm::Event& ev, const edm::EventSetup& es) override;

private:
void beginJob(){};
Expand Down
4 changes: 2 additions & 2 deletions RecoHI/HiTracking/plugins/HIProtoTrackSelector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "FWCore/Framework/interface/MakerMacros.h"

#include "CommonTools/UtilAlgos/interface/ObjectSelector.h"
#include "CommonTools/UtilAlgos/interface/ObjectSelectorStream.h"
#include "RecoHI/HiTracking/plugins/HIProtoTrackSelector.h"

namespace reco
Expand All @@ -9,7 +9,7 @@ namespace reco
{

// define your producer name
typedef ObjectSelector<HIProtoTrackSelector> HIProtoTrackSelection;
typedef ObjectSelectorStream<HIProtoTrackSelector> HIProtoTrackSelection;

// declare the module as plugin
DEFINE_FWK_MODULE( HIProtoTrackSelection );
Expand Down