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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Sun Oct  4 16:36:17 2009
New Revision: 1848

Log:
Moving projection registration into init for D0 analyses

Modified:
   trunk/src/Analyses/D0_2001_S4674421.cc
   trunk/src/Analyses/D0_2004_S5992206.cc
   trunk/src/Analyses/D0_2006_S6438750.cc
   trunk/src/Analyses/D0_2008_S7662670.cc
   trunk/src/Analyses/D0_2008_S7719523.cc

Modified: trunk/src/Analyses/D0_2001_S4674421.cc
==============================================================================
--- trunk/src/Analyses/D0_2001_S4674421.cc	Thu Oct  1 23:17:18 2009	(r1847)
+++ trunk/src/Analyses/D0_2001_S4674421.cc	Sun Oct  4 16:36:17 2009	(r1848)
@@ -29,11 +29,17 @@
         _mwmz(0.8820), _brwenu(0.1073), _brzee(0.033632), 
         _mZmin(75.*GeV), _mZmax(105.*GeV)
     { 
-
       setBeams(PROTON, ANTIPROTON);
       setNeedsCrossSection(true);
-      //const FinalState fs(-3.0, 3.0); 
-      FinalState fs(-5.0, 5.0); //corrected for detector acceptance
+    }    
+    
+    
+    /// @name Analysis methods
+    //@{
+    
+    void init() {
+      // Final state projection
+      FinalState fs(-5.0, 5.0); // corrected for detector acceptance
       addProjection(fs, "FS");
 
       // Z -> e- e+
@@ -55,19 +61,14 @@
       VetoedFinalState vfs(fs);
       vfs.vetoNeutrinos();
       addProjection(vfs, "VFS");
-      
-    }    
-    
-    
-    /// @name Analysis methods
-    //@{
-    
-    void init() {
+
+      // Counters
       _eventsFilledW = 0.0;
       _eventsFilledZ = 0.0;
+
+      // Histograms
       _h_dsigdpt_w = bookHistogram1D(1, 1, 1);
       _h_dsigdpt_z = bookHistogram1D(1, 1, 2);
-
       vector<double> bins(23);
       bins += 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 25, 30, 35, 40, 50, 60, 70, 80, 100, 120, 160, 200;
       _h_dsigdpt_scaled_z = bookHistogram1D("d01-x01-y03", bins);

Modified: trunk/src/Analyses/D0_2004_S5992206.cc
==============================================================================
--- trunk/src/Analyses/D0_2004_S5992206.cc	Thu Oct  1 23:17:18 2009	(r1847)
+++ trunk/src/Analyses/D0_2004_S5992206.cc	Sun Oct  4 16:36:17 2009	(r1848)
@@ -34,6 +34,16 @@
     D0_2004_S5992206() : Analysis("D0_2004_S5992206")
     {
       setBeams(PROTON, ANTIPROTON);
+    }
+
+    //@}
+
+
+    /// @name Analysis methods
+    //@{
+
+    void init() {
+      // Final state for jets, mET etc.
       const FinalState fs(-3.0, 3.0);
       addProjection(fs, "FS");
       addProjection(FastJets(fs, FastJets::D0ILCONE, 0.7, 6*GeV), "Jets");
@@ -45,16 +55,8 @@
       vfs.vetoNeutrinos();
       vfs.addVetoDetail(MUON, 1.0, MAXDOUBLE);
       addProjection(vfs, "VFS");
-    }
-
-    //@}
-
 
-    /// @name Analysis methods
-    //@{
-
-    /// Book histograms
-    void init() {
+      // Book histograms
       _histJetAzimuth_pTmax75_100  = bookHistogram1D(1, 2, 1);
       _histJetAzimuth_pTmax100_130 = bookHistogram1D(2, 2, 1);
       _histJetAzimuth_pTmax130_180 = bookHistogram1D(3, 2, 1);

Modified: trunk/src/Analyses/D0_2006_S6438750.cc
==============================================================================
--- trunk/src/Analyses/D0_2006_S6438750.cc	Thu Oct  1 23:17:18 2009	(r1847)
+++ trunk/src/Analyses/D0_2006_S6438750.cc	Sun Oct  4 16:36:17 2009	(r1848)
@@ -23,18 +23,7 @@
     D0_2006_S6438750() : Analysis("D0_2006_S6438750")
     {
       setBeams(PROTON, ANTIPROTON);
-      
-      /// @todo Use cross-section from generator
       setNeedsCrossSection(true);
-      
-      // General FS for photon isolation
-      FinalState fs(-1.5, 1.5);
-      addProjection(fs, "AllFS");
-      
-      // Get leading photon
-      LeadingParticlesFinalState photonfs(fs, -1.0, 1.0);
-      photonfs.addParticleId(PHOTON);
-      addProjection(photonfs, "LeadingPhoton");
     } 
     
     //@}
@@ -43,8 +32,17 @@
     /// @name Analysis methods
     //@{ 
 
-    /// Book histograms
     void init() {
+      // General FS for photon isolation
+      FinalState fs(-1.5, 1.5);
+      addProjection(fs, "AllFS");
+      
+      // Get leading photon
+      LeadingParticlesFinalState photonfs(fs, -1.0, 1.0);
+      photonfs.addParticleId(PHOTON);
+      addProjection(photonfs, "LeadingPhoton");
+
+      // Book histograms
       _h_pTgamma = bookHistogram1D(1, 1, 1);
     }
     

Modified: trunk/src/Analyses/D0_2008_S7662670.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7662670.cc	Thu Oct  1 23:17:18 2009	(r1847)
+++ trunk/src/Analyses/D0_2008_S7662670.cc	Sun Oct  4 16:36:17 2009	(r1848)
@@ -26,13 +26,6 @@
     {
       setBeams(PROTON, ANTIPROTON);
       setNeedsCrossSection(true);
-      
-      // Full final state
-      FinalState fs(-5.0, 5.0);
-      addProjection(fs, "FS");
-      
-      FastJets jetpro(fs, FastJets::D0ILCONE, 0.7, 6*GeV);
-      addProjection(jetpro, "Jets");
     }
     
     //@}
@@ -41,9 +34,18 @@
     /// @name Analysis methods
     //@{ 
 
-    /// Book histograms
     void init() 
     {
+      
+      // Full final state
+      FinalState fs(-5.0, 5.0);
+      addProjection(fs, "FS");
+
+      // Jets      
+      FastJets jetpro(fs, FastJets::D0ILCONE, 0.7, 6*GeV);
+      addProjection(jetpro, "Jets");
+
+      // Book histograms
       _h_dsigdptdy_y00_04 = bookHistogram1D(1, 1, 1);
       _h_dsigdptdy_y04_08 = bookHistogram1D(2, 1, 1);
       _h_dsigdptdy_y08_12 = bookHistogram1D(3, 1, 1);

Modified: trunk/src/Analyses/D0_2008_S7719523.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7719523.cc	Thu Oct  1 23:17:18 2009	(r1847)
+++ trunk/src/Analyses/D0_2008_S7719523.cc	Sun Oct  4 16:36:17 2009	(r1848)
@@ -29,7 +29,16 @@
     {
       setBeams(PROTON, ANTIPROTON);
       setNeedsCrossSection(true);
-      
+    } 
+    
+    //@}
+
+
+    /// @name Analysis methods
+    //@{ 
+    
+    /// Set up projections and book histograms
+    void init() {
       // General FS
       FinalState fs(-5.0, 5.0);
       addProjection(fs, "FS");
@@ -43,16 +52,8 @@
       VetoedFinalState vfs(fs);
       vfs.addVetoOnThisFinalState(photonfs);
       addProjection(vfs, "JetFS");
-    } 
-    
-    //@}
-
 
-    /// @name Analysis methods
-    //@{ 
-    
-    /// Book histograms
-    void init() {
+      // Histograms
       _h_central_same_cross_section = bookHistogram1D(1, 1, 1);
       _h_central_opp_cross_section  = bookHistogram1D(2, 1, 1);
       _h_forward_same_cross_section = bookHistogram1D(3, 1, 1);