|
[Rivet-svn] r1834 - trunk/src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgThu Sep 24 12:50:24 BST 2009
Author: fsiegert Date: Thu Sep 24 12:50:23 2009 New Revision: 1834 Log: Move projections into init() for all my analyses. Modified: trunk/src/Analyses/CDF_2005_S6080774.cc trunk/src/Analyses/CDF_2006_S6450792.cc trunk/src/Analyses/CDF_2008_S7540469.cc trunk/src/Analyses/CDF_2008_S7828950.cc trunk/src/Analyses/CDF_2008_S8093652.cc trunk/src/Analyses/D0_1996_S3214044.cc trunk/src/Analyses/D0_1996_S3324664.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_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/JADE_OPAL_2000_S4300807.cc trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc trunk/src/Analyses/MC_TVT1960_ZJETS.cc Modified: trunk/src/Analyses/CDF_2005_S6080774.cc ============================================================================== --- trunk/src/Analyses/CDF_2005_S6080774.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/CDF_2005_S6080774.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -18,13 +18,6 @@ CDF_2005_S6080774() : Analysis("CDF_2005_S6080774") { setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); - - FinalState fs; - addProjection(fs, "FS"); - - IdentifiedFinalState ifs(-0.9, 0.9, 13.0*GeV); - ifs.acceptId(PHOTON); - addProjection(ifs, "IFS"); } //@} @@ -34,6 +27,13 @@ //@{ void init() { + FinalState fs; + addProjection(fs, "FS"); + + IdentifiedFinalState ifs(-0.9, 0.9, 13.0*GeV); + ifs.acceptId(PHOTON); + addProjection(ifs, "IFS"); + for (size_t yAxisId=1; yAxisId<5; ++yAxisId) { _h_m_PP.push_back(bookHistogram1D(1, 1, yAxisId)); _h_pT_PP.push_back(bookHistogram1D(2, 1, yAxisId)); Modified: trunk/src/Analyses/CDF_2006_S6450792.cc ============================================================================== --- trunk/src/Analyses/CDF_2006_S6450792.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/CDF_2006_S6450792.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -14,13 +14,9 @@ //@{ /// Constructor - CDF_2006_S6450792() - : Analysis("CDF_2006_S6450792") { + CDF_2006_S6450792() : Analysis("CDF_2006_S6450792") { setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); - - FinalState fs; - addProjection(FastJets(fs, FastJets::CDFMIDPOINT, 0.7, 61.0*GeV), "ConeFinder"); } //@} @@ -31,6 +27,9 @@ //@{ void init() { + FinalState fs; + addProjection(FastJets(fs, FastJets::CDFMIDPOINT, 0.7, 61.0*GeV), "ConeFinder"); + _h_jet_pt = bookHistogram1D(1, 1, 1); } Modified: trunk/src/Analyses/CDF_2008_S7540469.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S7540469.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/CDF_2008_S7540469.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -22,7 +22,13 @@ { setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); - + } + + /// @name Analysis methods + //@{ + + /// Book histograms + void init() { // Full final state FinalState fs(-5.0, 5.0); addProjection(fs, "FS"); @@ -31,13 +37,7 @@ IdentifiedFinalState elfs(-5.0, 5.0, 25.0*GeV); elfs.acceptIdPair(ELECTRON); addProjection(elfs, "LeadingElectrons"); - } - - /// @name Analysis methods - //@{ - /// Book histograms - void init() { _h_jet_multiplicity = bookHistogram1D(1, 1, 1); _h_jet_pT_cross_section_incl_1jet = bookHistogram1D(2, 1, 1); _h_jet_pT_cross_section_incl_2jet = bookHistogram1D(3, 1, 1); Modified: trunk/src/Analyses/CDF_2008_S7828950.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S7828950.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/CDF_2008_S7828950.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -21,13 +21,9 @@ //@{ /// Constructor - CDF_2008_S7828950() - : Analysis("CDF_2008_S7828950") + CDF_2008_S7828950() : Analysis("CDF_2008_S7828950") { setBeams(PROTON, ANTIPROTON); - //setSqrtS(1960*GeV); - const FinalState fs; - addProjection(FastJets(fs, FastJets::CDFMIDPOINT, 0.7, 62.0*GeV), "JetsM07"); setNeedsCrossSection(true); } @@ -39,6 +35,9 @@ // Book histos and set counters for number of events passed in each one void init() { + const FinalState fs; + addProjection(FastJets(fs, FastJets::CDFMIDPOINT, 0.7, 62.0*GeV), "JetsM07"); + /// @todo What actually are these histos showing? _binnedHistosR07.addHistogram( 0, 0.1, bookHistogram1D(1, 1, 1)); _binnedHistosR07.addHistogram(0.1, 0.7, bookHistogram1D(2, 1, 1)); Modified: trunk/src/Analyses/CDF_2008_S8093652.cc ============================================================================== --- trunk/src/Analyses/CDF_2008_S8093652.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/CDF_2008_S8093652.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -21,10 +21,6 @@ { setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); - - FinalState fs; - FastJets conefinder(fs, FastJets::CDFMIDPOINT, 0.7); - addProjection(conefinder, "ConeFinder"); } //@} @@ -35,6 +31,10 @@ /// Book histograms void init() { + FinalState fs; + FastJets conefinder(fs, FastJets::CDFMIDPOINT, 0.7); + addProjection(conefinder, "ConeFinder"); + _h_m_dijet = bookHistogram1D(1, 1, 1); } Modified: trunk/src/Analyses/D0_1996_S3214044.cc ============================================================================== --- trunk/src/Analyses/D0_1996_S3214044.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/D0_1996_S3214044.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -18,16 +18,10 @@ //@{ /// Constructor - D0_1996_S3214044() - : Analysis("D0_1996_S3214044") + D0_1996_S3214044() : Analysis("D0_1996_S3214044") { setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(false); - - const FinalState fs(-4.5, 4.5); - addProjection(fs, "FS"); - /// @todo Use correct jet algorithm - addProjection(FastJets(fs, FastJets::D0ILCONE, 0.7, 20.0*GeV), "ConeJets"); } @@ -36,6 +30,10 @@ /// Book histograms void init() { + const FinalState fs(-4.5, 4.5); + addProjection(fs, "FS"); + /// @todo Use correct jet algorithm + addProjection(FastJets(fs, FastJets::D0ILCONE, 0.7, 20.0*GeV), "ConeJets"); _h_3j_x3 = bookHistogram1D(1, 1, 1); _h_3j_x5 = bookHistogram1D(2, 1, 1); Modified: trunk/src/Analyses/D0_1996_S3324664.cc ============================================================================== --- trunk/src/Analyses/D0_1996_S3324664.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/D0_1996_S3324664.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -19,11 +19,6 @@ D0_1996_S3324664() : Analysis("D0_1996_S3324664") { setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(false); - - const FinalState fs(-3.2, 3.2); - addProjection(fs, "FS"); - /// @todo Use correct jet algorithm - addProjection(FastJets(fs, FastJets::D0ILCONE, 0.7, 20.0*GeV), "ConeJets"); } @@ -31,6 +26,11 @@ //@{ void init() { + const FinalState fs(-3.2, 3.2); + addProjection(fs, "FS"); + /// @todo Use correct jet algorithm + addProjection(FastJets(fs, FastJets::D0ILCONE, 0.7, 20.0*GeV), "ConeJets"); + _h_deta = bookHistogram1D(1, 1, 1); _h_dphi.addHistogram(0.0, 2.0, bookHistogram1D(2, 1, 1)); _h_dphi.addHistogram(2.0, 4.0, bookHistogram1D(2, 1, 2)); Modified: trunk/src/Analyses/D0_2007_S7075677.cc ============================================================================== --- trunk/src/Analyses/D0_2007_S7075677.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/D0_2007_S7075677.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -20,8 +20,14 @@ { // Run II Z rapidity setBeams(PROTON, ANTIPROTON); - + } + + + /// @name Analysis methods + //@{ + /// Book histograms + void init() { /// @todo Ask Gavin Hesketh about his first implemention without eta cuts. vector<pair<double, double> > etaRanges; // Remove eta cuts for the moment, because it seems like they have been @@ -31,14 +37,7 @@ // etaRanges.push_back(make_pair(1.5, 3.2)); ZFinder zfinder(etaRanges, 15.0*GeV, ELECTRON, 71.0*GeV, 111.0*GeV, 0.2); addProjection(zfinder, "ZFinder"); - } - - /// @name Analysis methods - //@{ - - /// Book histograms - void init() { _h_yZ = bookHistogram1D(1, 1, 1); } Modified: trunk/src/Analyses/D0_2008_S6879055.cc ============================================================================== --- trunk/src/Analyses/D0_2008_S6879055.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/D0_2008_S6879055.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -20,7 +20,14 @@ D0_2008_S6879055() : Analysis("D0_2008_S6879055") { setBeams(PROTON, ANTIPROTON); - + } + + + /// @name Analysis methods + //@{ + + // Book histograms + void init() { // Basic final state FinalState fs(-5.0, 5.0); addProjection(fs, "FS"); @@ -49,14 +56,7 @@ // Vertex PVertex vertex; addProjection(vertex, "PrimaryVertex"); - } - - /// @name Analysis methods - //@{ - - // Book histograms - void init() { _crossSectionRatio = bookHistogram1D(1, 1, 1); _pTjet1 = bookHistogram1D(2, 1, 1); _pTjet2 = bookHistogram1D(3, 1, 1); Modified: trunk/src/Analyses/D0_2008_S7554427.cc ============================================================================== --- trunk/src/Analyses/D0_2008_S7554427.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/D0_2008_S7554427.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -17,15 +17,10 @@ public: /// Default constructor. - D0_2008_S7554427() - : Analysis("D0_2008_S7554427") + D0_2008_S7554427() : Analysis("D0_2008_S7554427") { // Run II Z pT setBeams(PROTON, ANTIPROTON); - - ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON, - 40.0*GeV, 200.0*GeV, 0.2); - addProjection(zfinder, "ZFinder"); } @@ -34,6 +29,10 @@ /// Book histograms void init() { + ZFinder zfinder(-MAXRAPIDITY, MAXRAPIDITY, 0.0*GeV, ELECTRON, + 40.0*GeV, 200.0*GeV, 0.2); + addProjection(zfinder, "ZFinder"); + _h_ZpT = bookHistogram1D(1, 1, 1); _h_forward_ZpT = bookHistogram1D(3, 1, 1); } Modified: trunk/src/Analyses/D0_2008_S7863608.cc ============================================================================== --- trunk/src/Analyses/D0_2008_S7863608.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/D0_2008_S7863608.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -17,17 +17,10 @@ /// @name Construction //@{ /// Constructor - D0_2008_S7863608() - : Analysis("D0_2008_S7863608") + D0_2008_S7863608() : Analysis("D0_2008_S7863608") { setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); - - ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2); - addProjection(zfinder, "ZFinder"); - - FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5, 20.0*GeV); - addProjection(conefinder, "ConeFinder"); } //@} @@ -38,6 +31,12 @@ /// Book histograms void init() { + ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2); + addProjection(zfinder, "ZFinder"); + + FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5, 20.0*GeV); + addProjection(conefinder, "ConeFinder"); + _h_jet_pT_cross_section = bookHistogram1D(1, 1, 1); _h_jet_y_cross_section = bookHistogram1D(2, 1, 1); _h_Z_pT_cross_section = bookHistogram1D(3, 1, 1); Modified: trunk/src/Analyses/D0_2009_S8202443.cc ============================================================================== --- trunk/src/Analyses/D0_2009_S8202443.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/D0_2009_S8202443.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -16,12 +16,20 @@ /// @name Construction //@{ /// Constructor - D0_2009_S8202443() - : Analysis("D0_2009_S8202443"), + D0_2009_S8202443() : Analysis("D0_2009_S8202443"), _sum_of_weights(0.0), _sum_of_weights_constrained(0.0) { setBeams(PROTON, ANTIPROTON); - + } + + //@} + + + /// @name Analysis methods + //@{ + + /// Book histograms + void init() { // Leptons in constrained tracking acceptance vector<pair<double, double> > etaRanges; etaRanges.push_back(make_pair(-2.5, -1.5)); @@ -39,16 +47,7 @@ addProjection(zfinder, "ZFinder"); FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5, 20.0*GeV); addProjection(conefinder, "ConeFinder"); - } - - //@} - - /// @name Analysis methods - //@{ - - /// Book histograms - void init() { _h_jet1_pT_constrained = bookHistogram1D(1, 1, 1); _h_jet2_pT_constrained = bookHistogram1D(3, 1, 1); _h_jet3_pT_constrained = bookHistogram1D(5, 1, 1); Modified: trunk/src/Analyses/D0_2009_S8320160.cc ============================================================================== --- trunk/src/Analyses/D0_2009_S8320160.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/D0_2009_S8320160.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -18,14 +18,9 @@ //@{ /// Constructor - D0_2009_S8320160() - : Analysis("D0_2009_S8320160") + D0_2009_S8320160() : Analysis("D0_2009_S8320160") { setBeams(PROTON, ANTIPROTON); - - FinalState fs; - FastJets conefinder(fs, FastJets::D0ILCONE, 0.7); - addProjection(conefinder, "ConeFinder"); } //@} @@ -36,6 +31,10 @@ // Book histograms void init() { + FinalState fs; + FastJets conefinder(fs, FastJets::D0ILCONE, 0.7); + addProjection(conefinder, "ConeFinder"); + _h_chi_dijet.addHistogram(250., 300., bookHistogram1D(1, 1, 1)); _h_chi_dijet.addHistogram(300., 400., bookHistogram1D(2, 1, 1)); _h_chi_dijet.addHistogram(400., 500., bookHistogram1D(3, 1, 1)); Modified: trunk/src/Analyses/D0_2009_S8349509.cc ============================================================================== --- trunk/src/Analyses/D0_2009_S8349509.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/D0_2009_S8349509.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -16,16 +16,9 @@ //@{ /// Constructor - D0_2009_S8349509() : - Analysis("D0_2009_S8349509") + D0_2009_S8349509() : Analysis("D0_2009_S8349509") { setBeams(PROTON, ANTIPROTON); - - ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2); - addProjection(zfinder, "ZFinder"); - - FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5, 20.0*GeV); - addProjection(conefinder, "ConeFinder"); } //@} @@ -36,6 +29,11 @@ /// Book histograms void init() { + ZFinder zfinder(-1.7, 1.7, 15.0*GeV, MUON, 65.0*GeV, 115.0*GeV, 0.2); + addProjection(zfinder, "ZFinder"); + + FastJets conefinder(zfinder.remainingFinalState(), FastJets::D0ILCONE, 0.5, 20.0*GeV); + addProjection(conefinder, "ConeFinder"); _h_dphi_jet_Z25 = bookHistogram1D(1, 1, 1); _h_dphi_jet_Z45 = bookHistogram1D(2, 1, 1); Modified: trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc ============================================================================== --- trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/JADE_OPAL_2000_S4300807.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -29,11 +29,6 @@ _initialised(false) { setBeams(ELECTRON, POSITRON); - addProjection(Beam(), "Beams"); - const FinalState fs; - addProjection(fs, "FS"); - addProjection(FastJets(fs, FastJets::JADE, 0.7), "JadeJets"); - addProjection(FastJets(fs, FastJets::DURHAM, 0.7), "DurhamJets"); } //@} @@ -43,6 +38,11 @@ //@{ void init() { + addProjection(Beam(), "Beams"); + const FinalState fs; + addProjection(fs, "FS"); + addProjection(FastJets(fs, FastJets::JADE, 0.7), "JadeJets"); + addProjection(FastJets(fs, FastJets::DURHAM, 0.7), "DurhamJets"); } Modified: trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc ============================================================================== --- trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/MC_TVT1960_PHOTONJETS.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -16,7 +16,14 @@ { setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); - + } + + + /// @name Analysis methods + //@{ + + /// Book histograms + void init() { // General FS FinalState fs(-5.0, 5.0); addProjection(fs, "FS"); @@ -32,19 +39,12 @@ addProjection(vfs, "JetFS"); FastJets jetpro(vfs, FastJets::KT, 0.7, 20.0*GeV); addProjection(jetpro, "Jets"); - } - - - /// @name Analysis methods - //@{ - - /// Book histograms - void init() { + _h_photon_pT = bookHistogram1D("photon_pT", 50, 0.0, 500.0); _h_photon_y = bookHistogram1D("photon_y", 20, -1.0, 1.0); _h_photon_jet1_deta = bookHistogram1D("photon_jet1_deta", 50, -5.0, 5.0); _h_photon_jet1_dR = bookHistogram1D("photon_jet1_dR", 25, 0.5, 7.0); - + MC_JetAnalysis::init(); } Modified: trunk/src/Analyses/MC_TVT1960_ZJETS.cc ============================================================================== --- trunk/src/Analyses/MC_TVT1960_ZJETS.cc Thu Sep 24 11:38:34 2009 (r1833) +++ trunk/src/Analyses/MC_TVT1960_ZJETS.cc Thu Sep 24 12:50:23 2009 (r1834) @@ -19,11 +19,6 @@ { setBeams(PROTON, ANTIPROTON); setNeedsCrossSection(true); - - ZFinder zfinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2); - addProjection(zfinder, "ZFinder"); - FastJets jetpro(zfinder.remainingFinalState(), FastJets::KT, 0.7, 20.0*GeV); - addProjection(jetpro, "Jets"); } @@ -32,6 +27,11 @@ /// Book histograms void init() { + ZFinder zfinder(-3.5, 3.5, 25.0*GeV, ELECTRON, 65.0*GeV, 115.0*GeV, 0.2); + addProjection(zfinder, "ZFinder"); + FastJets jetpro(zfinder.remainingFinalState(), FastJets::KT, 0.7, 20.0*GeV); + addProjection(jetpro, "Jets"); + _h_Z_mass = bookHistogram1D("Z_mass", 50, 66.0, 116.0); _h_Z_pT = bookHistogram1D("Z_pT", 100, 0.0, 500.0); _h_Z_y = bookHistogram1D("Z_y", 40, -4.0, 4.0);
More information about the Rivet-svn mailing list |