|
[Rivet-svn] r3310 - branches/2011-07-aida2yoda branches/2011-07-aida2yoda/src/Analyses trunk trunk/src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgTue Aug 23 10:34:46 BST 2011
Author: hoeth Date: Tue Aug 23 10:34:42 2011 New Revision: 3310 Log: remove obsolete setBeams() from analyses Modified: branches/2011-07-aida2yoda/ChangeLog branches/2011-07-aida2yoda/src/Analyses/ALEPH_1991_S2435284.cc branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3196992.cc branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3486095.cc branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8924791.cc branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9120807.cc branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1990_S2089246.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3349578.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1997_S3541940.cc branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4517016.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4751469.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2004_S5839831.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_LEADINGJETS.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_NOTE_9351.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7828950.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8095620.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8057893.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_DY.cc branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_QCD.cc branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc branches/2011-07-aida2yoda/src/Analyses/D0_2004_S5992206.cc branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc branches/2011-07-aida2yoda/src/Analyses/D0_2007_S7075677.cc branches/2011-07-aida2yoda/src/Analyses/D0_2008_S6879055.cc branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7554427.cc branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7837160.cc branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8202443.cc branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8320160.cc branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8566488.cc branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc branches/2011-07-aida2yoda/src/Analyses/DELPHI_1995_S3137023.cc branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc branches/2011-07-aida2yoda/src/Analyses/E735_1998_S3905616.cc branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc branches/2011-07-aida2yoda/src/Analyses/JADE_1998_S3612880.cc branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc branches/2011-07-aida2yoda/src/Analyses/OPAL_1998_S3780481.cc branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc branches/2011-07-aida2yoda/src/Analyses/SFM_1984_S1178091.cc branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7993412.cc branches/2011-07-aida2yoda/src/Analyses/STAR_2009_UE_HELEN.cc branches/2011-07-aida2yoda/src/Analyses/TASSO_1990_S2148048.cc branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc branches/2011-07-aida2yoda/src/Analyses/UA5_1988_S1867512.cc branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc branches/2011-07-aida2yoda/src/Analyses/ZEUS_2001_S4815815.cc trunk/ChangeLog trunk/src/Analyses/ALEPH_1991_S2435284.cc trunk/src/Analyses/ALEPH_1996_S3196992.cc trunk/src/Analyses/ALEPH_1996_S3486095.cc trunk/src/Analyses/ALEPH_2004_S5765862.cc trunk/src/Analyses/ALICE_2010_S8624100.cc trunk/src/Analyses/ALICE_2010_S8625980.cc trunk/src/Analyses/ALICE_2010_S8706239.cc trunk/src/Analyses/ATLAS_2010_S8817804.cc trunk/src/Analyses/ATLAS_2011_S8924791.cc trunk/src/Analyses/ATLAS_2011_S9120807.cc trunk/src/Analyses/BELLE_2006_S6265367.cc trunk/src/Analyses/CDF_1988_S1865951.cc trunk/src/Analyses/CDF_1990_S2089246.cc trunk/src/Analyses/CDF_1993_S2742446.cc trunk/src/Analyses/CDF_1994_S2952106.cc trunk/src/Analyses/CDF_1996_S3108457.cc trunk/src/Analyses/CDF_1996_S3349578.cc trunk/src/Analyses/CDF_1996_S3418421.cc trunk/src/Analyses/CDF_1997_S3541940.cc trunk/src/Analyses/CDF_1998_S3618439.cc trunk/src/Analyses/CDF_2000_S4155203.cc trunk/src/Analyses/CDF_2000_S4266730.cc trunk/src/Analyses/CDF_2001_S4517016.cc trunk/src/Analyses/CDF_2001_S4563131.cc trunk/src/Analyses/CDF_2001_S4751469.cc trunk/src/Analyses/CDF_2002_S4796047.cc trunk/src/Analyses/CDF_2004_S5839831.cc trunk/src/Analyses/CDF_2005_S6080774.cc trunk/src/Analyses/CDF_2005_S6217184.cc trunk/src/Analyses/CDF_2006_S6450792.cc trunk/src/Analyses/CDF_2006_S6653332.cc trunk/src/Analyses/CDF_2007_S7057202.cc trunk/src/Analyses/CDF_2008_LEADINGJETS.cc trunk/src/Analyses/CDF_2008_NOTE_9351.cc trunk/src/Analyses/CDF_2008_S7540469.cc trunk/src/Analyses/CDF_2008_S7541902.cc trunk/src/Analyses/CDF_2008_S7782535.cc trunk/src/Analyses/CDF_2008_S7828950.cc trunk/src/Analyses/CDF_2008_S8093652.cc trunk/src/Analyses/CDF_2008_S8095620.cc trunk/src/Analyses/CDF_2009_NOTE_9936.cc trunk/src/Analyses/CDF_2009_S8057893.cc trunk/src/Analyses/CDF_2009_S8233977.cc trunk/src/Analyses/CDF_2009_S8383952.cc trunk/src/Analyses/CDF_2009_S8436959.cc trunk/src/Analyses/CDF_2010_S8591881_DY.cc trunk/src/Analyses/CDF_2010_S8591881_QCD.cc trunk/src/Analyses/CMS_2011_S8957746.cc trunk/src/Analyses/D0_1996_S3214044.cc trunk/src/Analyses/D0_1996_S3324664.cc 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_2007_S7075677.cc trunk/src/Analyses/D0_2008_S6879055.cc trunk/src/Analyses/D0_2008_S7554427.cc trunk/src/Analyses/D0_2008_S7662670.cc trunk/src/Analyses/D0_2008_S7719523.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_S8320160.cc trunk/src/Analyses/D0_2009_S8349509.cc trunk/src/Analyses/D0_2010_S8566488.cc trunk/src/Analyses/D0_2010_S8570965.cc trunk/src/Analyses/D0_2010_S8671338.cc trunk/src/Analyses/DELPHI_1995_S3137023.cc trunk/src/Analyses/DELPHI_1996_S3430090.cc trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc trunk/src/Analyses/E735_1998_S3905616.cc trunk/src/Analyses/H1_1994_S2919893.cc trunk/src/Analyses/H1_1995_S3167097.cc trunk/src/Analyses/H1_2000_S4129130.cc trunk/src/Analyses/JADE_1998_S3612880.cc trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc trunk/src/Analyses/LHCB_2010_S8758301.cc trunk/src/Analyses/OPAL_1993_S2692198.cc trunk/src/Analyses/OPAL_1998_S3780481.cc trunk/src/Analyses/OPAL_2001_S4553896.cc trunk/src/Analyses/PDG_Hadron_Multiplicities.cc trunk/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc trunk/src/Analyses/SFM_1984_S1178091.cc trunk/src/Analyses/STAR_2006_S6500200.cc trunk/src/Analyses/STAR_2006_S6860818.cc trunk/src/Analyses/STAR_2006_S6870392.cc trunk/src/Analyses/STAR_2008_S7869363.cc trunk/src/Analyses/STAR_2008_S7993412.cc trunk/src/Analyses/STAR_2009_UE_HELEN.cc trunk/src/Analyses/TASSO_1990_S2148048.cc trunk/src/Analyses/UA1_1990_S2044935.cc trunk/src/Analyses/UA5_1986_S1583476.cc trunk/src/Analyses/UA5_1987_S1640666.cc trunk/src/Analyses/UA5_1988_S1867512.cc trunk/src/Analyses/UA5_1989_S1926373.cc trunk/src/Analyses/ZEUS_2001_S4815815.cc Modified: branches/2011-07-aida2yoda/ChangeLog ============================================================================== --- branches/2011-07-aida2yoda/ChangeLog Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/ChangeLog Tue Aug 23 10:34:42 2011 (r3310) @@ -2,6 +2,8 @@ * Added ALICE_2011_S8945144 + * Remove obsolete setBeams() from the analyses + 2011-08-19 Frank Siegert <frank.siegert at cern.ch> * More NLO parton level generator friendliness: Don't crash or fail when Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_1991_S2435284.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALEPH_1991_S2435284.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_1991_S2435284.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ ALEPH_1991_S2435284() : Analysis("ALEPH_1991_S2435284") { - setBeams(ELECTRON, POSITRON); } Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3196992.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3196992.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3196992.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor ALEPH_1996_S3196992() : Analysis("ALEPH_1996_S3196992") { - setBeams(ELECTRON, POSITRON); } Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3486095.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3486095.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3486095.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -25,7 +25,6 @@ ALEPH_1996_S3486095() : Analysis("ALEPH_1996_S3486095") { - setBeams(ELECTRON, POSITRON); _numChParticles = 0; _weightedTotalPartNum = 0; _weightedTotalNumPiPlus = 0; Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ : Analysis("ALEPH_2004_S5765862") , _initialisedJets(false), _initialisedSpectra(false), _weightedTotalChargedPartNum(0) { - setBeams(ELECTRON, POSITRON); } Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ { /// @todo Set whether your finalize method needs the generator cross section setNeedsCrossSection(false); - setBeams(PROTON, PROTON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ { /// @todo Set whether your finalize method needs the generator cross section setNeedsCrossSection(false); - setBeams(PROTON, PROTON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ _Nevt_after_cuts(0.0) { setNeedsCrossSection(false); - setBeams(PROTON, PROTON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8817804.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ ATLAS_2010_S8817804() : Analysis("ATLAS_2010_S8817804") { - setBeams(PROTON, PROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8924791.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8924791.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8924791.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ ATLAS_2011_S8924791() : Analysis("ATLAS_2011_S8924791") { - setBeams(PROTON, PROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9120807.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9120807.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9120807.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -36,7 +36,6 @@ ATLAS_2011_S9120807() : Analysis("ATLAS_2011_S9120807") { - setBeams(PROTON, PROTON); setNeedsCrossSection(true); _eta_bins_areaoffset.push_back(0.0); Modified: branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ BELLE_2006_S6265367(): Analysis("BELLE_2006_S6265367") { - setBeams(ELECTRON, POSITRON); // setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ CDF_1988_S1865951() : Analysis("CDF_1988_S1865951") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); _sumWTrig = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1990_S2089246.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1990_S2089246.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1990_S2089246.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ CDF_1990_S2089246() : Analysis("CDF_1990_S2089246") { - setBeams(PROTON, ANTIPROTON); _sumWTrig = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ CDF_1993_S2742446() : Analysis("CDF_1993_S2742446") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(false); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ /// Constructor CDF_1994_S2952106() : Analysis("CDF_1994_S2952106") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_1996_S3108457() : Analysis("CDF_1996_S3108457") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3349578.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3349578.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3349578.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_1996_S3349578() : Analysis("CDF_1996_S3349578") { - setBeams(PROTON, ANTIPROTON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ CDF_1996_S3418421() : Analysis("CDF_1996_S3418421") { - setBeams(PROTON, ANTIPROTON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1997_S3541940.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1997_S3541940.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1997_S3541940.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ CDF_1997_S3541940() : Analysis("CDF_1997_S3541940") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_1998_S3618439() : Analysis("CDF_1998_S3618439") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ CDF_2000_S4155203() : Analysis("CDF_2000_S4155203") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2000_S4266730() : Analysis("CDF_2000_S4266730") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4517016.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4517016.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4517016.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ CDF_2001_S4517016() : Analysis("CDF_2001_S4517016") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2001_S4563131() : Analysis("CDF_2001_S4563131") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4751469.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4751469.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4751469.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -38,7 +38,6 @@ _totalNumTrans2(0), _totalNumTrans5(0), _totalNumTrans30(0), _sumWeightsPtLead2(0),_sumWeightsPtLead5(0), _sumWeightsPtLead30(0) { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -35,7 +35,6 @@ CDF_2002_S4796047() : Analysis("CDF_2002_S4796047") { - setBeams(PROTON, ANTIPROTON); _sumWTrig = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2004_S5839831.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2004_S5839831.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2004_S5839831.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -29,7 +29,6 @@ CDF_2004_S5839831() : Analysis("CDF_2004_S5839831") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -14,7 +14,6 @@ /// Constructor CDF_2005_S6080774() : Analysis("CDF_2005_S6080774") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2005_S6217184() : Analysis("CDF_2005_S6217184") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -14,7 +14,6 @@ /// Constructor CDF_2006_S6450792() : Analysis("CDF_2006_S6450792") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -29,7 +29,6 @@ _Rjet(0.7), _JetPtCut(20.), _JetEtaCut(1.5), _Lep1PtCut(18.), _Lep2PtCut(10.), _LepEtaCut(1.1), _sumWeightsWithZ(0.0), _sumWeightsWithZJet(0.0) { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ CDF_2007_S7057202() : Analysis("CDF_2007_S7057202") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_LEADINGJETS.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_LEADINGJETS.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_LEADINGJETS.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -36,7 +36,6 @@ CDF_2008_LEADINGJETS() : Analysis("CDF_2008_LEADINGJETS") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_NOTE_9351.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_NOTE_9351.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_NOTE_9351.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -33,7 +33,6 @@ /// Constructor CDF_2008_NOTE_9351() : Analysis("CDF_2008_NOTE_9351") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ CDF_2008_S7540469() : Analysis("CDF_2008_S7540469") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -28,7 +28,6 @@ _jetEtCutA(20.0*GeV), _jetEtCutB(25.0*GeV), _jetETA(2.0), _xpoint(1960.) { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ /// Constructor CDF_2008_S7782535() : Analysis("CDF_2008_S7782535") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7828950.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7828950.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7828950.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -21,7 +21,6 @@ /// Constructor CDF_2008_S7828950() : Analysis("CDF_2008_S7828950") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ CDF_2008_S8093652() : Analysis("CDF_2008_S8093652") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8095620.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8095620.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8095620.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ _Rjet(0.7), _JetPtCut(20.), _JetEtaCut(1.5), _Lep1PtCut(18.), _Lep2PtCut(10.), _LepEtaCut(3.2), _sumWeightSelected(0.0) { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ //_sumWPassed(0.0) { /// @todo Set approriate for your analysis - setBeams(PROTON, ANTIPROTON); /// @todo Set whether your finalize method needs the generator cross section setNeedsCrossSection(false); Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8057893.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8057893.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8057893.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ CDF_2009_S8057893::CDF_2009_S8057893() : Analysis("CDF_2009_S8057893") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -32,7 +32,6 @@ : Analysis("CDF_2009_S8233977"), _sumWeightSelected(0.0) { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2009_S8383952() : Analysis("CDF_2009_S8383952") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2009_S8436959() : Analysis("CDF_2009_S8436959") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_DY.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_DY.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_DY.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -33,7 +33,6 @@ /// Constructor CDF_2010_S8591881_DY() : Analysis("CDF_2010_S8591881_DY") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_QCD.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_QCD.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_QCD.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -36,7 +36,6 @@ CDF_2010_S8591881_QCD() : Analysis("CDF_2010_S8591881_QCD") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ /// Default constructor CMS_2011_S8957746() : Analysis("CMS_2011_S8957746") { - setBeams(PROTON, PROTON); } /// Initialization, called once before running Modified: branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -21,7 +21,6 @@ /// Constructor D0_1996_S3214044() : Analysis("D0_1996_S3214044") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(false); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor D0_1996_S3324664() : Analysis("D0_1996_S3324664") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(false); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ /// Constructor. D0_2001_S4674421() : Analysis("D0_2001_S4674421") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2004_S5992206.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2004_S5992206.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2004_S5992206.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -33,7 +33,6 @@ /// Constructor. D0_2004_S5992206() : Analysis("D0_2004_S5992206") { - setBeams(PROTON, ANTIPROTON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ /// Default constructor. D0_2006_S6438750() : Analysis("D0_2006_S6438750") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2007_S7075677.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2007_S7075677.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2007_S7075677.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ D0_2007_S7075677() : Analysis("D0_2007_S7075677") { // Run II Z rapidity - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S6879055.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S6879055.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S6879055.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ /// Default constructor. D0_2008_S6879055() : Analysis("D0_2008_S6879055") { - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7554427.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7554427.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7554427.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ D0_2008_S7554427() : Analysis("D0_2008_S7554427") { // Run II Z pT - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -24,7 +24,6 @@ D0_2008_S7662670() : Analysis("D0_2008_S7662670") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -28,7 +28,6 @@ D0_2008_S7719523() : Analysis("D0_2008_S7719523") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7837160.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7837160.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7837160.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -23,7 +23,6 @@ : Analysis("D0_2008_S7837160") { // Run II W charge asymmetry - setBeams(PROTON, ANTIPROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor D0_2008_S7863608() : Analysis("D0_2008_S7863608") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8202443.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8202443.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8202443.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ D0_2009_S8202443() : Analysis("D0_2009_S8202443"), _sum_of_weights(0.0), _sum_of_weights_constrained(0.0) { - setBeams(PROTON, ANTIPROTON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8320160.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8320160.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8320160.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ /// Constructor D0_2009_S8320160() : Analysis("D0_2009_S8320160") { - setBeams(PROTON, ANTIPROTON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ D0_2009_S8349509() : Analysis("D0_2009_S8349509"), _inclusive_Z_sumofweights(0.0) { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8566488.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8566488.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8566488.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ D0_2010_S8566488() : Analysis("D0_2010_S8566488") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ D0_2010_S8570965() : Analysis("D0_2010_S8570965") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ /// Constructor D0_2010_S8671338() : Analysis("D0_2010_S8671338") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/DELPHI_1995_S3137023.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/DELPHI_1995_S3137023.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/DELPHI_1995_S3137023.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ DELPHI_1995_S3137023() : Analysis("DELPHI_1995_S3137023") { - setBeams(ELECTRON, POSITRON); _weightedTotalNumXiMinus = 0; _weightedTotalNumSigma1385Plus = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -38,7 +38,6 @@ DELPHI_1996_S3430090() : Analysis("DELPHI_1996_S3430090") { - setBeams(ELECTRON, POSITRON); _weightedTotalPartNum = 0.0; _passedCutWeightSum = 0.0; _passedCut3WeightSum = 0.0; Modified: branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -23,7 +23,6 @@ DELPHI_2002_069_CONF_603() : Analysis("DELPHI_2002_069_CONF_603") { - setBeams(ELECTRON, POSITRON); } Modified: branches/2011-07-aida2yoda/src/Analyses/E735_1998_S3905616.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/E735_1998_S3905616.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/E735_1998_S3905616.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ /// Constructor E735_1998_S3905616() : Analysis("E735_1998_S3905616") { - setBeams(PROTON, ANTIPROTON); _sumWTrig = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ H1_1994_S2919893() : Analysis("H1_1994_S2919893") { - setBeams(ELECTRON, PROTON); // Initialise member variables _w77 = make_pair(0.0, 0.0); Modified: branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ /// Constructor H1_1995_S3167097() : Analysis("H1_1995_S3167097") { - setBeams(ELECTRON, PROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor H1_2000_S4129130() : Analysis("H1_2000_S4129130") { - setBeams(POSITRON, PROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/JADE_1998_S3612880.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/JADE_1998_S3612880.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/JADE_1998_S3612880.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ : Analysis("JADE_1998_S3612880") { /// @todo Set whether your finalize method needs the generator cross section - setBeams(ELECTRON, POSITRON); } Modified: branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ /// Constructor JADE_OPAL_2000_S4300807() : Analysis("JADE_OPAL_2000_S4300807") { - setBeams(ELECTRON, POSITRON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ { /// @todo Set whether your finalize method needs the generator cross section setNeedsCrossSection(false); - setBeams(PROTON, PROTON); } //@} Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ /// Constructor OPAL_1993_S2692198() : Analysis("OPAL_1993_S2692198") { - setBeams(ELECTRON, POSITRON); } Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_1998_S3780481.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/OPAL_1998_S3780481.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/OPAL_1998_S3780481.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor OPAL_1998_S3780481() : Analysis("OPAL_1998_S3780481") { - setBeams(ELECTRON, POSITRON); // Counters _weightedTotalPartNum = 0; Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -69,7 +69,6 @@ OPAL_2001_S4553896() : Analysis("OPAL_2001_S4553896") { - setBeams(ELECTRON, POSITRON); setNeedsCrossSection(false); } Modified: branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ /// Constructor PDG_HADRON_MULTIPLICITIES() : Analysis("PDG_HADRON_MULTIPLICITIES") { - setBeams(ELECTRON, POSITRON); } Modified: branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ /// Constructor PDG_HADRON_MULTIPLICITIES_RATIOS() : Analysis("PDG_HADRON_MULTIPLICITIES_RATIOS") { - setBeams(ELECTRON, POSITRON); _weightedTotalNumPiPlus = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/SFM_1984_S1178091.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/SFM_1984_S1178091.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/SFM_1984_S1178091.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -13,7 +13,6 @@ /// Constructor SFM_1984_S1178091() : Analysis("SFM_1984_S1178091") { - setBeams(PROTON, PROTON); _sumW = 0; _sumWDiff = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ : Analysis("STAR_2006_S6500200"), _sumWeightSelected(0.0) { - setBeams(PROTON, PROTON); } /// Book projections and histograms Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ : Analysis("STAR_2006_S6860818"), _sumWeightSelected(0.0) { - setBeams(PROTON, PROTON); for (size_t i=0 ; i<4 ; i++) { _nBaryon[i]=0; _nAntiBaryon[i]=0; Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ STAR_2006_S6870392() : Analysis("STAR_2006_S6870392") { - setBeams(PROTON, PROTON); setNeedsCrossSection(true); } Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -51,7 +51,6 @@ nCutsPassed(0), nPi(0), nPiPlus(0), nKaon(0), nKaonPlus(0), nProton(0), nAntiProton(0) { - setBeams(PROTON, PROTON); setNeedsCrossSection(false); } Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7993412.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7993412.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7993412.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -13,7 +13,6 @@ STAR_2008_S7993412() : Analysis("STAR_2008_S7993412") { - setBeams(PROTON, PROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2009_UE_HELEN.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/STAR_2009_UE_HELEN.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/STAR_2009_UE_HELEN.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -21,7 +21,6 @@ STAR_2009_UE_HELEN() : Analysis("STAR_2009_UE_HELEN") { - setBeams(PROTON, PROTON); } Modified: branches/2011-07-aida2yoda/src/Analyses/TASSO_1990_S2148048.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/TASSO_1990_S2148048.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/TASSO_1990_S2148048.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ : Analysis("TASSO_1990_S2148048") { /// @todo Set whether your finalize method needs the generator cross section - setBeams(ELECTRON, POSITRON); //_sumWPassed = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ /// Constructor UA1_1990_S2044935() : Analysis("UA1_1990_S2044935") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); _sumwTrig = 0; _sumwTrig08 = 0; Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ /// Constructor UA5_1986_S1583476() : Analysis("UA5_1986_S1583476") { - setBeams(PROTON, ANTIPROTON); _sumWTrig = 0; _sumWTrigNSD = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ UA5_1987_S1640666() : Analysis("UA5_1987_S1640666") { - setBeams(PROTON, ANTIPROTON); _sumWPassed = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1988_S1867512.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/UA5_1988_S1867512.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/UA5_1988_S1867512.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -25,7 +25,6 @@ UA5_1988_S1867512() : Analysis("UA5_1988_S1867512") { - setBeams(PROTON, ANTIPROTON); _sumWPassed = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -14,7 +14,6 @@ /// Constructor UA5_1989_S1926373() : Analysis("UA5_1989_S1926373") { - setBeams(PROTON, ANTIPROTON); _sumWPassed = 0; } Modified: branches/2011-07-aida2yoda/src/Analyses/ZEUS_2001_S4815815.cc ============================================================================== --- branches/2011-07-aida2yoda/src/Analyses/ZEUS_2001_S4815815.cc Tue Aug 23 10:26:36 2011 (r3309) +++ branches/2011-07-aida2yoda/src/Analyses/ZEUS_2001_S4815815.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ /// Constructor ZEUS_2001_S4815815() : Analysis("ZEUS_2001_S4815815") { - setBeams(POSITRON, PROTON); } Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/ChangeLog Tue Aug 23 10:34:42 2011 (r3310) @@ -2,6 +2,8 @@ * Added ALICE_2011_S8945144 + * Remove obsolete setBeams() from the analyses + 2011-08-19 Frank Siegert <frank.siegert at cern.ch> * More NLO parton level generator friendliness: Don't crash or fail when Modified: trunk/src/Analyses/ALEPH_1991_S2435284.cc ============================================================================== --- trunk/src/Analyses/ALEPH_1991_S2435284.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ALEPH_1991_S2435284.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ ALEPH_1991_S2435284() : Analysis("ALEPH_1991_S2435284") { - setBeams(ELECTRON, POSITRON); } Modified: trunk/src/Analyses/ALEPH_1996_S3196992.cc ============================================================================== --- trunk/src/Analyses/ALEPH_1996_S3196992.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ALEPH_1996_S3196992.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor ALEPH_1996_S3196992() : Analysis("ALEPH_1996_S3196992") { - setBeams(ELECTRON, POSITRON); } Modified: trunk/src/Analyses/ALEPH_1996_S3486095.cc ============================================================================== --- trunk/src/Analyses/ALEPH_1996_S3486095.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ALEPH_1996_S3486095.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -25,7 +25,6 @@ ALEPH_1996_S3486095() : Analysis("ALEPH_1996_S3486095") { - setBeams(ELECTRON, POSITRON); _numChParticles = 0; _weightedTotalPartNum = 0; _weightedTotalNumPiPlus = 0; Modified: trunk/src/Analyses/ALEPH_2004_S5765862.cc ============================================================================== --- trunk/src/Analyses/ALEPH_2004_S5765862.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ALEPH_2004_S5765862.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ : Analysis("ALEPH_2004_S5765862") , _initialisedJets(false), _initialisedSpectra(false), _weightedTotalChargedPartNum(0) { - setBeams(ELECTRON, POSITRON); } Modified: trunk/src/Analyses/ALICE_2010_S8624100.cc ============================================================================== --- trunk/src/Analyses/ALICE_2010_S8624100.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ALICE_2010_S8624100.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ { /// @todo Set whether your finalize method needs the generator cross section setNeedsCrossSection(false); - setBeams(PROTON, PROTON); } //@} Modified: trunk/src/Analyses/ALICE_2010_S8625980.cc ============================================================================== --- trunk/src/Analyses/ALICE_2010_S8625980.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ALICE_2010_S8625980.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ { /// @todo Set whether your finalize method needs the generator cross section setNeedsCrossSection(false); - setBeams(PROTON, PROTON); } //@} Modified: trunk/src/Analyses/ALICE_2010_S8706239.cc ============================================================================== --- trunk/src/Analyses/ALICE_2010_S8706239.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ALICE_2010_S8706239.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ _Nevt_after_cuts(0.0) { setNeedsCrossSection(false); - setBeams(PROTON, PROTON); } //@} Modified: trunk/src/Analyses/ATLAS_2010_S8817804.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2010_S8817804.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ATLAS_2010_S8817804.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ ATLAS_2010_S8817804() : Analysis("ATLAS_2010_S8817804") { - setBeams(PROTON, PROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/ATLAS_2011_S8924791.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S8924791.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ATLAS_2011_S8924791.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ ATLAS_2011_S8924791() : Analysis("ATLAS_2011_S8924791") { - setBeams(PROTON, PROTON); } Modified: trunk/src/Analyses/ATLAS_2011_S9120807.cc ============================================================================== --- trunk/src/Analyses/ATLAS_2011_S9120807.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ATLAS_2011_S9120807.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -36,7 +36,6 @@ ATLAS_2011_S9120807() : Analysis("ATLAS_2011_S9120807") { - setBeams(PROTON, PROTON); setNeedsCrossSection(true); _eta_bins_areaoffset.push_back(0.0); Modified: trunk/src/Analyses/BELLE_2006_S6265367.cc ============================================================================== --- trunk/src/Analyses/BELLE_2006_S6265367.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/BELLE_2006_S6265367.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ BELLE_2006_S6265367(): Analysis("BELLE_2006_S6265367") { - setBeams(ELECTRON, POSITRON); // setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_1988_S1865951.cc ============================================================================== --- trunk/src/Analyses/CDF_1988_S1865951.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_1988_S1865951.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ CDF_1988_S1865951() : Analysis("CDF_1988_S1865951") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); _sumWTrig = 0; } Modified: trunk/src/Analyses/CDF_1990_S2089246.cc ============================================================================== --- trunk/src/Analyses/CDF_1990_S2089246.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_1990_S2089246.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ CDF_1990_S2089246() : Analysis("CDF_1990_S2089246") { - setBeams(PROTON, ANTIPROTON); _sumWTrig = 0; } Modified: trunk/src/Analyses/CDF_1993_S2742446.cc ============================================================================== --- trunk/src/Analyses/CDF_1993_S2742446.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_1993_S2742446.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ CDF_1993_S2742446() : Analysis("CDF_1993_S2742446") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(false); } Modified: trunk/src/Analyses/CDF_1994_S2952106.cc ============================================================================== --- trunk/src/Analyses/CDF_1994_S2952106.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_1994_S2952106.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ /// Constructor CDF_1994_S2952106() : Analysis("CDF_1994_S2952106") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_1996_S3108457.cc ============================================================================== --- trunk/src/Analyses/CDF_1996_S3108457.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_1996_S3108457.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_1996_S3108457() : Analysis("CDF_1996_S3108457") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_1996_S3349578.cc ============================================================================== --- trunk/src/Analyses/CDF_1996_S3349578.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_1996_S3349578.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_1996_S3349578() : Analysis("CDF_1996_S3349578") { - setBeams(PROTON, ANTIPROTON); } //@} Modified: trunk/src/Analyses/CDF_1996_S3418421.cc ============================================================================== --- trunk/src/Analyses/CDF_1996_S3418421.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_1996_S3418421.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ CDF_1996_S3418421() : Analysis("CDF_1996_S3418421") { - setBeams(PROTON, ANTIPROTON); } //@} Modified: trunk/src/Analyses/CDF_1997_S3541940.cc ============================================================================== --- trunk/src/Analyses/CDF_1997_S3541940.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_1997_S3541940.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ CDF_1997_S3541940() : Analysis("CDF_1997_S3541940") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_1998_S3618439.cc ============================================================================== --- trunk/src/Analyses/CDF_1998_S3618439.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_1998_S3618439.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_1998_S3618439() : Analysis("CDF_1998_S3618439") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2000_S4155203.cc ============================================================================== --- trunk/src/Analyses/CDF_2000_S4155203.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2000_S4155203.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ CDF_2000_S4155203() : Analysis("CDF_2000_S4155203") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2000_S4266730.cc ============================================================================== --- trunk/src/Analyses/CDF_2000_S4266730.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2000_S4266730.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2000_S4266730() : Analysis("CDF_2000_S4266730") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2001_S4517016.cc ============================================================================== --- trunk/src/Analyses/CDF_2001_S4517016.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2001_S4517016.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ CDF_2001_S4517016() : Analysis("CDF_2001_S4517016") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2001_S4563131.cc ============================================================================== --- trunk/src/Analyses/CDF_2001_S4563131.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2001_S4563131.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2001_S4563131() : Analysis("CDF_2001_S4563131") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2001_S4751469.cc ============================================================================== --- trunk/src/Analyses/CDF_2001_S4751469.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2001_S4751469.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -39,7 +39,6 @@ _totalNumTrans2(0), _totalNumTrans5(0), _totalNumTrans30(0), _sumWeightsPtLead2(0),_sumWeightsPtLead5(0), _sumWeightsPtLead30(0) { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_2002_S4796047.cc ============================================================================== --- trunk/src/Analyses/CDF_2002_S4796047.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2002_S4796047.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -35,7 +35,6 @@ CDF_2002_S4796047() : Analysis("CDF_2002_S4796047") { - setBeams(PROTON, ANTIPROTON); _sumWTrig = 0; } Modified: trunk/src/Analyses/CDF_2004_S5839831.cc ============================================================================== --- trunk/src/Analyses/CDF_2004_S5839831.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2004_S5839831.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -29,7 +29,6 @@ CDF_2004_S5839831() : Analysis("CDF_2004_S5839831") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_2005_S6080774.cc ============================================================================== --- trunk/src/Analyses/CDF_2005_S6080774.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2005_S6080774.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -14,7 +14,6 @@ /// Constructor CDF_2005_S6080774() : Analysis("CDF_2005_S6080774") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2005_S6217184.cc ============================================================================== --- trunk/src/Analyses/CDF_2005_S6217184.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2005_S6217184.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2005_S6217184() : Analysis("CDF_2005_S6217184") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_2006_S6450792.cc ============================================================================== --- trunk/src/Analyses/CDF_2006_S6450792.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2006_S6450792.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -14,7 +14,6 @@ /// Constructor CDF_2006_S6450792() : Analysis("CDF_2006_S6450792") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2006_S6653332.cc ============================================================================== --- trunk/src/Analyses/CDF_2006_S6653332.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2006_S6653332.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -29,7 +29,6 @@ _Rjet(0.7), _JetPtCut(20.), _JetEtaCut(1.5), _Lep1PtCut(18.), _Lep2PtCut(10.), _LepEtaCut(1.1), _sumWeightsWithZ(0.0), _sumWeightsWithZJet(0.0) { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2007_S7057202.cc ============================================================================== --- trunk/src/Analyses/CDF_2007_S7057202.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2007_S7057202.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ CDF_2007_S7057202() : Analysis("CDF_2007_S7057202") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2008_LEADINGJETS.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_LEADINGJETS.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2008_LEADINGJETS.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -36,7 +36,6 @@ CDF_2008_LEADINGJETS() : Analysis("CDF_2008_LEADINGJETS") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_2008_NOTE_9351.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_NOTE_9351.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2008_NOTE_9351.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -33,7 +33,6 @@ /// Constructor CDF_2008_NOTE_9351() : Analysis("CDF_2008_NOTE_9351") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_2008_S7540469.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S7540469.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2008_S7540469.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ CDF_2008_S7540469() : Analysis("CDF_2008_S7540469") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2008_S7541902.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S7541902.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2008_S7541902.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -28,7 +28,6 @@ _jetEtCutA(20.0*GeV), _jetEtCutB(25.0*GeV), _jetETA(2.0), _xpoint(1960.) { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2008_S7782535.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S7782535.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2008_S7782535.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ /// Constructor CDF_2008_S7782535() : Analysis("CDF_2008_S7782535") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_2008_S7828950.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S7828950.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2008_S7828950.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -21,7 +21,6 @@ /// Constructor CDF_2008_S7828950() : Analysis("CDF_2008_S7828950") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2008_S8093652.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S8093652.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2008_S8093652.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ CDF_2008_S8093652() : Analysis("CDF_2008_S8093652") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2008_S8095620.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S8095620.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2008_S8095620.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ _Rjet(0.7), _JetPtCut(20.), _JetEtaCut(1.5), _Lep1PtCut(18.), _Lep2PtCut(10.), _LepEtaCut(3.2), _sumWeightSelected(0.0) { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_2009_NOTE_9936.cc ============================================================================== --- trunk/src/Analyses/CDF_2009_NOTE_9936.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2009_NOTE_9936.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ //_sumWPassed(0.0) { /// @todo Set approriate for your analysis - setBeams(PROTON, ANTIPROTON); /// @todo Set whether your finalize method needs the generator cross section setNeedsCrossSection(false); Modified: trunk/src/Analyses/CDF_2009_S8057893.cc ============================================================================== --- trunk/src/Analyses/CDF_2009_S8057893.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2009_S8057893.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ CDF_2009_S8057893::CDF_2009_S8057893() : Analysis("CDF_2009_S8057893") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_2009_S8233977.cc ============================================================================== --- trunk/src/Analyses/CDF_2009_S8233977.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2009_S8233977.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -32,7 +32,6 @@ : Analysis("CDF_2009_S8233977"), _sumWeightSelected(0.0) { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2009_S8383952.cc ============================================================================== --- trunk/src/Analyses/CDF_2009_S8383952.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2009_S8383952.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2009_S8383952() : Analysis("CDF_2009_S8383952") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2009_S8436959.cc ============================================================================== --- trunk/src/Analyses/CDF_2009_S8436959.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2009_S8436959.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ CDF_2009_S8436959() : Analysis("CDF_2009_S8436959") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/CDF_2010_S8591881_DY.cc ============================================================================== --- trunk/src/Analyses/CDF_2010_S8591881_DY.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2010_S8591881_DY.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -33,7 +33,6 @@ /// Constructor CDF_2010_S8591881_DY() : Analysis("CDF_2010_S8591881_DY") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CDF_2010_S8591881_QCD.cc ============================================================================== --- trunk/src/Analyses/CDF_2010_S8591881_QCD.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CDF_2010_S8591881_QCD.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -36,7 +36,6 @@ CDF_2010_S8591881_QCD() : Analysis("CDF_2010_S8591881_QCD") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/CMS_2011_S8957746.cc ============================================================================== --- trunk/src/Analyses/CMS_2011_S8957746.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/CMS_2011_S8957746.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ /// Default constructor CMS_2011_S8957746() : Analysis("CMS_2011_S8957746") { - setBeams(PROTON, PROTON); } /// Initialization, called once before running Modified: trunk/src/Analyses/D0_1996_S3214044.cc ============================================================================== --- trunk/src/Analyses/D0_1996_S3214044.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_1996_S3214044.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -21,7 +21,6 @@ /// Constructor D0_1996_S3214044() : Analysis("D0_1996_S3214044") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(false); } Modified: trunk/src/Analyses/D0_1996_S3324664.cc ============================================================================== --- trunk/src/Analyses/D0_1996_S3324664.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_1996_S3324664.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor D0_1996_S3324664() : Analysis("D0_1996_S3324664") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(false); } Modified: trunk/src/Analyses/D0_2001_S4674421.cc ============================================================================== --- trunk/src/Analyses/D0_2001_S4674421.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2001_S4674421.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ /// Constructor. D0_2001_S4674421() : Analysis("D0_2001_S4674421") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/D0_2004_S5992206.cc ============================================================================== --- trunk/src/Analyses/D0_2004_S5992206.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2004_S5992206.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -33,7 +33,6 @@ /// Constructor. D0_2004_S5992206() : Analysis("D0_2004_S5992206") { - setBeams(PROTON, ANTIPROTON); } //@} Modified: trunk/src/Analyses/D0_2006_S6438750.cc ============================================================================== --- trunk/src/Analyses/D0_2006_S6438750.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2006_S6438750.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ /// Default constructor. D0_2006_S6438750() : Analysis("D0_2006_S6438750") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/D0_2007_S7075677.cc ============================================================================== --- trunk/src/Analyses/D0_2007_S7075677.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2007_S7075677.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ D0_2007_S7075677() : Analysis("D0_2007_S7075677") { // Run II Z rapidity - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/D0_2008_S6879055.cc ============================================================================== --- trunk/src/Analyses/D0_2008_S6879055.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2008_S6879055.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ /// Default constructor. D0_2008_S6879055() : Analysis("D0_2008_S6879055") { - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/D0_2008_S7554427.cc ============================================================================== --- trunk/src/Analyses/D0_2008_S7554427.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2008_S7554427.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ D0_2008_S7554427() : Analysis("D0_2008_S7554427") { // Run II Z pT - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/D0_2008_S7662670.cc ============================================================================== --- trunk/src/Analyses/D0_2008_S7662670.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2008_S7662670.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -24,7 +24,6 @@ D0_2008_S7662670() : Analysis("D0_2008_S7662670") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/D0_2008_S7719523.cc ============================================================================== --- trunk/src/Analyses/D0_2008_S7719523.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2008_S7719523.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -28,7 +28,6 @@ D0_2008_S7719523() : Analysis("D0_2008_S7719523") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/D0_2008_S7837160.cc ============================================================================== --- trunk/src/Analyses/D0_2008_S7837160.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2008_S7837160.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -26,7 +26,6 @@ : Analysis("D0_2008_S7837160") { // Run II W charge asymmetry - setBeams(PROTON, ANTIPROTON); } Modified: trunk/src/Analyses/D0_2008_S7863608.cc ============================================================================== --- trunk/src/Analyses/D0_2008_S7863608.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2008_S7863608.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor D0_2008_S7863608() : Analysis("D0_2008_S7863608") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/D0_2009_S8202443.cc ============================================================================== --- trunk/src/Analyses/D0_2009_S8202443.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2009_S8202443.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ D0_2009_S8202443() : Analysis("D0_2009_S8202443"), _sum_of_weights(0.0), _sum_of_weights_constrained(0.0) { - setBeams(PROTON, ANTIPROTON); } //@} Modified: trunk/src/Analyses/D0_2009_S8320160.cc ============================================================================== --- trunk/src/Analyses/D0_2009_S8320160.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2009_S8320160.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ /// Constructor D0_2009_S8320160() : Analysis("D0_2009_S8320160") { - setBeams(PROTON, ANTIPROTON); } //@} Modified: trunk/src/Analyses/D0_2009_S8349509.cc ============================================================================== --- trunk/src/Analyses/D0_2009_S8349509.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2009_S8349509.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ D0_2009_S8349509() : Analysis("D0_2009_S8349509"), _inclusive_Z_sumofweights(0.0) { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/D0_2010_S8566488.cc ============================================================================== --- trunk/src/Analyses/D0_2010_S8566488.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2010_S8566488.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ D0_2010_S8566488() : Analysis("D0_2010_S8566488") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/D0_2010_S8570965.cc ============================================================================== --- trunk/src/Analyses/D0_2010_S8570965.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2010_S8570965.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ D0_2010_S8570965() : Analysis("D0_2010_S8570965") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/D0_2010_S8671338.cc ============================================================================== --- trunk/src/Analyses/D0_2010_S8671338.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/D0_2010_S8671338.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -20,7 +20,6 @@ /// Constructor D0_2010_S8671338() : Analysis("D0_2010_S8671338") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/DELPHI_1995_S3137023.cc ============================================================================== --- trunk/src/Analyses/DELPHI_1995_S3137023.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/DELPHI_1995_S3137023.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ DELPHI_1995_S3137023() : Analysis("DELPHI_1995_S3137023") { - setBeams(ELECTRON, POSITRON); _weightedTotalNumXiMinus = 0; _weightedTotalNumSigma1385Plus = 0; } Modified: trunk/src/Analyses/DELPHI_1996_S3430090.cc ============================================================================== --- trunk/src/Analyses/DELPHI_1996_S3430090.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/DELPHI_1996_S3430090.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -38,7 +38,6 @@ DELPHI_1996_S3430090() : Analysis("DELPHI_1996_S3430090") { - setBeams(ELECTRON, POSITRON); _weightedTotalPartNum = 0.0; _passedCutWeightSum = 0.0; _passedCut3WeightSum = 0.0; Modified: trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc ============================================================================== --- trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/DELPHI_2002_069_CONF_603.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -23,7 +23,6 @@ DELPHI_2002_069_CONF_603() : Analysis("DELPHI_2002_069_CONF_603") { - setBeams(ELECTRON, POSITRON); } Modified: trunk/src/Analyses/E735_1998_S3905616.cc ============================================================================== --- trunk/src/Analyses/E735_1998_S3905616.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/E735_1998_S3905616.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ /// Constructor E735_1998_S3905616() : Analysis("E735_1998_S3905616") { - setBeams(PROTON, ANTIPROTON); _sumWTrig = 0; } Modified: trunk/src/Analyses/H1_1994_S2919893.cc ============================================================================== --- trunk/src/Analyses/H1_1994_S2919893.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/H1_1994_S2919893.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ H1_1994_S2919893() : Analysis("H1_1994_S2919893") { - setBeams(ELECTRON, PROTON); // Initialise member variables _w77 = make_pair(0.0, 0.0); Modified: trunk/src/Analyses/H1_1995_S3167097.cc ============================================================================== --- trunk/src/Analyses/H1_1995_S3167097.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/H1_1995_S3167097.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ /// Constructor H1_1995_S3167097() : Analysis("H1_1995_S3167097") { - setBeams(ELECTRON, PROTON); } Modified: trunk/src/Analyses/H1_2000_S4129130.cc ============================================================================== --- trunk/src/Analyses/H1_2000_S4129130.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/H1_2000_S4129130.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor H1_2000_S4129130() : Analysis("H1_2000_S4129130") { - setBeams(POSITRON, PROTON); } Modified: trunk/src/Analyses/JADE_1998_S3612880.cc ============================================================================== --- trunk/src/Analyses/JADE_1998_S3612880.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/JADE_1998_S3612880.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ : Analysis("JADE_1998_S3612880") { /// @todo Set whether your finalize method needs the generator cross section - setBeams(ELECTRON, POSITRON); } Modified: trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc ============================================================================== --- trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ /// Constructor JADE_OPAL_2000_S4300807() : Analysis("JADE_OPAL_2000_S4300807") { - setBeams(ELECTRON, POSITRON); } //@} Modified: trunk/src/Analyses/LHCB_2010_S8758301.cc ============================================================================== --- trunk/src/Analyses/LHCB_2010_S8758301.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/LHCB_2010_S8758301.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ { /// @todo Set whether your finalize method needs the generator cross section setNeedsCrossSection(false); - setBeams(PROTON, PROTON); } //@} Modified: trunk/src/Analyses/OPAL_1993_S2692198.cc ============================================================================== --- trunk/src/Analyses/OPAL_1993_S2692198.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/OPAL_1993_S2692198.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ /// Constructor OPAL_1993_S2692198() : Analysis("OPAL_1993_S2692198") { - setBeams(ELECTRON, POSITRON); } Modified: trunk/src/Analyses/OPAL_1998_S3780481.cc ============================================================================== --- trunk/src/Analyses/OPAL_1998_S3780481.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/OPAL_1998_S3780481.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ /// Constructor OPAL_1998_S3780481() : Analysis("OPAL_1998_S3780481") { - setBeams(ELECTRON, POSITRON); // Counters _weightedTotalPartNum = 0; Modified: trunk/src/Analyses/OPAL_2001_S4553896.cc ============================================================================== --- trunk/src/Analyses/OPAL_2001_S4553896.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/OPAL_2001_S4553896.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -69,7 +69,6 @@ OPAL_2001_S4553896() : Analysis("OPAL_2001_S4553896") { - setBeams(ELECTRON, POSITRON); setNeedsCrossSection(false); } Modified: trunk/src/Analyses/PDG_Hadron_Multiplicities.cc ============================================================================== --- trunk/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ /// Constructor PDG_HADRON_MULTIPLICITIES() : Analysis("PDG_HADRON_MULTIPLICITIES") { - setBeams(ELECTRON, POSITRON); } Modified: trunk/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc ============================================================================== --- trunk/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ /// Constructor PDG_HADRON_MULTIPLICITIES_RATIOS() : Analysis("PDG_HADRON_MULTIPLICITIES_RATIOS") { - setBeams(ELECTRON, POSITRON); _weightedTotalNumPiPlus = 0; } Modified: trunk/src/Analyses/SFM_1984_S1178091.cc ============================================================================== --- trunk/src/Analyses/SFM_1984_S1178091.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/SFM_1984_S1178091.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -13,7 +13,6 @@ /// Constructor SFM_1984_S1178091() : Analysis("SFM_1984_S1178091") { - setBeams(PROTON, PROTON); _sumW = 0; _sumWDiff = 0; } Modified: trunk/src/Analyses/STAR_2006_S6500200.cc ============================================================================== --- trunk/src/Analyses/STAR_2006_S6500200.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/STAR_2006_S6500200.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -17,7 +17,6 @@ : Analysis("STAR_2006_S6500200"), _sumWeightSelected(0.0) { - setBeams(PROTON, PROTON); } /// Book projections and histograms Modified: trunk/src/Analyses/STAR_2006_S6860818.cc ============================================================================== --- trunk/src/Analyses/STAR_2006_S6860818.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/STAR_2006_S6860818.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -18,7 +18,6 @@ : Analysis("STAR_2006_S6860818"), _sumWeightSelected(0.0) { - setBeams(PROTON, PROTON); for (size_t i=0 ; i<4 ; i++) { _nBaryon[i]=0; _nAntiBaryon[i]=0; Modified: trunk/src/Analyses/STAR_2006_S6870392.cc ============================================================================== --- trunk/src/Analyses/STAR_2006_S6870392.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/STAR_2006_S6870392.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ STAR_2006_S6870392() : Analysis("STAR_2006_S6870392") { - setBeams(PROTON, PROTON); setNeedsCrossSection(true); } Modified: trunk/src/Analyses/STAR_2008_S7869363.cc ============================================================================== --- trunk/src/Analyses/STAR_2008_S7869363.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/STAR_2008_S7869363.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -51,7 +51,6 @@ nCutsPassed(0), nPi(0), nPiPlus(0), nKaon(0), nKaonPlus(0), nProton(0), nAntiProton(0) { - setBeams(PROTON, PROTON); setNeedsCrossSection(false); } Modified: trunk/src/Analyses/STAR_2008_S7993412.cc ============================================================================== --- trunk/src/Analyses/STAR_2008_S7993412.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/STAR_2008_S7993412.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -13,7 +13,6 @@ STAR_2008_S7993412() : Analysis("STAR_2008_S7993412") { - setBeams(PROTON, PROTON); } Modified: trunk/src/Analyses/STAR_2009_UE_HELEN.cc ============================================================================== --- trunk/src/Analyses/STAR_2009_UE_HELEN.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/STAR_2009_UE_HELEN.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -21,7 +21,6 @@ STAR_2009_UE_HELEN() : Analysis("STAR_2009_UE_HELEN") { - setBeams(PROTON, PROTON); } Modified: trunk/src/Analyses/TASSO_1990_S2148048.cc ============================================================================== --- trunk/src/Analyses/TASSO_1990_S2148048.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/TASSO_1990_S2148048.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -22,7 +22,6 @@ : Analysis("TASSO_1990_S2148048") { /// @todo Set whether your finalize method needs the generator cross section - setBeams(ELECTRON, POSITRON); //_sumWPassed = 0; } Modified: trunk/src/Analyses/UA1_1990_S2044935.cc ============================================================================== --- trunk/src/Analyses/UA1_1990_S2044935.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/UA1_1990_S2044935.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ /// Constructor UA1_1990_S2044935() : Analysis("UA1_1990_S2044935") { - setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); _sumwTrig = 0; _sumwTrig08 = 0; Modified: trunk/src/Analyses/UA5_1986_S1583476.cc ============================================================================== --- trunk/src/Analyses/UA5_1986_S1583476.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/UA5_1986_S1583476.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ /// Constructor UA5_1986_S1583476() : Analysis("UA5_1986_S1583476") { - setBeams(PROTON, ANTIPROTON); _sumWTrig = 0; _sumWTrigNSD = 0; } Modified: trunk/src/Analyses/UA5_1987_S1640666.cc ============================================================================== --- trunk/src/Analyses/UA5_1987_S1640666.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/UA5_1987_S1640666.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -15,7 +15,6 @@ UA5_1987_S1640666() : Analysis("UA5_1987_S1640666") { - setBeams(PROTON, ANTIPROTON); _sumWPassed = 0; } Modified: trunk/src/Analyses/UA5_1988_S1867512.cc ============================================================================== --- trunk/src/Analyses/UA5_1988_S1867512.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/UA5_1988_S1867512.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -16,7 +16,6 @@ UA5_1988_S1867512() : Analysis("UA5_1988_S1867512") { - setBeams(PROTON, ANTIPROTON); _sumWPassed = 0; } Modified: trunk/src/Analyses/UA5_1989_S1926373.cc ============================================================================== --- trunk/src/Analyses/UA5_1989_S1926373.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/UA5_1989_S1926373.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -14,7 +14,6 @@ /// Constructor UA5_1989_S1926373() : Analysis("UA5_1989_S1926373") { - setBeams(PROTON, ANTIPROTON); _sumWPassed = 0; } Modified: trunk/src/Analyses/ZEUS_2001_S4815815.cc ============================================================================== --- trunk/src/Analyses/ZEUS_2001_S4815815.cc Tue Aug 23 10:26:36 2011 (r3309) +++ trunk/src/Analyses/ZEUS_2001_S4815815.cc Tue Aug 23 10:34:42 2011 (r3310) @@ -19,7 +19,6 @@ /// Constructor ZEUS_2001_S4815815() : Analysis("ZEUS_2001_S4815815") { - setBeams(POSITRON, PROTON); }
More information about the Rivet-svn mailing list |