|
|
[Rivet-svn] r3210 - in branches/2011-07-aida2yoda/src: Analyses Core
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Tue Jul 19 16:26:29 BST 2011
Author: dgrell
Date: Tue Jul 19 16:26:29 2011
New Revision: 3210
Log:
partial scatter2D conversion
Modified:
branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9002537.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.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/D0_2001_S4674421.cc
branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc
branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc
branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc
branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc
branches/2011-07-aida2yoda/src/Analyses/UA5_1988_S1867512.cc
branches/2011-07-aida2yoda/src/Core/Analysis.cc
Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -100,12 +100,12 @@
}
// Durham n-jet fractions
- _h_R_Durham[0] = bookDataPointSet(offset+187, 1, 1); // R1 d187 ... d194
- _h_R_Durham[1] = bookDataPointSet(offset+195, 1, 1); // R2 d195 ... d202
- _h_R_Durham[2] = bookDataPointSet(offset+203, 1, 1); // R3 d203 ... d210
- _h_R_Durham[3] = bookDataPointSet(offset+211, 1, 1); // R4 d211 ... d218
- _h_R_Durham[4] = bookDataPointSet(offset+219, 1, 1); // R5 d219 ... d226
- _h_R_Durham[5] = bookDataPointSet(offset+227, 1, 1); // R>=6 d227 ... d234
+ _h_R_Durham[0] = bookScatter2D(offset+187, 1, 1); // R1 d187 ... d194
+ _h_R_Durham[1] = bookScatter2D(offset+195, 1, 1); // R2 d195 ... d202
+ _h_R_Durham[2] = bookScatter2D(offset+203, 1, 1); // R3 d203 ... d210
+ _h_R_Durham[3] = bookScatter2D(offset+211, 1, 1); // R4 d211 ... d218
+ _h_R_Durham[4] = bookScatter2D(offset+219, 1, 1); // R5 d219 ... d226
+ _h_R_Durham[5] = bookScatter2D(offset+227, 1, 1); // R>=6 d227 ... d234
}
// offset for the charged particle distributions
offset = 0;
@@ -270,7 +270,7 @@
}
const double avgNumParts = _weightedTotalChargedPartNum / sumOfWeights();
- AIDA::IDataPointSet * mult = bookDataPointSet(1, 1, 1);
+ AIDA::IDataPointSet * mult = bookScatter2D(1, 1, 1);
for (int i = 0; i < mult->size(); ++i) {
if (fuzzyEquals(sqrtS(), mult->point(i)->coordinate(0)->value(), 0.01)) {
mult->point(i)->coordinate(1)->setValue(avgNumParts);
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -78,8 +78,8 @@
_hist_ptsum_transverse_500[i] = new LWH::Profile1D(binEdges(3+isqrts, 1, 1));
}
// Then the data point sets into which the results will be inserted
- _dps_sdnch_transverse_500 = bookDataPointSet(5+isqrts, 1, 1);
- _dps_sdptsum_transverse_500 = bookDataPointSet(7+isqrts, 1, 1);
+ _dps_sdnch_transverse_500 = bookScatter2D(5+isqrts, 1, 1);
+ _dps_sdptsum_transverse_500 = bookScatter2D(7+isqrts, 1, 1);
// <pT> profiles, 500 MeV track pT cut
_hist_ptavg_transverse_500 = bookProfile1D(9+isqrts, 1, 1);
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9002537.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9002537.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9002537.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -30,7 +30,7 @@
_h_plus = bookHisto1D("_h_plus", binEdges(1,1,1));
_h_minus = bookHisto1D("_h_minus", binEdges(1,1,1));
- _h_asym = bookDataPointSet(1,1,1);
+ _h_asym = bookScatter2D(1,1,1);
}
void analyze(const Event& event) {
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -38,9 +38,9 @@
// Output histograms
_histJet1Et = bookHisto1D(1,1,1);
_histJet2Et = bookHisto1D(2,1,1);
- _histJet3eta = bookDataPointSet(3,1,1);
- _histR23 = bookDataPointSet(4,1,1);
- _histAlpha = bookDataPointSet(5,1,1);
+ _histJet3eta = bookScatter2D(3,1,1);
+ _histR23 = bookScatter2D(4,1,1);
+ _histAlpha = bookScatter2D(5,1,1);
// Temporary histos: these are the ones we actually fill for the plots which require correction
_tmphistJet3eta.reset(new LWH::Histogram1D(binEdges(3,1,1)));
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -42,7 +42,7 @@
_h_chi.addHistogram(517.0, 625.0, bookHisto1D(1, 1, 4));
_h_chi.addHistogram(625.0, 1800.0, bookHisto1D(1, 1, 5));
- _h_ratio = bookDataPointSet(2,1,1,"","","");
+ _h_ratio = bookScatter2D(2,1,1,"","","");
_chi_above_25.resize(_h_ratio->size());
_chi_below_25.resize(_h_ratio->size());
}
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -53,7 +53,7 @@
}
// Final histo
- _profhistPsi_vs_pT = bookDataPointSet(13, 1, 1);
+ _profhistPsi_vs_pT = bookScatter2D(13, 1, 1);
}
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -59,7 +59,7 @@
// Book histograms
for (int i = 0 ; i < 4 ; ++i) {
_histJetEt[i] = bookHisto1D(i+1, 1, 1);
- _histJetMultRatio[i] = bookDataPointSet(5 , 1, i+1);
+ _histJetMultRatio[i] = bookScatter2D(5 , 1, i+1);
_histJetMult[i] = bookHisto1D(i+6, 1, 1);
}
_histJetMultNorm = bookHisto1D("norm", 1, _xpoint, _xpoint+1.);
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -42,7 +42,7 @@
addProjection(jsp, pname);
_h_Psi_pT[i] = bookProfile1D(i+1, 2, 1);
}
- _h_OneMinusPsi_vs_pT = bookDataPointSet(5, 1, 1);
+ _h_OneMinusPsi_vs_pT = bookScatter2D(5, 1, 1);
}
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -59,7 +59,7 @@
// Histograms
_h_dsigdpt_w = bookHisto1D(1, 1, 1);
_h_dsigdpt_z = bookHisto1D(1, 1, 2);
- _h_dsigdpt_scaled_z = bookDataPointSet(2, 1, 1);
+ _h_dsigdpt_scaled_z = bookScatter2D(2, 1, 1);
}
Modified: branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -47,8 +47,8 @@
default: break;
}
for (size_t i = 0; i < 5; ++i) {
- _h_R_Jade[i] = bookDataPointSet(offset, 1, i+1);
- _h_R_Durham[i] = bookDataPointSet(offset+9, 1, i+1);
+ _h_R_Jade[i] = bookScatter2D(offset, 1, i+1);
+ _h_R_Durham[i] = bookScatter2D(offset+9, 1, i+1);
if (i < 4) _h_y_Durham[i] = bookHisto1D(offset+17, 1, i+1);
}
}
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_XS.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -31,7 +31,7 @@
/// Book histograms and initialise projections before the run
void init() {
- _h_XS = bookDataPointSet("XS", 1, 0.0, 1.0);
+ _h_XS = bookScatter2D("XS", 1, 0.0, 1.0);
_mc_xs=_mc_error=0.;
}
Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/OPAL_1993_S2692198.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -152,11 +152,11 @@
// addProjection(ChargedFinalState(), "CFS");
// Book data sets
- _nPhotonJade = bookDataPointSet(1, 1, 1);
- _nPhotonDurham = bookDataPointSet(2, 1, 1);
+ _nPhotonJade = bookScatter2D(1, 1, 1);
+ _nPhotonDurham = bookScatter2D(2, 1, 1);
for(unsigned int ix=0;ix<4;++ix) {
- _nPhotonJetJade [ix] = bookDataPointSet(3 , 1, 1+ix);
- _nPhotonJetDurham[ix] = bookDataPointSet(4 , 1, 1+ix);
+ _nPhotonJetJade [ix] = bookScatter2D(3 , 1, 1+ix);
+ _nPhotonJetDurham[ix] = bookScatter2D(4 , 1, 1+ix);
}
}
Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -45,7 +45,7 @@
_h_pT_ximinus = bookHisto1D(1, 6, 1);
_h_pT_xiplus = bookHisto1D(1, 7, 1);
//_h_pT_omega = bookHisto1D(1, 8, 1);
- _h_antibaryon_baryon_ratio = bookDataPointSet(2, 1, 1);
+ _h_antibaryon_baryon_ratio = bookScatter2D(2, 1, 1);
_h_pT_vs_mass = bookProfile1D(3, 1, 1);
}
Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1988_S1867512.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/UA5_1988_S1867512.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Analyses/UA5_1988_S1867512.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -53,14 +53,14 @@
// Histogram booking, we have sqrt(s) = 200, 546 and 900 GeV
// TODO use DataPointSet to be able to output errors
if (fuzzyEquals(sqrtS()/GeV, 200.0, 1E-4)) {
- _hist_correl = bookDataPointSet(2, 1, 1);
- _hist_correl_asym = bookDataPointSet(3, 1, 1);
+ _hist_correl = bookScatter2D(2, 1, 1);
+ _hist_correl_asym = bookScatter2D(3, 1, 1);
} else if (fuzzyEquals(sqrtS()/GeV, 546.0, 1E-4)) {
- _hist_correl = bookDataPointSet(2, 1, 2);
- _hist_correl_asym = bookDataPointSet(3, 1, 2);
+ _hist_correl = bookScatter2D(2, 1, 2);
+ _hist_correl_asym = bookScatter2D(3, 1, 2);
} else if (fuzzyEquals(sqrtS()/GeV, 900.0, 1E-4)) {
- _hist_correl = bookDataPointSet(2, 1, 3);
- _hist_correl_asym = bookDataPointSet(3, 1, 3);
+ _hist_correl = bookScatter2D(2, 1, 3);
+ _hist_correl_asym = bookScatter2D(3, 1, 3);
}
}
Modified: branches/2011-07-aida2yoda/src/Core/Analysis.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Core/Analysis.cc Tue Jul 19 16:22:39 2011 (r3209)
+++ branches/2011-07-aida2yoda/src/Core/Analysis.cc Tue Jul 19 16:26:29 2011 (r3210)
@@ -427,8 +427,7 @@
double oldintg = 0.0;
int nBins = histo->numBins();
for (int iBin = 0; iBin != nBins; ++iBin) {
- // Leaving out factor of binWidth because AIDA's "height" already includes a width factor.
- oldintg += histo->bin(iBin).area(); // * histo->axis().binWidth(iBin);
+ oldintg += histo->bin(iBin).area();
}
if (oldintg == 0.0) {
MSG_WARNING("Histo " << hpath << " has null integral during normalization");
More information about the Rivet-svn
mailing list
|