|
[Rivet-svn] r2785 - in trunk: data/anainfo src/Analysesblackhole at projects.hepforge.org blackhole at projects.hepforge.orgSat Nov 27 01:15:32 GMT 2010
Author: buckley Date: Sat Nov 27 01:15:32 2010 New Revision: 2785 Log: Rewriting CDF 1994 coherence analysis to apply detector smearing factors and generally deleting around half the code ;) Modified: trunk/data/anainfo/CDF_2008_S7782535.info trunk/src/Analyses/CDF_1994_S2952106.cc Modified: trunk/data/anainfo/CDF_2008_S7782535.info ============================================================================== --- trunk/data/anainfo/CDF_2008_S7782535.info Sat Nov 27 01:12:52 2010 (r2784) +++ trunk/data/anainfo/CDF_2008_S7782535.info Sat Nov 27 01:15:32 2010 (r2785) @@ -8,6 +8,7 @@ Authors: - Alison Lister <alister at fnal.gov> - Emily Nurse <nurse at hep.ucl.ac.uk> + - Andy Buckley <andy.buckley at cern.ch> References: - arXiv:0806.1699 - Phys.Rev.D78:072005,2008 Modified: trunk/src/Analyses/CDF_1994_S2952106.cc ============================================================================== --- trunk/src/Analyses/CDF_1994_S2952106.cc Sat Nov 27 01:12:52 2010 (r2784) +++ trunk/src/Analyses/CDF_1994_S2952106.cc Sat Nov 27 01:15:32 2010 (r2785) @@ -6,13 +6,14 @@ #include "Rivet/Projections/VetoedFinalState.hh" #include "Rivet/Projections/VisibleFinalState.hh" #include "Rivet/Projections/MissingMomentum.hh" +#include "LWH/Histogram1D.h" namespace Rivet { /// @brief CDF Run I color coherence analysis /// @author Lars Sonnenschein - /// @todo Apply detector correction factors + /// @author Andy Buckley class CDF_1994_S2952106 : public Analysis { public: @@ -20,7 +21,6 @@ CDF_1994_S2952106() : Analysis("CDF_1994_S2952106") { setBeams(PROTON, ANTIPROTON); - // setNeedsCrossSection(true); } @@ -30,103 +30,39 @@ void init() { const FinalState fs(-4.2, 4.2); addProjection(fs, "FS"); - // Veto neutrinos, and muons with pT above 1.0 GeV - VetoedFinalState vfs(fs); - vfs.vetoNeutrinos(); - vfs.addVetoPairDetail(MUON, 1.0*GeV, MAXDOUBLE); - addProjection(vfs, "VFS"); - addProjection(FastJets(vfs, FastJets::CDFJETCLU, 0.7), "ConeJets"); - - /// @todo Use histogram auto-booking - - //const string hname = "HvsDphi"; - //const string htitle = "H vs Delta phi"; - //_histHvsDphi = bookHistogram2D(hname, htitle, 40, -4., 4., 32, 0., 3.2); - - //const string hname2 = "RvsAlpha"; - //const string htitle2 = "R vs alpha"; - //_histRvsAlpha = bookHistogram2D(hname2, htitle2, 50, 0., 5., 32, -1.6, 1.6); + addProjection(FastJets(fs, FastJets::CDFJETCLU, 0.7), "Jets"); - //_histJet1Et = bookHistogram1D("Jet1Et", 40, 0., 500.); _histJet1Et = bookHistogram1D(1,1,1); - //_histJet2Et = bookHistogram1D("Jet2Et", 40, 0., 500.); _histJet2Et = bookHistogram1D(2,1,1); - //_histJet3eta = bookHistogram1D("Jet3eta", 42, -4., 4.); - _histJet3eta = bookHistogram1D(3,1,1); - //_histR23 = bookHistogram1D("R23", 50, 0., 5.); - _histR23 = bookHistogram1D(4,1,1); - //_histAlpha = bookHistogram1D("alpha", 42, -PI/2., PI/2.); - _histAlpha = bookHistogram1D(5,1,1); - - //const string hname8 = "alphaMCvsDat"; - //const string htitle8 = "alpha MC vs. Data "; - //_histAlphaMCvsDat = bookHistogram1D(hname8, htitle8, 42, -PI/2., PI/2.); - - /// @todo Need better title - //_histAlphaCDF = bookHistogram1D("alphaCDF", 42, -PI/2., PI/2.); - _histAlphaCDF = bookHistogram1D(6,1,1); - - /// @todo Need better title - //_histAlphaIdeal = bookHistogram1D("alphaIdeal", 42, -PI/2., PI/2.); - _histAlphaIdeal = bookHistogram1D(6,1,2); - - - /// @todo Need better title - //_histR23CDF = bookHistogram1D("R23CDF", 50, 0., 5.); - _histR23CDF = bookHistogram1D(7,1,1); - - /// @todo Need better title - //_histR23Ideal = bookHistogram1D("R23Ideal", 50, 0., 5.); - _histR23Ideal = bookHistogram1D(7,1,2); - - - /// @todo Need better title - //_histJet3etaCDF = bookHistogram1D("Jet3etaCDF", 42, -4., 4.); - _histJet3etaCDF = bookHistogram1D(8,1,1); - - /// @todo Need better title - //_histJet3etaIdeal = bookHistogram1D("Jet3etaIdeal", 42, -4., 4.); - _histJet3etaIdeal = bookHistogram1D(8,1,2); - - - //_histEta3Corr = bookHistogram1D(3,1,1); - const string hnameEta3 = "Eta3Corr"; - //const string htitleEta3 = "Eta3Corr"; - //_histEta3Corr = bookHistogram1D(hnameEta3, 40, -4., 4.); - _histEta3Corr = bookDataPointSet(hnameEta3); - - //_histR23Corr = bookHistogram1D(4,1,1); - const string hnameR23 = "R23Corr"; - //const string htitleR23 = "R23Corr"; - //_histR23Corr = bookHistogram1D(hnameR23, 35, 0., 4.375); - _histR23Corr = bookDataPointSet(hnameR23); - - //_histAlphaCorr = bookHistogram1D(5,1,1); - const string hnameAlpha = "AlphaCorr"; - //const string htitleAlpha = "AlphaCorr"; - //_histAlphaCorr = bookHistogram1D(hnameAlpha, 40, -90., 90.); - _histAlphaCorr = bookDataPointSet(hnameAlpha); - + _histJet3eta = bookDataPointSet(3,1,1); + _histR23 = bookDataPointSet(4,1,1); + _histAlpha = bookDataPointSet(5,1,1); + + // Temporary histos: these are the ones we actually fill for the plots which require correction + _tmphistJet3eta = new LWH::Histogram1D(binEdges(3,1,1)); + _tmphistR23 = new LWH::Histogram1D(binEdges(4,1,1)); + _tmphistAlpha = new LWH::Histogram1D(binEdges(5,1,1)); } // Do the analysis void analyze(const Event & event) { - const Jets jets = applyProjection<FastJets>(event, "ConeJets").jetsByPt(); - getLog() << Log::DEBUG << "Jet multiplicity before any cuts = " << jets.size() << endl; + const Jets jets = applyProjection<FastJets>(event, "Jets").jetsByPt(); + MSG_DEBUG("Jet multiplicity before any cuts = " << jets.size()); // ETs only from jets: - _Et_sinphi_sum = 0.; - _Et_cosphi_sum = 0.; - _Et_sum = 0.; - for (size_t i=0; i< jets.size(); ++i) { - _Et_sinphi_sum = jets[i].momentum().Et() * sin(jets[i].phi()); - _Et_cosphi_sum = jets[i].momentum().Et() * cos(jets[i].phi()); - _Et_sum = jets[i].momentum().Et(); + double et_sinphi_sum = 0; + double et_cosphi_sum = 0; + double et_sum = 0; + for (size_t i = 0; i< jets.size(); ++i) { + et_sinphi_sum += jets[i].momentum().Et() * sin(jets[i].phi()); + et_cosphi_sum += jets[i].momentum().Et() * cos(jets[i].phi()); + et_sum += jets[i].momentum().Et(); } - if (sqrt(_Et_sinphi_sum*_Et_sinphi_sum + _Et_cosphi_sum*_Et_cosphi_sum)/_Et_sum > 6.0) - vetoEvent; + + // ET requirement + if (sqrt(sqr(et_sinphi_sum) + sqr(et_cosphi_sum))/et_sum > 6.0) vetoEvent; // Check jet requirements if (jets.size() < 3) vetoEvent; @@ -135,178 +71,115 @@ // More jet 1,2,3 checks FourMomentum pj1(jets[0].momentum()), pj2(jets[1].momentum()), pj3(jets[2].momentum()); if (fabs(pj1.eta()) > 0.7 || fabs(pj2.eta()) > 0.7) vetoEvent; - getLog() << Log::DEBUG << "Jet 1 & 2 eta, pT requirements fulfilled" << endl; + MSG_DEBUG("Jet 1 & 2 eta, pT requirements fulfilled"); // Require that jets are back-to-back within 20 degrees in phi - if (deltaPhi(pj1.phi(), pj2.phi()) < 8./9. * PI) vetoEvent; - getLog() << Log::DEBUG << "Jet 1 & 2 phi requirement fulfilled" << endl; + if ((PI - deltaPhi(pj1.phi(), pj2.phi())) > (20/180.0)*PI) vetoEvent; + MSG_DEBUG("Jet 1 & 2 phi requirement fulfilled"); const double weight = event.weight(); _histJet1Et->fill(pj1.pT(), weight); _histJet2Et->fill(pj2.pT(), weight); - _histR23->fill(deltaR(pj2, pj3), weight); - _histJet3eta->fill(pj3.eta(), weight); + _tmphistR23->fill(deltaR(pj2, pj3), weight); + _tmphistJet3eta->fill(pj3.eta(), weight); // Next cut only required for alpha studies - if (pj3.pT()/GeV < 10.0) vetoEvent; - getLog() << Log::DEBUG << "3rd jet passes alpha histo pT cut" << endl; + if (pj3.pT() < 10.0*GeV) vetoEvent; + MSG_DEBUG("3rd jet passes alpha histo pT cut"); // Calc and plot alpha const double dPhi = deltaPhi(pj3.phi(), pj2.phi()); const double dH = sign(pj2.eta()) * (pj3.eta() - pj2.eta()); const double alpha = atan(dH/dPhi); - _histAlpha->fill(alpha*180./PI, weight); + _tmphistAlpha->fill(alpha*180./PI, weight); } - /// Finalize + /// Apply bin-wise detector correction factors void finalize() { + // eta3 correction const double eta3_CDF_sim[] = - { 0.0013, 0.0037, 0.0047, 0.0071, 0.0093, - 0.0117, 0.0151, 0.0149, 0.0197, 0.0257, - 0.0344, 0.0409, 0.0481, 0.0454, 0.0394, - 0.0409, 0.0387, 0.0387, 0.0322, 0.0313, - 0.029, 0.0309, 0.0412, 0.0417, 0.0412, - 0.0397, 0.0417, 0.0414, 0.0376, 0.0316, - 0.027, 0.0186, 0.0186, 0.0132, 0.0127, - 0.0106, 0.0071, 0.004, 0.002, 0.0013 }; - + { 0.0013, 0.0037, 0.0047, 0.0071, 0.0093, 0.0117, 0.0151, 0.0149, 0.0197, 0.0257, + 0.0344, 0.0409, 0.0481, 0.0454, 0.0394, 0.0409, 0.0387, 0.0387, 0.0322, 0.0313, + 0.0290, 0.0309, 0.0412, 0.0417, 0.0412, 0.0397, 0.0417, 0.0414, 0.0376, 0.0316, + 0.0270, 0.0186, 0.0186, 0.0132, 0.0127, 0.0106, 0.0071, 0.0040, 0.0020, 0.0013 }; const double eta3_CDF_sim_err[] = - { 0.0009, 0.0009, 0.0007, 0.0007, 0.0007, - 0.001, 0.0012, 0.0012, 0.0013, 0.0016, - 0.0017, 0.002, 0.002, 0.0022, 0.002, - 0.002, 0.0018, 0.0018, 0.0016, 0.0017, - 0.0017, 0.0019, 0.002, 0.0021, 0.002, - 0.002, 0.0019, 0.002, 0.0018, 0.0017, - 0.0017, 0.0014, 0.0014, 0.0009, 0.001, - 0.0009, 0.0009, 0.0008, 0.0008, 0.0009 }; - + { 0.0009, 0.0009, 0.0007, 0.0007, 0.0007, 0.0010, 0.0012, 0.0012, 0.0013, 0.0016, + 0.0017, 0.0020, 0.0020, 0.0022, 0.0020, 0.0020, 0.0018, 0.0018, 0.0016, 0.0017, + 0.0017, 0.0019, 0.0020, 0.0021, 0.0020, 0.0020, 0.0019, 0.0020, 0.0018, 0.0017, + 0.0017, 0.0014, 0.0014, 0.0009, 0.0010, 0.0009, 0.0009, 0.0008, 0.0008, 0.0009 }; const double eta3_Ideal_sim[] = - { 0.0017, 0.003, 0.0033, 0.0062, 0.0062, - 0.0112, 0.0177, 0.0164, 0.0196, 0.0274, - 0.0351, 0.0413, 0.052, 0.0497, 0.0448, - 0.0446, 0.0375, 0.0329, 0.0291, 0.0272, - 0.0233, 0.0288, 0.0384, 0.0396, 0.0468, - 0.0419, 0.0459, 0.0399, 0.0355, 0.0329, - 0.0274, 0.023, 0.0201, 0.012, 0.01, - 0.008, 0.0051, 0.0051, 0.001, 0.001 }; - - vector<double> xval_eta3, xerr_eta3, yval_eta3, yerr_eta3; - for (int ibin = 0; ibin < 40; ++ibin) { //x-value + weight=err^2/y-value - xval_eta3.push_back(-4. + (ibin+0.5)*8./40.); - xerr_eta3.push_back(0.5*8./40.); - yval_eta3.push_back(eta3_CDF_sim[ibin]/eta3_Ideal_sim[ibin]); - yerr_eta3.push_back(eta3_CDF_sim_err[ibin]/eta3_Ideal_sim[ibin]); + { 0.0017, 0.0030, 0.0033, 0.0062, 0.0062, 0.0112, 0.0177, 0.0164, 0.0196, 0.0274, + 0.0351, 0.0413, 0.0520, 0.0497, 0.0448, 0.0446, 0.0375, 0.0329, 0.0291, 0.0272, + 0.0233, 0.0288, 0.0384, 0.0396, 0.0468, 0.0419, 0.0459, 0.0399, 0.0355, 0.0329, + 0.0274, 0.0230, 0.0201, 0.0120, 0.0100, 0.0080, 0.0051, 0.0051, 0.0010, 0.0010 }; + vector<double> yval_eta3, yerr_eta3; + for (size_t i = 0; i < 40; ++i) { + const double yval = _tmphistJet3eta->binHeight(i) * (eta3_CDF_sim[i]/eta3_Ideal_sim[i]); + yval_eta3.push_back(yval); + const double yerr = _tmphistJet3eta->binError(i) * (eta3_CDF_sim_err[i]/eta3_Ideal_sim[i]); + yerr_eta3.push_back(yerr); } - _histEta3Corr->setCoordinate(0, xval_eta3, xerr_eta3); - _histEta3Corr->setCoordinate(1, yval_eta3, yerr_eta3); - + _histJet3eta->setCoordinate(1, yval_eta3, yerr_eta3); + // R23 correction const double R23_CDF_sim[] = - { 0.0005, 0.0161, 0.057, 0.0762, 0.0723, - 0.0705, 0.0598, 0.0563, 0.0557, 0.0579, - 0.0538, 0.0522, 0.0486, 0.0449, 0.0418, - 0.0361, 0.0326, 0.0304, 0.0252, 0.0212, - 0.0173, 0.0176, 0.0145, 0.0127, 0.0103, - 0.0065, 0.0049, 0.0045, 0.0035, 0.0029, - 0.0024, 0.0014, 0.0011, 0.001, 0.0009 }; - + { 0.0005, 0.0161, 0.0570, 0.0762, 0.0723, 0.0705, 0.0598, 0.0563, 0.0557, 0.0579, + 0.0538, 0.0522, 0.0486, 0.0449, 0.0418, 0.0361, 0.0326, 0.0304, 0.0252, 0.0212, + 0.0173, 0.0176, 0.0145, 0.0127, 0.0103, 0.0065, 0.0049, 0.0045, 0.0035, 0.0029, + 0.0024, 0.0014, 0.0011, 0.0010, 0.0009 }; const double R23_CDF_sim_err[] = - { 0.0013, 0.0009, 0.0022, 0.0029, 0.0026, - 0.0024, 0.0022, 0.0025, 0.0023, 0.0024, - 0.0021, 0.0021, 0.0021, 0.0021, 0.0021, - 0.0019, 0.0019, 0.0016, 0.0017, 0.0014, - 0.001, 0.0014, 0.0012, 0.0013, 0.001, - 0.0011, 0.001, 0.001, 0.001, 0.0011, + { 0.0013, 0.0009, 0.0022, 0.0029, 0.0026, 0.0024, 0.0022, 0.0025, 0.0023, 0.0024, + 0.0021, 0.0021, 0.0021, 0.0021, 0.0021, 0.0019, 0.0019, 0.0016, 0.0017, 0.0014, + 0.0010, 0.0014, 0.0012, 0.0013, 0.0010, 0.0011, 0.0010, 0.0010, 0.0010, 0.0011, 0.0011, 0.0009, 0.0008, 0.0008, 0.0009 }; - const double R23_Ideal_sim[] = - { 0.0005, 0.0176, 0.0585, 0.0862, 0.0843, - 0.0756, 0.0673, 0.0635, 0.0586, 0.0619, - 0.0565, 0.0515, 0.0466, 0.0472, 0.0349, - 0.0349, 0.0266, 0.0254, 0.0204, 0.0179, - 0.0142, 0.0134, 0.0101, 0.009, 0.008, - 0.0034, 0.003, 0.0033, 0.0027, 0.0021, + { 0.0005, 0.0176, 0.0585, 0.0862, 0.0843, 0.0756, 0.0673, 0.0635, 0.0586, 0.0619, + 0.0565, 0.0515, 0.0466, 0.0472, 0.0349, 0.0349, 0.0266, 0.0254, 0.0204, 0.0179, + 0.0142, 0.0134, 0.0101, 0.0090, 0.0080, 0.0034, 0.0030, 0.0033, 0.0027, 0.0021, 0.0012, 0.0006, 0.0004, 0.0005, 0.0003 }; - - vector<double> xval_R23, xerr_R23, yval_R23, yerr_R23; - for (int ibin = 0; ibin < 35; ++ibin) { // x-value + weight=err^2/y-value - xval_R23.push_back((ibin+0.5)*4.375/35.); - xerr_R23.push_back(0.5*4.375/35.); - yval_R23.push_back(R23_CDF_sim[ibin]/R23_Ideal_sim[ibin]); - yerr_R23.push_back(R23_CDF_sim_err[ibin]/R23_Ideal_sim[ibin]); + vector<double> yval_R23, yerr_R23; + for (size_t i = 0; i < 35; ++i) { + const double yval = _tmphistR23->binHeight(i) * (R23_CDF_sim[i]/R23_Ideal_sim[i]); + yval_R23.push_back(yval); + const double yerr = _tmphistR23->binError(i) * (R23_CDF_sim_err[i]/R23_Ideal_sim[i]); + yerr_R23.push_back(yerr); } - _histR23Corr->setCoordinate(0, xval_R23, xerr_R23); - _histR23Corr->setCoordinate(1, yval_R23, yerr_R23); - + _histR23->setCoordinate(1, yval_R23, yerr_R23); + // alpha correction const double alpha_CDF_sim[] = - { 0.0517, 0.0461, 0.049, 0.0452, 0.0451, - 0.0435, 0.0317, 0.0287, 0.0294, 0.0261, - 0.0231, 0.022, 0.0233, 0.0192, 0.0213, - 0.0166, 0.0176, 0.0146, 0.0136, 0.0156, - 0.0142, 0.0152, 0.0151, 0.0147, 0.0164, - 0.0186, 0.018, 0.021, 0.0198, 0.0189, - 0.0197, 0.0211, 0.027, 0.0236, 0.0243, - 0.0269, 0.0257, 0.0276, 0.0246, 0.0286 }; - + { 0.0517, 0.0461, 0.0490, 0.0452, 0.0451, 0.0435, 0.0317, 0.0287, 0.0294, 0.0261, + 0.0231, 0.0220, 0.0233, 0.0192, 0.0213, 0.0166, 0.0176, 0.0146, 0.0136, 0.0156, + 0.0142, 0.0152, 0.0151, 0.0147, 0.0164, 0.0186, 0.0180, 0.0210, 0.0198, 0.0189, + 0.0197, 0.0211, 0.0270, 0.0236, 0.0243, 0.0269, 0.0257, 0.0276, 0.0246, 0.0286 }; const double alpha_CDF_sim_err[] = - { 0.0024, 0.0025, 0.0024, 0.0024, 0.0024, - 0.0022, 0.0019, 0.0018, 0.0019, 0.0016, - 0.0017, 0.0017, 0.0019, 0.0013, 0.0017, - 0.0014, 0.0016, 0.0013, 0.0012, 0.0009, - 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, - 0.0015, 0.0014, 0.0016, 0.0016, 0.0015, - 0.0016, 0.0016, 0.0019, 0.0017, 0.0019, - 0.0018, 0.0018, 0.0018, 0.0018, 0.0019 }; - + { 0.0024, 0.0025, 0.0024, 0.0024, 0.0024, 0.0022, 0.0019, 0.0018, 0.0019, 0.0016, + 0.0017, 0.0017, 0.0019, 0.0013, 0.0017, 0.0014, 0.0016, 0.0013, 0.0012, 0.0009, + 0.0014, 0.0014, 0.0014, 0.0014, 0.0014, 0.0015, 0.0014, 0.0016, 0.0016, 0.0015, + 0.0016, 0.0016, 0.0019, 0.0017, 0.0019, 0.0018, 0.0018, 0.0018, 0.0018, 0.0019 }; const double alpha_Ideal_sim[] = - { 0.0552, 0.0558, 0.0583, 0.055, 0.0495, - 0.0433, 0.0393, 0.0346, 0.0331, 0.0296, - 0.0258, 0.0196, 0.0171, 0.0179, 0.0174, - 0.0141, 0.0114, 0.0096, 0.0076, 0.0087, - 0.0099, 0.0079, 0.0102, 0.0114, 0.0124, - 0.013, 0.0165, 0.016, 0.0177, 0.019, - 0.0232, 0.0243, 0.0238, 0.0248, 0.0235, - 0.0298, 0.0292, 0.0291, 0.0268, 0.0316 }; - - vector<double> xval_alpha, xerr_alpha, yval_alpha, yerr_alpha; - for (int ibin = 0; ibin < 40; ++ibin) { //x-value + weight=err^2/y-value - xval_alpha.push_back(-90. + (ibin+0.5)*180./40.); - xerr_alpha.push_back(0.5*180./40.); - yval_alpha.push_back(alpha_CDF_sim[ibin]/alpha_Ideal_sim[ibin]); - yerr_alpha.push_back(alpha_CDF_sim_err[ibin]/alpha_Ideal_sim[ibin]); + { 0.0552, 0.0558, 0.0583, 0.0550, 0.0495, 0.0433, 0.0393, 0.0346, 0.0331, 0.0296, + 0.0258, 0.0196, 0.0171, 0.0179, 0.0174, 0.0141, 0.0114, 0.0096, 0.0076, 0.0087, + 0.0099, 0.0079, 0.0102, 0.0114, 0.0124, 0.0130, 0.0165, 0.0160, 0.0177, 0.0190, + 0.0232, 0.0243, 0.0238, 0.0248, 0.0235, 0.0298, 0.0292, 0.0291, 0.0268, 0.0316 }; + vector<double> yval_alpha, yerr_alpha; + for (size_t i = 0; i < 40; ++i) { + const double yval = _tmphistAlpha->binHeight(i) * (alpha_CDF_sim[i]/alpha_Ideal_sim[i]); + yval_alpha.push_back(yval); + const double yerr = _tmphistAlpha->binError(i) * (alpha_CDF_sim_err[i]/alpha_Ideal_sim[i]); + yerr_alpha.push_back(yerr); } - _histAlphaCorr->setCoordinate(0, xval_alpha, xerr_alpha); - _histAlphaCorr->setCoordinate(1, yval_alpha, yerr_alpha); - + _histAlpha->setCoordinate(1, yval_alpha, yerr_alpha); - //AIDA::IDataPointSetFactory& hf = datapointsetFactory(); - /// @todo Histo factory output paths don't work this way - //hf.multiply(histoDir() + "/d03-x01-y01", *_histJet3eta, *_histEta3Corr); - //hf.multiply("/_histJet3eta", *_histJet3eta, *_histEta3Corr); - //_histJet3eta = hf.multiply("/_histJet3eta", *_histJet3eta, *_histEta3Corr); - datapointsetFactory().destroy(_histEta3Corr); - - /// @todo Histo factory output paths don't work this way - //hf.multiply(histoDir() + "/d04-x01-y01", *_histR23, *_histR23Corr); - //hf.multiply("/_histR23", *_histR23, *_histR23Corr); - datapointsetFactory().destroy(_histR23Corr); - - /// @todo Histo factory output paths don't work this way - //hf.multiply(histoDir() + "/d05-x01-y01", *_histAlpha, *_histAlphaCorr); - //hf.multiply("/_histAlpha", *_histAlpha, *_histAlphaCorr); - datapointsetFactory().destroy(_histAlphaCorr); - - //getLog() << Log::INFO << "Cross-section = " << crossSection()/picobarn << " pb" << endl; - // plots have unit area given error from reading data from plot in paper - // so divide by bin width - normalize(_histJet1Et, 12.5); - normalize(_histJet2Et, 12.5); - normalize(_histJet3eta, 0.2); - normalize(_histR23, 0.125); - normalize(_histAlpha, 4.5); + // Normalize to data + normalize(_histJet1Et, 12.3); + normalize(_histJet2Et, 12.3); + /// @todo These normalisations need to go into the DPS construction *sigh* + // normalize(_histJet3eta, 0.2); + // normalize(_histR23, 0.126); + // normalize(_histAlpha, 4.5); } //@} @@ -314,35 +187,21 @@ private: - /// @name Histogram collections + /// @name Histograms //@{ - // AIDA::IHistogram2D* _histHvsDphi; - // AIDA::IHistogram2D* _histRvsAlpha; + AIDA::IHistogram1D* _histJet1Et; AIDA::IHistogram1D* _histJet2Et; - AIDA::IHistogram1D* _histR23; - AIDA::IHistogram1D* _histJet3eta; - AIDA::IHistogram1D* _histAlpha; - - AIDA::IHistogram1D* _histAlphaIdeal; - AIDA::IHistogram1D* _histAlphaCDF; - AIDA::IHistogram1D* _histR23Ideal; - AIDA::IHistogram1D* _histR23CDF; - AIDA::IHistogram1D* _histJet3etaIdeal; - AIDA::IHistogram1D* _histJet3etaCDF; - - //AIDA::IHistogram1D* _histEta3Corr; - AIDA::IDataPointSet* _histEta3Corr; - //AIDA::IHistogram1D* _histR23Corr; - AIDA::IDataPointSet* _histR23Corr; - //AIDA::IHistogram1D* _histAlphaCorr; - AIDA::IDataPointSet* _histAlphaCorr; - //@} - /// @name jet MET variables - double _Et_sinphi_sum; - double _Et_cosphi_sum; - double _Et_sum; + AIDA::IDataPointSet* _histR23; + AIDA::IDataPointSet* _histJet3eta; + AIDA::IDataPointSet* _histAlpha; + + LWH::IHistogram1D* _tmphistR23; + LWH::IHistogram1D* _tmphistJet3eta; + LWH::IHistogram1D* _tmphistAlpha; + + //@} };
More information about the Rivet-svn mailing list |