[Rivet-svn] r4043 - in trunk: data/anainfo data/plotinfo src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sat Nov 24 19:42:24 2012
New Revision: 4043

Log:
Updates and tweaks to MC_PHOTONS: now marked as validated but I'm sure can be usefully extended

Modified:
   trunk/data/anainfo/MC_PHOTONS.info
   trunk/data/plotinfo/MC_PHOTONS.plot
   trunk/src/Analyses/MC_PHOTONS.cc

Modified: trunk/data/anainfo/MC_PHOTONS.info
==============================================================================
--- trunk/data/anainfo/MC_PHOTONS.info	Sat Nov 24 19:41:03 2012	(r4042)
+++ trunk/data/anainfo/MC_PHOTONS.info	Sat Nov 24 19:42:24 2012	(r4043)
@@ -1,6 +1,6 @@
 Name: MC_PHOTONS
 Summary: Monte Carlo validation observables for general photons
-Status: UNVALIDATED
+Status: VALIDATED
 Authors:
  - Steve Lloyd
  - Andy Buckley <andy.buckley at cern.ch>

Modified: trunk/data/plotinfo/MC_PHOTONS.plot
==============================================================================
--- trunk/data/plotinfo/MC_PHOTONS.plot	Sat Nov 24 19:41:03 2012	(r4042)
+++ trunk/data/plotinfo/MC_PHOTONS.plot	Sat Nov 24 19:42:24 2012	(r4043)
@@ -22,25 +22,25 @@
 YLabel=$1/\sigma \, \mathrm{d}\sigma/\mathrm{d}\sum{E_\gamma}$ [GeV$^{-1}$]
 # END PLOT
 
-# BEGIN PLOT /MC_PHOTONS/deltaR
+# BEGIN PLOT /MC_PHOTONS/DeltaR
 Title=$\Delta{R}$ between photons and associated leptons
 XLabel=$\Delta{R}$
 #YLabel=$1/\sigma \, \mathrm{d}\sigma/\mathrm{d}\Delta{R}$
 # END PLOT
 
-# BEGIN PLOT /MC_PHOTONS/deltaR_weighted
+# BEGIN PLOT /MC_PHOTONS/DeltaR_ptweighted
 Title=$p_\perp$-weighted $\Delta{R}$ between photons and associated leptons
 XLabel=$\Delta{R}$
 #YLabel=$1/\sigma \, \mathrm{d}\sigma/\mathrm{d}\Delta{R}$
 # END PLOT
 
-# BEGIN PLOT /MC_PHOTONS/deltaR_R
+# BEGIN PLOT /MC_PHOTONS/DeltaR_R
 Title=Phase-space weighted $\Delta{R}$ between photons and associated leptons
 XLabel=$\Delta{R}$
 #YLabel=$1/\sigma \, \mathrm{d}\sigma/\mathrm{d}\Delta{R}$
 # END PLOT
 
-# BEGIN PLOT /MC_PHOTONS/deltaR_R_weighted
+# BEGIN PLOT /MC_PHOTONS/DeltaR_R_ptweighted
 Title=Phase-space \& $p_\perp$-weighted $\Delta{R}$ between photons and associated leptons
 XLabel=$\Delta{R}$
 #YLabel=$1/\sigma \, \mathrm{d}\sigma/\mathrm{d}\Delta{R}$
@@ -51,16 +51,26 @@
 # END PLOT
 
 # BEGIN PLOT /MC_PHOTONS/DeltaR_vs_pTlep
-Title=Mean $\Delta{R}$ between photons and associated leptons vs. lepton $p_\perp$
-YLabel=$\angle\Delta{R}\rangle$
+Title=$\Delta{R}_{\gamma\ell}$ vs. lepton $p_\perp$
+YLabel=$\langle\Delta{R}_{\gamma\ell}\rangle$
 # END PLOT
 
-# BEGIN PLOT /MC_PHOTONS/DeltaR_weighted_vs_pTlep
-Title=Mean $p_\perp$-weighted $\Delta{R}$ between photons and associated leptons vs. lepton $p_\perp$
-YLabel=$\angle\text{Weighted}\quad\Delta{R}\rangle$
+# BEGIN PLOT /MC_PHOTONS/DeltaR_ptweighted_vs_pTlep
+Title=$p_\perp$-weighted $\Delta{R}_{\gamma\ell}$ vs. lepton $p_\perp$
+YLabel=$\langle\text{Weighted}\quad\Delta{R}_{\gamma\ell}\rangle$
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONS/DeltaR_R_ptweighted_vs_pTlep
+Title=$1/R$-weighted $\Delta{R}_{\gamma\ell}$ vs. lepton $p_\perp$
+YLabel=$\langle\text{Weighted}\quad\Delta{R}_{\gamma\ell}\rangle$
+# END PLOT
+
+# BEGIN PLOT /MC_PHOTONS/DeltaR_R_ptweighted_vs_pTlep
+Title=$p_\perp/R$-weighted $\Delta{R}_{\gamma\ell}$ vs. lepton $p_\perp$
+YLabel=$\langle\text{Weighted}\quad\Delta{R}_{\gamma\ell}\rangle$
 # END PLOT
 
 # BEGIN PLOT /MC_PHOTONS/sumPtGamma_vs_pTlep
-Title=Mean scalar $\sum{p_\perp}$ of photons on associated leptons vs. lepton $p_\perp$
-YLabel=$\angle\sum{p_\perp}\rangle$
+Title=Scalar $\sum{p_\perp}^\gamma$ vs. associated lepton $p_\perp$
+YLabel=$\langle\sum{p_\perp}^\gamma\rangle$ [GeV]
 # END PLOT

Modified: trunk/src/Analyses/MC_PHOTONS.cc
==============================================================================
--- trunk/src/Analyses/MC_PHOTONS.cc	Sat Nov 24 19:41:03 2012	(r4042)
+++ trunk/src/Analyses/MC_PHOTONS.cc	Sat Nov 24 19:42:24 2012	(r4043)
@@ -37,15 +37,17 @@
 
       _h_Ptgamma = bookHisto1D("Ptgamma", logspace(50, 0.01, 30));
       _h_Egamma = bookHisto1D("Egamma", logspace(50, 0.01, 200));
-      _h_sumPtgamma = bookHisto1D("sumPtgamma", logspace(50, 0.1, 100));
-      _h_sumEgamma = bookHisto1D("sumEgamma", logspace(50, 0.1, 500));
+      _h_sumPtgamma = bookHisto1D("sumPtgamma", 50, 0, 100);
+      _h_sumEgamma = bookHisto1D("sumEgamma", 50, 0, sqrtS()/GeV/5.0);
       _h_DelR = bookHisto1D("DeltaR", 50, 0, 2);
-      _h_DelR_weighted = bookHisto1D("DeltaR_weighted", 50, 0, 2);
+      _h_DelR_weighted = bookHisto1D("DeltaR_ptweighted", 50, 0, 2);
       _h_DelR_R = bookHisto1D("DeltaR_R", 50, 0, 2);
-      _h_DelR_R_weighted = bookHisto1D("DeltaR_R_weighted", 50, 0, 2);
-      _p_DelR_vs_pTl = bookProfile1D("DeltaR_vs_pTlep", logspace(50, 10, 50*log10(sqrtS())));
-      _p_DelR_weighted_vs_pTl = bookProfile1D("DeltaR_weighted_vs_pTlep", logspace(50, 10, 50*log10(sqrtS())));
-      _p_sumPtgamma_vs_pTl = bookProfile1D("sumPtGamma_vs_pTlep", logspace(50, 10, 50*log10(sqrtS())));
+      _h_DelR_R_weighted = bookHisto1D("DeltaR_R_ptweighted", 50, 0, 2);
+      _p_DelR_vs_pTl = bookProfile1D("DeltaR_vs_pTlep", 50, 10, 120);
+      _p_DelR_weighted_vs_pTl = bookProfile1D("DeltaR_ptweighted_vs_pTlep", 50, 10, 120);
+      _p_DelR_R_vs_pTl = bookProfile1D("DeltaR_R_vs_pTlep", 50, 10, 120);
+      _p_DelR_R_weighted_vs_pTl = bookProfile1D("DeltaR_R_ptweighted_vs_pTlep", 50, 10, 120);
+      _p_sumPtgamma_vs_pTl = bookProfile1D("sumPtGamma_vs_pTlep", 50, 10, 120);
     }
 
 
@@ -86,11 +88,13 @@
         }
         if (ilep != -1) {
           _h_DelR->fill(delR, weight);
-          _h_DelR_weighted->fill(delR*pTgamma/GeV, weight);
+          _h_DelR_weighted->fill(delR, weight*pTgamma/GeV);
           _h_DelR_R->fill(delR, weight/(delR+1e-5));
-          _h_DelR_R_weighted->fill(delR*pTgamma/GeV, weight/(delR+1e-5));
+          _h_DelR_R_weighted->fill(delR, weight*pTgamma/GeV/(delR+1e-5));
           _p_DelR_vs_pTl->fill(leptons[ilep].momentum().pT()/GeV, delR, weight);
-          _p_DelR_weighted_vs_pTl->fill(leptons[ilep].momentum().pT()/GeV, delR*pTgamma, weight);
+          _p_DelR_weighted_vs_pTl->fill(leptons[ilep].momentum().pT()/GeV, delR, weight*pTgamma/GeV);
+          _p_DelR_R_vs_pTl->fill(leptons[ilep].momentum().pT()/GeV, delR, weight/(delR+1e-5));
+          _p_DelR_R_weighted_vs_pTl->fill(leptons[ilep].momentum().pT()/GeV, delR, weight*pTgamma/GeV/(delR+1e-5));
           sumpT_per_lep[ilep] += pTgamma;
         }
       }
@@ -131,6 +135,7 @@
     Histo1DPtr _h_DelR, _h_DelR_weighted;
     Histo1DPtr _h_DelR_R, _h_DelR_R_weighted;
     Profile1DPtr _p_DelR_vs_pTl, _p_DelR_weighted_vs_pTl;
+    Profile1DPtr _p_DelR_R_vs_pTl, _p_DelR_R_weighted_vs_pTl;
     Profile1DPtr _p_sumPtgamma_vs_pTl;
     //@}