|
|
[Rivet-svn] r3207 - branches/2011-07-aida2yoda/src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Tue Jul 19 15:00:28 BST 2011
Author: dgrell
Date: Tue Jul 19 15:00:27 2011
New Revision: 3207
Log:
partial pointer transition Profile1D
Modified:
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4751469.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2004_S5839831.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2008_LEADINGJETS.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2008_NOTE_9351.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_DY.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_QCD.cc
branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc
branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc
branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc
branches/2011-07-aida2yoda/src/Analyses/MC_LEADINGJETS.cc
branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETUE.cc
branches/2011-07-aida2yoda/src/Analyses/STAR_2009_UE_HELEN.cc
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:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -209,8 +209,8 @@
_hist_pt100_nch20_eta, _hist_pt500_nch1_eta,
_hist_pt500_nch6_eta, _hist_pt2500_nch1_eta;
- AIDA::IProfile1D *_hist_pt100_nch2_ptnch,
- *_hist_pt500_nch1_ptnch, *_hist_pt2500_nch1_ptnch;
+ Profile1DPtr _hist_pt100_nch2_ptnch,
+ _hist_pt500_nch1_ptnch, _hist_pt2500_nch1_ptnch;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4751469.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4751469.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4751469.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -258,24 +258,24 @@
//@{
// These histos (binned in dphi) are filled per event and then reset
// TODO: use LWH
- AIDA::IProfile1D *_hist_num_dphi_2, *_hist_num_dphi_5, *_hist_num_dphi_30;
- AIDA::IProfile1D *_hist_pt_dphi_2, *_hist_pt_dphi_5, *_hist_pt_dphi_30;
+ Profile1DPtr _hist_num_dphi_2, _hist_num_dphi_5, _hist_num_dphi_30;
+ Profile1DPtr _hist_pt_dphi_2, _hist_pt_dphi_5, _hist_pt_dphi_30;
// The sumpt vs. dphi and Nch vs. dphi histos
- AIDA::IProfile1D *_numvsDeltaPhi2, *_numvsDeltaPhi5, *_numvsDeltaPhi30;
- AIDA::IProfile1D *_pTvsDeltaPhi2, *_pTvsDeltaPhi5, *_pTvsDeltaPhi30;
+ Profile1DPtr _numvsDeltaPhi2, _numvsDeltaPhi5, _numvsDeltaPhi30;
+ Profile1DPtr _pTvsDeltaPhi2, _pTvsDeltaPhi5, _pTvsDeltaPhi30;
/// Profile histograms, binned in the \f$ p_T \f$ of the leading jet, for
/// the \f$ p_T \f$ sum in the toward, transverse and away regions.
- AIDA::IProfile1D *_ptsumTowardMB, *_ptsumTransMB, *_ptsumAwayMB;
- AIDA::IProfile1D *_ptsumTowardJ20, *_ptsumTransJ20, *_ptsumAwayJ20;
+ Profile1DPtr _ptsumTowardMB, _ptsumTransMB, _ptsumAwayMB;
+ Profile1DPtr _ptsumTowardJ20, _ptsumTransJ20, _ptsumAwayJ20;
/// Profile histograms, binned in the \f$ p_T \f$ of the leading jet, for
/// the number of charged particles per jet in the toward, transverse and
/// away regions.
- AIDA::IProfile1D *_numTowardMB, *_numTransMB, *_numAwayMB;
- AIDA::IProfile1D *_numTowardJ20, *_numTransJ20, *_numAwayJ20;
+ Profile1DPtr _numTowardMB, _numTransMB, _numAwayMB;
+ Profile1DPtr _numTowardJ20, _numTransJ20, _numAwayJ20;
/// Histogram of \f$ p_T \f$ distribution for 3 different \f$ p_{T1} \f$ IR cutoffs.
Histo1DPtr _ptTrans2, _ptTrans5, _ptTrans30;
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2004_S5839831.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2004_S5839831.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2004_S5839831.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -337,34 +337,34 @@
/// the average \f$ p_T \f$ in the toward, transverse and away regions at
/// \f$ \sqrt{s} = 1800 \text{GeV} \f$.
/// Corresponds to Table 1, and HepData table 1.
- AIDA::IProfile1D *_pt90MaxAvg1800, *_pt90MinAvg1800;
+ Profile1DPtr _pt90MaxAvg1800, _pt90MinAvg1800;
/// Profile histograms, binned in the \f$ E_T \f$ of the leading jet, for
/// the \f$ p_T \f$ sum in the toward, transverse and away regions at
/// \f$ \sqrt{s} = 1800 \text{GeV} \f$.
/// Corresponds to figure 2/3, and HepData table 2.
- AIDA::IProfile1D *_pt90Max1800, *_pt90Min1800, *_pt90Diff1800;
+ Profile1DPtr _pt90Max1800, _pt90Min1800, _pt90Diff1800;
/// Profile histograms, binned in the \f$ E_T \f$ of the leading jet, for
/// the \f$ p_T \f$ sum in the toward, transverse and away regions at
/// at \f$ \sqrt{s} = 630 \text{GeV} \f$.
/// Corresponds to figure 8, and HepData table 8.
- AIDA::IProfile1D *_pt90Max630, *_pt90Min630, *_pt90Diff630;
+ Profile1DPtr _pt90Max630, _pt90Min630, _pt90Diff630;
/// Profile histograms, binned in the \f$ E_T \f$ of the leading jet, for
/// the cone track multiplicity at \f$ \sqrt{s} = 1800 \text{GeV} \f$.
/// Corresponds to figure 5, and HepData table 4.
- AIDA::IProfile1D *_num90Max1800, *_num90Min1800;
+ Profile1DPtr _num90Max1800, _num90Min1800;
/// Profile histograms, binned in the \f$ E_T \f$ of the leading jet, for
/// the \f$ p_T \f$ sum at \f$ \sqrt{s} = 1800 \text{GeV} \f$.
/// Corresponds to figure 7, and HepData table 7.
- AIDA::IProfile1D *_pTSum1800_2Jet, *_pTSum1800_3Jet;
+ Profile1DPtr _pTSum1800_2Jet, _pTSum1800_3Jet;
/// Profile histograms, binned in the \f$ E_T \f$ of the leading jet, for
/// the \f$ p_T \f$ sum at \f$ \sqrt{s} = 630 \text{GeV} \f$.
/// Corresponds to figure 9, and HepData table 9.
- AIDA::IProfile1D *_pTSum630_2Jet, *_pTSum630_3Jet;
+ Profile1DPtr _pTSum630_2Jet, _pTSum630_3Jet;
/// Histogram of \f$ p_{T\text{sum}} \f$ distribution for 5 different
/// \f$ E_{T1} \f$ bins.
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_LEADINGJETS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_LEADINGJETS.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_LEADINGJETS.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -218,15 +218,15 @@
private:
- AIDA::IProfile1D *_hist_pnchg;
- AIDA::IProfile1D *_hist_pmaxnchg;
- AIDA::IProfile1D *_hist_pminnchg;
- AIDA::IProfile1D *_hist_pdifnchg;
- AIDA::IProfile1D *_hist_pcptsum;
- AIDA::IProfile1D *_hist_pmaxcptsum;
- AIDA::IProfile1D *_hist_pmincptsum;
- AIDA::IProfile1D *_hist_pdifcptsum;
- AIDA::IProfile1D *_hist_pcptave;
+ Profile1DPtr _hist_pnchg;
+ Profile1DPtr _hist_pmaxnchg;
+ Profile1DPtr _hist_pminnchg;
+ Profile1DPtr _hist_pdifnchg;
+ Profile1DPtr _hist_pcptsum;
+ Profile1DPtr _hist_pmaxcptsum;
+ Profile1DPtr _hist_pmincptsum;
+ Profile1DPtr _hist_pdifcptsum;
+ Profile1DPtr _hist_pcptave;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_NOTE_9351.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_NOTE_9351.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_NOTE_9351.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -196,27 +196,27 @@
private:
- AIDA::IProfile1D *_hist_tnchg;
- AIDA::IProfile1D *_hist_pnchg;
- AIDA::IProfile1D *_hist_pmaxnchg;
- AIDA::IProfile1D *_hist_pminnchg;
- AIDA::IProfile1D *_hist_pdifnchg;
- AIDA::IProfile1D *_hist_anchg;
- AIDA::IProfile1D *_hist_tcptsum;
- AIDA::IProfile1D *_hist_pcptsum;
- AIDA::IProfile1D *_hist_pmaxcptsum;
- AIDA::IProfile1D *_hist_pmincptsum;
- AIDA::IProfile1D *_hist_pdifcptsum;
- AIDA::IProfile1D *_hist_acptsum;
- AIDA::IProfile1D *_hist_tcptave;
- AIDA::IProfile1D *_hist_pcptave;
- AIDA::IProfile1D *_hist_acptave;
- AIDA::IProfile1D *_hist_tcptmax;
- AIDA::IProfile1D *_hist_pcptmax;
- AIDA::IProfile1D *_hist_acptmax;
- AIDA::IProfile1D *_hist_zptvsnchg;
- AIDA::IProfile1D *_hist_cptavevsnchg;
- AIDA::IProfile1D *_hist_cptavevsnchgsmallzpt;
+ Profile1DPtr _hist_tnchg;
+ Profile1DPtr _hist_pnchg;
+ Profile1DPtr _hist_pmaxnchg;
+ Profile1DPtr _hist_pminnchg;
+ Profile1DPtr _hist_pdifnchg;
+ Profile1DPtr _hist_anchg;
+ Profile1DPtr _hist_tcptsum;
+ Profile1DPtr _hist_pcptsum;
+ Profile1DPtr _hist_pmaxcptsum;
+ Profile1DPtr _hist_pmincptsum;
+ Profile1DPtr _hist_pdifcptsum;
+ Profile1DPtr _hist_acptsum;
+ Profile1DPtr _hist_tcptave;
+ Profile1DPtr _hist_pcptave;
+ Profile1DPtr _hist_acptave;
+ Profile1DPtr _hist_tcptmax;
+ Profile1DPtr _hist_pcptmax;
+ Profile1DPtr _hist_acptmax;
+ Profile1DPtr _hist_zptvsnchg;
+ Profile1DPtr _hist_cptavevsnchg;
+ Profile1DPtr _hist_cptavevsnchgsmallzpt;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -117,7 +117,7 @@
private:
double _sumWeightSelected;
- AIDA::IProfile1D *_hist_pt_vs_multiplicity;
+ Profile1DPtr _hist_pt_vs_multiplicity;
Histo1DPtr _hist_pt;
Histo1DPtr _hist_sumEt;
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_DY.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_DY.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_DY.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -185,25 +185,25 @@
private:
- AIDA::IProfile1D *_hist_tnchg;
- AIDA::IProfile1D *_hist_pnchg;
- AIDA::IProfile1D *_hist_pmaxnchg;
- AIDA::IProfile1D *_hist_pminnchg;
- AIDA::IProfile1D *_hist_pdifnchg;
- AIDA::IProfile1D *_hist_anchg;
- AIDA::IProfile1D *_hist_tcptsum;
- AIDA::IProfile1D *_hist_pcptsum;
- AIDA::IProfile1D *_hist_pmaxcptsum;
- AIDA::IProfile1D *_hist_pmincptsum;
- AIDA::IProfile1D *_hist_pdifcptsum;
- AIDA::IProfile1D *_hist_acptsum;
- AIDA::IProfile1D *_hist_tcptave;
- AIDA::IProfile1D *_hist_pcptave;
- AIDA::IProfile1D *_hist_tcptmax;
- AIDA::IProfile1D *_hist_pcptmax;
- AIDA::IProfile1D *_hist_zptvsnchg;
- AIDA::IProfile1D *_hist_cptavevsnchg;
- AIDA::IProfile1D *_hist_cptavevsnchgsmallzpt;
+ Profile1DPtr _hist_tnchg;
+ Profile1DPtr _hist_pnchg;
+ Profile1DPtr _hist_pmaxnchg;
+ Profile1DPtr _hist_pminnchg;
+ Profile1DPtr _hist_pdifnchg;
+ Profile1DPtr _hist_anchg;
+ Profile1DPtr _hist_tcptsum;
+ Profile1DPtr _hist_pcptsum;
+ Profile1DPtr _hist_pmaxcptsum;
+ Profile1DPtr _hist_pmincptsum;
+ Profile1DPtr _hist_pdifcptsum;
+ Profile1DPtr _hist_acptsum;
+ Profile1DPtr _hist_tcptave;
+ Profile1DPtr _hist_pcptave;
+ Profile1DPtr _hist_tcptmax;
+ Profile1DPtr _hist_pcptmax;
+ Profile1DPtr _hist_zptvsnchg;
+ Profile1DPtr _hist_cptavevsnchg;
+ Profile1DPtr _hist_cptavevsnchgsmallzpt;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_QCD.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_QCD.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2010_S8591881_QCD.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -174,20 +174,20 @@
private:
- AIDA::IProfile1D *_hist_tnchg;
- AIDA::IProfile1D *_hist_pnchg;
- AIDA::IProfile1D *_hist_anchg;
- AIDA::IProfile1D *_hist_pmaxnchg;
- AIDA::IProfile1D *_hist_pminnchg;
- AIDA::IProfile1D *_hist_pdifnchg;
- AIDA::IProfile1D *_hist_tcptsum;
- AIDA::IProfile1D *_hist_pcptsum;
- AIDA::IProfile1D *_hist_acptsum;
- AIDA::IProfile1D *_hist_pmaxcptsum;
- AIDA::IProfile1D *_hist_pmincptsum;
- AIDA::IProfile1D *_hist_pdifcptsum;
- AIDA::IProfile1D *_hist_pcptave;
- AIDA::IProfile1D *_hist_pcptmax;
+ Profile1DPtr _hist_tnchg;
+ Profile1DPtr _hist_pnchg;
+ Profile1DPtr _hist_anchg;
+ Profile1DPtr _hist_pmaxnchg;
+ Profile1DPtr _hist_pminnchg;
+ Profile1DPtr _hist_pdifnchg;
+ Profile1DPtr _hist_tcptsum;
+ Profile1DPtr _hist_pcptsum;
+ Profile1DPtr _hist_acptsum;
+ Profile1DPtr _hist_pmaxcptsum;
+ Profile1DPtr _hist_pmincptsum;
+ Profile1DPtr _hist_pdifcptsum;
+ Profile1DPtr _hist_pcptave;
+ Profile1DPtr _hist_pcptmax;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -108,7 +108,7 @@
Histo1DPtr _h_deta;
BinnedHistogram<double> _h_dphi;
- AIDA::IProfile1D *_h_cosdphi_deta;
+ Profile1DPtr _h_cosdphi_deta;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -117,8 +117,8 @@
Histo1DPtr _histXbprim;
Histo1DPtr _histXbweak;
- AIDA::IProfile1D *_histMeanXbprim;
- AIDA::IProfile1D *_histMeanXbweak;
+ Profile1DPtr _histMeanXbprim;
+ Profile1DPtr _histMeanXbweak;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -244,7 +244,7 @@
Histo1DPtr _histSpectraW122;
Histo1DPtr _histSpectraW169;
Histo1DPtr _histSpectraW117;
- AIDA::IProfile1D *_histPT2;
+ Profile1DPtr _histPT2;
//@}
/// @name storage of weight to calculate averages for normalisation
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_LEADINGJETS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_LEADINGJETS.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_LEADINGJETS.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -152,13 +152,13 @@
private:
- AIDA::IProfile1D *_hist_pnchg;
- AIDA::IProfile1D *_hist_pmaxnchg;
- AIDA::IProfile1D *_hist_pminnchg;
- AIDA::IProfile1D *_hist_pcptsum;
- AIDA::IProfile1D *_hist_pmaxcptsum;
- AIDA::IProfile1D *_hist_pmincptsum;
- AIDA::IProfile1D *_hist_pcptave;
+ Profile1DPtr _hist_pnchg;
+ Profile1DPtr _hist_pmaxnchg;
+ Profile1DPtr _hist_pminnchg;
+ Profile1DPtr _hist_pcptsum;
+ Profile1DPtr _hist_pmaxcptsum;
+ Profile1DPtr _hist_pmincptsum;
+ Profile1DPtr _hist_pcptave;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETUE.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETUE.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETUE.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -242,13 +242,13 @@
Histo1DPtr _hist_jetgamma_dR;
Histo1DPtr _hist_jetgamma_dphi;
- AIDA::IProfile1D *_hist_pnchg_jet, *_hist_pnchg_gamma;
- AIDA::IProfile1D *_hist_pmaxnchg_jet, *_hist_pmaxnchg_gamma;
- AIDA::IProfile1D *_hist_pminnchg_jet, *_hist_pminnchg_gamma;
- AIDA::IProfile1D *_hist_pcptsum_jet, *_hist_pcptsum_gamma;
- AIDA::IProfile1D *_hist_pmaxcptsum_jet, *_hist_pmaxcptsum_gamma;
- AIDA::IProfile1D *_hist_pmincptsum_jet, *_hist_pmincptsum_gamma;
- AIDA::IProfile1D *_hist_pcptave_jet, *_hist_pcptave_gamma;
+ Profile1DPtr _hist_pnchg_jet, _hist_pnchg_gamma;
+ Profile1DPtr _hist_pmaxnchg_jet, _hist_pmaxnchg_gamma;
+ Profile1DPtr _hist_pminnchg_jet, _hist_pminnchg_gamma;
+ Profile1DPtr _hist_pcptsum_jet, _hist_pcptsum_gamma;
+ Profile1DPtr _hist_pmaxcptsum_jet, _hist_pmaxcptsum_gamma;
+ Profile1DPtr _hist_pmincptsum_jet, _hist_pmincptsum_gamma;
+ Profile1DPtr _hist_pcptave_jet, _hist_pcptave_gamma;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2009_UE_HELEN.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2009_UE_HELEN.cc Tue Jul 19 14:54:18 2011 (r3206)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2009_UE_HELEN.cc Tue Jul 19 15:00:27 2011 (r3207)
@@ -157,9 +157,9 @@
private:
- AIDA::IProfile1D *_hist_pmaxnchg;
- AIDA::IProfile1D *_hist_pminnchg;
- AIDA::IProfile1D *_hist_anchg;
+ Profile1DPtr _hist_pmaxnchg;
+ Profile1DPtr _hist_pminnchg;
+ Profile1DPtr _hist_anchg;
};
More information about the Rivet-svn
mailing list
|