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

[blackhole at projects.hepforge.org]

Author: richardn
Date: Sun Apr 15 11:33:29 2012
New Revision: 3680

Log:
couple more identified particle LEP analyses

Added:
   trunk/src/Analyses/ALEPH_2002_S4823664.cc
      - copied, changed from r3678, trunk/src/Analyses/OPAL_1995_S3198391.cc
   trunk/src/Analyses/OPAL_1996_S3257789.cc
      - copied, changed from r3676, trunk/src/Analyses/OPAL_1995_S3198391.cc
Modified:
   trunk/src/Analyses/Makefile.am

Copied and modified: trunk/src/Analyses/ALEPH_2002_S4823664.cc (from r3678, trunk/src/Analyses/OPAL_1995_S3198391.cc)
==============================================================================
--- trunk/src/Analyses/OPAL_1995_S3198391.cc	Sat Apr 14 15:48:04 2012	(r3678, copy source)
+++ trunk/src/Analyses/ALEPH_2002_S4823664.cc	Sun Apr 15 11:33:29 2012	(r3680)
@@ -10,14 +10,14 @@
 namespace Rivet {
 
 
-  /// @brief OPAL Delta++ fragmentation function paper
+  /// @brief ALEPH eta/omega fragmentation function paper
   /// @author Peter Richardson
-  class OPAL_1995_S3198391 : public Analysis {
+  class ALEPH_2002_S4823664 : public Analysis {
   public:
 
     /// Constructor
-    OPAL_1995_S3198391()
-      : Analysis("OPAL_1995_S3198391")
+    ALEPH_2002_S4823664()
+      : Analysis("ALEPH_2002_S4823664")
     {}
 
 
@@ -28,7 +28,8 @@
       addProjection(Beam(), "Beams");
       addProjection(ChargedFinalState(), "FS");
       addProjection(UnstableFinalState(), "UFS");
-      _histXpDelta   = bookHistogram1D( 1, 1, 1);
+      _histXpEta   = bookHistogram1D( 2, 1, 2);
+      _histXpOmega = bookHistogram1D( 3, 1, 2);
     }
 
 
@@ -57,9 +58,13 @@
       const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS");
       
       foreach (const Particle& p, ufs.particles()) {
-	if(abs(p.pdgId())==2224) {
+	if(abs(p.pdgId())==221) {
 	  double xp = p.momentum().vector3().mod()/meanBeamMom;
-	  _histXpDelta->fill(xp, weight);
+	  _histXpEta->fill(xp, weight);
+        }
+	else if(abs(p.pdgId())==223) {
+	  double xp = p.momentum().vector3().mod()/meanBeamMom;
+	  _histXpOmega->fill(xp, weight);
         }
       }
     }
@@ -67,7 +72,8 @@
 
     /// Finalize
     void finalize() {
-      scale(_histXpDelta, 1./sumOfWeights());
+      scale(_histXpEta  , 1./sumOfWeights());
+      scale(_histXpOmega, 1./sumOfWeights());
     }
 
     //@}
@@ -75,12 +81,13 @@
 
   private:
 
-      AIDA::IHistogram1D *_histXpDelta;
+      AIDA::IHistogram1D *_histXpEta;
+      AIDA::IHistogram1D *_histXpOmega;
     //@}
 
   };
 
   // The hook for the plugin system
-  DECLARE_RIVET_PLUGIN(OPAL_1995_S3198391);
+  DECLARE_RIVET_PLUGIN(ALEPH_2002_S4823664);
 
 }

Modified: trunk/src/Analyses/Makefile.am
==============================================================================
--- trunk/src/Analyses/Makefile.am	Sun Apr 15 11:30:19 2012	(r3679)
+++ trunk/src/Analyses/Makefile.am	Sun Apr 15 11:33:29 2012	(r3680)
@@ -207,6 +207,7 @@
     ALEPH_1996_S3196992.cc \
     ALEPH_1999_S4193598.cc \
     ALEPH_2001_S4656318.cc \
+    ALEPH_2002_S4823664.cc \
     ALEPH_2004_S5765862.cc \
     DELPHI_1995_S3137023.cc \
     DELPHI_1996_S3430090.cc \
@@ -214,6 +215,7 @@
     DELPHI_2000_S4328825.cc \
     OPAL_1994_S2927284.cc \
     OPAL_1995_S3198391.cc \
+    OPAL_1996_S3257789.cc \
     OPAL_1997_S3396100.cc \
     OPAL_1997_S3608263.cc \
     OPAL_1998_S3702294.cc \

Copied and modified: trunk/src/Analyses/OPAL_1996_S3257789.cc (from r3676, trunk/src/Analyses/OPAL_1995_S3198391.cc)
==============================================================================
--- trunk/src/Analyses/OPAL_1995_S3198391.cc	Thu Apr 12 10:55:36 2012	(r3676, copy source)
+++ trunk/src/Analyses/OPAL_1996_S3257789.cc	Sun Apr 15 11:33:29 2012	(r3680)
@@ -10,14 +10,14 @@
 namespace Rivet {
 
 
-  /// @brief OPAL Delta++ fragmentation function paper
+  /// @brief OPAL J/Psi fragmentation function paper
   /// @author Peter Richardson
-  class OPAL_1995_S3198391 : public Analysis {
+  class OPAL_1996_S3257789 : public Analysis {
   public:
 
     /// Constructor
-    OPAL_1995_S3198391()
-      : Analysis("OPAL_1995_S3198391")
+    OPAL_1996_S3257789()
+      : Analysis("OPAL_1996_S3257789"), _weightSum(0.)
     {}
 
 
@@ -28,7 +28,9 @@
       addProjection(Beam(), "Beams");
       addProjection(ChargedFinalState(), "FS");
       addProjection(UnstableFinalState(), "UFS");
-      _histXpDelta   = bookHistogram1D( 1, 1, 1);
+      _histXpJPsi   = bookHistogram1D( 1, 1, 1);
+      _multJPsi     = bookHistogram1D( 2, 1, 1);
+      _multPsiPrime = bookHistogram1D( 2, 1, 2);
     }
 
 
@@ -57,17 +59,24 @@
       const UnstableFinalState& ufs = applyProjection<UnstableFinalState>(e, "UFS");
       
       foreach (const Particle& p, ufs.particles()) {
-	if(abs(p.pdgId())==2224) {
+	if(abs(p.pdgId())==443) {
 	  double xp = p.momentum().vector3().mod()/meanBeamMom;
-	  _histXpDelta->fill(xp, weight);
+	  _histXpJPsi->fill(xp, weight);
+	  _multJPsi->fill(91.2,weight);
+	  _weightSum += weight;
         }
+	else if(abs(p.pdgId())==100443) {
+	  _multPsiPrime->fill(91.2,weight);
+	}
       }
     }
 
 
     /// Finalize
     void finalize() {
-      scale(_histXpDelta, 1./sumOfWeights());
+      scale(_histXpJPsi  , 0.1/_weightSum);
+      scale(_multJPsi    , 1./sumOfWeights());
+      scale(_multPsiPrime, 1./sumOfWeights());
     }
 
     //@}
@@ -75,12 +84,15 @@
 
   private:
 
-      AIDA::IHistogram1D *_histXpDelta;
+    double _weightSum;
+    AIDA::IHistogram1D *_histXpJPsi;
+    AIDA::IHistogram1D *_multJPsi;
+    AIDA::IHistogram1D *_multPsiPrime;
     //@}
 
   };
 
   // The hook for the plugin system
-  DECLARE_RIVET_PLUGIN(OPAL_1995_S3198391);
+  DECLARE_RIVET_PLUGIN(OPAL_1996_S3257789);
 
 }