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

Thread-safe conversion for HLT modules in CommonTools/RecoAlgos, backport of #9081 #9478

Merged
merged 1 commit into from
Jun 16, 2015
+8 −6
Merged

Thread-safe conversion for HLT modules in CommonTools/RecoAlgos, backport of #9081 #9478

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: 4 additions & 2 deletions CommonTools/RecoAlgos/interface/TrackSelector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
* $Id: TrackSelector.h,v 1.1 2009/03/04 13:11:28 llista Exp $
*
*/

#include "FWCore/Framework/interface/stream/EDFilter.h"
#include "DataFormats/TrackReco/interface/Track.h"
#include "DataFormats/TrackReco/interface/TrackFwd.h"
#include "DataFormats/TrackReco/interface/TrackExtra.h"
Expand Down Expand Up @@ -130,7 +132,7 @@ namespace helper {


//----------------------------------------------------------------------
class TrackSelectorBase : public edm::EDFilter {
class TrackSelectorBase : public edm::stream::EDFilter<> {
public:
TrackSelectorBase( const edm::ParameterSet & cfg ) {
std::string alias( cfg.getParameter<std::string>( "@module_label" ) );
Expand All @@ -145,7 +147,7 @@ namespace helper {


template<>
struct StoreManagerTrait<reco::TrackCollection> {
struct StoreManagerTrait< reco::TrackCollection, edm::stream::EDFilter<> > {
typedef TrackCollectionStoreManager type;
typedef TrackSelectorBase base;
};
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/RecoAlgos/plugins/LargestEtCaloJetSelector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
*
*/
#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 "DataFormats/JetReco/interface/CaloJet.h"
#include "CommonTools/Utils/interface/EtComparator.h"

typedef ObjectSelector<
typedef ObjectSelectorStream<
SortCollectionSelector<
reco::CaloJetCollection,
GreaterByEt<reco::CaloJet>
Expand Down
4 changes: 2 additions & 2 deletions CommonTools/RecoAlgos/plugins/LargestEtPFJetSelector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
*
*/
#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 "DataFormats/JetReco/interface/PFJet.h"
#include "CommonTools/Utils/interface/EtComparator.h"

typedef ObjectSelector<
typedef ObjectSelectorStream<
SortCollectionSelector<
reco::PFJetCollection,
GreaterByEt<reco::PFJet>
Expand Down