|
|
[Rivet-svn] r3204 - in branches/2011-07-aida2yoda: include/Rivet include/Rivet/Analyses include/Rivet/Tools src/Analyses src/Tools
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Tue Jul 19 14:11:03 BST 2011
Author: dgrell
Date: Tue Jul 19 14:11:00 2011
New Revision: 3204
Log:
partial pointer transition
Modified:
branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh
branches/2011-07-aida2yoda/include/Rivet/RivetYODA.hh
branches/2011-07-aida2yoda/include/Rivet/Tools/BinnedHistogram.hh
branches/2011-07-aida2yoda/src/Analyses/ALEPH_1991_S2435284.cc
branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_CONF_2010_049.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8971293.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8983313.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9019561.cc
branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1990_S2089246.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8095620.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2004_S5992206.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8320160.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8821313.cc
branches/2011-07-aida2yoda/src/Analyses/E735_1998_S3905616.cc
branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc
branches/2011-07-aida2yoda/src/Analyses/MC_DIJET.cc
branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc
branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc
branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETUE.cc
branches/2011-07-aida2yoda/src/Analyses/MC_TTBAR.cc
branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc
branches/2011-07-aida2yoda/src/Analyses/OPAL_2004_S6132243.cc
branches/2011-07-aida2yoda/src/Analyses/TASSO_1990_S2148048.cc
branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc
branches/2011-07-aida2yoda/src/Analyses/UA5_1982_S875503.cc
branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc
branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc
branches/2011-07-aida2yoda/src/Analyses/ZEUS_2001_S4815815.cc
branches/2011-07-aida2yoda/src/Tools/BinnedHistogram.cc
Modified: branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh Tue Jul 19 14:11:00 2011 (r3204)
@@ -52,8 +52,8 @@
std::vector<AIDA::IHistogram1D *> _h_rap_jet;
std::vector<shared_ptr<LWH::Histogram1D> > _h_rap_jet_plus, _h_rap_jet_minus;
std::vector<AIDA::IHistogram1D *> _h_mass_jet;
- std::map<std::pair<size_t, size_t>, AIDA::IHistogram1D*> _h_deta_jets;
- std::map<std::pair<size_t, size_t>, AIDA::IHistogram1D*> _h_dR_jets;
+ std::map<std::pair<size_t, size_t>, Histo1DPtr> _h_deta_jets;
+ std::map<std::pair<size_t, size_t>, Histo1DPtr> _h_dR_jets;
AIDA::IHistogram1D * _h_jet_multi_exclusive;
AIDA::IHistogram1D * _h_jet_multi_inclusive;
AIDA::IDataPointSet * _h_jet_multi_ratio;
Modified: branches/2011-07-aida2yoda/include/Rivet/RivetYODA.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/RivetYODA.hh Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/include/Rivet/RivetYODA.hh Tue Jul 19 14:11:00 2011 (r3204)
@@ -30,7 +30,7 @@
string getDatafilePath(string papername);
// /// Return the integral over the histogram bins
- // inline double integral(AIDA::IHistogram1D* histo) {
+ // inline double integral(Histo1DPtr histo) {
// double intg = 0.;
// for ( int i = 0; i < histo->axis().bins(); ++i ) {
// // Don't multiply with binWidth -- it's already included in binHeight
Modified: branches/2011-07-aida2yoda/include/Rivet/Tools/BinnedHistogram.hh
==============================================================================
--- branches/2011-07-aida2yoda/include/Rivet/Tools/BinnedHistogram.hh Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/include/Rivet/Tools/BinnedHistogram.hh Tue Jul 19 14:11:00 2011 (r3204)
@@ -27,11 +27,11 @@
/// set of BinnedHistograms.
const BinnedHistogram<T>& addHistogram(const T& binMin,
const T& binMax,
- AIDA::IHistogram1D* histo);
+ Histo1DPtr histo);
/// Fill the histogram that lies in the same region as @a bin with the value
/// @a val of weight @a weight.
- AIDA::IHistogram1D* fill(const T& bin,
+ Histo1DPtr fill(const T& bin,
const T& val,
double weight);
@@ -39,16 +39,16 @@
/// scale/binWidth
void scale(const T& scale, Analysis* ana);
- const vector<AIDA::IHistogram1D*>& getHistograms() const { return _histos; }
- vector<AIDA::IHistogram1D*>& getHistograms() { return _histos; }
+ const vector<Histo1DPtr>& getHistograms() const { return _histos; }
+ vector<Histo1DPtr>& getHistograms() { return _histos; }
private:
- map<T, AIDA::IHistogram1D*> _histosByUpperBound;
- map<T, AIDA::IHistogram1D*> _histosByLowerBound;
- vector<AIDA::IHistogram1D*> _histos;
- map<AIDA::IHistogram1D*, T> _binWidths;
+ map<T, Histo1DPtr> _histosByUpperBound;
+ map<T, Histo1DPtr> _histosByLowerBound;
+ vector<Histo1DPtr> _histos;
+ map<Histo1DPtr, T> _binWidths;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_1991_S2435284.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ALEPH_1991_S2435284.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_1991_S2435284.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -54,7 +54,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _histChTot;
+ Histo1DPtr _histChTot;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -87,7 +87,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _h_pT;
+ Histo1DPtr _h_pT;
AIDA::IProfile1D* _h_pT_Nch_015 ;
AIDA::IProfile1D* _h_pT_Nch_05 ;
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_CONF_2010_049.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_CONF_2010_049.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_CONF_2010_049.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -108,11 +108,11 @@
private:
- AIDA::IHistogram1D* _h_xsec[2];
- AIDA::IHistogram1D* _h_frag_04_06[2];
- AIDA::IHistogram1D* _h_frag_06_10[2];
- AIDA::IHistogram1D* _h_frag_10_15[2];
- AIDA::IHistogram1D* _h_frag_15_24[2];
+ Histo1DPtr _h_xsec[2];
+ Histo1DPtr _h_frag_04_06[2];
+ Histo1DPtr _h_frag_06_10[2];
+ Histo1DPtr _h_frag_10_15[2];
+ Histo1DPtr _h_frag_15_24[2];
double _njets_04_06[2];
double _njets_06_10[2];
double _njets_10_15[2];
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -60,9 +60,9 @@
private:
- AIDA::IHistogram1D* _h_dNch_deta;
- AIDA::IHistogram1D* _h_dNch_dpT;
- AIDA::IHistogram1D* _h_dNevt_dNch;
+ Histo1DPtr _h_dNch_deta;
+ Histo1DPtr _h_dNch_dpT;
+ Histo1DPtr _h_dNevt_dNch;
AIDA::IProfile1D* _p_meanpT_Nch;
double _Nevt_after_cuts;
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -14,8 +14,8 @@
/// Helper for collectively filling Nch, pT, eta, and pT vs. Nch histograms
void fillPtEtaNch(const ChargedFinalState& cfs, int nchcut, double weight,
- AIDA::IHistogram1D* h_nch, AIDA::IHistogram1D* h_pt,
- AIDA::IHistogram1D* h_eta, AIDA::IProfile1D* h_ptnch = 0) {
+ Histo1DPtr h_nch, Histo1DPtr h_pt,
+ Histo1DPtr h_eta, AIDA::IProfile1D* h_ptnch = 0) {
// Get number of particles and skip if event fails cut
const int nch = cfs.size();
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_CONF_2011_090.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -354,16 +354,16 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _count_e_channel;
- AIDA::IHistogram1D* _count_mu_channel;
+ Histo1DPtr _count_e_channel;
+ Histo1DPtr _count_mu_channel;
- AIDA::IHistogram1D* _hist_eTmiss_e;
- AIDA::IHistogram1D* _hist_eTmiss_mu;
+ Histo1DPtr _hist_eTmiss_e;
+ Histo1DPtr _hist_eTmiss_mu;
- AIDA::IHistogram1D* _hist_m_eff_e;
- AIDA::IHistogram1D* _hist_m_eff_mu;
- AIDA::IHistogram1D* _hist_m_eff_e_final;
- AIDA::IHistogram1D* _hist_m_eff_mu_final;
+ Histo1DPtr _hist_m_eff_e;
+ Histo1DPtr _hist_m_eff_mu;
+ Histo1DPtr _hist_m_eff_e_final;
+ Histo1DPtr _hist_m_eff_mu_final;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8971293.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8971293.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8971293.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -70,7 +70,7 @@
/// Normalise histograms etc., after the run
void finalize() {
- foreach (AIDA::IHistogram1D* hist, _h_deltaPhi.getHistograms()) {
+ foreach (Histo1DPtr hist, _h_deltaPhi.getHistograms()) {
normalize(hist, 1/M_PI);
}
}
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8983313.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8983313.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8983313.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -313,14 +313,14 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _count_A;
- AIDA::IHistogram1D* _count_B;
- AIDA::IHistogram1D* _count_C;
- AIDA::IHistogram1D* _count_D;
- AIDA::IHistogram1D* _hist_meff_A;
- AIDA::IHistogram1D* _hist_mT2_B;
- AIDA::IHistogram1D* _hist_meff_CD;
- AIDA::IHistogram1D* _hist_eTmiss;
+ Histo1DPtr _count_A;
+ Histo1DPtr _count_B;
+ Histo1DPtr _count_C;
+ Histo1DPtr _count_D;
+ Histo1DPtr _hist_meff_A;
+ Histo1DPtr _hist_mT2_B;
+ Histo1DPtr _hist_meff_CD;
+ Histo1DPtr _hist_eTmiss;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9019561.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9019561.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9019561.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -316,14 +316,14 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _count_OS_e_mu;
- AIDA::IHistogram1D* _count_OS_e_e;
- AIDA::IHistogram1D* _count_OS_mu_mu;
- AIDA::IHistogram1D* _count_SS_e_mu;
- AIDA::IHistogram1D* _count_SS_e_e;
- AIDA::IHistogram1D* _count_SS_mu_mu;
- AIDA::IHistogram1D* _hist_eTmiss_OS;
- AIDA::IHistogram1D* _hist_eTmiss_SS;
+ Histo1DPtr _count_OS_e_mu;
+ Histo1DPtr _count_OS_e_e;
+ Histo1DPtr _count_OS_mu_mu;
+ Histo1DPtr _count_SS_e_mu;
+ Histo1DPtr _count_SS_e_e;
+ Histo1DPtr _count_SS_mu_mu;
+ Histo1DPtr _hist_eTmiss_OS;
+ Histo1DPtr _hist_eTmiss_SS;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/BELLE_2006_S6265367.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -197,22 +197,22 @@
//@{
/// Histograms
// histograms for continuum data (sqrt(s) = 10.52 GeV)
- AIDA::IHistogram1D* _histXpDstarplus2D0_C;
- AIDA::IHistogram1D* _histXpD0_C;
- AIDA::IHistogram1D* _histXpDplus_C;
- AIDA::IHistogram1D* _histXpDplus_s_C;
- AIDA::IHistogram1D* _histXpLambda_c_C;
- AIDA::IHistogram1D* _histXpDstarplus2Dplus_C;
- AIDA::IHistogram1D* _histXpDstar0_C;
+ Histo1DPtr _histXpDstarplus2D0_C;
+ Histo1DPtr _histXpD0_C;
+ Histo1DPtr _histXpDplus_C;
+ Histo1DPtr _histXpDplus_s_C;
+ Histo1DPtr _histXpLambda_c_C;
+ Histo1DPtr _histXpDstarplus2Dplus_C;
+ Histo1DPtr _histXpDstar0_C;
// histograms for on-resonance data (sqrt(s) = 10.58 GeV)
- AIDA::IHistogram1D* _histXpDstarplus2D0_R;
- AIDA::IHistogram1D* _histXpD0_R;
- AIDA::IHistogram1D* _histXpDplus_R;
- AIDA::IHistogram1D* _histXpDplus_s_R;
- AIDA::IHistogram1D* _histXpLambda_c_R;
- AIDA::IHistogram1D* _histXpDstarplus2Dplus_R;
- AIDA::IHistogram1D* _histXpDstar0_R;
+ Histo1DPtr _histXpDstarplus2D0_R;
+ Histo1DPtr _histXpD0_R;
+ Histo1DPtr _histXpDplus_R;
+ Histo1DPtr _histXpDplus_s_R;
+ Histo1DPtr _histXpLambda_c_R;
+ Histo1DPtr _histXpDstarplus2Dplus_R;
+ Histo1DPtr _histXpDstar0_R;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1988_S1865951.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -75,7 +75,7 @@
/// @name Histos
//@{
- AIDA::IHistogram1D* _hist_pt;
+ Histo1DPtr _hist_pt;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1990_S2089246.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1990_S2089246.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1990_S2089246.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -75,7 +75,7 @@
/// @name Histogram collections
//@{
- AIDA::IHistogram1D* _hist_eta;
+ Histo1DPtr _hist_eta;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3418421.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -89,7 +89,7 @@
/// Normalise histograms etc., after the run
void finalize() {
- foreach (AIDA::IHistogram1D* hist, _h_chi.getHistograms()) {
+ foreach (Histo1DPtr hist, _h_chi.getHistograms()) {
normalize(hist);
}
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -114,7 +114,7 @@
/// @name Histos
//@{
- AIDA::IHistogram1D* _hist_multiplicity;
+ Histo1DPtr _hist_multiplicity;
AIDA::IProfile1D* _hist_pt_vs_multiplicity;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6080774.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -93,9 +93,9 @@
/// @name Histograms
//@{
- std::vector<AIDA::IHistogram1D*> _h_m_PP;
- std::vector<AIDA::IHistogram1D*> _h_pT_PP;
- std::vector<AIDA::IHistogram1D*> _h_dphi_PP;
+ std::vector<Histo1DPtr> _h_m_PP;
+ std::vector<Histo1DPtr> _h_pT_PP;
+ std::vector<Histo1DPtr> _h_dphi_PP;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6653332.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -176,9 +176,9 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _sigmaBJet;
- AIDA::IHistogram1D* _ratioBJetToZ;
- AIDA::IHistogram1D* _ratioBJetToJet;
+ Histo1DPtr _sigmaBJet;
+ Histo1DPtr _ratioBJetToZ;
+ Histo1DPtr _ratioBJetToJet;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2007_S7057202.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -74,10 +74,10 @@
BinnedHistogram<double> _binnedHistosD07;
// Single histogram for the \f$R=0.5\f$ \f$k_\perp\f$ jets
- AIDA::IHistogram1D* _histoD05;
+ Histo1DPtr _histoD05;
// Single histogram for the \f$R=1.0\f$ \f$k_\perp\f$ jets
- AIDA::IHistogram1D* _histoD10;
+ Histo1DPtr _histoD10;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7541902.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -193,10 +193,10 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _histJetEt[4];
- AIDA::IHistogram1D* _histJetMultNorm;
+ Histo1DPtr _histJetEt[4];
+ Histo1DPtr _histJetMultNorm;
AIDA::IDataPointSet* _histJetMultRatio[4];
- AIDA::IHistogram1D* _histJetMult[4];
+ Histo1DPtr _histJetMult[4];
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8093652.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -65,7 +65,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _h_m_dijet;
+ Histo1DPtr _h_m_dijet;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8095620.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8095620.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S8095620.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -171,12 +171,12 @@
//@{
/// Histograms
- AIDA::IHistogram1D* _dStot;
- AIDA::IHistogram1D* _dSdET;
- AIDA::IHistogram1D* _dSdETA;
- AIDA::IHistogram1D* _dSdNJet;
- AIDA::IHistogram1D* _dSdNbJet;
- AIDA::IHistogram1D* _dSdZpT;
+ Histo1DPtr _dStot;
+ Histo1DPtr _dSdET;
+ Histo1DPtr _dSdETA;
+ Histo1DPtr _dSdNJet;
+ Histo1DPtr _dSdNbJet;
+ Histo1DPtr _dSdZpT;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2001_S4674421.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -176,8 +176,8 @@
//@{
/// Histograms
- AIDA::IHistogram1D* _h_dsigdpt_w;
- AIDA::IHistogram1D* _h_dsigdpt_z;
+ Histo1DPtr _h_dsigdpt_w;
+ Histo1DPtr _h_dsigdpt_z;
AIDA::IDataPointSet* _h_dsigdpt_scaled_z;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2004_S5992206.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2004_S5992206.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2004_S5992206.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -125,10 +125,10 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _histJetAzimuth_pTmax75_100;
- AIDA::IHistogram1D* _histJetAzimuth_pTmax100_130;
- AIDA::IHistogram1D* _histJetAzimuth_pTmax130_180;
- AIDA::IHistogram1D* _histJetAzimuth_pTmax180_;
+ Histo1DPtr _histJetAzimuth_pTmax75_100;
+ Histo1DPtr _histJetAzimuth_pTmax100_130;
+ Histo1DPtr _histJetAzimuth_pTmax130_180;
+ Histo1DPtr _histJetAzimuth_pTmax180_;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2006_S6438750.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -93,7 +93,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _h_pTgamma;
+ Histo1DPtr _h_pTgamma;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7662670.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -112,12 +112,12 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _h_dsigdptdy_y00_04;
- AIDA::IHistogram1D* _h_dsigdptdy_y04_08;
- AIDA::IHistogram1D* _h_dsigdptdy_y08_12;
- AIDA::IHistogram1D* _h_dsigdptdy_y12_16;
- AIDA::IHistogram1D* _h_dsigdptdy_y16_20;
- AIDA::IHistogram1D* _h_dsigdptdy_y20_24;
+ Histo1DPtr _h_dsigdptdy_y00_04;
+ Histo1DPtr _h_dsigdptdy_y04_08;
+ Histo1DPtr _h_dsigdptdy_y08_12;
+ Histo1DPtr _h_dsigdptdy_y12_16;
+ Histo1DPtr _h_dsigdptdy_y16_20;
+ Histo1DPtr _h_dsigdptdy_y20_24;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7719523.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -174,10 +174,10 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _h_central_same_cross_section;
- AIDA::IHistogram1D* _h_central_opp_cross_section;
- AIDA::IHistogram1D* _h_forward_same_cross_section;
- AIDA::IHistogram1D* _h_forward_opp_cross_section;
+ Histo1DPtr _h_central_same_cross_section;
+ Histo1DPtr _h_central_opp_cross_section;
+ Histo1DPtr _h_forward_same_cross_section;
+ Histo1DPtr _h_forward_opp_cross_section;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8320160.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8320160.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8320160.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -72,7 +72,7 @@
/// Finalize
void finalize() {
- foreach (AIDA::IHistogram1D* hist, _h_chi_dijet.getHistograms()) {
+ foreach (Histo1DPtr hist, _h_chi_dijet.getHistograms()) {
normalize(hist);
}
}
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8821313.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8821313.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8821313.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -94,10 +94,10 @@
/// Normalise histograms etc., after the run
void finalize() {
- foreach (AIDA::IHistogram1D* hist, _h_phistar_ee.getHistograms()) {
+ foreach (Histo1DPtr hist, _h_phistar_ee.getHistograms()) {
normalize(hist, 1.0);
}
- foreach (AIDA::IHistogram1D* hist, _h_phistar_mm.getHistograms()) {
+ foreach (Histo1DPtr hist, _h_phistar_mm.getHistograms()) {
normalize(hist, 1.0);
}
}
Modified: branches/2011-07-aida2yoda/src/Analyses/E735_1998_S3905616.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/E735_1998_S3905616.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/E735_1998_S3905616.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -65,7 +65,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _hist_multiplicity;
+ Histo1DPtr _hist_multiplicity;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -133,7 +133,7 @@
static const double _xmin, _xmax;
/// Histograms for the \f$ E_T \f$ flows
- vector<AIDA::IHistogram1D*> _hEtFlow, _hEtFlowStat;
+ vector<Histo1DPtr> _hEtFlow, _hEtFlowStat;
/// Histograms for averages in different kinematical bins.
AIDA::IHistogram1D *_hAvEt, *_hAvX, *_hAvQ2, *_hN;
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_DIJET.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_DIJET.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_DIJET.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -95,20 +95,20 @@
private:
- AIDA::IHistogram1D* _hist_jetcount;
- AIDA::IHistogram1D* _hist_jetpt;
- AIDA::IHistogram1D* _hist_jetptlog;
- AIDA::IHistogram1D* _hist_leadingjetpt;
- AIDA::IHistogram1D* _hist_secondleadingjetpt;
- AIDA::IHistogram1D* _hist_jetphi;
- AIDA::IHistogram1D* _hist_jetdphi;
- AIDA::IHistogram1D* _hist_jeteta;
- AIDA::IHistogram1D* _hist_jetdeta;
- AIDA::IHistogram1D* _hist_chargemultiplicity;
- AIDA::IHistogram1D* _hist_chargemeanpt;
- AIDA::IHistogram1D* _hist_chargept;
- AIDA::IHistogram1D* _hist_chargelogpt;
- AIDA::IHistogram1D* _hist_chargermspt;
+ Histo1DPtr _hist_jetcount;
+ Histo1DPtr _hist_jetpt;
+ Histo1DPtr _hist_jetptlog;
+ Histo1DPtr _hist_leadingjetpt;
+ Histo1DPtr _hist_secondleadingjetpt;
+ Histo1DPtr _hist_jetphi;
+ Histo1DPtr _hist_jetdphi;
+ Histo1DPtr _hist_jeteta;
+ Histo1DPtr _hist_jetdeta;
+ Histo1DPtr _hist_chargemultiplicity;
+ Histo1DPtr _hist_chargemeanpt;
+ Histo1DPtr _hist_chargept;
+ Histo1DPtr _hist_chargelogpt;
+ Histo1DPtr _hist_chargermspt;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_DIPHOTON.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -86,9 +86,9 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _h_m_PP;
- AIDA::IHistogram1D* _h_pT_PP;
- AIDA::IHistogram1D* _h_dphi_PP;
+ Histo1DPtr _h_m_PP;
+ Histo1DPtr _h_pT_PP;
+ Histo1DPtr _h_dphi_PP;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_JetAnalysis.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -212,7 +212,7 @@
}
// Scale the d{eta,R} histograms
- map<pair<size_t, size_t>, AIDA::IHistogram1D*>::iterator it;
+ map<pair<size_t, size_t>, Histo1DPtr>::iterator it;
for (it = _h_deta_jets.begin(); it != _h_deta_jets.end(); ++it) {
scale(it->second, crossSection()/sumOfWeights());
}
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETUE.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETUE.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETUE.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -239,8 +239,8 @@
private:
- AIDA::IHistogram1D* _hist_jetgamma_dR;
- AIDA::IHistogram1D* _hist_jetgamma_dphi;
+ Histo1DPtr _hist_jetgamma_dR;
+ Histo1DPtr _hist_jetgamma_dphi;
AIDA::IProfile1D *_hist_pnchg_jet, *_hist_pnchg_gamma;
AIDA::IProfile1D *_hist_pmaxnchg_jet, *_hist_pmaxnchg_gamma;
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_TTBAR.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_TTBAR.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_TTBAR.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -73,9 +73,9 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _hist_nch_eta;
- AIDA::IHistogram1D* _hist_nch_pt;
- AIDA::IHistogram1D* _hist_nch_phi;
+ Histo1DPtr _hist_nch_eta;
+ Histo1DPtr _hist_nch_pt;
+ Histo1DPtr _hist_nch_phi;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -129,7 +129,7 @@
void finalize() {
for (size_t i=0; i<_h_histos.size(); ++i) {
- foreach (AIDA::IHistogram1D* histo, _h_histos[i]) {
+ foreach (Histo1DPtr histo, _h_histos[i]) {
scale(histo, crossSectionPerEvent());
}
}
@@ -145,7 +145,7 @@
//@{
std::vector<std::vector<AIDA::IProfile1D*> > _h_dists;
- std::vector<std::vector<AIDA::IHistogram1D*> > _h_histos;
+ std::vector<std::vector<Histo1DPtr> > _h_histos;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_2004_S6132243.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/OPAL_2004_S6132243.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/OPAL_2004_S6132243.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -223,36 +223,36 @@
/// @name Event shape histos at 4 energies
//@{
- AIDA::IHistogram1D* _hist1MinusT[4];
- AIDA::IHistogram1D* _histHemiMassH[4];
- AIDA::IHistogram1D* _histCParam[4];
- AIDA::IHistogram1D* _histHemiBroadT[4];
- AIDA::IHistogram1D* _histHemiBroadW[4];
- AIDA::IHistogram1D* _histY23Durham[4];
- AIDA::IHistogram1D* _histTMajor[4];
- AIDA::IHistogram1D* _histTMinor[4];
- AIDA::IHistogram1D* _histAplanarity[4];
- AIDA::IHistogram1D* _histSphericity[4];
- AIDA::IHistogram1D* _histOblateness[4];
- AIDA::IHistogram1D* _histHemiMassL[4];
- AIDA::IHistogram1D* _histHemiBroadN[4];
- AIDA::IHistogram1D* _histDParam[4];
+ Histo1DPtr _hist1MinusT[4];
+ Histo1DPtr _histHemiMassH[4];
+ Histo1DPtr _histCParam[4];
+ Histo1DPtr _histHemiBroadT[4];
+ Histo1DPtr _histHemiBroadW[4];
+ Histo1DPtr _histY23Durham[4];
+ Histo1DPtr _histTMajor[4];
+ Histo1DPtr _histTMinor[4];
+ Histo1DPtr _histAplanarity[4];
+ Histo1DPtr _histSphericity[4];
+ Histo1DPtr _histOblateness[4];
+ Histo1DPtr _histHemiMassL[4];
+ Histo1DPtr _histHemiBroadN[4];
+ Histo1DPtr _histDParam[4];
//@}
/// @name Event shape moment histos at 4 energies
//@{
- AIDA::IHistogram1D* _hist1MinusTMom[4];
- AIDA::IHistogram1D* _histHemiMassHMom[4];
- AIDA::IHistogram1D* _histCParamMom[4];
- AIDA::IHistogram1D* _histHemiBroadTMom[4];
- AIDA::IHistogram1D* _histHemiBroadWMom[4];
- AIDA::IHistogram1D* _histY23DurhamMom[4];
- AIDA::IHistogram1D* _histTMajorMom[4];
- AIDA::IHistogram1D* _histTMinorMom[4];
- AIDA::IHistogram1D* _histSphericityMom[4];
- AIDA::IHistogram1D* _histOblatenessMom[4];
- AIDA::IHistogram1D* _histHemiMassLMom[4];
- AIDA::IHistogram1D* _histHemiBroadNMom[4];
+ Histo1DPtr _hist1MinusTMom[4];
+ Histo1DPtr _histHemiMassHMom[4];
+ Histo1DPtr _histCParamMom[4];
+ Histo1DPtr _histHemiBroadTMom[4];
+ Histo1DPtr _histHemiBroadWMom[4];
+ Histo1DPtr _histY23DurhamMom[4];
+ Histo1DPtr _histTMajorMom[4];
+ Histo1DPtr _histTMinorMom[4];
+ Histo1DPtr _histSphericityMom[4];
+ Histo1DPtr _histOblatenessMom[4];
+ Histo1DPtr _histHemiMassLMom[4];
+ Histo1DPtr _histHemiBroadNMom[4];
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/TASSO_1990_S2148048.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/TASSO_1990_S2148048.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/TASSO_1990_S2148048.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -152,10 +152,10 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _h_xp ;
- AIDA::IHistogram1D* _h_sphericity;
- AIDA::IHistogram1D* _h_aplanarity;
- AIDA::IHistogram1D* _h_thrust ;
+ Histo1DPtr _h_xp ;
+ Histo1DPtr _h_sphericity;
+ Histo1DPtr _h_aplanarity;
+ Histo1DPtr _h_thrust ;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -161,14 +161,14 @@
/// @name Histogram collections
//@{
- AIDA::IHistogram1D* _hist_Nch;
- AIDA::IHistogram1D* _hist_Esigd3p;
- AIDA::IHistogram1D* _hist_Esigd3p08;
- AIDA::IHistogram1D* _hist_Esigd3p40;
- AIDA::IHistogram1D* _hist_Esigd3p80;
+ Histo1DPtr _hist_Nch;
+ Histo1DPtr _hist_Esigd3p;
+ Histo1DPtr _hist_Esigd3p08;
+ Histo1DPtr _hist_Esigd3p40;
+ Histo1DPtr _hist_Esigd3p80;
AIDA::IProfile1D* _hist_Pt;
AIDA::IProfile1D* _hist_Etavg;
- AIDA::IHistogram1D* _hist_Et;
+ Histo1DPtr _hist_Et;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1982_S875503.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/UA5_1982_S875503.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/UA5_1982_S875503.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -80,8 +80,8 @@
/// @name Histogram collections
//@{
- AIDA::IHistogram1D* _hist_nch;
- AIDA::IHistogram1D* _hist_eta;
+ Histo1DPtr _hist_nch;
+ Histo1DPtr _hist_eta;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -109,7 +109,7 @@
//@{
AIDA::IHistogram1D *_hist_eta_nsd;
AIDA::IHistogram1D *_hist_eta_inelastic;
- vector<AIDA::IHistogram1D*> _hists_eta_nsd;
+ vector<Histo1DPtr> _hists_eta_nsd;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/UA5_1989_S1926373.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -97,12 +97,12 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _hist_nch;
- AIDA::IHistogram1D* _hist_nch_eta05;
- AIDA::IHistogram1D* _hist_nch_eta15;
- AIDA::IHistogram1D* _hist_nch_eta30;
- AIDA::IHistogram1D* _hist_nch_eta50;
- AIDA::IHistogram1D* _hist_mean_nch;
+ Histo1DPtr _hist_nch;
+ Histo1DPtr _hist_nch_eta05;
+ Histo1DPtr _hist_nch_eta15;
+ Histo1DPtr _hist_nch_eta30;
+ Histo1DPtr _hist_nch_eta50;
+ Histo1DPtr _hist_mean_nch;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/ZEUS_2001_S4815815.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ZEUS_2001_S4815815.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Analyses/ZEUS_2001_S4815815.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -63,7 +63,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D* _histJetEt1;
+ Histo1DPtr _histJetEt1;
//@}
Modified: branches/2011-07-aida2yoda/src/Tools/BinnedHistogram.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Tools/BinnedHistogram.cc Tue Jul 19 14:08:11 2011 (r3203)
+++ branches/2011-07-aida2yoda/src/Tools/BinnedHistogram.cc Tue Jul 19 14:11:00 2011 (r3204)
@@ -18,7 +18,7 @@
_histosByUpperBound[binMax] = histo;
_histosByLowerBound[binMin] = histo;
bool found = false;
- foreach (AIDA::IHistogram1D* hist, _histos) {
+ foreach (Histo1DPtr hist, _histos) {
if (hist == histo) {
found = true;
break;
@@ -36,18 +36,18 @@
template<typename T>
- AIDA::IHistogram1D* BinnedHistogram<T>::fill(const T& bin,
+ Histo1DPtr BinnedHistogram<T>::fill(const T& bin,
const T& val,
double weight) {
- typename map<T, AIDA::IHistogram1D*>::iterator histIt =
+ typename map<T, Histo1DPtr>::iterator histIt =
_histosByUpperBound.upper_bound(bin);
//check that the bin is not out of range
if (histIt == _histosByUpperBound.end()) {
return 0;
}
- AIDA::IHistogram1D* histo = histIt->second;
+ Histo1DPtr histo = histIt->second;
histIt = _histosByLowerBound.lower_bound(bin);
// No need to check going beyond the upper bound if we already passed above
@@ -72,7 +72,7 @@
template<typename T>
void BinnedHistogram<T>::scale(const T& scale, Analysis* ana) {
- foreach (AIDA::IHistogram1D* hist, getHistograms()) {
+ foreach (Histo1DPtr hist, getHistograms()) {
ana->scale(hist, scale/_binWidths[hist]);
}
}
More information about the Rivet-svn
mailing list
|