[Rivet-svn] r3101 - in trunk: bin src/Analyses

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun May 22 21:44:53 2011
New Revision: 3101

Log:
Restrict to only positive PIDs -- it takes forever to plot this thing at the moment, due to the thousands of unoptimised empty bins, so it may as well be twice as fast as the general case

Modified:
   trunk/bin/make-plots
   trunk/src/Analyses/MC_GENERIC.cc

Modified: trunk/bin/make-plots
==============================================================================
--- trunk/bin/make-plots	Sun May 22 20:26:50 2011	(r3100)
+++ trunk/bin/make-plots	Sun May 22 21:44:53 2011	(r3101)
@@ -5,6 +5,7 @@
 
 TODO
  * use std method (from compphys marking) to kill the subprocess
+ * Optimise output for e.g. lots of same-height bins in a row
  * Tidy LaTeX-writing code
  * Handle boolean values flexibly (yes, no, true, false, etc. as well as 1, 0)
 """

Modified: trunk/src/Analyses/MC_GENERIC.cc
==============================================================================
--- trunk/src/Analyses/MC_GENERIC.cc	Sun May 22 20:26:50 2011	(r3100)
+++ trunk/src/Analyses/MC_GENERIC.cc	Sun May 22 21:44:53 2011	(r3101)
@@ -41,8 +41,8 @@
       _histMult   = bookHistogram1D("Mult", 100, -0.5, 199.5);
       _histMultCh = bookHistogram1D("MultCh", 100, -0.5, 199.5);
 
-      _histStablePIDs  = bookHistogram1D("MultsStablePIDs", 6669, -3334.5, 3334.5);
-      _histDecayedPIDs = bookHistogram1D("MultsDecayedPIDs", 6669, -3334.5, 3334.5);
+      _histStablePIDs  = bookHistogram1D("MultsStablePIDs", 3335, 0, 3334.5);
+      _histDecayedPIDs = bookHistogram1D("MultsDecayedPIDs", 3335, 0, 3334.5);
 
       _histPt    = bookHistogram1D("Pt", 300, 0, 30);
       _histPtCh  = bookHistogram1D("PtCh", 300, 0, 30);
@@ -84,8 +84,7 @@
       MSG_DEBUG("Total multiplicity = " << cnfs.size());
       _histMult->fill(cnfs.size(), weight);
       foreach (const Particle& p, cnfs.particles()) {
-        const PdgId pid = abs(p.pdgId());
-        _histStablePIDs->fill(pid, weight);
+        _histStablePIDs->fill(abs(p.pdgId()), weight);
         const double eta = p.momentum().eta();
         _histEta->fill(eta, weight);
         _histEtaSumEt->fill(fabs(eta), p.momentum().Et(), weight);
@@ -134,8 +133,8 @@
       const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(event, "UFS");
       foreach (const Particle& p, ufs.particles()) {
         const double eta_abs = fabs(p.momentum().eta());
+        _histDecayedPIDs->fill(p.pdgId(), weight);
         const PdgId pid = abs(p.pdgId());
-        _histDecayedPIDs->fill(pid, weight);
         //if (PID::isMeson(pid) && PID::hasStrange()) {
         if (pid == 211 || pid == 111) _histEtaPi->fill(eta_abs, weight);
         else if (pid == 321 || pid == 130 || pid == 310) _histEtaK->fill(eta_abs, weight);