[Rivet-svn] r2154 - in trunk: include/Rivet/Projections src/Analyses

[blackhole at projects.hepforge.org]

Author: fsiegert
Date: Wed Dec  9 10:08:29 2009
New Revision: 2154

Log:
Bugfix for arguments in LPFS constructor which don't get used.

Modified:
   trunk/include/Rivet/Projections/LeadingParticlesFinalState.hh
   trunk/src/Analyses/D0_2001_S4674421.cc
   trunk/src/Analyses/D0_2006_S6438750.cc
   trunk/src/Analyses/D0_2008_S6879055.cc
   trunk/src/Analyses/D0_2008_S7719523.cc
   trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc

Modified: trunk/include/Rivet/Projections/LeadingParticlesFinalState.hh
==============================================================================
--- trunk/include/Rivet/Projections/LeadingParticlesFinalState.hh	Wed Dec  9 09:54:02 2009	(r2153)
+++ trunk/include/Rivet/Projections/LeadingParticlesFinalState.hh	Wed Dec  9 10:08:29 2009	(r2154)
@@ -16,9 +16,8 @@
   public:
 
     /// Constructor: the supplied FinalState projection is assumed to live through the run.
-    /// @todo Why specify the rap & pT cuts again?
-    LeadingParticlesFinalState(const FinalState& fsp, double mineta=-MAXRAPIDITY, double maxeta=MAXRAPIDITY, double minpt=0.0*GeV)
-      :  FinalState(mineta, maxeta, minpt)
+    LeadingParticlesFinalState(const FinalState& fsp)
+      :  FinalState()
     {
       setName("LeadingParticlesFinalState");
       addProjection(fsp, "FS");

Modified: trunk/src/Analyses/D0_2001_S4674421.cc
==============================================================================
--- trunk/src/Analyses/D0_2001_S4674421.cc	Wed Dec  9 09:54:02 2009	(r2153)
+++ trunk/src/Analyses/D0_2001_S4674421.cc	Wed Dec  9 10:08:29 2009	(r2154)
@@ -43,17 +43,17 @@
       addProjection(fs, "FS");
 
       // Z -> e- e+
-      LeadingParticlesFinalState eeFS(fs, -2.5, 2.5, 0.); //20.);
+      LeadingParticlesFinalState eeFS(FinalState(-2.5, 2.5, 0.)); //20.);
       eeFS.addParticleIdPair(ELECTRON);
       addProjection(eeFS, "eeFS");
    
       // W- -> e- nu_e~
-      LeadingParticlesFinalState enuFS(fs, -2.5, 2.5, 0.); //25.);
+      LeadingParticlesFinalState enuFS(FinalState(-2.5, 2.5, 0.)); //25.);
       enuFS.addParticleId(ELECTRON).addParticleId(NU_EBAR);
       addProjection(enuFS, "enuFS");
    
       // W+ -> e+ nu_e
-      LeadingParticlesFinalState enubFS(fs, -2.5, 2.5, 0.); //25.);
+      LeadingParticlesFinalState enubFS(FinalState(-2.5, 2.5, 0.)); //25.);
       enubFS.addParticleId(POSITRON).addParticleId(NU_E);
       addProjection(enubFS, "enubFS");
 

Modified: trunk/src/Analyses/D0_2006_S6438750.cc
==============================================================================
--- trunk/src/Analyses/D0_2006_S6438750.cc	Wed Dec  9 09:54:02 2009	(r2153)
+++ trunk/src/Analyses/D0_2006_S6438750.cc	Wed Dec  9 10:08:29 2009	(r2154)
@@ -34,11 +34,11 @@
 
     void init() {
       // General FS for photon isolation
-      FinalState fs(-1.5, 1.5);
+      FinalState fs;
       addProjection(fs, "AllFS");
    
       // Get leading photon
-      LeadingParticlesFinalState photonfs(fs, -1.0, 1.0);
+      LeadingParticlesFinalState photonfs(FinalState(-1.0, 1.0, 23.0*GeV));
       photonfs.addParticleId(PHOTON);
       addProjection(photonfs, "LeadingPhoton");
 

Modified: trunk/src/Analyses/D0_2008_S6879055.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S6879055.cc	Wed Dec  9 09:54:02 2009	(r2153)
+++ trunk/src/Analyses/D0_2008_S6879055.cc	Wed Dec  9 10:08:29 2009	(r2154)
@@ -33,7 +33,7 @@
       addProjection(fs, "FS");
    
       // Leading electrons in tracking acceptance
-      LeadingParticlesFinalState lpfs(fs, -1.1, 1.1, 25*GeV);
+      LeadingParticlesFinalState lpfs(FinalState(-1.1, 1.1, 25*GeV));
       lpfs.addParticleId(ELECTRON).addParticleId(POSITRON);
       addProjection(lpfs, "LeadingElectronsFS");
    

Modified: trunk/src/Analyses/D0_2008_S7719523.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7719523.cc	Wed Dec  9 09:54:02 2009	(r2153)
+++ trunk/src/Analyses/D0_2008_S7719523.cc	Wed Dec  9 10:08:29 2009	(r2154)
@@ -44,7 +44,7 @@
       addProjection(fs, "FS");
    
       // Get leading photon
-      LeadingParticlesFinalState photonfs(fs, -1.0, 1.0);
+      LeadingParticlesFinalState photonfs(FinalState(-1.0, 1.0));
       photonfs.addParticleId(PHOTON);
       addProjection(photonfs, "LeadingPhoton");
    

Modified: trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc	Wed Dec  9 09:54:02 2009	(r2153)
+++ trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc	Wed Dec  9 10:08:29 2009	(r2154)
@@ -29,7 +29,7 @@
       addProjection(fs, "FS");
    
       // Get leading photon
-      LeadingParticlesFinalState photonfs(fs, -1.0, 1.0);
+      LeadingParticlesFinalState photonfs(FinalState(-1.0, 1.0));
       photonfs.addParticleId(PHOTON);
       addProjection(photonfs, "LeadingPhoton");