[Rivet-svn] r3766 - in branches/2011-07-aida2yoda: data/anainfo src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Fri Jun  8 15:59:29 2012
New Revision: 3766

Log:
merge c3737, 3738, 3752 from trunk

Modified:
   branches/2011-07-aida2yoda/data/anainfo/DELPHI_2000_S4328825.info
   branches/2011-07-aida2yoda/data/anainfo/OPAL_1997_S3396100.info
   branches/2011-07-aida2yoda/src/Analyses/OPAL_1996_S3257789.cc
   branches/2011-07-aida2yoda/src/Analyses/SLD_1999_S3743934.cc

Modified: branches/2011-07-aida2yoda/data/anainfo/DELPHI_2000_S4328825.info
==============================================================================
--- branches/2011-07-aida2yoda/data/anainfo/DELPHI_2000_S4328825.info	Fri Jun  8 15:53:09 2012	(r3765)
+++ branches/2011-07-aida2yoda/data/anainfo/DELPHI_2000_S4328825.info	Fri Jun  8 15:59:29 2012	(r3766)
@@ -1,6 +1,6 @@
 Name: DELPHI_2000_S4328825
 Year: 2000
-Summary: Hadronization properties of $b$ quarks compared to light quarks in $e^+e^-\to q \bar q$ from 183 GeV to 200 GeV 
+Summary: Hadronization properties of $b$ quarks compared to light quarks in $e^+e^-\to q \bar q$ from 183 GeV to 200 GeV
 Experiment: OPAL
 Collider: LEP 2
 SpiresID: 4328825
@@ -11,7 +11,6 @@
  - Phys.Lett.B479:118-128,2000
  - hep-ex/0103022
  - DELPHI 2002-052 CONF 586
-
 RunInfo:
   Hadronic Z decay events generated on the Z pole (sqrt(s) = 91.2 GeV)
 NumEvents: 1000000

Modified: branches/2011-07-aida2yoda/data/anainfo/OPAL_1997_S3396100.info
==============================================================================
--- branches/2011-07-aida2yoda/data/anainfo/OPAL_1997_S3396100.info	Fri Jun  8 15:53:09 2012	(r3765)
+++ branches/2011-07-aida2yoda/data/anainfo/OPAL_1997_S3396100.info	Fri Jun  8 15:59:29 2012	(r3766)
@@ -16,7 +16,7 @@
 Energies: [91.2]
 PtCuts: [0]
 Description:
-  Measurement of the $\Xi^-$, $\Lambda^0$, $\Sigma^+(1385)$, \Sigma^-(1385)$,
+  Measurement of the $\Xi^-$, $\Lambda^0$, $\Sigma^+(1385)$, $\Sigma^-(1385)$,
   $\Xi^0(1530)$ and $\Lambda^0(1520)$ scaled
   momentum distributions by OPAL at LEP 1. The paper also has the
   production cross-sections of these particles, but that is not
@@ -25,7 +25,7 @@
 BibTeX: '@Article{Alexander:1996qj,
      author    = "Alexander, G. and others",
      collaboration = "OPAL",
-     title     = "{Strange baryon production in hadronic Z0 decays}",
+     title     = "{Strange baryon production in hadronic $Z^0$ decays}",
      journal   = "Z. Phys.",
      volume    = "C73",
      year      = "1997",

Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_1996_S3257789.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/OPAL_1996_S3257789.cc	Fri Jun  8 15:53:09 2012	(r3765)
+++ branches/2011-07-aida2yoda/src/Analyses/OPAL_1996_S3257789.cc	Fri Jun  8 15:59:29 2012	(r3766)
@@ -74,7 +74,8 @@
 
     /// Finalize
     void finalize() {
-      scale(_histXpJPsi  , 0.1/_weightSum);
+      if(_weightSum>0.)
+        scale(_histXpJPsi  , 0.1/_weightSum);
       scale(_multJPsi    , 1./sumOfWeights());
       scale(_multPsiPrime, 1./sumOfWeights());
     }

Modified: branches/2011-07-aida2yoda/src/Analyses/SLD_1999_S3743934.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/SLD_1999_S3743934.cc	Fri Jun  8 15:53:09 2012	(r3765)
+++ branches/2011-07-aida2yoda/src/Analyses/SLD_1999_S3743934.cc	Fri Jun  8 15:59:29 2012	(r3766)
@@ -545,7 +545,7 @@
       //// phi
       //// all
       //avgNumPartsAll = _multPhi[0]/sumOfWeights();
-      //multA = bookDataPointSet(25, 5, 1);
+      //multA = bookDataPointSet(24, 5, 1);
       //multA->point(0)->coordinate(1)->setValue(avgNumPartsAll);
       //// light
       //avgNumPartsLight = _multPhi[1]/_SumOfudsWeights;