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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun Oct  4 16:50:01 2009
New Revision: 1855

Log:
Moving projection registration into init for misc analyses

Modified:
   trunk/src/Analyses/E735_1998_S3905616.cc
   trunk/src/Analyses/OPAL_1998_S3780481.cc
   trunk/src/Analyses/SFM_1984_S1178091.cc

Modified: trunk/src/Analyses/E735_1998_S3905616.cc
==============================================================================
--- trunk/src/Analyses/E735_1998_S3905616.cc	Sun Oct  4 16:49:49 2009	(r1854)
+++ trunk/src/Analyses/E735_1998_S3905616.cc	Sun Oct  4 16:50:01 2009	(r1855)
@@ -11,11 +11,8 @@
   public:
     
     /// Constructor
-    E735_1998_S3905616()
-      : Analysis("E735_1998_S3905616") {
+    E735_1998_S3905616() : Analysis("E735_1998_S3905616") {
       setBeams(PROTON, ANTIPROTON);
-      const ChargedFinalState cfs;
-      addProjection(cfs, "FS");
     }
     
 
@@ -23,6 +20,9 @@
     //@{
     
     void init() {
+      const ChargedFinalState cfs;
+      addProjection(cfs, "FS");
+
       _hist_multiplicity = bookHistogram1D(1, 1, 1);
     }
 

Modified: trunk/src/Analyses/OPAL_1998_S3780481.cc
==============================================================================
--- trunk/src/Analyses/OPAL_1998_S3780481.cc	Sun Oct  4 16:49:49 2009	(r1854)
+++ trunk/src/Analyses/OPAL_1998_S3780481.cc	Sun Oct  4 16:50:01 2009	(r1855)
@@ -20,9 +20,8 @@
       : Analysis("OPAL_1998_S3780481")
     {
       setBeams(ELECTRON, POSITRON); 
-      addProjection(Beam(), "Beams");
-      addProjection(ChargedFinalState(), "FS");
-      addProjection(InitialQuarks(), "IQF");
+
+      // Counters
       _weightedTotalPartNum = 0;
       _SumOfudsWeights = 0;
       _SumOfcWeights = 0;
@@ -100,19 +99,19 @@
         _histMultiChargedall->fill(_histMultiChargedall->binMean(0), weight);
         switch (flavour) {
           /// @todo Use PDG code enums
-        case 1:
-        case 2:
-        case 3:
+        case DQUARK:
+        case UQUARK:
+        case SQUARK:
           _histXpuds->fill(xp, weight);
           _histLogXpuds->fill(logxp, weight);
           _histMultiChargeduds->fill(_histMultiChargeduds->binMean(0), weight);
           break;
-        case 4:
+        case CQUARK:
           _histXpc->fill(xp, weight);
           _histLogXpc->fill(logxp, weight);
           _histMultiChargedc->fill(_histMultiChargedc->binMean(0), weight);
           break;
-        case 5:
+        case BQUARK:
           _histXpb->fill(xp, weight);
           _histLogXpb->fill(logxp, weight);
           _histMultiChargedb->fill(_histMultiChargedb->binMean(0), weight);
@@ -124,6 +123,12 @@
     
     
     void init() {
+      // Projections
+      addProjection(Beam(), "Beams");
+      addProjection(ChargedFinalState(), "FS");
+      addProjection(InitialQuarks(), "IQF");
+
+      // Book histos
       _histXpuds           = bookHistogram1D(1, 1, 1);
       _histXpc             = bookHistogram1D(2, 1, 1);
       _histXpb             = bookHistogram1D(3, 1, 1);

Modified: trunk/src/Analyses/SFM_1984_S1178091.cc
==============================================================================
--- trunk/src/Analyses/SFM_1984_S1178091.cc	Sun Oct  4 16:49:49 2009	(r1854)
+++ trunk/src/Analyses/SFM_1984_S1178091.cc	Sun Oct  4 16:50:01 2009	(r1855)
@@ -13,8 +13,6 @@
     /// Constructor
     SFM_1984_S1178091() : Analysis("SFM_1984_S1178091") {
       setBeams(PROTON, PROTON);
-      addProjection(Beam(), "Beam");
-      addProjection(ChargedFinalState(), "FS");
     }
 
 
@@ -22,6 +20,11 @@
     //@{
 
     void init() {
+      // Projections
+      addProjection(Beam(), "Beam");
+      addProjection(ChargedFinalState(), "FS");
+
+      // Histograms
       _hist_multiplicity_inel_30 = bookHistogram1D(1, 1, 1); 
       _hist_multiplicity_inel_45 = bookHistogram1D(1, 1, 2);
       _hist_multiplicity_inel_53 = bookHistogram1D(1, 1, 3);