|
|
[Rivet-svn] r1841 - trunk/src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Wed Sep 30 10:18:01 BST 2009
Author: buckley
Date: Wed Sep 30 10:18:00 2009
New Revision: 1841
Log:
Moving projections into init for remaining CDF analyses
Modified:
trunk/src/Analyses/CDF_1988_S1865951.cc
trunk/src/Analyses/CDF_1990_S2089246.cc
trunk/src/Analyses/CDF_1994_S2952106.cc
trunk/src/Analyses/CDF_2000_S4155203.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_S8057893.cc
trunk/src/Analyses/CDF_2009_S8233977.cc
Modified: trunk/src/Analyses/CDF_1988_S1865951.cc
==============================================================================
--- trunk/src/Analyses/CDF_1988_S1865951.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_1988_S1865951.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -10,31 +10,27 @@
class CDF_1988_S1865951 : public Analysis {
-
public:
- /// @name Constructor etc.
- //@{
-
/// Constructor
CDF_1988_S1865951()
: Analysis("CDF_1988_S1865951")
{
- const ChargedFinalState cfs(-1.,1., 0.4*GeV);
- addProjection(cfs, "CFS");
- addProjection(ChargedFinalState(-5.9, 5.9), "CFSAll");
- addProjection(TotalVisibleMomentum(cfs), "Mom");
- addProjection(Beam(), "Beam");
+ setBeams(PROTON, ANTIPROTON);
}
-
- //@}
/// @name Analysis methods
//@{
/// Book histograms
- void init() {
+ void init() {
+ const ChargedFinalState cfs(-1.,1., 0.4*GeV);
+ addProjection(cfs, "CFS");
+ addProjection(ChargedFinalState(-5.9, 5.9), "CFSAll");
+ addProjection(TotalVisibleMomentum(cfs), "Mom");
+ addProjection(Beam(), "Beam");
+
_hist_pt1800 = bookHistogram1D(1, 1, 1);
_hist_pt630 = bookHistogram1D(2, 1, 1);
}
Modified: trunk/src/Analyses/CDF_1990_S2089246.cc
==============================================================================
--- trunk/src/Analyses/CDF_1990_S2089246.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_1990_S2089246.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -15,29 +15,24 @@
* @author Andy Buckley
*/
class CDF_1990_S2089246 : public Analysis {
-
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_1990_S2089246()
: Analysis("CDF_1990_S2089246")
{
setBeams(PROTON, ANTIPROTON);
- addProjection(ChargedFinalState(-3.5, 3.5), "FS");
- addProjection(ChargedFinalState(-5.9, 5.9), "CFSAll");
- addProjection(Beam(), "Beam");
}
-
- //@}
/// @name Analysis methods
//@{
void init() {
+ addProjection(ChargedFinalState(-3.5, 3.5), "FS");
+ addProjection(ChargedFinalState(-5.9, 5.9), "CFSAll");
+ addProjection(Beam(), "Beam");
+
_hist_eta1800 = bookHistogram1D(3, 1, 1);
_hist_eta630 = bookHistogram1D(4, 1, 1);
}
Modified: trunk/src/Analyses/CDF_1994_S2952106.cc
==============================================================================
--- trunk/src/Analyses/CDF_1994_S2952106.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_1994_S2952106.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -14,12 +14,8 @@
* @author Lars Sonnenschein
*/
class CDF_1994_S2952106 : public Analysis {
-
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_1994_S2952106()
: Analysis("CDF_1994_S2952106"),
@@ -28,7 +24,15 @@
{
setBeams(PROTON, ANTIPROTON);
setNeedsCrossSection(true);
-
+
+ _events3jPassed = 0.0;
+ }
+
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
const FinalState fs(-4.2, 4.2);
addProjection(fs, "FS");
addProjection(FastJets(fs, FastJets::CDFJETCLU, 0.7), "ConeJets");
@@ -40,17 +44,7 @@
vfs.vetoNeutrinos();
vfs.addVetoDetail(MUON, 1.0*GeV, MAXDOUBLE);
addProjection(vfs, "VFS");
-
- _events3jPassed = 0.0;
- }
-
- //@}
-
- /// @name Analysis methods
- //@{
-
- void init() {
/// @todo Use histogram auto-booking
//const string hname = "HvsDphi";
Modified: trunk/src/Analyses/CDF_2000_S4155203.cc
==============================================================================
--- trunk/src/Analyses/CDF_2000_S4155203.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2000_S4155203.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -16,27 +16,23 @@
class CDF_2000_S4155203 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
- /// Constructor: cuts on final state are \f$ -1 < \eta < 1 \f$
- /// and \f$ p_T > 0.5 \f$ GeV.
+ /// Constructor
CDF_2000_S4155203()
: Analysis("CDF_2000_S4155203")
{
setBeams(PROTON, ANTIPROTON);
- ZFinder zfinder(FinalState(), ELECTRON, 66.0*GeV, 116.0*GeV, 0.2);
- addProjection(zfinder, "ZFinder");
}
-
- //@}
/// @name Analysis methods
//@{
- /// Book histograms
void init() {
+ // Set up projections
+ ZFinder zfinder(FinalState(), ELECTRON, 66.0*GeV, 116.0*GeV, 0.2);
+ addProjection(zfinder, "ZFinder");
+
+ // Book histogram
_hist_zpt = bookHistogram1D(1, 1, 1);
}
Modified: trunk/src/Analyses/CDF_2001_S4751469.cc
==============================================================================
--- trunk/src/Analyses/CDF_2001_S4751469.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2001_S4751469.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -31,9 +31,6 @@
class CDF_2001_S4751469 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor: cuts on final state are \f$ -1 < \eta < 1 \f$
/// and \f$ p_T > 0.5 \f$ GeV.
CDF_2001_S4751469()
Modified: trunk/src/Analyses/CDF_2002_S4796047.cc
==============================================================================
--- trunk/src/Analyses/CDF_2002_S4796047.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2002_S4796047.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -30,27 +30,23 @@
class CDF_2002_S4796047 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
- /// Constructor: cuts on final state are \f$ -1 < \eta < 1 \f$
- /// and \f$ p_T > 0.4 \f$ GeV.
+ /// Constructor
CDF_2002_S4796047()
: Analysis("CDF_2002_S4796047")
{
setBeams(PROTON, ANTIPROTON);
- addProjection(Beam(), "Beam");
- const ChargedFinalState cfs(-1.0, 1.0, 0.4*GeV);
- addProjection(cfs, "FS");
}
- //@}
/// @name Analysis methods
//@{
- /// Book histograms
+ /// Book projections and histograms
void init() {
+ addProjection(Beam(), "Beam");
+ const ChargedFinalState cfs(-1.0, 1.0, 0.4*GeV);
+ addProjection(cfs, "FS");
+
_hist_multiplicity_630 = bookHistogram1D(1, 1, 1);
_hist_multiplicity_1800 = bookHistogram1D(2, 1, 1);
_hist_pt_vs_multiplicity_630 = bookProfile1D(3, 1, 1);
Modified: trunk/src/Analyses/CDF_2004_S5839831.cc
==============================================================================
--- trunk/src/Analyses/CDF_2004_S5839831.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2004_S5839831.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -19,31 +19,13 @@
class CDF_2004_S5839831 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor: cuts on charged final state are \f$ -1 < \eta < 1 \f$
/// and \f$ p_T > 0.4 \f$ GeV.
CDF_2004_S5839831()
: Analysis("CDF_2004_S5839831")
{
setBeams(PROTON, ANTIPROTON);
- addProjection(Beam(), "Beam");
- const FinalState calofs(-1.2, 1.2);
- addProjection(calofs, "CaloFS");
- addProjection(FastJets(calofs, FastJets::CDFJETCLU, 0.7), "Jets");
- const ChargedFinalState trackfs(-1.2, 1.2, 0.4*GeV);
- addProjection(trackfs, "TrackFS");
- // Restrict tracks to |eta| < 0.7 for the min bias part.
- const ChargedFinalState mbfs(-0.7, 0.7, 0.4*GeV);
- addProjection(mbfs, "MBFS");
- // Restrict tracks to |eta| < 1 for the Swiss-Cheese part.
- const ChargedFinalState cheesefs(-1.0, 1.0, 0.4*GeV);
- addProjection(cheesefs, "CheeseFS");
- addProjection(FastJets(cheesefs, FastJets::CDFJETCLU, 0.7), "CheeseJets");
}
-
- //@}
private:
@@ -109,8 +91,23 @@
/// @name Analysis methods
//@{
- /// Book histograms
void init() {
+ // Set up projections
+ addProjection(Beam(), "Beam");
+ const FinalState calofs(-1.2, 1.2);
+ addProjection(calofs, "CaloFS");
+ addProjection(FastJets(calofs, FastJets::CDFJETCLU, 0.7), "Jets");
+ const ChargedFinalState trackfs(-1.2, 1.2, 0.4*GeV);
+ addProjection(trackfs, "TrackFS");
+ // Restrict tracks to |eta| < 0.7 for the min bias part.
+ const ChargedFinalState mbfs(-0.7, 0.7, 0.4*GeV);
+ addProjection(mbfs, "MBFS");
+ // Restrict tracks to |eta| < 1 for the Swiss-Cheese part.
+ const ChargedFinalState cheesefs(-1.0, 1.0, 0.4*GeV);
+ addProjection(cheesefs, "CheeseFS");
+ addProjection(FastJets(cheesefs, FastJets::CDFJETCLU, 0.7), "CheeseJets");
+
+ // Book histograms
_pt90MaxAvg1800 = bookProfile1D(1, 1, 1);
_pt90MinAvg1800 = bookProfile1D(1, 1, 2);
_pt90Max1800 = bookProfile1D(2, 1, 1);
Modified: trunk/src/Analyses/CDF_2005_S6080774.cc
==============================================================================
--- trunk/src/Analyses/CDF_2005_S6080774.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2005_S6080774.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -11,17 +11,12 @@
class CDF_2005_S6080774 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_2005_S6080774() : Analysis("CDF_2005_S6080774") {
setBeams(PROTON, ANTIPROTON);
setNeedsCrossSection(true);
}
- //@}
-
/// @name Analysis methods
//@{
Modified: trunk/src/Analyses/CDF_2005_S6217184.cc
==============================================================================
--- trunk/src/Analyses/CDF_2005_S6217184.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2005_S6217184.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -17,15 +17,18 @@
class CDF_2005_S6217184 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_2005_S6217184()
: Analysis("CDF_2005_S6217184")
- {
+ {
setBeams(PROTON, ANTIPROTON);
-
+ }
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
+ // Set up projections
const FinalState fs(-2.0, 2.0);
addProjection(fs, "FS");
addProjection(FastJets(fs, FastJets::CDFMIDPOINT, 0.7), "Jets");
@@ -42,16 +45,8 @@
// Specify pT bins
_pTbins += 37.0, 45.0, 55.0, 63.0, 73.0, 84.0, 97.0, 112.0, 128.0,
148.0, 166.0, 186.0, 208.0, 229.0, 250.0, 277.0, 304.0, 340.0, 380.0;
- }
-
- //@}
-
-
- /// @name Analysis methods
- //@{
-
- /// Book histograms
- void init() {
+
+ /// Book histograms
// 18 = 6x3 pT bins, one histogram each
for (size_t i = 0; i < 6; ++i) {
for (size_t j = 0; j < 3; ++j) {
Modified: trunk/src/Analyses/CDF_2006_S6450792.cc
==============================================================================
--- trunk/src/Analyses/CDF_2006_S6450792.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2006_S6450792.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -10,19 +10,13 @@
class CDF_2006_S6450792 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_2006_S6450792() : Analysis("CDF_2006_S6450792") {
setBeams(PROTON, ANTIPROTON);
setNeedsCrossSection(true);
}
- //@}
- public:
-
/// @name Analysis methods
//@{
Modified: trunk/src/Analyses/CDF_2006_S6653332.cc
==============================================================================
--- trunk/src/Analyses/CDF_2006_S6653332.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2006_S6653332.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -21,12 +21,8 @@
* jets in Z + (b) jet production, before and after tagging.
*/
class CDF_2006_S6653332 : public Analysis {
-
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_2006_S6653332()
: Analysis("CDF_2006_S6653332"),
@@ -35,12 +31,19 @@
{
setBeams(PROTON, ANTIPROTON);
setNeedsCrossSection(true);
+ }
+
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
const FinalState fs(-3.6, 3.6);
addProjection(fs, "FS");
// Create a final state with any e+e- or mu+mu- pair with
// invariant mass 76 -> 106 GeV and ET > 20 (Z decay products)
- std::vector<std::pair<long,long> > vids;
+ vector<pair<long,long> > vids;
vids.push_back(make_pair(ELECTRON, POSITRON));
vids.push_back(make_pair(MUON, ANTIMUON));
FinalState fs2(-3.6, 3.6);
@@ -52,15 +55,7 @@
vfs.addVetoOnThisFinalState(invfs);
addProjection(vfs, "VFS");
addProjection(FastJets(vfs, FastJets::CDFMIDPOINT, 0.7), "Jets");
- }
-
- //@}
-
- /// @name Analysis methods
- //@{
-
- void init() {
// Book histograms
_sigmaBJet = bookHistogram1D(1, 1, 1);
_ratioBJetToZ = bookHistogram1D(2, 1, 1);
Modified: trunk/src/Analyses/CDF_2007_S7057202.cc
==============================================================================
--- trunk/src/Analyses/CDF_2007_S7057202.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2007_S7057202.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -13,9 +13,6 @@
class CDF_2007_S7057202 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_2007_S7057202()
: Analysis("CDF_2007_S7057202"),
@@ -23,15 +20,8 @@
{
setBeams(PROTON, ANTIPROTON);
//setSqrtS(1960*GeV);
- const FinalState fs;
- addProjection(FastJets(fs, FastJets::KT, 0.5), "JetsD05");
- addProjection(FastJets(fs, FastJets::KT, 0.7), "JetsD07");
- addProjection(FastJets(fs, FastJets::KT, 1.0), "JetsD10");
setNeedsCrossSection(true);
}
-
-
- //@}
/// @name Analysis methods
@@ -39,6 +29,13 @@
/// Book histos and set counters for number of events passed in each one
void init() {
+ // Set up projections
+ const FinalState fs;
+ addProjection(FastJets(fs, FastJets::KT, 0.5), "JetsD05");
+ addProjection(FastJets(fs, FastJets::KT, 0.7), "JetsD07");
+ addProjection(FastJets(fs, FastJets::KT, 1.0), "JetsD10");
+
+ // Book histos
_histoD05 = bookHistogram1D(6, 1, 1);
_histoD10 = bookHistogram1D(7, 1, 1);
_binnedHistosD07.addHistogram( 0, 0.1, bookHistogram1D(1, 1, 1));
Modified: trunk/src/Analyses/CDF_2008_LEADINGJETS.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_LEADINGJETS.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2008_LEADINGJETS.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -31,14 +31,18 @@
class CDF_2008_LEADINGJETS : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
+ /// Constructor
CDF_2008_LEADINGJETS()
: Analysis("CDF_2008_LEADINGJETS")
{
setBeams(PROTON, ANTIPROTON);
-
+ }
+
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
// Final state for the jet finding
const FinalState fsj(-4.0, 4.0, 0.0*GeV);
addProjection(fsj, "FSJ");
@@ -51,14 +55,8 @@
// Charged final state for the distributions
const ChargedFinalState cfs(-1.0, 1.0, 0.5*GeV);
addProjection(cfs, "CFS");
- }
-
- /// @name Analysis methods
- //@{
-
- /// Book histograms
- void init() {
+ // Book histograms
_hist_pnchg = bookProfile1D( 1, 1, 1);
_hist_pmaxnchg = bookProfile1D( 2, 1, 1);
_hist_pminnchg = bookProfile1D( 3, 1, 1);
Modified: trunk/src/Analyses/CDF_2008_NOTE_9351.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_NOTE_9351.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2008_NOTE_9351.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -29,30 +29,25 @@
class CDF_2008_NOTE_9351 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
- /// Constructor: cuts on final state are \f$ -1 < \eta < 1 \f$
- /// and \f$ p_T > 0.5 \f$ GeV.
+ /// Constructor
CDF_2008_NOTE_9351()
: Analysis("CDF_2008_NOTE_9351")
{
setBeams(PROTON, ANTIPROTON);
- const ChargedFinalState cfs(-1.0, 1.0, 0.5*GeV);
- const ChargedFinalState clfs(-1.0, 1.0, 20*GeV);
- addProjection(cfs, "FS");
- addProjection(ChargedLeptons(clfs), "CL");
}
-
-
- //@}
/// @name Analysis methods
//@{
- // Book histograms
void init() {
+ // Set up projections
+ const ChargedFinalState cfs(-1.0, 1.0, 0.5*GeV);
+ const ChargedFinalState clfs(-1.0, 1.0, 20*GeV);
+ addProjection(cfs, "FS");
+ addProjection(ChargedLeptons(clfs), "CL");
+
+ // Book histograms
_hist_tnchg = bookProfile1D( 1, 1, 1);
_hist_pnchg = bookProfile1D( 2, 1, 1);
_hist_pmaxnchg = bookProfile1D( 3, 1, 1);
Modified: trunk/src/Analyses/CDF_2008_S7540469.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S7540469.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2008_S7540469.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -16,13 +16,14 @@
public:
- /// Default constructor.
+ /// Constructor
CDF_2008_S7540469()
: Analysis("CDF_2008_S7540469")
{
setBeams(PROTON, ANTIPROTON);
setNeedsCrossSection(true);
}
+
/// @name Analysis methods
//@{
Modified: trunk/src/Analyses/CDF_2008_S7541902.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S7541902.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2008_S7541902.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -27,9 +27,6 @@
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_2008_S7541902()
: Analysis("CDF_2008_S7541902"),
@@ -40,7 +37,14 @@
{
setBeams(PROTON, ANTIPROTON);
setNeedsCrossSection(true);
-
+ }
+
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
+ // Set up projections
// Basic FS
FinalState fs(-3.6, 3.6);
addProjection(fs, "FS");
@@ -58,15 +62,9 @@
vfs.addVetoOnThisFinalState(invfs);
addProjection(vfs, "VFS");
addProjection(FastJets(vfs, FastJets::CDFJETCLU, 0.4), "Jets");
- }
-
- //@}
- /// @name Analysis methods
- //@{
-
- void init() {
+ // Book histograms
for (int i = 0 ; i < 4 ; ++i) {
_histJetEt[i] = bookHistogram1D(i+1, 1, 1);
_histJetMultRatio[i] = bookDataPointSet(5 , 1, i+1);
Modified: trunk/src/Analyses/CDF_2008_S7782535.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S7782535.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2008_S7782535.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -15,45 +15,32 @@
class CDF_2008_S7782535 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_2008_S7782535()
: Analysis("CDF_2008_S7782535"),
_Rjet(0.7) , _NpTbins(4)
{
setBeams(PROTON, ANTIPROTON);
-
+ }
+
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
+ // Set up projections
const FinalState fs(-3.6, 3.6);
addProjection(fs, "FS");
// Veto (anti)neutrinos, and muons with pT above 1.0 GeV
VetoedFinalState vfs(fs);
- vfs
- .addVetoPairId(NU_E)
- .addVetoPairId(NU_MU)
- .addVetoPairId(NU_TAU)
- .addVetoDetail(MUON, 1.0*GeV, MAXDOUBLE);
+ vfs.vetoNeutrinos();
+ vfs.addVetoDetail(MUON, 1.0*GeV, MAXDOUBLE);
addProjection(vfs, "VFS");
addProjection(FastJets(vfs, FastJets::CDFMIDPOINT, 0.7), "Jets");
addProjection(JetShape(vfs, _jetaxes, 0.0, 0.7, 0.1, 0.3), "JetShape");
-
- // We don't attempt to model the following cuts:
- // * missing ET significance
- // * veto on additional vertices
- // * Z_vtx < 50 cm
- }
-
-
- //@}
-
- /// @name Analysis methods
- //@{
-
- void init() {
- _pTbins += 52, 80, 104, 142, 300;
// Book histograms
+ _pTbins += 52, 80, 104, 142, 300;
for (int i = 0; i < _NpTbins; ++i) {
_h_Psi_pT[i] = bookProfile1D(i+1, 2, 1);
}
Modified: trunk/src/Analyses/CDF_2008_S7828950.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S7828950.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2008_S7828950.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -17,17 +17,12 @@
class CDF_2008_S7828950 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
/// Constructor
CDF_2008_S7828950() : Analysis("CDF_2008_S7828950")
{
setBeams(PROTON, ANTIPROTON);
setNeedsCrossSection(true);
}
-
- //@}
/// @name Analysis methods
Modified: trunk/src/Analyses/CDF_2008_S8093652.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S8093652.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2008_S8093652.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -12,9 +12,6 @@
public:
- /// @name Construction
- //@{
-
/// Constructor
CDF_2008_S8093652()
: Analysis("CDF_2008_S8093652")
@@ -22,8 +19,6 @@
setBeams(PROTON, ANTIPROTON);
setNeedsCrossSection(true);
}
-
- //@}
/// @name Analysis methods
Modified: trunk/src/Analyses/CDF_2008_S8095620.cc
==============================================================================
--- trunk/src/Analyses/CDF_2008_S8095620.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2008_S8095620.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -11,14 +11,10 @@
namespace Rivet {
-
- /// Implementation of CDF Run II Z+b-jet cross section paper
+ /// Implementation of CDF Run II Z + b-jet cross section paper
class CDF_2008_S8095620 : public Analysis {
public:
-
- /// @name Constructors etc.
- //@{
-
+
/// Constructor.
/// jet cuts: |eta| <= 1.5
CDF_2008_S8095620()
@@ -27,10 +23,16 @@
_sumWeightSelected(0.0)
{
setBeams(PROTON, ANTIPROTON);
-
+ }
+
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
+ // Set up projections
const FinalState fs(-3.6, 3.6);
addProjection(fs, "FS");
-
// Create a final state with any e+e- or mu+mu- pair with
// invariant mass 76 -> 106 GeV and ET > 20 (Z decay products)
vector<pair<long,long> > vids;
@@ -44,15 +46,7 @@
vfs.addVetoOnThisFinalState(invfs);
addProjection(vfs, "VFS");
addProjection(FastJets(vfs, FastJets::CDFMIDPOINT, 0.7), "Jets");
- }
-
- //@}
-
- /// @name Analysis methods
- //@{
-
- void init() {
// Book histograms
_dSdET = bookHistogram1D(1, 1, 1);
_dSdETA = bookHistogram1D(2, 1, 1);
Modified: trunk/src/Analyses/CDF_2009_S8057893.cc
==============================================================================
--- trunk/src/Analyses/CDF_2009_S8057893.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2009_S8057893.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -1,79 +1,85 @@
-#include "Rivet/Rivet.hh"
+#include "Rivet/Analysis.hh"
#include "Rivet/RivetAIDA.hh"
#include "Rivet/Tools/Logging.hh"
-#include "Rivet/Analyses/CDF_2009_S8057893.hh"
#include "Rivet/Projections/FinalState.hh"
#include "Rivet/Projections/FastJets.hh"
namespace Rivet {
- CDF_2009_S8057893::CDF_2009_S8057893()
- : Analysis("CDF_2009_S8057893")
- {
- setBeams(PROTON, ANTIPROTON);
-
- const FinalState fsj(-4.0, 4.0, 0.0*GeV);
- addProjection(fsj, "FSJ");
- addProjection(FastJets(fsj, FastJets::CDFMIDPOINT, 1.0), "Jets");
-
- }
-
-
- void CDF_2009_S8057893::init() {
-
-
- }
-
-
- void CDF_2009_S8057893::analyze(const Event& event) {
-
- const FastJets& jetpro = applyProjection<FastJets>(e, "MidpointJets");
- const Jets& jets = jetpro.jetsByPt();
- getLog() << Log::DEBUG << "Jet multiplicity = " << jets.size() << endl;
- if (jets.size() < 1) {
- getLog() << Log::DEBUG << "Failed jet multiplicity cut" << endl;
- vetoEvent;
+ /// CDF in-jet kT distribution analysis
+ class CDF_2009_S8057893 : public Analysis {
+ public:
+
+ /// Constructor
+ CDF_2009_S8057893::CDF_2009_S8057893()
+ : Analysis("CDF_2009_S8057893")
+ {
+ setBeams(PROTON, ANTIPROTON);
}
- // Email sent to authors:
- // Okay, so here are the questions:
-
- // * What |eta| and pT_min acceptance cuts were used?
- // * Is the "cone algorithm" JETCLU or MIDPOINT? You refer to the old 1992 paper that defines
- // JETCLU, but I thought Run II analyses were using the more IRC-safe midpoint algorithm.
- // * Effective min j1, j2 Et values?
- // * Definition of "require the two leading jets to be well-balanced in Et"?
- // * Definition of the complementary cones: per-jet for j1, j2? Otherwise, what is defn of
- // "dijet axis" (since the two jet axes will not exactly match due to ISR and extra jets.)
- // Complementary cones are same eta as jet, but phi +- 90 degrees? Radius of compl. cones
- // = 1.0? Or defined in theta_c (not Lorentz invariant)?
- // * kT of tracks rel to jet axis for all jets, j1 & j2, or just j1?
- // Herwig missing from plots!
- // Data tables? More dijet mass bins (only 3 are shown, but 8 are mentioned)
+ /// @name Analysis methods
+ //@{
+ void CDF_2009_S8057893::init() {
+ const FinalState fsj(-4.0, 4.0, 0.0*GeV);
+ addProjection(fsj, "FSJ");
+ addProjection(FastJets(fsj, FastJets::CDFMIDPOINT, 1.0), "Jets");
+ }
- // Only use tracks with kT > 0.3 GeV
- // Low histo limit: kT_jet > 0.5 GeV
+ void CDF_2009_S8057893::analyze(const Event& event) {
+ const FastJets& jetpro = applyProjection<FastJets>(e, "MidpointJets");
+ const Jets& jets = jetpro.jetsByPt();
+ getLog() << Log::DEBUG << "Jet multiplicity = " << jets.size() << endl;
+ if (jets.size() < 1) {
+ getLog() << Log::DEBUG << "Failed jet multiplicity cut" << endl;
+ vetoEvent;
+ }
+
+ // Email sent to authors:
+ // Okay, so here are the questions:
+
+ // * What |eta| and pT_min acceptance cuts were used?
+ // * Is the "cone algorithm" JETCLU or MIDPOINT? You refer to the old 1992 paper that defines
+ // JETCLU, but I thought Run II analyses were using the more IRC-safe midpoint algorithm.
+ // * Effective min j1, j2 Et values?
+ // * Definition of "require the two leading jets to be well-balanced in Et"?
+ // * Definition of the complementary cones: per-jet for j1, j2? Otherwise, what is defn of
+ // "dijet axis" (since the two jet axes will not exactly match due to ISR and extra jets.)
+ // Complementary cones are same eta as jet, but phi +- 90 degrees? Radius of compl. cones
+ // = 1.0? Or defined in theta_c (not Lorentz invariant)?
+ // * kT of tracks rel to jet axis for all jets, j1 & j2, or just j1?
+
+ // Herwig missing from plots!
+ // Data tables? More dijet mass bins (only 3 are shown, but 8 are mentioned)
+
+
+ // Only use tracks with kT > 0.3 GeV
+
+ // Low histo limit: kT_jet > 0.5 GeV
+
+ // Opening cone theta_c = 0.5 rad (in dijet rest frame)
+
+ // 95 < Mjj < 132 GeV
+ // 243 < Mjj < 323 GeV
+ // 428 < Mjj < 563 GeV
+ // < Mjj < GeV
+ // < Mjj < GeV
+ // < Mjj < GeV
+ // < Mjj < GeV
+ // < Mjj < GeV
+ }
- // Opening cone theta_c = 0.5 rad (in dijet rest frame)
- // 95 < Mjj < 132 GeV
- // 243 < Mjj < 323 GeV
- // 428 < Mjj < 563 GeV
- // < Mjj < GeV
- // < Mjj < GeV
- // < Mjj < GeV
- // < Mjj < GeV
- // < Mjj < GeV
- }
+ void CDF_2009_S8057893::finalize() {
+ }
- void CDF_2009_S8057893::finalize() {
+ //@}
- }
+ };
// This global object acts as a hook for the plugin system
Modified: trunk/src/Analyses/CDF_2009_S8233977.cc
==============================================================================
--- trunk/src/Analyses/CDF_2009_S8233977.cc Tue Sep 29 17:00:10 2009 (r1840)
+++ trunk/src/Analyses/CDF_2009_S8233977.cc Wed Sep 30 10:18:00 2009 (r1841)
@@ -26,19 +26,11 @@
class CDF_2009_S8233977 : public Analysis {
public:
- /// @name Constructors etc.
- //@{
-
- /// Constructor: cuts on final state are \f$ -1 < \eta < 1 \f$
- /// and \f$ p_T > 0.4 \f$ GeV.
+ /// Constructor
CDF_2009_S8233977()
: Analysis("CDF_2009_S8233977")
{
setBeams(PROTON, ANTIPROTON);
- const FinalState fs(-1.0, 1.0, 0.0*GeV);
- const ChargedFinalState cfs(-1.0, 1.0, 0.4*GeV);
- addProjection(fs, "FS");
- addProjection(cfs, "CFS");
//setNeedsCrossSection(true);
}
@@ -46,8 +38,13 @@
/// @name Analysis methods
//@{
- /// Book histograms
+ /// Book histograms and projections
void init() {
+ const FinalState fs(-1.0, 1.0, 0.0*GeV);
+ const ChargedFinalState cfs(-1.0, 1.0, 0.4*GeV);
+ addProjection(fs, "FS");
+ addProjection(cfs, "CFS");
+
_hist_pt_vs_multiplicity = bookProfile1D(1, 1, 1);
_hist_pt = bookHistogram1D(2, 1, 1);
_hist_sumEt = bookHistogram1D(3, 1, 1);
More information about the Rivet-svn
mailing list
|