|
[Rivet-svn] r4018 - in trunk: . include/Rivet include/Rivet/Math src/Analyses src/Core src/Projections testblackhole at projects.hepforge.org blackhole at projects.hepforge.orgWed Nov 14 19:21:13 GMT 2012
Author: buckley Date: Wed Nov 14 19:21:13 2012 New Revision: 4018 Log: Converting the argument order of logspace, clarifying the arguments, updating affected code, and removing Analysis::logBinEdges. Modified: trunk/ChangeLog trunk/include/Rivet/Analysis.hh trunk/include/Rivet/Math/MathUtils.hh trunk/src/Analyses/MC_DIPHOTON.cc trunk/src/Analyses/MC_HJETS.cc trunk/src/Analyses/MC_JetAnalysis.cc trunk/src/Analyses/MC_PDFS.cc trunk/src/Analyses/MC_PHOTONJETS.cc trunk/src/Analyses/MC_TTBAR.cc trunk/src/Analyses/MC_WJETS.cc trunk/src/Analyses/MC_WPOL.cc trunk/src/Analyses/MC_WWJETS.cc trunk/src/Analyses/MC_ZJETS.cc trunk/src/Analyses/MC_ZZJETS.cc trunk/src/Core/Analysis.cc trunk/src/Projections/JetShape.cc trunk/test/testMath.cc Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/ChangeLog Wed Nov 14 19:21:13 2012 (r4018) @@ -1,7 +1,12 @@ 2012-11-14 Andy Buckley <andy.buckley at cern.ch> + * Converting the argument order of logspace, clarifying the + arguments, updating affected code, and removing Analysis::logBinEdges. + + * Merging updates from the AIDA maintenance branch up to r3974 + * Merging updates from the AIDA maintenance branch up to r4002 - (latest revision for next merges is r4009). + (latest revision for next merges is r4009). 2012-11-11 Andy Buckley <andy.buckley at cern.ch> Modified: trunk/include/Rivet/Analysis.hh ============================================================================== --- trunk/include/Rivet/Analysis.hh Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/include/Rivet/Analysis.hh Wed Nov 14 19:21:13 2012 (r4018) @@ -380,9 +380,6 @@ const YODA::Scatter2D & referenceData(size_t datasetId, size_t xAxisId, size_t yAxisId) const; - /// Get bin edges with logarithmic widths - BinEdges logBinEdges(size_t nbins, double lower, double upper); - /// Book a 1D histogram with @a nbins uniformly distributed across the range @a lower - @a upper . /// (NB. this returns a pointer rather than a reference since it will /// have to be stored in the analysis class - there's no point in forcing users to explicitly Modified: trunk/include/Rivet/Math/MathUtils.hh ============================================================================== --- trunk/include/Rivet/Math/MathUtils.hh Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/include/Rivet/Math/MathUtils.hh Wed Nov 14 19:21:13 2012 (r4018) @@ -208,8 +208,11 @@ /// @name Binning helper functions //@{ - /// Make a list of @a nbins + 1 values equally spaced between @a start and @a end inclusive. - inline vector<double> linspace(double start, double end, size_t nbins) { + /// @brief Make a list of @a nbins + 1 values equally spaced between @a start and @a end inclusive. + /// + /// NB. The arg ordering and the meaning of the nbins variable is "histogram-like", + /// as opposed to the Numpy/Matlab version. + inline vector<double> linspace(size_t nbins, double start, double end) { assert(end >= start); assert(nbins > 0); vector<double> rtn; @@ -224,14 +227,18 @@ } - /// Make a list of @a nbins + 1 values exponentially spaced between @a start and @a end inclusive. - inline vector<double> logspace(double start, double end, size_t nbins) { + /// @brief Make a list of @a nbins + 1 values exponentially spaced between @a start and @a end inclusive. + /// + /// NB. The arg ordering and the meaning of the nbins variable is "histogram-like", + /// as opposed to the Numpy/Matlab version, and the start and end arguments are expressed + /// in "normal" space, rather than as the logarithms of the start/end values as in Numpy/Matlab. + inline vector<double> logspace(size_t nbins, double start, double end) { assert(end >= start); assert(start > 0); assert(nbins > 0); const double logstart = std::log(start); const double logend = std::log(end); - const vector<double> logvals = linspace(logstart, logend, nbins); + const vector<double> logvals = linspace(nbins, logstart, logend); assert(logvals.size() == nbins+1); vector<double> rtn; foreach (double logval, logvals) { Modified: trunk/src/Analyses/MC_DIPHOTON.cc ============================================================================== --- trunk/src/Analyses/MC_DIPHOTON.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_DIPHOTON.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -29,8 +29,8 @@ ifs.acceptId(PHOTON); addProjection(ifs, "IFS"); - _h_m_PP = bookHisto1D("m_PP", logBinEdges(50, 1.0, 0.25*sqrtS())); - _h_pT_PP = bookHisto1D("pT_PP", logBinEdges(50, 1.0, 0.25*sqrtS())); + _h_m_PP = bookHisto1D("m_PP", logspace(50, 1.0, 0.25*sqrtS())); + _h_pT_PP = bookHisto1D("pT_PP", logspace(50, 1.0, 0.25*sqrtS())); _h_pT_P1 = bookHisto1D("pT_P1", 50, 0.0, 70.0); _h_pT_P2 = bookHisto1D("pT_P2", 50, 0.0, 70.0); _h_dphi_PP = bookHisto1D("dphi_PP", 20, 0.0, M_PI); Modified: trunk/src/Analyses/MC_HJETS.cc ============================================================================== --- trunk/src/Analyses/MC_HJETS.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_HJETS.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -30,13 +30,13 @@ addProjection(jetpro, "Jets"); _h_H_mass = bookHisto1D("H_mass", 50, 119.7, 120.3); - _h_H_pT = bookHisto1D("H_pT", logBinEdges(100, 1.0, 0.5*sqrtS())); + _h_H_pT = bookHisto1D("H_pT", logspace(100, 1.0, 0.5*sqrtS())); _h_H_pT_peak = bookHisto1D("H_pT_peak", 25, 0.0, 25.0); _h_H_y = bookHisto1D("H_y", 40, -4.0, 4.0); _h_H_phi = bookHisto1D("H_phi", 25, 0.0, TWOPI); _h_H_jet1_deta = bookHisto1D("H_jet1_deta", 50, -5.0, 5.0); _h_H_jet1_dR = bookHisto1D("H_jet1_dR", 25, 0.5, 7.0); - _h_lepton_pT = bookHisto1D("lepton_pT", logBinEdges(100, 10.0, 0.25*sqrtS())); + _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS())); _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4.0, 4.0); MC_JetAnalysis::init(); Modified: trunk/src/Analyses/MC_JetAnalysis.cc ============================================================================== --- trunk/src/Analyses/MC_JetAnalysis.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_JetAnalysis.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -39,13 +39,13 @@ pTname << "jet_pT_" << i+1; double pTmax = 1.0/(double(i)+2.0) * sqrtS()/GeV/2.0; int nbins_pT = 100/(i+1); - _h_pT_jet[i] = bookHisto1D(pTname.str(), logBinEdges(nbins_pT, 10.0, pTmax)); + _h_pT_jet[i] = bookHisto1D(pTname.str(), logspace(nbins_pT, 10.0, pTmax)); stringstream massname; massname << "jet_mass_" << i+1; double mmax = 100.0; int nbins_m = 100/(i+1); - _h_mass_jet[i] = bookHisto1D(massname.str(), logBinEdges(nbins_m, 1.0, mmax)); + _h_mass_jet[i] = bookHisto1D(massname.str(), logspace(nbins_m, 1.0, mmax)); stringstream etaname; etaname << "jet_eta_" << i+1; @@ -82,7 +82,7 @@ _h_jet_multi_exclusive = bookHisto1D("jet_multi_exclusive", m_njet+3, -0.5, m_njet+3-0.5); _h_jet_multi_inclusive = bookHisto1D("jet_multi_inclusive", m_njet+3, -0.5, m_njet+3-0.5); _h_jet_multi_ratio = bookScatter2D("jet_multi_ratio", m_njet+2, 0.5, m_njet+3-0.5); - _h_jet_HT = bookHisto1D("jet_HT", logBinEdges(50, m_jetptcut, sqrtS()/GeV/2.0)); + _h_jet_HT = bookHisto1D("jet_HT", logspace(50, m_jetptcut, sqrtS()/GeV/2.0)); } Modified: trunk/src/Analyses/MC_PDFS.cc ============================================================================== --- trunk/src/Analyses/MC_PDFS.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_PDFS.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -28,17 +28,16 @@ // addProjection(ChargedFinalState(-5.0, 5.0, 500*MeV), "CFS"); // Histograms - _histPdfX = bookHisto1D("PdfX", logspace(0.000001, 1.0, 50)); - _histPdfXmin = bookHisto1D("PdfXmin", logspace(0.000001, 1.0, 50)); - _histPdfXmax = bookHisto1D("PdfXmax", logspace(0.000001, 1.0, 50)); + _histPdfX = bookHisto1D("PdfX", logspace(50, 0.000001, 1.0)); + _histPdfXmin = bookHisto1D("PdfXmin", logspace(50, 0.000001, 1.0)); + _histPdfXmax = bookHisto1D("PdfXmax", logspace(50, 0.000001, 1.0)); _histPdfQ = bookHisto1D("PdfQ", 50, 0.0, 30.0); - // _histPdfXQ = bookHisto2D("PdfXQ", logspace(0.000001, 1.0, 50), linspace(0.0, 30.0, 50)); - // _histPdfTrackptVsX = bookProfile1D("PdfTrackptVsX", logspace(0.000001, 1.0, 50)); + // _histPdfXQ = bookHisto2D("PdfXQ", logspace(50, 0.000001, 1.0), linspace(50, 0.0, 30.0)); + // _histPdfTrackptVsX = bookProfile1D("PdfTrackptVsX", logspace(50, 0.000001, 1.0)); // _histPdfTrackptVsQ = bookProfile1D("PdfTrackptVsQ", 50, 0.0, 30.0); } - /// Perform the per-event analysis void analyze(const Event& event) { const double weight = event.weight(); Modified: trunk/src/Analyses/MC_PHOTONJETS.cc ============================================================================== --- trunk/src/Analyses/MC_PHOTONJETS.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_PHOTONJETS.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -40,7 +40,7 @@ FastJets jetpro(vfs, FastJets::KT, 0.7); addProjection(jetpro, "Jets"); - _h_photon_pT = bookHisto1D("photon_pT", logBinEdges(50, 30.0, 0.5*sqrtS())); + _h_photon_pT = bookHisto1D("photon_pT", logspace(50, 30.0, 0.5*sqrtS())); _h_photon_pT_lin = bookHisto1D("photon_pT_lin", 50, 0.0, 70.0); _h_photon_y = bookHisto1D("photon_y", 50, -5.0, 5.0); _h_photon_jet1_deta = bookHisto1D("photon_jet1_deta", 50, -5.0, 5.0); Modified: trunk/src/Analyses/MC_TTBAR.cc ============================================================================== --- trunk/src/Analyses/MC_TTBAR.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_TTBAR.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -41,17 +41,17 @@ // Booking of histograms _h_njets = bookHisto1D("jet_mult", 11, -0.5, 10.5); // - _h_jet_1_pT = bookHisto1D("jet_1_pT", logspace(20.0, 500.0, 50)); - _h_jet_2_pT = bookHisto1D("jet_2_pT", logspace(20.0, 400.0, 50)); - _h_jet_3_pT = bookHisto1D("jet_3_pT", logspace(20.0, 300.0, 50)); - _h_jet_4_pT = bookHisto1D("jet_4_pT", logspace(20.0, 200.0, 50)); - _h_jet_HT = bookHisto1D("jet_HT", logspace(100.0, 2000.0, 50)); + _h_jet_1_pT = bookHisto1D("jet_1_pT", logspace(50, 20.0, 500.0)); + _h_jet_2_pT = bookHisto1D("jet_2_pT", logspace(50, 20.0, 400.0)); + _h_jet_3_pT = bookHisto1D("jet_3_pT", logspace(50, 20.0, 300.0)); + _h_jet_4_pT = bookHisto1D("jet_4_pT", logspace(50, 20.0, 200.0)); + _h_jet_HT = bookHisto1D("jet_HT", logspace(50, 100.0, 2000.0)); // - _h_bjet_1_pT = bookHisto1D("jetb_1_pT", logspace(20.0, 400.0, 50)); - _h_bjet_2_pT = bookHisto1D("jetb_2_pT", logspace(20.0, 300.0, 50)); + _h_bjet_1_pT = bookHisto1D("jetb_1_pT", logspace(50, 20.0, 400.0)); + _h_bjet_2_pT = bookHisto1D("jetb_2_pT", logspace(50, 20.0, 300.0)); // - _h_ljet_1_pT = bookHisto1D("jetl_1_pT", logspace(20.0, 400.0, 50)); - _h_ljet_2_pT = bookHisto1D("jetl_2_pT", logspace(20.0, 300.0, 50)); + _h_ljet_1_pT = bookHisto1D("jetl_1_pT", logspace(50, 20.0, 400.0)); + _h_ljet_2_pT = bookHisto1D("jetl_2_pT", logspace(50, 20.0, 300.0)); // _h_W_mass = bookHisto1D("W_mass", 75, 30, 180); _h_t_mass = bookHisto1D("t_mass", 150, 130, 430); Modified: trunk/src/Analyses/MC_WJETS.cc ============================================================================== --- trunk/src/Analyses/MC_WJETS.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_WJETS.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -32,15 +32,15 @@ addProjection(jetpro, "Jets"); _h_W_mass = bookHisto1D("W_mass", 50, 55.0, 105.0); - _h_W_pT = bookHisto1D("W_pT", logBinEdges(100, 1.0, 0.5*sqrtS())); + _h_W_pT = bookHisto1D("W_pT", logspace(100, 1.0, 0.5*sqrtS())); _h_W_pT_peak = bookHisto1D("W_pT_peak", 25, 0.0, 125.0); _h_W_y = bookHisto1D("W_y", 40, -4.0, 4.0); _h_W_phi = bookHisto1D("W_phi", 25, 0.0, TWOPI); _h_W_jet1_deta = bookHisto1D("W_jet1_deta", 50, -5.0, 5.0); _h_W_jet1_dR = bookHisto1D("W_jet1_dR", 25, 0.5, 7.0); - _h_Wplus_pT = bookHisto1D("Wplus_pT", logBinEdges(25, 10.0, 0.5*sqrtS())); - _h_Wminus_pT = bookHisto1D("Wminus_pT", logBinEdges(25, 10.0, 0.5*sqrtS())); - _h_lepton_pT = bookHisto1D("lepton_pT", logBinEdges(100, 10.0, 0.25*sqrtS())); + _h_Wplus_pT = bookHisto1D("Wplus_pT", logspace(25, 10.0, 0.5*sqrtS())); + _h_Wminus_pT = bookHisto1D("Wminus_pT", logspace(25, 10.0, 0.5*sqrtS())); + _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS())); _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4.0, 4.0); _htmp_dsigminus_deta = bookHisto1D("lepton_dsigminus_deta", 20, 0.0, 4.0); _htmp_dsigplus_deta = bookHisto1D("lepton_dsigplus_deta", 20, 0.0, 4.0); Modified: trunk/src/Analyses/MC_WPOL.cc ============================================================================== --- trunk/src/Analyses/MC_WPOL.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_WPOL.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -46,17 +46,17 @@ _h_histos.resize(tags.size()); for (size_t i=0; i<tags.size(); ++i) { _h_dists[i].resize(11,Profile1DPtr()); - _h_dists[i][0] = bookProfile1D("A0"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][1] = bookProfile1D("A1"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][2] = bookProfile1D("A2"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][3] = bookProfile1D("A3"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][4] = bookProfile1D("A4"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][5] = bookProfile1D("A5"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][6] = bookProfile1D("A6"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][7] = bookProfile1D("A7"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][8] = bookProfile1D("fL"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][9] = bookProfile1D("fR"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); - _h_dists[i][10] = bookProfile1D("f0"+tags[i],logBinEdges(100, 1.0, 0.5*sqrtS())); + _h_dists[i][0] = bookProfile1D("A0"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][1] = bookProfile1D("A1"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][2] = bookProfile1D("A2"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][3] = bookProfile1D("A3"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][4] = bookProfile1D("A4"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][5] = bookProfile1D("A5"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][6] = bookProfile1D("A6"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][7] = bookProfile1D("A7"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][8] = bookProfile1D("fL"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][9] = bookProfile1D("fR"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); + _h_dists[i][10] = bookProfile1D("f0"+tags[i],logspace(100, 1.0, 0.5*sqrtS())); _h_histos[i].resize(4,Histo1DPtr()); _h_histos[i][0] = bookHisto1D("thetastar"+tags[i],100,-1.0,1.0); _h_histos[i][1] = bookHisto1D("phistar"+tags[i],90,0.0,360.0); Modified: trunk/src/Analyses/MC_WWJETS.cc ============================================================================== --- trunk/src/Analyses/MC_WWJETS.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_WWJETS.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -42,27 +42,27 @@ addProjection(jetpro, "Jets"); // properties of the pair momentum - _h_WW_pT = bookHisto1D("WW_pT", logBinEdges(100, 1.0, 0.5*sqrtS())); + _h_WW_pT = bookHisto1D("WW_pT", logspace(100, 1.0, 0.5*sqrtS())); _h_WW_pT_peak = bookHisto1D("WW_pT_peak", 25, 0.0, 25.0); _h_WW_eta = bookHisto1D("WW_eta", 40, -7.0, 7.0); _h_WW_phi = bookHisto1D("WW_phi", 25, 0.0, TWOPI); - _h_WW_m = bookHisto1D("WW_m", logBinEdges(100, 150.0, 180.0+0.25*sqrtS())); + _h_WW_m = bookHisto1D("WW_m", logspace(100, 150.0, 180.0+0.25*sqrtS())); // correlations between the WW _h_WW_dphi = bookHisto1D("WW_dphi", 25, 0.0, PI); /// @todo non-linear? _h_WW_deta = bookHisto1D("WW_deta", 25, -7.0, 7.0); _h_WW_dR = bookHisto1D("WW_dR", 25, 0.5, 7.0); - _h_WW_dpT = bookHisto1D("WW_dpT", logBinEdges(100, 1.0, 0.5*sqrtS())); + _h_WW_dpT = bookHisto1D("WW_dpT", logspace(100, 1.0, 0.5*sqrtS())); _h_WW_costheta_planes = bookHisto1D("WW_costheta_planes", 25, -1.0, 1.0); /// @todo fuer WW: missing ET // properties of the W bosons - _h_W_pT = bookHisto1D("W_pT", logBinEdges(100, 10.0, 0.25*sqrtS())); + _h_W_pT = bookHisto1D("W_pT", logspace(100, 10.0, 0.25*sqrtS())); _h_W_eta = bookHisto1D("W_eta", 70, -7.0, 7.0); // properties of the leptons - _h_Wl_pT = bookHisto1D("Wl_pT", logBinEdges(100, 30.0, 0.1 + _h_Wl_pT = bookHisto1D("Wl_pT", logspace(100, 30.0, 0.1 *sqrtS())); _h_Wl_eta = bookHisto1D("Wl_eta", 40, -3.5, 3.5); @@ -78,8 +78,8 @@ _h_We_jet1_dR = bookHisto1D("We_jet1_dR", 25, 0.0, 7.0); // global stuff - _h_HT = bookHisto1D("HT", logBinEdges(100, 100.0, 0.5*sqrtS())); - _h_jets_m_12 = bookHisto1D("jets_m_12", logBinEdges(100, 1.0, 0.25*sqrtS())); + _h_HT = bookHisto1D("HT", logspace(100, 100.0, 0.5*sqrtS())); + _h_jets_m_12 = bookHisto1D("jets_m_12", logspace(100, 1.0, 0.25*sqrtS())); MC_JetAnalysis::init(); } Modified: trunk/src/Analyses/MC_ZJETS.cc ============================================================================== --- trunk/src/Analyses/MC_ZJETS.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_ZJETS.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -30,13 +30,13 @@ addProjection(jetpro, "Jets"); _h_Z_mass = bookHisto1D("Z_mass", 50, 66.0, 116.0); - _h_Z_pT = bookHisto1D("Z_pT", logBinEdges(100, 1.0, 0.5*sqrtS())); + _h_Z_pT = bookHisto1D("Z_pT", logspace(100, 1.0, 0.5*sqrtS())); _h_Z_pT_peak = bookHisto1D("Z_pT_peak", 25, 0.0, 25.0); _h_Z_y = bookHisto1D("Z_y", 40, -4.0, 4.0); _h_Z_phi = bookHisto1D("Z_phi", 25, 0.0, TWOPI); _h_Z_jet1_deta = bookHisto1D("Z_jet1_deta", 50, -5.0, 5.0); _h_Z_jet1_dR = bookHisto1D("Z_jet1_dR", 25, 0.5, 7.0); - _h_lepton_pT = bookHisto1D("lepton_pT", logBinEdges(100, 10.0, 0.25*sqrtS())); + _h_lepton_pT = bookHisto1D("lepton_pT", logspace(100, 10.0, 0.25*sqrtS())); _h_lepton_eta = bookHisto1D("lepton_eta", 40, -4.0, 4.0); MC_JetAnalysis::init(); Modified: trunk/src/Analyses/MC_ZZJETS.cc ============================================================================== --- trunk/src/Analyses/MC_ZZJETS.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Analyses/MC_ZZJETS.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -41,27 +41,27 @@ addProjection(jetpro, "Jets"); // properties of the pair momentum - _h_ZZ_pT = bookHisto1D("ZZ_pT", logBinEdges(100, 1.0, 0.5*sqrtS())); + _h_ZZ_pT = bookHisto1D("ZZ_pT", logspace(100, 1.0, 0.5*sqrtS())); _h_ZZ_pT_peak = bookHisto1D("ZZ_pT_peak", 25, 0.0, 25.0); _h_ZZ_eta = bookHisto1D("ZZ_eta", 40, -7.0, 7.0); _h_ZZ_phi = bookHisto1D("ZZ_phi", 25, 0.0, TWOPI); - _h_ZZ_m = bookHisto1D("ZZ_m", logBinEdges(100, 150.0, 180.0+0.25*sqrtS())); + _h_ZZ_m = bookHisto1D("ZZ_m", logspace(100, 150.0, 180.0+0.25*sqrtS())); // correlations between the ZZ _h_ZZ_dphi = bookHisto1D("ZZ_dphi", 25, 0.0, PI); /// @todo non-linear? _h_ZZ_deta = bookHisto1D("ZZ_deta", 25, -7.0, 7.0); _h_ZZ_dR = bookHisto1D("ZZ_dR", 25, 0.5, 7.0); - _h_ZZ_dpT = bookHisto1D("ZZ_dpT", logBinEdges(100, 1.0, 0.5*sqrtS())); + _h_ZZ_dpT = bookHisto1D("ZZ_dpT", logspace(100, 1.0, 0.5*sqrtS())); _h_ZZ_costheta_planes = bookHisto1D("ZZ_costheta_planes", 25, -1.0, 1.0); /// @todo fuer WW: missing ET // properties of the Z bosons - _h_Z_pT = bookHisto1D("Z_pT", logBinEdges(100, 10.0, 0.25*sqrtS())); + _h_Z_pT = bookHisto1D("Z_pT", logspace(100, 10.0, 0.25*sqrtS())); _h_Z_eta = bookHisto1D("Z_eta", 70, -7.0, 7.0); // properties of the leptons - _h_Zl_pT = bookHisto1D("Zl_pT", logBinEdges(100, 30.0, 0.1 + _h_Zl_pT = bookHisto1D("Zl_pT", logspace(100, 30.0, 0.1 *sqrtS())); _h_Zl_eta = bookHisto1D("Zl_eta", 40, -3.5, 3.5); @@ -77,7 +77,7 @@ _h_Ze_jet1_dR = bookHisto1D("Ze_jet1_dR", 25, 0.0, 7.0); // global stuff - _h_HT = bookHisto1D("HT", logBinEdges(100, 100.0, 0.5*sqrtS())); + _h_HT = bookHisto1D("HT", logspace(100, 100.0, 0.5*sqrtS())); MC_JetAnalysis::init(); } Modified: trunk/src/Core/Analysis.cc ============================================================================== --- trunk/src/Core/Analysis.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Core/Analysis.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -186,22 +186,9 @@ } - BinEdges Analysis::logBinEdges(size_t nbins, double lower, double upper) { - assert(lower>0.0); - assert(upper>lower); - double loglower=log10(lower); - double logupper=log10(upper); - vector<double> binedges; - double stepwidth=(logupper-loglower)/double(nbins); - for (size_t i=0; i<=nbins; ++i) { - binedges.push_back(pow(10.0, loglower+double(i)*stepwidth)); - } - return binedges; - } - Histo1DPtr Analysis::bookHisto1D(size_t datasetId, size_t xAxisId, - size_t yAxisId, const string& title, - const string& xtitle, const string& ytitle) + size_t yAxisId, const string& title, + const string& xtitle, const string& ytitle) { const string axisCode = makeAxisCode(datasetId, xAxisId, yAxisId); return bookHisto1D(axisCode, title, xtitle, ytitle); Modified: trunk/src/Projections/JetShape.cc ============================================================================== --- trunk/src/Projections/JetShape.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/src/Projections/JetShape.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -14,7 +14,7 @@ : _rapscheme(rapscheme) { setName("JetShape"); - _binedges = linspace(rmin, rmax, nbins); + _binedges = linspace(nbins, rmin, rmax); _ptcuts = make_pair(ptmin, ptmax); _rapcuts = make_pair(absrapmin, absrapmax); addProjection(jetalg, "Jets"); Modified: trunk/test/testMath.cc ============================================================================== --- trunk/test/testMath.cc Wed Nov 14 19:08:55 2012 (r4017) +++ trunk/test/testMath.cc Wed Nov 14 19:21:13 2012 (r4018) @@ -21,18 +21,18 @@ //////////// - linspace(0, 10, 50); - logspace(0.000001, 1.0, 50); + linspace(50, 0, 10); + logspace(50, 0.000001, 1.0); -// // These tests are disabled, because they trigger compiler warnings on SL5 -// inRange(1, 0, 2); -// inRange(1, 0.0, 2); -// inRange(1, 0, 2.0); -// inRange(1, 0.0, 2.0); -// inRange(1.0, 0, 2); -// inRange(1.0, 0.0, 2); -// inRange(1.0, 0, 2.0); -// inRange(1.0, 0.0, 2.0); + /// @todo Compiler warnings on SLC5... reinstate + // inRange(1, 0, 2); + // inRange(1, 0.0, 2); + // inRange(1, 0, 2.0); + // inRange(1, 0.0, 2.0); + // inRange(1.0, 0, 2); + // inRange(1.0, 0.0, 2); + // inRange(1.0, 0, 2.0); + // inRange(1.0, 0.0, 2.0); assert(isZero(1e-15)); assert(fuzzyEquals(1e-15, 0.0));
More information about the Rivet-svn mailing list |