[Rivet-svn] r3913 - trunk/src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Aug 24 15:38:00 2012
New Revision: 3913

Log:
merge r3841 and r3842 from branches/2012-06-aidarivet

Modified:
   trunk/src/Analyses/MC_VH2BB.cc

Modified: trunk/src/Analyses/MC_VH2BB.cc
==============================================================================
--- trunk/src/Analyses/MC_VH2BB.cc	Fri Aug 24 15:32:03 2012	(r3912)
+++ trunk/src/Analyses/MC_VH2BB.cc	Fri Aug 24 15:38:00 2012	(r3913)
@@ -53,7 +53,16 @@
       double angle1 = b1BOOSTED.angle(virtualVBMomentumBOOSTED);
       double angle2 = b2BOOSTED.angle(virtualVBMomentumBOOSTED);
 
-      double anglebb = b1BOOSTED.angle(b2BOOSTED);
+      double cosbb = b1BOOSTED.vector3().unit().dot(b2BOOSTED.vector3().unit());
+      double test = 1.+cosbb;
+      double anglebb;
+      if(test<0.&&test>-1e-10) {
+        cosbb=-1.;
+        anglebb = M_PI;
+      }
+      else {
+        anglebb = acos(cosbb);
+      }
 
       vector<double> toReturn;
       toReturn.push_back(angle1 < angle2 ? angle1 : angle2);
@@ -89,15 +98,15 @@
       _h_jet_bb_Delta_R = bookHisto1D("jet_bb_Delta_R", 50, 0, 5);
       _h_jet_b_jet_eta = bookHisto1D("jet_b_jet_eta", 50, -4, 4);
       _h_jet_b_jet_multiplicity = bookHisto1D("jet_b_jet_multiplicity", 11, -0.5, 10.5);
-      _h_jet_b_jet_phi = bookHisto1D("jet_b_jet_phi", 50, -M_PI, M_PI);
+      _h_jet_b_jet_phi = bookHisto1D("jet_b_jet_phi", 50, 0, 2.*M_PI);
       _h_jet_b_jet_pT = bookHisto1D("jet_b_jet_pT", 50, 0, 500);
       _h_jet_H_eta_using_bb = bookHisto1D("jet_H_eta_using_bb", 50, -4, 4);
       _h_jet_H_mass_using_bb = bookHisto1D("jet_H_mass_using_bb", 50, 50, 200);
-      _h_jet_H_phi_using_bb = bookHisto1D("jet_H_phi_using_bb", 50, -M_PI, M_PI);
+      _h_jet_H_phi_using_bb = bookHisto1D("jet_H_phi_using_bb", 50, 0, 2.*M_PI);
       _h_jet_H_pT_using_bb = bookHisto1D("jet_H_pT_using_bb", 50, 0, 500);
       _h_jet_eta = bookHisto1D("jet_eta", 50, -4, 4);
       _h_jet_multiplicity = bookHisto1D("jet_multiplicity", 11, -0.5, 10.5);
-      _h_jet_phi = bookHisto1D("jet_phi", 50, -M_PI, M_PI);
+      _h_jet_phi = bookHisto1D("jet_phi", 50, 0, 2.*M_PI);
       _h_jet_pT = bookHisto1D("jet_pT", 50, 0, 500);
       _h_jet_VBbb_Delta_eta = bookHisto1D("jet_VBbb_Delta_eta", 50, 0, 4);
       _h_jet_VBbb_Delta_phi = bookHisto1D("jet_VBbb_Delta_phi", 50, 0, M_PI);
@@ -108,7 +117,7 @@
       _h_VB_mass = bookHisto1D("VB_mass", 50, 60, 110);
       _h_Z_multiplicity = bookHisto1D("Z_multiplicity", 11, -0.5, 10.5);
       _h_W_multiplicity = bookHisto1D("W_multiplicity", 11, -0.5, 10.5);
-      _h_VB_phi = bookHisto1D("VB_phi", 50, -M_PI, M_PI);
+      _h_VB_phi = bookHisto1D("VB_phi", 50, 0, 2.*M_PI);
       _h_VB_pT = bookHisto1D("VB_pT", 50, 0, 500);
 
       _h_jet_bVB_angle_Hframe = bookHisto1D("jet_bVB_angle_Hframe", 50, 0, M_PI);
@@ -130,16 +139,16 @@
       const WFinder& wefinder = applyProjection<WFinder>(event, "WeFinder");
       const WFinder& wmfinder = applyProjection<WFinder>(event, "WmFinder");
 
-      Jets jets = applyProjection<FastJets>(event, "AntiKTJets").jetsByPt(JETPTCUT);
+      Jets jets = applyProjection<FastJets>(event, "AntiKT04").jetsByPt(JETPTCUT);
 
-      ParticleVector vectorBosons = zeefinder.particles();
+      ParticleVector vectorBosons = zeefinder.bosons();
       /// @todo Don't we have a neater vector concatenation?
-      vectorBosons.insert(vectorBosons.end(), zeefinder.particles().begin(), zeefinder.particles().end());
-      vectorBosons.insert(vectorBosons.end(), wefinder.particles().begin(), wefinder.particles().end());
-      vectorBosons.insert(vectorBosons.end(), wmfinder.particles().begin(), wmfinder.particles().end());
+      vectorBosons.insert(vectorBosons.end(), zmmfinder.bosons().begin(), zmmfinder.bosons().end());
+      vectorBosons.insert(vectorBosons.end(), wefinder.bosons().begin(), wefinder.bosons().end());
+      vectorBosons.insert(vectorBosons.end(), wmfinder.bosons().begin(), wmfinder.bosons().end());
 
-      _h_Z_multiplicity->fill(zeefinder.particles().size() + zmmfinder.particles().size(), weight);
-      _h_W_multiplicity->fill(wefinder.particles().size() + wmfinder.particles().size(), weight);
+      _h_Z_multiplicity->fill(zeefinder.bosons().size() + zmmfinder.bosons().size(), weight);
+      _h_W_multiplicity->fill(wefinder.bosons().size() + wmfinder.bosons().size(), weight);
       _h_jet_multiplicity->fill(jets.size(), weight);
 
       // Identify the b-jets
@@ -169,6 +178,9 @@
         _h_VB_mass->fill(v.momentum().mass(), weight);
       }
 
+      // rest of analysis requires at least 1 b jets
+      if(bjets.empty()) vetoEvent;
+
       // Construct Higgs candidates from pairs of b-jets
       for (size_t i = 0; i < bjets.size()-1; ++i) {
         for (size_t j = i+1; j < bjets.size(); ++j) {