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

blackhole at projects.hepforge.org blackhole at projects.hepforge.org
Wed Dec 7 20:42:51 GMT 2011


Author: fsiegert
Date: Wed Dec  7 20:42:50 2011
New Revision: 3520

Log:
Update analyses from deprecated W/ZFinder constructors in last commit.

Modified:
   trunk/src/Analyses/ATLAS_2011_I925932.cc
   trunk/src/Analyses/ATLAS_2011_S9131140.cc
   trunk/src/Analyses/CDF_2000_S4155203.cc
   trunk/src/Analyses/CDF_2009_S8383952.cc
   trunk/src/Analyses/D0_2000_S4480767.cc
   trunk/src/Analyses/D0_2007_S7075677.cc
   trunk/src/Analyses/D0_2008_S6879055.cc
   trunk/src/Analyses/D0_2008_S7554427.cc
   trunk/src/Analyses/D0_2008_S7837160.cc
   trunk/src/Analyses/D0_2008_S7863608.cc
   trunk/src/Analyses/D0_2009_S8202443.cc
   trunk/src/Analyses/D0_2009_S8349509.cc
   trunk/src/Analyses/D0_2010_S8671338.cc
   trunk/src/Analyses/D0_2010_S8821313.cc
   trunk/src/Analyses/MC_HJETS.cc
   trunk/src/Analyses/MC_VH2BB.cc
   trunk/src/Analyses/MC_WJETS.cc
   trunk/src/Analyses/MC_WPOL.cc
   trunk/src/Analyses/MC_WWJETS.cc
   trunk/src/Analyses/MC_ZJETS.cc
   trunk/src/Analyses/MC_ZZJETS.cc

Modified: trunk/src/Analyses/ATLAS_2011_I925932.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_I925932.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/ATLAS_2011_I925932.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -21,13 +21,14 @@
 
     void init() {
       // Set up projections
-      WFinder wfinder_dressed_el(-2.4, 2.4, 20.0*GeV, ELECTRON, 0.0*GeV, 1000.0*GeV, 25.0*GeV, 0.2,true,false);
+      FinalState fs;
+      WFinder wfinder_dressed_el(fs, -2.4, 2.4, 20.0*GeV, ELECTRON, 0.0*GeV, 1000.0*GeV, 25.0*GeV, 0.2,true,false);
       addProjection(wfinder_dressed_el, "WFinder_dressed_el");
-      WFinder wfinder_bare_el(-2.4, 2.4, 20.0*GeV, ELECTRON, 0.0*GeV, 1000.0*GeV, 25.0*GeV, 0.0,true,false);
+      WFinder wfinder_bare_el(fs, -2.4, 2.4, 20.0*GeV, ELECTRON, 0.0*GeV, 1000.0*GeV, 25.0*GeV, 0.0,true,false);
       addProjection(wfinder_bare_el, "WFinder_bare_el");
-      WFinder wfinder_dressed_mu(-2.4, 2.4, 20.0*GeV, MUON, 0.0*GeV, 1000.0*GeV, 25.0*GeV, 0.2,true,false);
+      WFinder wfinder_dressed_mu(fs, -2.4, 2.4, 20.0*GeV, MUON, 0.0*GeV, 1000.0*GeV, 25.0*GeV, 0.2,true,false);
       addProjection(wfinder_dressed_mu, "WFinder_dressed_mu");
-      WFinder wfinder_bare_mu(-2.4, 2.4, 20.0*GeV, MUON, 0.0*GeV, 1000.0*GeV, 25.0*GeV, 0.0,true,false);
+      WFinder wfinder_bare_mu(fs, -2.4, 2.4, 20.0*GeV, MUON, 0.0*GeV, 1000.0*GeV, 25.0*GeV, 0.0,true,false);
       addProjection(wfinder_bare_mu, "WFinder_bare_mu");
 
       // Counters

Modified: trunk/src/Analyses/ATLAS_2011_S9131140.cc
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_S9131140.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/ATLAS_2011_S9131140.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -30,13 +30,14 @@
     void init() {
 
       // Set up projections
-      ZFinder zfinder_dressed_el(-2.4, 2.4, 20, ELECTRON, 66.0*GeV, 116.0*GeV, 0.1, true, false);
+      FinalState fs;
+      ZFinder zfinder_dressed_el(fs, -2.4, 2.4, 20, ELECTRON, 66.0*GeV, 116.0*GeV, 0.1, true, false);
       addProjection(zfinder_dressed_el, "ZFinder_dressed_el");
-      ZFinder zfinder_bare_el(-2.4, 2.4, 20, ELECTRON, 66.0*GeV, 116.0*GeV, 0.0, true, false);
+      ZFinder zfinder_bare_el(fs, -2.4, 2.4, 20, ELECTRON, 66.0*GeV, 116.0*GeV, 0.0, true, false);
       addProjection(zfinder_bare_el, "ZFinder_bare_el");
-      ZFinder zfinder_dressed_mu(-2.4, 2.4, 20, MUON, 66.0*GeV, 116.0*GeV, 0.1, true, false);
+      ZFinder zfinder_dressed_mu(fs, -2.4, 2.4, 20, MUON, 66.0*GeV, 116.0*GeV, 0.1, true, false);
       addProjection(zfinder_dressed_mu, "ZFinder_dressed_mu");
-      ZFinder zfinder_bare_mu(-2.4, 2.4, 20, MUON, 66.0*GeV, 116.0*GeV, 0.0, true, false);
+      ZFinder zfinder_bare_mu(fs, -2.4, 2.4, 20, MUON, 66.0*GeV, 116.0*GeV, 0.0, true, false);
       addProjection(zfinder_bare_mu, "ZFinder_bare_mu");
 
       // Book histograms

Modified: trunk/src/Analyses/CDF_2000_S4155203.cc
==============================================================================
--- trunk/src/Analyses/CDF_2000_S4155203.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/CDF_2000_S4155203.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -23,7 +23,8 @@
 
     void init() {
       // Set up projections
-      ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
+      FinalState fs;
+      ZFinder zfinder(fs, -MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
                       66.0*GeV, 116.0*GeV, 0.0, false, false);
       addProjection(zfinder, "ZFinder");
 

Modified: trunk/src/Analyses/CDF_2009_S8383952.cc
==============================================================================
--- trunk/src/Analyses/CDF_2009_S8383952.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/CDF_2009_S8383952.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -34,7 +34,8 @@
       /// Initialise and register projections here
       // this seems to have been corrected completely for all selection cuts,
       // i.e. eta cuts and pT cuts on leptons.
-      ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
+      FinalState fs;
+      ZFinder zfinder(fs, -MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
                       66.0*GeV, 116.0*GeV, 0.2, true, true);
       addProjection(zfinder, "ZFinder");
 

Modified: trunk/src/Analyses/D0_2000_S4480767.cc
==============================================================================
--- trunk/src/Analyses/D0_2000_S4480767.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2000_S4480767.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -29,8 +29,8 @@
 
     /// Book histograms and initialise projections before the run
     void init() {
-
-      WFinder wf(-5, 5, 0.0*GeV, ELECTRON, 0.0*GeV, 200.0*GeV, 0.0*GeV, 0.2);
+      FinalState fs;
+      WFinder wf(fs, -5, 5, 0.0*GeV, ELECTRON, 0.0*GeV, 200.0*GeV, 0.0*GeV, 0.2);
       addProjection(wf, "WFinder");
 
       _h_W_pT = bookHistogram1D(1, 1, 1);

Modified: trunk/src/Analyses/D0_2007_S7075677.cc
==============================================================================
--- trunk/src/Analyses/D0_2007_S7075677.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2007_S7075677.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -27,7 +27,8 @@
 
     /// Book histograms
     void init() {
-      ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
+      FinalState fs;
+      ZFinder zfinder(fs, -MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
                       71.0*GeV, 111.0*GeV, 0.2, true, true);
       addProjection(zfinder, "ZFinder");
 

Modified: trunk/src/Analyses/D0_2008_S6879055.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S6879055.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2008_S6879055.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -23,7 +23,8 @@
 
     // Book histograms
     void init() {
-      ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
+      FinalState fs;
+      ZFinder zfinder(fs, -MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
                       40.0*GeV, 200.0*GeV, 0.2, true, true);
       addProjection(zfinder, "ZFinder");
 

Modified: trunk/src/Analyses/D0_2008_S7554427.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7554427.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2008_S7554427.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -28,7 +28,8 @@
 
     /// Book histograms
     void init() {
-      ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
+      FinalState fs;
+      ZFinder zfinder(fs, -MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
                       40.0*GeV, 200.0*GeV, 0.2, true, true);
       addProjection(zfinder, "ZFinder");
 

Modified: trunk/src/Analyses/D0_2008_S7837160.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7837160.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2008_S7837160.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -36,7 +36,8 @@
     void init() {
       // Projections
       /// @todo Use separate pT and ETmiss cuts in WFinder
-      const WFinder wfe(-5, 5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
+      FinalState fs;
+      const WFinder wfe(fs, -5, 5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
       addProjection(wfe, "WFe");
 
       // Cross-section histograms

Modified: trunk/src/Analyses/D0_2008_S7863608.cc
==============================================================================
--- trunk/src/Analyses/D0_2008_S7863608.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2008_S7863608.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -28,7 +28,8 @@
 
     /// Book histograms
     void init() {
-      ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, false, true);
+      FinalState fs;
+      ZFinder zfinder(fs, -1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, false, true);
       addProjection(zfinder, "ZFinder");
 
       FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5);

Modified: trunk/src/Analyses/D0_2009_S8202443.cc
==============================================================================
--- trunk/src/Analyses/D0_2009_S8202443.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2009_S8202443.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -29,12 +29,13 @@
 
     /// Book histograms
     void init() {
+      FinalState fs;
       // Leptons in constrained tracking acceptance
       vector<pair<double, double> > etaRanges;
       etaRanges.push_back(make_pair(-2.5, -1.5));
       etaRanges.push_back(make_pair(-1.1, 1.1));
       etaRanges.push_back(make_pair(1.5, 2.5));
-      ZFinder zfinder_constrained(etaRanges, 25.0*GeV, ELECTRON,
+      ZFinder zfinder_constrained(fs, etaRanges, 25.0*GeV, ELECTRON,
                                   65.0*GeV, 115.0*GeV, 0.2, true, true);
       addProjection(zfinder_constrained, "ZFinderConstrained");
       FastJets conefinder_constrained(zfinder_constrained.remainingFinalState(),
@@ -42,7 +43,7 @@
       addProjection(conefinder_constrained, "ConeFinderConstrained");
 
       // Unconstrained leptons
-      ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
+      ZFinder zfinder(fs, -MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
                       65.0*GeV, 115.0*GeV, 0.2, true, true);
       addProjection(zfinder, "ZFinder");
       FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5);

Modified: trunk/src/Analyses/D0_2009_S8349509.cc
==============================================================================
--- trunk/src/Analyses/D0_2009_S8349509.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2009_S8349509.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -29,7 +29,8 @@
 
     /// Book histograms
     void init() {
-      ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, false, true);
+      FinalState fs;
+      ZFinder zfinder(fs, -1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, false, true);
       addProjection(zfinder, "ZFinder");
 
       FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5);

Modified: trunk/src/Analyses/D0_2010_S8671338.cc
==============================================================================
--- trunk/src/Analyses/D0_2010_S8671338.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2010_S8671338.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -28,7 +28,8 @@
 
     /// Add projections and book histograms
     void init() {
-      ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, false, true);
+      FinalState fs;
+      ZFinder zfinder(fs, -1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, false, true);
       addProjection(zfinder, "ZFinder");
 
       _h_Z_pT_normalised = bookHistogram1D(1, 1, 1);

Modified: trunk/src/Analyses/D0_2010_S8821313.cc
==============================================================================
--- trunk/src/Analyses/D0_2010_S8821313.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/D0_2010_S8821313.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -34,14 +34,15 @@
     void init() {
 
       /// Initialise and register projections
+      FinalState fs;
       vector<pair<double, double> > etaRanges_ee;
       etaRanges_ee.push_back(make_pair(-3.0, -1.5));
       etaRanges_ee.push_back(make_pair(-1.1, 1.1));
       etaRanges_ee.push_back(make_pair(1.5, 3.0));
-      ZFinder zfinder_ee(etaRanges_ee, 20.0*GeV, ELECTRON, 70.0*GeV, 110.0*GeV, 0.2, true, true);
+      ZFinder zfinder_ee(fs, etaRanges_ee, 20.0*GeV, ELECTRON, 70.0*GeV, 110.0*GeV, 0.2, true, true);
       addProjection(zfinder_ee, "zfinder_ee");
 
-      ZFinder zfinder_mm(-2.0, 2.0, 15.0*GeV, MUON, 70.0*GeV, 110.0*GeV, 0.0, false, false);
+      ZFinder zfinder_mm(fs, -2.0, 2.0, 15.0*GeV, MUON, 70.0*GeV, 110.0*GeV, 0.0, false, false);
       addProjection(zfinder_mm, "zfinder_mm");
 
       /// Book histograms here

Modified: trunk/src/Analyses/MC_HJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_HJETS.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/MC_HJETS.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -23,7 +23,8 @@
 
     /// Book histograms
     void init() {
-      ZFinder hfinder(-3.5, 3.5, 25.0*GeV, TAU, 115.0*GeV, 125.0*GeV, 0.0, false, false);
+      FinalState fs;
+      ZFinder hfinder(fs, -3.5, 3.5, 25.0*GeV, TAU, 115.0*GeV, 125.0*GeV, 0.0, false, false);
       addProjection(hfinder, "Hfinder");
       FastJets jetpro(hfinder.remainingFinalState(), FastJets::KT, 0.7);
       addProjection(jetpro, "Jets");

Modified: trunk/src/Analyses/MC_VH2BB.cc
==============================================================================
--- trunk/src/Analyses/MC_VH2BB.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/MC_VH2BB.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -66,17 +66,17 @@
     /// Book histograms and initialise projections before the run
     void init() {
 
-      ZFinder zeefinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
+      FinalState fs;
+      ZFinder zeefinder(fs, -3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
       addProjection(zeefinder, "ZeeFinder");
-      ZFinder zmmfinder(-3.5, 3.5, 25.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
+      ZFinder zmmfinder(fs, -3.5, 3.5, 25.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
       addProjection(zmmfinder, "ZmmFinder");
 
-      WFinder wefinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
+      WFinder wefinder(fs, -3.5, 3.5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
       addProjection(wefinder, "WeFinder");
-      WFinder wmfinder(-3.5, 3.5, 25.0*GeV, MUON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
+      WFinder wmfinder(fs, -3.5, 3.5, 25.0*GeV, MUON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
       addProjection(wmfinder, "WmFinder");
 
-      FinalState fs;
       addProjection(fs, "FinalState");
       addProjection(FastJets(fs, FastJets::ANTIKT, 0.4), "AntiKT04");
       addProjection(FastJets(fs, FastJets::ANTIKT, 0.5), "AntiKT05");

Modified: trunk/src/Analyses/MC_WJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_WJETS.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/MC_WJETS.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -24,7 +24,8 @@
 
     /// Book histograms
     void init() {
-      WFinder wfinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
+      FinalState fs;
+      WFinder wfinder(fs, -3.5, 3.5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
       addProjection(wfinder, "WFinder");
       FastJets jetpro(wfinder.remainingFinalState(), FastJets::KT, 0.7);
       addProjection(jetpro, "Jets");

Modified: trunk/src/Analyses/MC_WPOL.cc
==============================================================================
--- trunk/src/Analyses/MC_WPOL.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/MC_WPOL.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -33,7 +33,8 @@
     /// Book histograms and initialise projections before the run
     void init() {
 
-      WFinder wfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
+      FinalState fs;
+      WFinder wfinder(fs, -MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON,
                       60.0*GeV, 100.0*GeV, 0.0*GeV, 0.0);
       addProjection(wfinder, "WFinder");
       Beam beams;

Modified: trunk/src/Analyses/MC_WWJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_WWJETS.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/MC_WWJETS.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -25,10 +25,15 @@
 
     /// Book histograms
     void init() {
-      WFinder wenufinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
+      FinalState fs;
+      WFinder wenufinder(fs, -3.5, 3.5, 25.0*GeV, ELECTRON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
       addProjection(wenufinder, "WenuFinder");
-      WFinder wmnufinder(-3.5, 3.5, 25.0*GeV, MUON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
+
+      VetoedFinalState wmnuinput;
+      wmnuinput.addVetoOnThisFinalState(wenufinder);
+      WFinder wmnufinder(wmnuinput, -3.5, 3.5, 25.0*GeV, MUON, 60.0*GeV, 100.0*GeV, 25.0*GeV, 0.2);
       addProjection(wmnufinder, "WmnuFinder");
+
       VetoedFinalState jetinput;
       jetinput
           .addVetoOnThisFinalState(wenufinder)

Modified: trunk/src/Analyses/MC_ZJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_ZJETS.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/MC_ZJETS.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -23,7 +23,8 @@
 
     /// Book histograms
     void init() {
-      ZFinder zfinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
+      FinalState fs;
+      ZFinder zfinder(fs, -3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
       addProjection(zfinder, "ZFinder");
       FastJets jetpro(zfinder.remainingFinalState(), FastJets::KT, 0.7);
       addProjection(jetpro, "Jets");

Modified: trunk/src/Analyses/MC_ZZJETS.cc
==============================================================================
--- trunk/src/Analyses/MC_ZZJETS.cc	Wed Dec  7 20:42:17 2011	(r3519)
+++ trunk/src/Analyses/MC_ZZJETS.cc	Wed Dec  7 20:42:50 2011	(r3520)
@@ -24,10 +24,15 @@
 
     /// Book histograms
     void init() {
-      ZFinder zeefinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
+      FinalState fs;
+      ZFinder zeefinder(fs, -3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
       addProjection(zeefinder, "ZeeFinder");
-      ZFinder zmmfinder(-3.5, 3.5, 25.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
+
+      VetoedFinalState zmminput;
+      zmminput.addVetoOnThisFinalState(zeefinder);
+      ZFinder zmmfinder(zmminput, -3.5, 3.5, 25.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2, true, true);
       addProjection(zmmfinder, "ZmmFinder");
+
       VetoedFinalState jetinput;
       jetinput
           .addVetoOnThisFinalState(zeefinder)


More information about the Rivet-svn mailing list