From 56c140659c4c3e9998165cdba0e5baff64478019 Mon Sep 17 00:00:00 2001
From: Carl Vuosalo <cvuosalo@cern.ch>
Date: Fri, 5 Jun 2015 17:53:32 +0200
Subject: [PATCH] Made files thread-safe

---
 CommonTools/RecoAlgos/interface/TrackSelector.h           | 6 ++++--
 CommonTools/RecoAlgos/plugins/LargestEtCaloJetSelector.cc | 4 ++--
 CommonTools/RecoAlgos/plugins/LargestEtPFJetSelector.cc   | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CommonTools/RecoAlgos/interface/TrackSelector.h b/CommonTools/RecoAlgos/interface/TrackSelector.h
index 8b422f95a0102..b9c52b8615c2c 100755
--- a/CommonTools/RecoAlgos/interface/TrackSelector.h
+++ b/CommonTools/RecoAlgos/interface/TrackSelector.h
@@ -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"
@@ -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" ) );
@@ -145,7 +147,7 @@ namespace helper {
 
 
   template<>
-  struct StoreManagerTrait<reco::TrackCollection> {
+  struct StoreManagerTrait< reco::TrackCollection, edm::stream::EDFilter<> > {
     typedef TrackCollectionStoreManager type;
     typedef TrackSelectorBase base;
   };
diff --git a/CommonTools/RecoAlgos/plugins/LargestEtCaloJetSelector.cc b/CommonTools/RecoAlgos/plugins/LargestEtCaloJetSelector.cc
index ca0574032d889..2a6a45a71368c 100755
--- a/CommonTools/RecoAlgos/plugins/LargestEtCaloJetSelector.cc
+++ b/CommonTools/RecoAlgos/plugins/LargestEtCaloJetSelector.cc
@@ -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> 
diff --git a/CommonTools/RecoAlgos/plugins/LargestEtPFJetSelector.cc b/CommonTools/RecoAlgos/plugins/LargestEtPFJetSelector.cc
index 12d9dc049cb2d..ae93dbcd8f392 100755
--- a/CommonTools/RecoAlgos/plugins/LargestEtPFJetSelector.cc
+++ b/CommonTools/RecoAlgos/plugins/LargestEtPFJetSelector.cc
@@ -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>