Merge pull request cms-sw#668 from inugent/myMultiThreadPatch

Use consumes API in TauSpinner
carolhungwt · Aug 30, 2013 · 6d0984b · 6d0984b
2 parents d51a254 + 5621b84
commit 6d0984b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/GeneratorInterface/ExternalDecays/interface/TauSpinnerCMS.h b/GeneratorInterface/ExternalDecays/interface/TauSpinnerCMS.h
@@ -60,12 +60,16 @@ class TauSpinnerCMS : public edm::EDProducer
   int MotherPDGID_,Ipol_,nonSM2_,nonSMN_;
   static bool isTauSpinnerConfigure;
 
+  edm::EDGetTokenT<HepMCProduct> EvtHandleToken_;
+  edm::EDGetTokenT<reco::GenParticleCollection> gensrcToken_;
+
   // Additional funtionms for Reco (not provided by Tauola/TauSpinner authors)
   int readParticlesfromReco(edm::Event& e,SimpleParticle &X,SimpleParticle &tau,SimpleParticle &tau2,
 			    std::vector<SimpleParticle> &tau_daughters,std::vector<SimpleParticle> &tau2_daughters);
   void GetLastSelf(const reco::GenParticle *Particle);
   void GetRecoDaughters(const reco::GenParticle *Particle,std::vector<SimpleParticle> &daughters,int parentpdgid);
   bool isFirst(const reco::GenParticle *Particle);
   double roundOff_;
+
 }; 
 #endif
diff --git a/GeneratorInterface/ExternalDecays/plugins/TauSpinnerCMS.cc b/GeneratorInterface/ExternalDecays/plugins/TauSpinnerCMS.cc
@@ -27,6 +27,9 @@ TauSpinnerCMS::TauSpinnerCMS( const ParameterSet& pset ) :
   produces<double>("TauSpinnerWTFlip").setBranchAlias("TauSpinnerWTFlip");
   produces<double>("TauSpinnerWThplus").setBranchAlias("TauSpinnerWThplus");
   produces<double>("TauSpinnerWThminus").setBranchAlias("TauSpinnerWThminus");
+
+  if(isReco_) EvtHandleToken_ = consumes<HepMCProduct>(gensrc_);
+  if(isReco_) gensrcToken_= consumes<reco::GenParticleCollection>(gensrc_);
 }
 
 void TauSpinnerCMS::beginJob()
@@ -60,7 +63,7 @@ void TauSpinnerCMS::produce( edm::Event& e, const edm::EventSetup& iSetup){
   }
   else{
     Handle< HepMCProduct > EvtHandle ;
-    e.getByLabel( "generator", EvtHandle ) ;
+    e.getByToken(EvtHandleToken_, EvtHandle ) ;
     const HepMC::GenEvent* Evt = EvtHandle->GetEvent() ;
     stat=readParticlesFromHepMC(Evt,X,tau,tau2,tau_daughters,tau_daughters2);
   }  
@@ -147,7 +150,7 @@ void TauSpinnerCMS::endJob(){}
 int TauSpinnerCMS::readParticlesfromReco(edm::Event& e,SimpleParticle &X,SimpleParticle &tau,SimpleParticle &tau2, 
 					 std::vector<SimpleParticle> &tau_daughters,std::vector<SimpleParticle> &tau2_daughters){
   edm::Handle<reco::GenParticleCollection> genParticles;
-  e.getByLabel(gensrc_, genParticles);
+  e.getByToken(gensrcToken_, genParticles);
   for(reco::GenParticleCollection::const_iterator itr = genParticles->begin(); itr!= genParticles->end(); ++itr){
     int pdgid=abs(itr->pdgId());
     if(pdgid==24 || pdgid==37 || pdgid ==25 || pdgid==36 || pdgid==22 || pdgid==23 ){