Convert modules used in product to stream typed modules

Based on results from the static analyzer, we determined which modules would be safe to convert to stream type and therefore work properly when used in the threaded framework.
stadie · Apr 22, 2014 · 9996be1 · 9996be1
1 parent 8ca1553
commit 9996be1
Show file tree

Hide file tree

Showing 168 changed files with 338 additions and 380 deletions.
diff --git a/CommonTools/ParticleFlow/plugins/PFCandIsolatorFromDeposit.h b/CommonTools/ParticleFlow/plugins/PFCandIsolatorFromDeposit.h
@@ -1,7 +1,7 @@
 #ifndef PFCandIsolatorFromDeposits_H
 #define PFCandIsolatorFromDeposits_H
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 
@@ -20,7 +20,7 @@
 namespace edm { class Event; }
 namespace edm { class EventSetup; }
 
-class PFCandIsolatorFromDeposits : public edm::EDProducer {
+class PFCandIsolatorFromDeposits : public edm::stream::EDProducer<> {
 
 public:
   typedef edm::ValueMap<double> CandDoubleMap;

diff --git a/CommonTools/ParticleFlow/plugins/PFPileUp.h b/CommonTools/ParticleFlow/plugins/PFPileUp.h
@@ -7,7 +7,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "FWCore/Framework/interface/Event.h"
@@ -31,7 +31,7 @@ produces the corresponding collection of PileUpCandidates.
 
 
 
-class PFPileUp : public edm::EDProducer {
+class PFPileUp : public edm::stream::EDProducer<> {
  public:
 
   typedef std::vector< edm::FwdPtr<reco::PFCandidate> >  PFCollection;

diff --git a/EventFilter/CSCRawToDigi/interface/CSCDCCUnpacker.h b/EventFilter/CSCRawToDigi/interface/CSCDCCUnpacker.h
@@ -8,14 +8,14 @@
  */
 
 #include <FWCore/Framework/interface/ConsumesCollector.h>
-#include <FWCore/Framework/interface/EDProducer.h>
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 
 class CSCMonitorInterface;
 
-class CSCDCCUnpacker: public edm::EDProducer {
+class CSCDCCUnpacker: public edm::stream::EDProducer<> {
  public:
   /// Constructor
   CSCDCCUnpacker(const edm::ParameterSet & pset);

diff --git a/EventFilter/CSCTFRawToDigi/interface/CSCTFUnpacker.h b/EventFilter/CSCTFRawToDigi/interface/CSCTFUnpacker.h
@@ -1,7 +1,7 @@
 #ifndef CSCTFUnpacker_h
 #define CSCTFUnpacker_h
 
-#include <FWCore/Framework/interface/EDProducer.h>
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
 #include <FWCore/Utilities/interface/InputTag.h>
 
@@ -13,7 +13,7 @@
 
 class CSCTriggerMapping;
 
-class CSCTFUnpacker: public edm::EDProducer {
+class CSCTFUnpacker: public edm::stream::EDProducer<> {
 private:
 	int  m_minBX, m_maxBX;
 	bool swapME1strips;

diff --git a/EventFilter/CSCTFRawToDigi/plugins/CSCTFUnpacker.cc b/EventFilter/CSCTFRawToDigi/plugins/CSCTFUnpacker.cc
@@ -36,7 +36,7 @@
 //#include <iostream>
 #include <sstream>
 
-CSCTFUnpacker::CSCTFUnpacker(const edm::ParameterSet& pset):edm::EDProducer(),mapping(0){
+CSCTFUnpacker::CSCTFUnpacker(const edm::ParameterSet& pset):edm::stream::EDProducer<>(),mapping(0){
 	LogDebug("CSCTFUnpacker|ctor")<<"Started ...";
 
 	// Edges of the time window, which LCTs are put into (unlike tracks, which are always centred around 0):

diff --git a/EventFilter/CastorRawToDigi/plugins/CastorRawToDigi.h b/EventFilter/CastorRawToDigi/plugins/CastorRawToDigi.h
@@ -14,7 +14,7 @@
  *
  ************************************************************/
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
@@ -26,7 +26,7 @@
 #include "EventFilter/CastorRawToDigi/interface/CastorCtdcUnpacker.h"
 #include "EventFilter/CastorRawToDigi/interface/CastorDataFrameFilter.h"
 
-class CastorRawToDigi : public edm::EDProducer
+class CastorRawToDigi : public edm::stream::EDProducer<>
 {
 public:
   explicit CastorRawToDigi(const edm::ParameterSet& ps);

diff --git a/EventFilter/DTTFRawToDigi/interface/DTTFFEDReader.h b/EventFilter/DTTFRawToDigi/interface/DTTFFEDReader.h
@@ -18,13 +18,13 @@
 #include "DataFormats/L1DTTrackFinder/interface/L1MuDTChambThContainer.h"
 #include "DataFormats/L1DTTrackFinder/interface/L1MuDTTrackContainer.h"
 
-#include <FWCore/Framework/interface/EDProducer.h>
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
 #include <FWCore/Utilities/interface/InputTag.h>
 
 #include <string>
 
-class DTTFFEDReader : public edm::EDProducer {
+class DTTFFEDReader : public edm::stream::EDProducer<> {
 
  public:
 

diff --git a/EventFilter/ESRawToDigi/interface/ESRawToDigi.h b/EventFilter/ESRawToDigi/interface/ESRawToDigi.h
@@ -3,15 +3,15 @@
 
 #include "DataFormats/Common/interface/Handle.h"
 #include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "EventFilter/ESRawToDigi/interface/ESUnpacker.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "DataFormats/EcalRawData/interface/ESListOfFEDS.h"
 
 
-class ESRawToDigi : public edm::EDProducer {
+class ESRawToDigi : public edm::stream::EDProducer<> {
 
  public:
 

diff --git a/EventFilter/EcalRawToDigi/plugins/EcalRawToDigi.h b/EventFilter/EcalRawToDigi/plugins/EcalRawToDigi.h
@@ -27,7 +27,7 @@
 
 #include <DataFormats/Common/interface/Handle.h>
 #include <FWCore/Framework/interface/Event.h>
-#include <FWCore/Framework/interface/EDProducer.h>
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include <FWCore/MessageLogger/interface/MessageLogger.h>
 #include <FWCore/ParameterSet/interface/ParameterSet.h>
 #include <FWCore/Framework/interface/ESWatcher.h>
@@ -38,7 +38,7 @@ class EcalElectronicsMapper;
 class EcalElectronicsMapping;
 class DCCDataUnpacker;
 
-class EcalRawToDigi : public edm::EDProducer{
+class EcalRawToDigi : public edm::stream::EDProducer<>{
 
  public:
   /**

diff --git a/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerEvmRawToDigi.h b/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerEvmRawToDigi.h
@@ -21,7 +21,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -41,7 +41,7 @@ class FEDTrailer;
 
 
 // class declaration
-class L1GlobalTriggerEvmRawToDigi : public edm::EDProducer
+class L1GlobalTriggerEvmRawToDigi : public edm::stream::EDProducer<>
 {
 
 public:

diff --git a/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRawToDigi.h b/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRawToDigi.h
@@ -22,7 +22,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -46,7 +46,7 @@ class L1MuTriggerPtScale;
 
 
 // class declaration
-class L1GlobalTriggerRawToDigi : public edm::EDProducer
+class L1GlobalTriggerRawToDigi : public edm::stream::EDProducer<>
 {
 
 public:

diff --git a/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRecordProducer.h b/EventFilter/L1GlobalTriggerRawToDigi/interface/L1GlobalTriggerRecordProducer.h
@@ -20,7 +20,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -32,7 +32,7 @@
 class L1GtTriggerMask;
 
 // class declaration
-class L1GlobalTriggerRecordProducer : public edm::EDProducer
+class L1GlobalTriggerRecordProducer : public edm::stream::EDProducer<>
 {
 
 public:
@@ -45,12 +45,7 @@ class L1GlobalTriggerRecordProducer : public edm::EDProducer
 
 private:
 
-    virtual void beginJob();
-
-    virtual void produce(edm::Event&, const edm::EventSetup&);
-
-    ///
-    virtual void endJob();
+    virtual void produce(edm::Event&, const edm::EventSetup&) override;
 
 private:
 

diff --git a/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerRecordProducer.cc b/EventFilter/L1GlobalTriggerRawToDigi/src/L1GlobaTriggerRecordProducer.cc
@@ -69,11 +69,6 @@ L1GlobalTriggerRecordProducer::~L1GlobalTriggerRecordProducer()
 
 // member functions
 
-void L1GlobalTriggerRecordProducer::beginJob()
-{
-    // empty
-}
-
 // method called to produce the data
 void L1GlobalTriggerRecordProducer::produce(edm::Event& iEvent, const edm::EventSetup& evSetup)
 {
@@ -230,13 +225,5 @@ void L1GlobalTriggerRecordProducer::produce(edm::Event& iEvent, const edm::Event
 
 }
 
-//
-void L1GlobalTriggerRecordProducer::endJob()
-{
-
-    // empty now
-}
-
-
 // static class members
 
diff --git a/EventFilter/RPCRawToDigi/plugins/RPCUnpackingModule.h b/EventFilter/RPCRawToDigi/plugins/RPCUnpackingModule.h
@@ -6,7 +6,7 @@
  ** unpacking RPC raw data
  **/
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "FWCore/Framework/interface/ESWatcher.h"
 #include "CondFormats/DataRecord/interface/RPCEMapRcd.h"
@@ -17,7 +17,7 @@
 class RPCReadOutMapping;
 namespace edm { class Event; class EventSetup; class Run; }
 
-class RPCUnpackingModule: public edm::EDProducer {
+class RPCUnpackingModule: public edm::stream::EDProducer<> {
 public:
 
     ///Constructor

diff --git a/EventFilter/ScalersRawToDigi/src/ScalersRawToDigi.cc b/EventFilter/ScalersRawToDigi/src/ScalersRawToDigi.cc
@@ -16,7 +16,7 @@
 
 #include <memory>
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -35,7 +35,7 @@
 #include "DataFormats/Scalers/interface/DcsStatus.h"
 #include "DataFormats/Scalers/interface/ScalersRaw.h"
 
-class ScalersRawToDigi : public edm::EDProducer 
+class ScalersRawToDigi : public edm::stream::EDProducer<> 
 {
   public:
     explicit ScalersRawToDigi(const edm::ParameterSet&);

diff --git a/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.h b/EventFilter/SiPixelRawToDigi/plugins/SiPixelRawToDigi.h
@@ -7,7 +7,7 @@
  */
 
 #include "FWCore/Framework/interface/ESWatcher.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -23,7 +23,7 @@ class TH1D;
 class R2DTimerObserver;
 class PixelUnpackingRegions;
 
-class SiPixelRawToDigi : public edm::EDProducer {
+class SiPixelRawToDigi : public edm::stream::EDProducer<> {
 public:
 
   /// ctor

diff --git a/L1Trigger/GlobalTrigger/interface/ConvertObjectMapRecord.h b/L1Trigger/GlobalTrigger/interface/ConvertObjectMapRecord.h
@@ -20,11 +20,11 @@
  *
  */
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
-class ConvertObjectMapRecord : public edm::EDProducer {
+class ConvertObjectMapRecord : public edm::stream::EDProducer<> {
 
 public:
     explicit ConvertObjectMapRecord(const edm::ParameterSet& pset);

diff --git a/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h b/L1Trigger/L1ExtraFromDigis/interface/L1ExtraParticlesProd.h
@@ -18,7 +18,7 @@
 // system include files
 
 // user include files
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
@@ -38,7 +38,7 @@
 // forward declarations
 class L1CaloGeometry ;
 
-class L1ExtraParticlesProd : public edm::EDProducer {
+class L1ExtraParticlesProd : public edm::stream::EDProducer<> {
    public:
       explicit L1ExtraParticlesProd(const edm::ParameterSet&);
       ~L1ExtraParticlesProd();

diff --git a/PhysicsTools/IsolationAlgos/plugins/CandIsoDepositProducer.h b/PhysicsTools/IsolationAlgos/plugins/CandIsoDepositProducer.h
@@ -1,7 +1,7 @@
 #ifndef MuonIsolationProducers_CandIsoDepositProducer_H
 #define MuonIsolationProducers_CandIsoDepositProducer_H
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "DataFormats/Common/interface/AssociationVector.h"
@@ -17,7 +17,7 @@
 namespace edm { class Event; }
 namespace edm { class EventSetup; }
 
-class CandIsoDepositProducer : public edm::EDProducer {
+class CandIsoDepositProducer : public edm::stream::EDProducer<> {
 
 public:
   CandIsoDepositProducer(const edm::ParameterSet&);

diff --git a/PhysicsTools/IsolationAlgos/plugins/CandIsolatorFromDeposits.h b/PhysicsTools/IsolationAlgos/plugins/CandIsolatorFromDeposits.h
@@ -1,7 +1,7 @@
 #ifndef MuonIsolationProducers_CandIsolatorFromDeposits_H
 #define MuonIsolationProducers_CandIsolatorFromDeposits_H
 
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/ConsumesCollector.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
@@ -20,7 +20,7 @@
 namespace edm { class Event; }
 namespace edm { class EventSetup; }
 
-class CandIsolatorFromDeposits : public edm::EDProducer {
+class CandIsolatorFromDeposits : public edm::stream::EDProducer<> {
 
 public:
   typedef edm::ValueMap<double> CandDoubleMap;

diff --git a/RecoBTag/ImpactParameter/plugins/TrackIPProducer.h b/RecoBTag/ImpactParameter/plugins/TrackIPProducer.h
@@ -6,12 +6,12 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 class HistogramProbabilityEstimator;
 
-class TrackIPProducer : public edm::EDProducer {
+class TrackIPProducer : public edm::stream::EDProducer<> {
    public:
       explicit TrackIPProducer(const edm::ParameterSet&);
       ~TrackIPProducer();

diff --git a/RecoBTag/SecondaryVertex/plugins/BVertexFilter.cc b/RecoBTag/SecondaryVertex/plugins/BVertexFilter.cc
@@ -22,7 +22,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/stream/EDFilter.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -37,7 +37,7 @@
 // class declaration
 //
 #include "RecoBTag/SecondaryVertex/interface/VertexFilter.h"
-class BVertexFilter : public edm::EDFilter {
+class BVertexFilter : public edm::stream::EDFilter<> {
    public:
       explicit BVertexFilter(const edm::ParameterSet&);
       ~BVertexFilter();