Merge pull request cms-sw#9 from YoungKwonJo/master

added jets_partonflavor
geonmo · Feb 10, 2014 · 9ca86bf · 9ca86bf
2 parents 7b3b957 + 50e55af
commit 9ca86bf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/GenericNtuple/interface/GenericEvent.h b/GenericNtuple/interface/GenericEvent.h
@@ -42,7 +42,7 @@ struct GenericEvent
   doublesP electrons_scEta_;
 
   doublesP jets_pt_, jets_eta_, jets_phi_, jets_m_;
-  doublesP jets_bTag_;
+  doublesP jets_bTag_, jets_partonflavor_;
   doublesP jets_JESUp_, jets_JESDn_;
   doublesP jets_JER_, jets_JERUp_, jets_JERDn_;
 

diff --git a/GenericNtuple/plugins/KGenericNtupleMaker.cc b/GenericNtuple/plugins/KGenericNtupleMaker.cc
@@ -374,6 +374,7 @@ void KGenericNtupleMaker::analyze(const edm::Event& event, const edm::EventSetup
     fevent_->jets_phi_->push_back(jet.phi());
     fevent_->jets_m_  ->push_back(jet.mass());
     fevent_->jets_bTag_->push_back(jet.bDiscriminator(bTagType_.c_str()));
+    fevent_->jets_partonflavor_->push_back(jet.partonFlavour());
 
     fevent_->jets_JESUp_->push_back(fJESUp);
     fevent_->jets_JESDn_->push_back(fJESDn);

diff --git a/GenericNtuple/src/GenericEvent.cc b/GenericNtuple/src/GenericEvent.cc
@@ -28,6 +28,7 @@ GenericEvent::GenericEvent(bool isMC)
   jets_phi_ = new doubles;
   jets_m_   = new doubles;
   jets_bTag_ = new doubles;
+  jets_partonflavor_ = new doubles;
   jets_JESUp_ = new doubles;
   jets_JESDn_ = new doubles;
 
@@ -107,6 +108,7 @@ void GenericEvent::book(TTree* tree)
   tree_->Branch("jets_phi" , jets_phi_ );
   tree_->Branch("jets_m"   , jets_m_   );
   tree_->Branch("jets_bTag", jets_bTag_);
+  tree_->Branch("jets_partonflavor", jets_partonflavor_);
 
   tree_->Branch("jets_JESUp", jets_JESUp_);
   tree_->Branch("jets_JESDn", jets_JESDn_);
@@ -198,6 +200,7 @@ void GenericEvent::clear()
   jets_phi_->clear();
   jets_m_->clear();
   jets_bTag_->clear();
+  jets_partonflavor_->clear();
 
   jets_JESUp_->clear();
   jets_JESDn_->clear();
@@ -275,6 +278,7 @@ void GenericEvent::setBranch(TTree* tree)
   tree_->SetBranchAddress("jets_phi" , &jets_phi_ );
   tree_->SetBranchAddress("jets_m"   , &jets_m_   );
   tree_->SetBranchAddress("jets_bTag", &jets_bTag_);
+  tree_->SetBranchAddress("jets_partonflavor", &jets_partonflavor_);
 
   tree_->SetBranchAddress("jets_JESUp", &jets_JESUp_);
   tree_->SetBranchAddress("jets_JESDn", &jets_JESDn_);
@@ -365,6 +369,7 @@ GenericEvent::~GenericEvent()
   delete jets_phi_;
   delete jets_m_  ;
   delete jets_bTag_;
+  delete jets_partonflavor_;
   delete jets_JESUp_;
   delete jets_JESDn_;