Finish consumes migration for DataMixer

SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.cc

@@ -36,7 +36,7 @@ namespace edm
   DataMixingEMDigiWorker::DataMixingEMDigiWorker() { }
 
   // Constructor 
-  DataMixingEMDigiWorker::DataMixingEMDigiWorker(const edm::ParameterSet& ps) : 
+  DataMixingEMDigiWorker::DataMixingEMDigiWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
 							    label_(ps.getParameter<std::string>("Label"))
 
   {                                                         
@@ -50,22 +50,23 @@ namespace edm
     EEProducerSig_ = ps.getParameter<edm::InputTag>("EEdigiProducerSig");
     ESProducerSig_ = ps.getParameter<edm::InputTag>("ESdigiProducerSig");
 
+    EBDigiToken_ = iC.consumes<EBDigiCollection>(EBProducerSig_);
+    EEDigiToken_ = iC.consumes<EEDigiCollection>(EEProducerSig_);
+    ESDigiToken_ = iC.consumes<ESDigiCollection>(ESProducerSig_);
+
     EBPileInputTag_ = ps.getParameter<edm::InputTag>("EBPileInputTag");
     EEPileInputTag_ = ps.getParameter<edm::InputTag>("EEPileInputTag");
     ESPileInputTag_ = ps.getParameter<edm::InputTag>("ESPileInputTag");
 
+    EBDigiPileToken_ = iC.consumes<EBDigiCollection>(EBPileInputTag_);
+    EEDigiPileToken_ = iC.consumes<EEDigiCollection>(EEPileInputTag_);
+    ESDigiPileToken_ = iC.consumes<ESDigiCollection>(ESPileInputTag_);
+
     EBDigiCollectionDM_        = ps.getParameter<std::string>("EBDigiCollectionDM");
     EEDigiCollectionDM_        = ps.getParameter<std::string>("EEDigiCollectionDM");
     ESDigiCollectionDM_        = ps.getParameter<std::string>("ESDigiCollectionDM");
-   //   nMaxPrintout_            = ps.getUntrackedParameter<int>("nMaxPrintout",10);
-
-   //EBalgo_ = new EcalDigiSimpleAlgo();
-   //EEalgo_ = new EcalDigiSimpleAlgo();
 
-   // don't think I can "produce" in a sub-class...
 
-   //produces< EBDigiCollection >(EBDigiCollectionDM_);
-   //produces< EEDigiCollection >(EEDigiCollectionDM_);
 
   }
 
@@ -85,7 +86,7 @@ namespace edm
 
    const EBDigiCollection*  EBDigis = 0;
 
-   if(e.getByLabel(EBProducerSig_, pEBDigis) ){
+   if(e.getByToken(EBDigiToken_, pEBDigis) ){
      EBDigis = pEBDigis.product(); // get a ptr to the product
      LogDebug("DataMixingEMDigiWorker") << "total # EB digis: " << EBDigis->size();
    }
@@ -116,7 +117,7 @@ namespace edm
    const EEDigiCollection*  EEDigis = 0;
 
 
-   if(e.getByLabel(EEProducerSig_, pEEDigis) ){
+   if(e.getByToken(EEDigiToken_, pEEDigis) ){
      EEDigis = pEEDigis.product(); // get a ptr to the product
      LogDebug("DataMixingEMDigiWorker") << "total # EE digis: " << EEDigis->size();
    } 
@@ -145,7 +146,7 @@ namespace edm
    const ESDigiCollection*  ESDigis = 0;
 
 
-   if(e.getByLabel( ESProducerSig_, pESDigis) ){
+   if(e.getByToken( ESDigiToken_, pESDigis) ){
      ESDigis = pESDigis.product(); // get a ptr to the product
 #ifdef DEBUG
      LogDebug("DataMixingEMDigiWorker") << "total # ES digis: " << ESDigis->size();

SimGeneral/DataMixingModule/plugins/DataMixingEMDigiWorker.h

@@ -17,6 +17,7 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
@@ -46,7 +47,7 @@ namespace edm
       DataMixingEMDigiWorker();
 
      /** standard constructor*/
-      explicit DataMixingEMDigiWorker(const edm::ParameterSet& ps);
+      explicit DataMixingEMDigiWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
 
       /**Default destructor*/
       virtual ~DataMixingEMDigiWorker();
@@ -80,6 +81,15 @@ namespace edm
       edm::InputTag EEPileInputTag_; // complete input tag for EE pileup digis
       edm::InputTag ESPileInputTag_; // complete input tag for ES pileup digis
 
+      edm::EDGetTokenT<EBDigiCollection> EBDigiToken_ ;  // Token to retrieve information
+      edm::EDGetTokenT<EEDigiCollection> EEDigiToken_ ;  // Token to retrieve information
+      edm::EDGetTokenT<ESDigiCollection> ESDigiToken_ ;  // Token to retrieve information  
+
+      edm::EDGetTokenT<EBDigiCollection> EBDigiPileToken_ ;  // Token to retrieve information
+      edm::EDGetTokenT<EEDigiCollection> EEDigiPileToken_ ;  // Token to retrieve information
+      edm::EDGetTokenT<ESDigiCollection> ESDigiPileToken_ ;  // Token to retrieve information  
+
+
       std::string EBDigiCollectionDM_; // secondary name to be given to EB collection of hits
       std::string EEDigiCollectionDM_; // secondary name to be given to EE collection of hits
       std::string ESDigiCollectionDM_; // secondary name to be given to ES collection of hits

SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.cc

@@ -27,7 +27,7 @@ namespace edm
   DataMixingEMWorker::DataMixingEMWorker() { }
 
   // Constructor 
-  DataMixingEMWorker::DataMixingEMWorker(const edm::ParameterSet& ps) : 
+  DataMixingEMWorker::DataMixingEMWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
 							    label_(ps.getParameter<std::string>("Label"))
 
   {                                                         
@@ -41,6 +41,10 @@ namespace edm
     EEProducerSig_ = ps.getParameter<edm::InputTag>("EEProducerSig");
     ESProducerSig_ = ps.getParameter<edm::InputTag>("ESProducerSig");
 
+    EBRecHitToken_ = iC.consumes<EBRecHitCollection>(EBProducerSig_);
+    EERecHitToken_ = iC.consumes<EERecHitCollection>(EEProducerSig_);
+    ESRecHitToken_ = iC.consumes<ESRecHitCollection>(ESProducerSig_);
+
 
     EBrechitCollectionSig_ = ps.getParameter<edm::InputTag>("EBrechitCollectionSig");
     EErechitCollectionSig_ = ps.getParameter<edm::InputTag>("EErechitCollectionSig");
@@ -50,19 +54,14 @@ namespace edm
     EEPileRecHitInputTag_ = ps.getParameter<edm::InputTag>("EEPileRecHitInputTag");
     ESPileRecHitInputTag_ = ps.getParameter<edm::InputTag>("ESPileRecHitInputTag");
 
+    EBPileRecHitToken_ = iC.consumes<EBRecHitCollection>(EBPileRecHitInputTag_);
+    EEPileRecHitToken_ = iC.consumes<EERecHitCollection>(EEPileRecHitInputTag_);
+    ESPileRecHitToken_ = iC.consumes<ESRecHitCollection>(ESPileRecHitInputTag_);
+
 
     EBRecHitCollectionDM_        = ps.getParameter<std::string>("EBRecHitCollectionDM");
     EERecHitCollectionDM_        = ps.getParameter<std::string>("EERecHitCollectionDM");
     ESRecHitCollectionDM_        = ps.getParameter<std::string>("ESRecHitCollectionDM");
-   //   nMaxPrintout_            = ps.getUntrackedParameter<int>("nMaxPrintout",10);
-
-   //EBalgo_ = new EcalRecHitSimpleAlgo();
-   //EEalgo_ = new EcalRecHitSimpleAlgo();
-
-   // don't think I can "produce" in a sub-class...
-
-   //produces< EBRecHitCollection >(EBRecHitCollectionDM_);
-   //produces< EERecHitCollection >(EERecHitCollectionDM_);
 
   }
 
@@ -82,7 +81,7 @@ namespace edm
 
    const EBRecHitCollection*  EBRecHits = 0;
 
-   if(e.getByLabel(EBProducerSig_, pEBRecHits) ){
+   if(e.getByToken(EBRecHitToken_, pEBRecHits) ){
      EBRecHits = pEBRecHits.product(); // get a ptr to the product
      LogDebug("DataMixingEMWorker") << "total # EB rechits: " << EBRecHits->size();
    }
@@ -110,7 +109,7 @@ namespace edm
    const EERecHitCollection*  EERecHits = 0;
 
 
-   if(e.getByLabel(EEProducerSig_, pEERecHits) ){
+   if(e.getByToken(EERecHitToken_, pEERecHits) ){
      EERecHits = pEERecHits.product(); // get a ptr to the product
      LogDebug("DataMixingEMWorker") << "total # EE rechits: " << EERecHits->size();
    } 
@@ -138,7 +137,7 @@ namespace edm
    const ESRecHitCollection*  ESRecHits = 0;
 
 
-   if(e.getByLabel( ESProducerSig_, pESRecHits) ){
+   if(e.getByToken( ESRecHitToken_, pESRecHits) ){
      ESRecHits = pESRecHits.product(); // get a ptr to the product
 #ifdef DEBUG
      LogDebug("DataMixingEMWorker") << "total # ES rechits: " << ESRecHits->size();
@@ -389,3 +388,5 @@ namespace edm
   }
 
 } //edm
+
+//  LocalWords:  ESProducerSig

SimGeneral/DataMixingModule/plugins/DataMixingEMWorker.h

@@ -17,6 +17,7 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
@@ -42,7 +43,7 @@ namespace edm
       DataMixingEMWorker();
 
      /** standard constructor*/
-      explicit DataMixingEMWorker(const edm::ParameterSet& ps);
+      explicit DataMixingEMWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
 
       /**Default destructor*/
       virtual ~DataMixingEMWorker();
@@ -68,6 +69,13 @@ namespace edm
       edm::InputTag EEPileRecHitInputTag_; // full InputTag for pileup EE calib rechits
       edm::InputTag ESPileRecHitInputTag_; // full InputTag for pileup ES calib rechits
 
+      edm::EDGetTokenT<EBRecHitCollection> EBRecHitToken_ ;  // Token to retrieve information
+      edm::EDGetTokenT<EERecHitCollection> EERecHitToken_ ;  // Token to retrieve information
+      edm::EDGetTokenT<ESRecHitCollection> ESRecHitToken_ ;  // Token to retrieve information  
+
+      edm::EDGetTokenT<EBRecHitCollection> EBPileRecHitToken_ ;  // Token to retrieve information
+      edm::EDGetTokenT<EERecHitCollection> EEPileRecHitToken_ ;  // Token to retrieve information
+      edm::EDGetTokenT<ESRecHitCollection> ESPileRecHitToken_ ;  // Token to retrieve information  
 
 
 

SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.cc

@@ -9,6 +9,7 @@
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Framework/interface/ConstProductRegistry.h"
 #include "FWCore/ServiceRegistry/interface/Service.h"
+
 #include "DataFormats/Common/interface/Handle.h"
 #include "DataFormats/Provenance/interface/Provenance.h"
 #include "DataFormats/Provenance/interface/BranchDescription.h"
@@ -26,7 +27,7 @@ namespace edm
   DataMixingGeneralTrackWorker::DataMixingGeneralTrackWorker() { }
 
   // Constructor 
-  DataMixingGeneralTrackWorker::DataMixingGeneralTrackWorker(const edm::ParameterSet& ps)
+  DataMixingGeneralTrackWorker::DataMixingGeneralTrackWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC)
   {                                                         
 
     // get the subdetector names
@@ -40,6 +41,9 @@ namespace edm
 
     GeneralTrackCollectionDM_  = ps.getParameter<std::string>("GeneralTrackDigiCollectionDM");
 
+    GTrackSigToken_ = iC.consumes<reco::TrackCollection>(GeneralTrackLabelSig_);
+    GTrackPileToken_ = iC.consumes<reco::TrackCollection>(GeneralTrackPileInputTag_);
+
   }
 
 
@@ -60,7 +64,7 @@ namespace edm
     //edm::Handle<reco::TrackCollection> generalTrkHandle;
     //e.getByLabel("generalTracks", generalTrkHandle);
     edm::Handle<reco::TrackCollection> tracks;
-    e.getByLabel(GeneralTrackLabelSig_, tracks);
+    e.getByToken(GTrackSigToken_, tracks);
 
     if (tracks.isValid()) {
       for (reco::TrackCollection::const_iterator track = tracks->begin();  track != tracks->end();  ++track) {

SimGeneral/DataMixingModule/plugins/DataMixingGeneralTrackWorker.h

@@ -17,6 +17,7 @@
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "DataFormats/Provenance/interface/ProductID.h"
 #include "DataFormats/Common/interface/Handle.h"
@@ -42,7 +43,7 @@ namespace edm
       DataMixingGeneralTrackWorker();
 
      /** standard constructor*/
-      explicit DataMixingGeneralTrackWorker(const edm::ParameterSet& ps);
+      explicit DataMixingGeneralTrackWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
 
       /**Default destructor*/
       virtual ~DataMixingGeneralTrackWorker();
@@ -60,6 +61,9 @@ namespace edm
       edm::InputTag GeneralTrackPileInputTag_ ;    // InputTag for pileup tracks
       std::string GeneralTrackCollectionDM_  ; // secondary name to be given to new GeneralTrack
 
+      edm::EDGetTokenT<reco::TrackCollection>GTrackSigToken_ ;  // Token to retrieve information  
+      edm::EDGetTokenT<reco::TrackCollection>GTrackPileToken_ ;  // Token to retrieve information  
+
       // 
 
       std::auto_ptr<reco::TrackCollection> NewTrackList_;

SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.cc

@@ -34,7 +34,7 @@ namespace edm
   DataMixingHcalDigiWorker::DataMixingHcalDigiWorker() { }
 
   // Constructor 
-  DataMixingHcalDigiWorker::DataMixingHcalDigiWorker(const edm::ParameterSet& ps) : 
+  DataMixingHcalDigiWorker::DataMixingHcalDigiWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC) : 
 							    label_(ps.getParameter<std::string>("Label"))
 
   {                                                         
@@ -56,9 +56,23 @@ namespace edm
     HFPileInputTag_ = ps.getParameter<edm::InputTag>("HFPileInputTag");
     ZDCPileInputTag_ = ps.getParameter<edm::InputTag>("ZDCPileInputTag");
 
+    HBHEDigiToken_ = iC.consumes<HBHEDigiCollection>(HBHEdigiCollectionSig_);
+    HODigiToken_ = iC.consumes<HODigiCollection>(HOdigiCollectionSig_);
+    HFDigiToken_ = iC.consumes<HFDigiCollection>(HFdigiCollectionSig_);
+
+    HBHEDigiPToken_ = iC.consumes<HBHEDigiCollection>(HBHEPileInputTag_);
+    HODigiPToken_ = iC.consumes<HODigiCollection>(HOPileInputTag_);
+    HFDigiPToken_ = iC.consumes<HFDigiCollection>(HFPileInputTag_);
+
     DoZDC_ = false;
     if(ZDCPileInputTag_.label() != "") DoZDC_ = true;
 
+    if(DoZDC_) { 
+      ZDCDigiToken_ = iC.consumes<ZDCDigiCollection>(ZDCdigiCollectionSig_);
+      ZDCDigiPToken_ = iC.consumes<ZDCDigiCollection>(ZDCPileInputTag_);
+    }
+
+
     HBHEDigiCollectionDM_ = ps.getParameter<std::string>("HBHEDigiCollectionDM");
     HODigiCollectionDM_   = ps.getParameter<std::string>("HODigiCollectionDM");
     HFDigiCollectionDM_   = ps.getParameter<std::string>("HFDigiCollectionDM");
@@ -90,7 +104,7 @@ namespace edm
 
    const HBHEDigiCollection*  HBHEDigis = 0;
 
-   if( e.getByLabel( HBHEdigiCollectionSig_, pHBHEDigis) ) {
+   if( e.getByToken( HBHEDigiToken_, pHBHEDigis) ) {
      HBHEDigis = pHBHEDigis.product(); // get a ptr to the product
      LogDebug("DataMixingHcalDigiWorker") << "total # HBHE digis: " << HBHEDigis->size();
    } 
@@ -139,7 +153,7 @@ namespace edm
 
    const HODigiCollection*  HODigis = 0;
 
-   if( e.getByLabel( HOdigiCollectionSig_, pHODigis) ){
+   if( e.getByToken( HODigiToken_, pHODigis) ){
      HODigis = pHODigis.product(); // get a ptr to the product
 #ifdef DEBUG
      LogDebug("DataMixingHcalDigiWorker") << "total # HO digis: " << HODigis->size();
@@ -181,7 +195,7 @@ namespace edm
 
    const HFDigiCollection*  HFDigis = 0;
 
-   if( e.getByLabel( HFdigiCollectionSig_, pHFDigis) ) {
+   if( e.getByToken( HFDigiToken_, pHFDigis) ) {
      HFDigis = pHFDigis.product(); // get a ptr to the product
 #ifdef DEBUG
      LogDebug("DataMixingHcalDigiWorker") << "total # HF digis: " << HFDigis->size();
@@ -225,7 +239,7 @@ namespace edm
 
      const ZDCDigiCollection*  ZDCDigis = 0;
 
-     if( e.getByLabel( ZDCdigiCollectionSig_, pZDCDigis) ) {
+     if( e.getByToken( ZDCDigiToken_, pZDCDigis) ) {
        ZDCDigis = pZDCDigis.product(); // get a ptr to the product
 #ifdef DEBUG
        LogDebug("DataMixingHcalDigiWorker") << "total # ZDC digis: " << ZDCDigis->size();

SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorker.h

@@ -18,6 +18,7 @@
 #include "FWCore/Framework/interface/EventPrincipal.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
 
 #include "CalibFormats/CaloObjects/interface/CaloSamples.h"
 #include "DataFormats/Provenance/interface/ProductID.h"
@@ -44,7 +45,7 @@ namespace edm
       DataMixingHcalDigiWorker();
 
      /** standard constructor*/
-      explicit DataMixingHcalDigiWorker(const edm::ParameterSet& ps);
+      explicit DataMixingHcalDigiWorker(const edm::ParameterSet& ps, edm::ConsumesCollector && iC);
 
       /**Default destructor*/
       virtual ~DataMixingHcalDigiWorker();
@@ -69,6 +70,17 @@ namespace edm
       edm::InputTag HFPileInputTag_  ; // InputTag for Pileup Digis collection
       edm::InputTag ZDCPileInputTag_ ; // InputTag for Pileup Digis collection
 
+      edm::EDGetTokenT<HBHEDigiCollection> HBHEDigiToken_ ;  // Token to retrieve information 
+      edm::EDGetTokenT<HODigiCollection> HODigiToken_ ;  // Token to retrieve information 
+      edm::EDGetTokenT<HFDigiCollection> HFDigiToken_ ;  // Token to retrieve information 
+      edm::EDGetTokenT<ZDCDigiCollection> ZDCDigiToken_ ;  // Token to retrieve information 
+
+      edm::EDGetTokenT<HBHEDigiCollection> HBHEDigiPToken_ ;  // Token to retrieve information 
+      edm::EDGetTokenT<HODigiCollection> HODigiPToken_ ;  // Token to retrieve information 
+      edm::EDGetTokenT<HFDigiCollection> HFDigiPToken_ ;  // Token to retrieve information 
+      edm::EDGetTokenT<ZDCDigiCollection> ZDCDigiPToken_ ;  // Token to retrieve information 
+
+
       std::string HBHEDigiCollectionDM_; // secondary name to be given to collection of digis
       std::string HODigiCollectionDM_  ; // secondary name to be given to collection of digis
       std::string HFDigiCollectionDM_  ; // secondary name to be given to collection of digis

SimGeneral/DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc

@@ -16,14 +16,20 @@
 using namespace std;
 namespace edm {
   // Constructor 
-  DataMixingHcalDigiWorkerProd::DataMixingHcalDigiWorkerProd(const edm::ParameterSet& ps, edm::ConsumesCollector& iC) : 
+  DataMixingHcalDigiWorkerProd::DataMixingHcalDigiWorkerProd(const edm::ParameterSet& ps, edm::ConsumesCollector&& iC) : 
     HBHEPileInputTag_(ps.getParameter<edm::InputTag>("HBHEPileInputTag")),
     HOPileInputTag_(ps.getParameter<edm::InputTag>("HOPileInputTag")),
     HFPileInputTag_(ps.getParameter<edm::InputTag>("HFPileInputTag")),
     ZDCPileInputTag_(ps.getParameter<edm::InputTag>("ZDCPileInputTag")),
     label_(ps.getParameter<std::string>("Label"))
   {  
 
+    // 
+    tok_hbhe_ = iC.consumes<HBHEDigitizerTraits::DigiCollection>(HBHEPileInputTag_);
+    tok_ho_ = iC.consumes<HODigitizerTraits::DigiCollection>(HOPileInputTag_);
+    tok_hf_ = iC.consumes<HFDigitizerTraits::DigiCollection>(HFPileInputTag_);
+    tok_zdc_ = iC.consumes<ZDCDigitizerTraits::DigiCollection>(ZDCPileInputTag_);
+
     theHBHESignalGenerator = HBHESignalGenerator(HBHEPileInputTag_,tok_hbhe_);
     theHOSignalGenerator = HOSignalGenerator(HOPileInputTag_,tok_ho_);
     theHFSignalGenerator = HFSignalGenerator(HFPileInputTag_,tok_hf_);