|
|
[Rivet-svn] r3206 - branches/2011-07-aida2yoda/src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Tue Jul 19 14:54:18 BST 2011
Author: dgrell
Date: Tue Jul 19 14:54:18 2011
New Revision: 3206
Log:
partial pointer transition Profile1D
Modified:
branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8994773.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8924791.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc
branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc
branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc
branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc
branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7993412.cc
branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc
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:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8706239.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -89,8 +89,8 @@
Histo1DPtr _h_pT;
- AIDA::IProfile1D* _h_pT_Nch_015 ;
- AIDA::IProfile1D* _h_pT_Nch_05 ;
+ Profile1DPtr _h_pT_Nch_015 ;
+ Profile1DPtr _h_pT_Nch_05 ;
double _Nevt_after_cuts;
//@}
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:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8591806.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -63,7 +63,7 @@
Histo1DPtr _h_dNch_deta;
Histo1DPtr _h_dNch_dpT;
Histo1DPtr _h_dNevt_dNch;
- AIDA::IProfile1D* _p_meanpT_Nch;
+ Profile1DPtr _p_meanpT_Nch;
double _Nevt_after_cuts;
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc Tue Jul 19 14:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8894728.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -11,7 +11,7 @@
namespace {
- inline void _moments_to_stddev(AIDA::IProfile1D* moment_profiles[], AIDA::IDataPointSet* target_dps) {
+ inline void _moments_to_stddev(Profile1DPtr moment_profiles[], AIDA::IDataPointSet* target_dps) {
for (int b = 0; b < target_dps->size(); ++b) { // loop over bins
/// @todo Assuming unit weights here! Should use N_effective = sumW**2/sumW2? How?
const double numentries = moment_profiles[0]->binEntries(b);
@@ -286,44 +286,44 @@
private:
- AIDA::IProfile1D* _hist_nch_transverse_500[4];
- AIDA::IProfile1D* _hist_nch_toward_500;
- AIDA::IProfile1D* _hist_nch_away_500;
-
- AIDA::IProfile1D* _hist_ptsum_transverse_500[4];
- AIDA::IProfile1D* _hist_ptsum_toward_500;
- AIDA::IProfile1D* _hist_ptsum_away_500;
+ Profile1DPtr _hist_nch_transverse_500[4];
+ Profile1DPtr _hist_nch_toward_500;
+ Profile1DPtr _hist_nch_away_500;
+
+ Profile1DPtr _hist_ptsum_transverse_500[4];
+ Profile1DPtr _hist_ptsum_toward_500;
+ Profile1DPtr _hist_ptsum_away_500;
AIDA::IDataPointSet* _dps_sdnch_transverse_500;
AIDA::IDataPointSet* _dps_sdptsum_transverse_500;
- AIDA::IProfile1D* _hist_ptavg_transverse_500;
- AIDA::IProfile1D* _hist_ptavg_toward_500;
- AIDA::IProfile1D* _hist_ptavg_away_500;
-
- AIDA::IProfile1D* _hist_dn_dpt_transverse_500;
- AIDA::IProfile1D* _hist_dn_dpt_toward_500;
- AIDA::IProfile1D* _hist_dn_dpt_away_500;
-
- AIDA::IProfile1D* _hist_N_vs_dPhi_1_500;
- AIDA::IProfile1D* _hist_N_vs_dPhi_2_500;
- AIDA::IProfile1D* _hist_N_vs_dPhi_3_500;
- AIDA::IProfile1D* _hist_N_vs_dPhi_5_500;
-
- AIDA::IProfile1D* _hist_pT_vs_dPhi_1_500;
- AIDA::IProfile1D* _hist_pT_vs_dPhi_2_500;
- AIDA::IProfile1D* _hist_pT_vs_dPhi_3_500;
- AIDA::IProfile1D* _hist_pT_vs_dPhi_5_500;
-
- AIDA::IProfile1D* _hist_nch_transverse_100;
- AIDA::IProfile1D* _hist_nch_toward_100;
- AIDA::IProfile1D* _hist_nch_away_100;
- AIDA::IProfile1D* _hist_ptsum_transverse_100;
- AIDA::IProfile1D* _hist_ptsum_toward_100;
- AIDA::IProfile1D* _hist_ptsum_away_100;
+ Profile1DPtr _hist_ptavg_transverse_500;
+ Profile1DPtr _hist_ptavg_toward_500;
+ Profile1DPtr _hist_ptavg_away_500;
+
+ Profile1DPtr _hist_dn_dpt_transverse_500;
+ Profile1DPtr _hist_dn_dpt_toward_500;
+ Profile1DPtr _hist_dn_dpt_away_500;
+
+ Profile1DPtr _hist_N_vs_dPhi_1_500;
+ Profile1DPtr _hist_N_vs_dPhi_2_500;
+ Profile1DPtr _hist_N_vs_dPhi_3_500;
+ Profile1DPtr _hist_N_vs_dPhi_5_500;
+
+ Profile1DPtr _hist_pT_vs_dPhi_1_500;
+ Profile1DPtr _hist_pT_vs_dPhi_2_500;
+ Profile1DPtr _hist_pT_vs_dPhi_3_500;
+ Profile1DPtr _hist_pT_vs_dPhi_5_500;
+
+ Profile1DPtr _hist_nch_transverse_100;
+ Profile1DPtr _hist_nch_toward_100;
+ Profile1DPtr _hist_nch_away_100;
+ Profile1DPtr _hist_ptsum_transverse_100;
+ Profile1DPtr _hist_ptsum_toward_100;
+ Profile1DPtr _hist_ptsum_away_100;
- AIDA::IProfile1D* _hist_nch_vs_eta_transverse_100;
- AIDA::IProfile1D* _hist_ptsum_vs_eta_transverse_100;
+ Profile1DPtr _hist_nch_vs_eta_transverse_100;
+ Profile1DPtr _hist_ptsum_vs_eta_transverse_100;
};
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:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -15,7 +15,7 @@
/// Helper for collectively filling Nch, pT, eta, and pT vs. Nch histograms
void fillPtEtaNch(const ChargedFinalState& cfs, int nchcut, double weight,
Histo1DPtr h_nch, Histo1DPtr h_pt,
- Histo1DPtr h_eta, AIDA::IProfile1D* h_ptnch = 0) {
+ Histo1DPtr h_eta, Profile1DPtr 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_2010_S8994773.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8994773.cc Tue Jul 19 14:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8994773.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -121,13 +121,13 @@
private:
int isqrts;
- AIDA::IProfile1D* _hist_N_transverse_500;
+ Profile1DPtr _hist_N_transverse_500;
- AIDA::IProfile1D* _hist_ptsum_transverse_500;
+ Profile1DPtr _hist_ptsum_transverse_500;
- AIDA::IProfile1D* _hist_N_vs_dPhi_1_500;
- AIDA::IProfile1D* _hist_N_vs_dPhi_2_500;
- AIDA::IProfile1D* _hist_N_vs_dPhi_3_500;
+ Profile1DPtr _hist_N_vs_dPhi_1_500;
+ Profile1DPtr _hist_N_vs_dPhi_2_500;
+ Profile1DPtr _hist_N_vs_dPhi_3_500;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8924791.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8924791.cc Tue Jul 19 14:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S8924791.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -120,8 +120,8 @@
/// @name Histograms
//@{
- AIDA::IProfile1D* _profhistRho_pT[11][6];
- AIDA::IProfile1D* _profhistPsi_pT[11][6];
+ Profile1DPtr _profhistRho_pT[11][6];
+ Profile1DPtr _profhistPsi_pT[11][6];
//@}
};
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:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2002_S4796047.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -115,7 +115,7 @@
/// @name Histos
//@{
Histo1DPtr _hist_multiplicity;
- AIDA::IProfile1D* _hist_pt_vs_multiplicity;
+ Profile1DPtr _hist_pt_vs_multiplicity;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc Tue Jul 19 14:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2005_S6217184.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -97,7 +97,7 @@
vector<double> y, ey;
for (size_t i = 0; i < _ptedges.size()-1; ++i) {
// Get entry for rad_Psi = 0.2 bin
- AIDA::IProfile1D* ph_i = _profhistPsi_pT[i];
+ Profile1DPtr ph_i = _profhistPsi_pT[i];
y.push_back(ph_i->binHeight(2));
ey.push_back(ph_i->binError(1));
}
@@ -124,8 +124,8 @@
/// @name Histograms
//@{
- AIDA::IProfile1D* _profhistRho_pT[18];
- AIDA::IProfile1D* _profhistPsi_pT[18];
+ Profile1DPtr _profhistRho_pT[18];
+ Profile1DPtr _profhistPsi_pT[18];
AIDA::IDataPointSet* _profhistPsi_vs_pT;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc Tue Jul 19 14:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7782535.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -100,7 +100,7 @@
vector<double> y, ey;
for (size_t i = 0; i < _ptedges.size()-1; ++i) {
// Get entry for rad_Psi = 0.2 bin
- AIDA::IProfile1D* ph_i = _h_Psi_pT[i];
+ Profile1DPtr ph_i = _h_Psi_pT[i];
y.push_back(1.0 - ph_i->binHeight(1));
ey.push_back(ph_i->binError(1));
}
@@ -127,7 +127,7 @@
/// @name Histograms
//@{
- AIDA::IProfile1D* _h_Psi_pT[4];
+ Profile1DPtr _h_Psi_pT[4];
AIDA::IDataPointSet* _h_OneMinusPsi_vs_pT;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc Tue Jul 19 14:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -262,8 +262,8 @@
vector<Histo1DPtr> _histETHighQa;
vector<Histo1DPtr> _histETLowQb;
vector<Histo1DPtr> _histETHighQb;
- AIDA::IProfile1D * _histAverETCentral;
- AIDA::IProfile1D * _histAverETFrag;
+ Profile1DPtr _histAverETCentral;
+ Profile1DPtr _histAverETFrag;
//@}
/// @name storage of weights for normalisation
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc Tue Jul 19 14:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_WPOL.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -144,7 +144,7 @@
/// @name Histograms
//@{
- std::vector<std::vector<AIDA::IProfile1D*> > _h_dists;
+ std::vector<std::vector<Profile1DPtr> > _h_dists;
std::vector<std::vector<Histo1DPtr> > _h_histos;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc Tue Jul 19 14:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -197,7 +197,7 @@
Histo1DPtr _h_pT_xiplus;
//Histo1DPtr _h_pT_omega;
AIDA::IDataPointSet* _h_antibaryon_baryon_ratio;
- AIDA::IProfile1D* _h_pT_vs_mass;
+ Profile1DPtr _h_pT_vs_mass;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7993412.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7993412.cc Tue Jul 19 14:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7993412.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -71,8 +71,8 @@
/// @name Histograms
//@{
- AIDA::IProfile1D * _h_Y_jet_trigger;
- AIDA::IProfile1D * _h_Y_jet_associated;
+ Profile1DPtr _h_Y_jet_trigger;
+ Profile1DPtr _h_Y_jet_associated;
//@}
};
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:49:04 2011 (r3205)
+++ branches/2011-07-aida2yoda/src/Analyses/UA1_1990_S2044935.cc Tue Jul 19 14:54:18 2011 (r3206)
@@ -166,8 +166,8 @@
Histo1DPtr _hist_Esigd3p08;
Histo1DPtr _hist_Esigd3p40;
Histo1DPtr _hist_Esigd3p80;
- AIDA::IProfile1D* _hist_Pt;
- AIDA::IProfile1D* _hist_Etavg;
+ Profile1DPtr _hist_Pt;
+ Profile1DPtr _hist_Etavg;
Histo1DPtr _hist_Et;
//@}
More information about the Rivet-svn
mailing list
|