Merge pull request #128 from blinkseb/fill_branches_fix

Ensure all branches are created during the first event
cp3-llbb · Feb 13, 2017 · b2467c9 · b2467c9
2 parents be29108 + 1bd6c59
commit b2467c9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/interface/HHAnalyzer.h b/interface/HHAnalyzer.h
@@ -92,7 +92,7 @@ class HHAnalyzer: public Framework::Analyzer {
         //// October 2016: adding some asymmetric btag candidates, for study
         //BRANCH(llmetjj_HWWleptons_btagLM_cmva, std::vector<HH::DileptonMetDijet>);
         //BRANCH(llmetjj_HWWleptons_btagMT_cmva, std::vector<HH::DileptonMetDijet>);
-        
+
         BRANCH(llmetjj, std::vector<HH::DileptonMetDijet>);
 
         virtual void analyze(const edm::Event&, const edm::EventSetup&, const ProducersManager&, const AnalyzersManager&, const CategoryManager&) override;
@@ -208,6 +208,20 @@ class HHAnalyzer: public Framework::Analyzer {
         ONLY_NOMINAL_BRANCH(gen_Nu1, LorentzVector);
         ONLY_NOMINAL_BRANCH(gen_Nu2, LorentzVector);
 
+        ONLY_NOMINAL_BRANCH(gen_deltaR_jet_B, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_jet_Bbar, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_jet_B_afterFSR, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_jet_Bbar_afterFSR, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_electron_L1, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_electron_L2, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_electron_L1_afterFSR, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_electron_L2_afterFSR, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_muon_L1, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_muon_L2, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_muon_L1_afterFSR, std::vector<float>);
+        ONLY_NOMINAL_BRANCH(gen_deltaR_muon_L2_afterFSR, std::vector<float>);
+
+
     private:
         // Producers name
         std::string m_electrons_producer;

diff --git a/plugins/HHAnalyzer.cc b/plugins/HHAnalyzer.cc
@@ -265,19 +265,6 @@ void HHAnalyzer::analyze(const edm::Event& event, const edm::EventSetup&, const
         // ***** ***** *****
         // Matching
         // ***** ***** *****
-        ONLY_NOMINAL_BRANCH(gen_deltaR_jet_B, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_jet_Bbar, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_jet_B_afterFSR, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_jet_Bbar_afterFSR, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_electron_L1, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_electron_L2, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_electron_L1_afterFSR, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_electron_L2_afterFSR, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_muon_L1, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_muon_L2, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_muon_L1_afterFSR, std::vector<float>);    
-        ONLY_NOMINAL_BRANCH(gen_deltaR_muon_L2_afterFSR, std::vector<float>);    
-
         for (auto p4: alljets.gen_p4) {
             gen_deltaR_jet_B.push_back(deltaR(p4, gen_B));
             gen_deltaR_jet_Bbar.push_back(deltaR(p4, gen_Bbar));