|
|
[Rivet-svn] r3205 - in branches/2011-07-aida2yoda: include/Rivet/Analyses src/Analyses src/Tools
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Tue Jul 19 14:49:05 BST 2011
Author: dgrell
Date: Tue Jul 19 14:49:04 2011
New Revision: 3205
Log:
partial pointer transition
Modified:
branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh
branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3196992.cc
branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3486095.cc
branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc
branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc
branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8914702.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc
branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8919674.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3349578.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1997_S3541940.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.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_2006_S6450792.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc
branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc
branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc
branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc
branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2000_S4480767.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2007_S7075677.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2008_S6879055.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7554427.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7837160.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8202443.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc
branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc
branches/2011-07-aida2yoda/src/Analyses/DELPHI_1995_S3137023.cc
branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc
branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc
branches/2011-07-aida2yoda/src/Analyses/DELPHI_2003_WUD_03_11.cc
branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc
branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc
branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc
branches/2011-07-aida2yoda/src/Analyses/JADE_1998_S3612880.cc
branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc
branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc
branches/2011-07-aida2yoda/src/Analyses/MC_GENERIC.cc
branches/2011-07-aida2yoda/src/Analyses/MC_HJETS.cc
branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc
branches/2011-07-aida2yoda/src/Analyses/MC_SUSY.cc
branches/2011-07-aida2yoda/src/Analyses/MC_WJETS.cc
branches/2011-07-aida2yoda/src/Analyses/MC_WWJETS.cc
branches/2011-07-aida2yoda/src/Analyses/MC_ZJETS.cc
branches/2011-07-aida2yoda/src/Analyses/MC_ZZJETS.cc
branches/2011-07-aida2yoda/src/Analyses/OPAL_1998_S3780481.cc
branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc
branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc
branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc
branches/2011-07-aida2yoda/src/Analyses/SFM_1984_S1178091.cc
branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc
branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc
branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc
branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc
branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc
branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/include/Rivet/Analyses/MC_JetAnalysis.hh Tue Jul 19 14:49:04 2011 (r3205)
@@ -44,20 +44,20 @@
/// @name Histograms
//@{
- std::vector<AIDA::IHistogram1D *> _h_log10_d;
+ std::vector<Histo1DPtr> _h_log10_d;
std::vector<AIDA::IDataPointSet *> _h_log10_R;
- std::vector<AIDA::IHistogram1D *> _h_pT_jet;
- std::vector<AIDA::IHistogram1D *> _h_eta_jet;
+ std::vector<Histo1DPtr> _h_pT_jet;
+ std::vector<Histo1DPtr> _h_eta_jet;
std::vector<shared_ptr<LWH::Histogram1D> > _h_eta_jet_plus, _h_eta_jet_minus;
- std::vector<AIDA::IHistogram1D *> _h_rap_jet;
+ std::vector<Histo1DPtr> _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::vector<Histo1DPtr> _h_mass_jet;
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;
+ Histo1DPtr _h_jet_multi_exclusive;
+ Histo1DPtr _h_jet_multi_inclusive;
AIDA::IDataPointSet * _h_jet_multi_ratio;
- AIDA::IHistogram1D * _h_jet_HT;
+ Histo1DPtr _h_jet_HT;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3196992.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3196992.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3196992.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -153,9 +153,9 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_z_2jet_001, *_h_z_2jet_006, *_h_z_2jet_01, *_h_z_2jet_033;
- AIDA::IHistogram1D *_h_z_3jet_001, *_h_z_3jet_006, *_h_z_3jet_01;
- AIDA::IHistogram1D *_h_z_4jet_001;
+ Histo1DPtr _h_z_2jet_001, _h_z_2jet_006, _h_z_2jet_01, _h_z_2jet_033;
+ Histo1DPtr _h_z_3jet_001, _h_z_3jet_006, _h_z_3jet_01;
+ Histo1DPtr _h_z_4jet_001;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3486095.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3486095.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_1996_S3486095.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -482,74 +482,74 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_histSphericity;
- AIDA::IHistogram1D *_histAplanarity;
+ Histo1DPtr _histSphericity;
+ Histo1DPtr _histAplanarity;
- AIDA::IHistogram1D *_hist1MinusT;
- AIDA::IHistogram1D *_histTMinor;
+ Histo1DPtr _hist1MinusT;
+ Histo1DPtr _histTMinor;
- AIDA::IHistogram1D *_histY3;
- AIDA::IHistogram1D *_histHeavyJetMass;
- AIDA::IHistogram1D *_histCParam;
- AIDA::IHistogram1D *_histOblateness;
-
- AIDA::IHistogram1D *_histScaledMom;
- AIDA::IHistogram1D *_histRapidityT;
-
- AIDA::IHistogram1D *_histPtSIn;
- AIDA::IHistogram1D *_histPtSOut;
-
- AIDA::IHistogram1D *_histJetRate2Durham;
- AIDA::IHistogram1D *_histJetRate3Durham;
- AIDA::IHistogram1D *_histJetRate4Durham;
- AIDA::IHistogram1D *_histJetRate5Durham;
-
- AIDA::IHistogram1D *_histLogScaledMom;
-
-
- AIDA::IHistogram1D *_histChMult;
-
-
- AIDA::IHistogram1D *_histMultiPiPlus;
- AIDA::IHistogram1D *_histMultiKPlus;
- AIDA::IHistogram1D *_histMultiP;
- AIDA::IHistogram1D *_histMultiPhoton;
- AIDA::IHistogram1D *_histMultiPi0;
- AIDA::IHistogram1D *_histMultiEta;
- AIDA::IHistogram1D *_histMultiEtaPrime;
- AIDA::IHistogram1D *_histMultiK0;
- AIDA::IHistogram1D *_histMultiLambda0;
- AIDA::IHistogram1D *_histMultiXiMinus;
- AIDA::IHistogram1D *_histMultiSigma1385Plus;
- AIDA::IHistogram1D *_histMultiXi1530_0;
- AIDA::IHistogram1D *_histMultiRho;
- AIDA::IHistogram1D *_histMultiOmega782;
- AIDA::IHistogram1D *_histMultiKStar892_0;
- AIDA::IHistogram1D *_histMultiPhi;
- AIDA::IHistogram1D *_histMultiKStar892Plus;
+ Histo1DPtr _histY3;
+ Histo1DPtr _histHeavyJetMass;
+ Histo1DPtr _histCParam;
+ Histo1DPtr _histOblateness;
+
+ Histo1DPtr _histScaledMom;
+ Histo1DPtr _histRapidityT;
+
+ Histo1DPtr _histPtSIn;
+ Histo1DPtr _histPtSOut;
+
+ Histo1DPtr _histJetRate2Durham;
+ Histo1DPtr _histJetRate3Durham;
+ Histo1DPtr _histJetRate4Durham;
+ Histo1DPtr _histJetRate5Durham;
+
+ Histo1DPtr _histLogScaledMom;
+
+
+ Histo1DPtr _histChMult;
+
+
+ Histo1DPtr _histMultiPiPlus;
+ Histo1DPtr _histMultiKPlus;
+ Histo1DPtr _histMultiP;
+ Histo1DPtr _histMultiPhoton;
+ Histo1DPtr _histMultiPi0;
+ Histo1DPtr _histMultiEta;
+ Histo1DPtr _histMultiEtaPrime;
+ Histo1DPtr _histMultiK0;
+ Histo1DPtr _histMultiLambda0;
+ Histo1DPtr _histMultiXiMinus;
+ Histo1DPtr _histMultiSigma1385Plus;
+ Histo1DPtr _histMultiXi1530_0;
+ Histo1DPtr _histMultiRho;
+ Histo1DPtr _histMultiOmega782;
+ Histo1DPtr _histMultiKStar892_0;
+ Histo1DPtr _histMultiPhi;
+ Histo1DPtr _histMultiKStar892Plus;
// mean multiplicities
- AIDA::IHistogram1D *_histMeanChMult;
- AIDA::IHistogram1D *_histMeanChMultRapt05;
- AIDA::IHistogram1D *_histMeanChMultRapt10;
- AIDA::IHistogram1D *_histMeanChMultRapt15;
- AIDA::IHistogram1D *_histMeanChMultRapt20;
-
- AIDA::IHistogram1D *_histMeanMultiPi0;
- AIDA::IHistogram1D *_histMeanMultiEta;
- AIDA::IHistogram1D *_histMeanMultiEtaPrime;
- AIDA::IHistogram1D *_histMeanMultiK0;
- AIDA::IHistogram1D *_histMeanMultiRho;
- AIDA::IHistogram1D *_histMeanMultiOmega782;
- AIDA::IHistogram1D *_histMeanMultiPhi;
- AIDA::IHistogram1D *_histMeanMultiKStar892Plus;
- AIDA::IHistogram1D *_histMeanMultiKStar892_0;
- AIDA::IHistogram1D *_histMeanMultiLambda0;
- AIDA::IHistogram1D *_histMeanMultiSigma0;
- AIDA::IHistogram1D *_histMeanMultiXiMinus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385Plus;
- AIDA::IHistogram1D *_histMeanMultiXi1530_0;
- AIDA::IHistogram1D *_histMeanMultiOmegaOmegaBar;
+ Histo1DPtr _histMeanChMult;
+ Histo1DPtr _histMeanChMultRapt05;
+ Histo1DPtr _histMeanChMultRapt10;
+ Histo1DPtr _histMeanChMultRapt15;
+ Histo1DPtr _histMeanChMultRapt20;
+
+ Histo1DPtr _histMeanMultiPi0;
+ Histo1DPtr _histMeanMultiEta;
+ Histo1DPtr _histMeanMultiEtaPrime;
+ Histo1DPtr _histMeanMultiK0;
+ Histo1DPtr _histMeanMultiRho;
+ Histo1DPtr _histMeanMultiOmega782;
+ Histo1DPtr _histMeanMultiPhi;
+ Histo1DPtr _histMeanMultiKStar892Plus;
+ Histo1DPtr _histMeanMultiKStar892_0;
+ Histo1DPtr _histMeanMultiLambda0;
+ Histo1DPtr _histMeanMultiSigma0;
+ Histo1DPtr _histMeanMultiXiMinus;
+ Histo1DPtr _histMeanMultiSigma1385Plus;
+ Histo1DPtr _histMeanMultiXi1530_0;
+ Histo1DPtr _histMeanMultiOmegaOmegaBar;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/ALEPH_2004_S5765862.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -293,28 +293,28 @@
bool _initialisedJets;
bool _initialisedSpectra;
- AIDA::IHistogram1D *_h_xp;
- AIDA::IHistogram1D *_h_xi;
- AIDA::IHistogram1D *_h_xe;
- AIDA::IHistogram1D *_h_pTin;
- AIDA::IHistogram1D *_h_pTout;
- AIDA::IHistogram1D *_h_rapidityT;
- AIDA::IHistogram1D *_h_rapidityS;
- AIDA::IHistogram1D *_h_thrust;
- AIDA::IHistogram1D *_h_heavyjetmass;
- AIDA::IHistogram1D *_h_totaljetbroadening;
- AIDA::IHistogram1D *_h_widejetbroadening;
- AIDA::IHistogram1D *_h_cparameter;
- AIDA::IHistogram1D *_h_thrustmajor;
- AIDA::IHistogram1D *_h_thrustminor;
- AIDA::IHistogram1D *_h_jetmassdifference;
- AIDA::IHistogram1D *_h_aplanarity;
- AIDA::IHistogram1D *_h_planarity;
- AIDA::IHistogram1D *_h_oblateness;
- AIDA::IHistogram1D *_h_sphericity;
+ Histo1DPtr _h_xp;
+ Histo1DPtr _h_xi;
+ Histo1DPtr _h_xe;
+ Histo1DPtr _h_pTin;
+ Histo1DPtr _h_pTout;
+ Histo1DPtr _h_rapidityT;
+ Histo1DPtr _h_rapidityS;
+ Histo1DPtr _h_thrust;
+ Histo1DPtr _h_heavyjetmass;
+ Histo1DPtr _h_totaljetbroadening;
+ Histo1DPtr _h_widejetbroadening;
+ Histo1DPtr _h_cparameter;
+ Histo1DPtr _h_thrustmajor;
+ Histo1DPtr _h_thrustminor;
+ Histo1DPtr _h_jetmassdifference;
+ Histo1DPtr _h_aplanarity;
+ Histo1DPtr _h_planarity;
+ Histo1DPtr _h_oblateness;
+ Histo1DPtr _h_sphericity;
AIDA::IDataPointSet *_h_R_Durham[6];
- AIDA::IHistogram1D *_h_y_Durham[5];
+ Histo1DPtr _h_y_Durham[5];
double _weightedTotalChargedPartNum;
Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8624100.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -84,9 +84,9 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_dN_dNch_05;
- AIDA::IHistogram1D *_h_dN_dNch_10;
- AIDA::IHistogram1D *_h_dN_dNch_13;
+ Histo1DPtr _h_dN_dNch_05;
+ Histo1DPtr _h_dN_dNch_10;
+ Histo1DPtr _h_dN_dNch_13;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/ALICE_2010_S8625980.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -89,8 +89,8 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_dN_deta;
- AIDA::IHistogram1D *_h_dN_dNch;
+ Histo1DPtr _h_dN_deta;
+ Histo1DPtr _h_dN_dNch;
double _Nevt_after_cuts;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8914702.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8914702.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8914702.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -184,7 +184,7 @@
private:
- AIDA::IHistogram1D *_h_Et_photon[6];
+ Histo1DPtr _h_Et_photon[6];
fastjet::AreaDefinition* _area_def;
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8918562.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -197,17 +197,17 @@
double _sumW_pt100_nch2, _sumW_pt100_nch20, _sumW_pt500_nch1,
_sumW_pt500_nch6, _sumW_pt2500_nch1;
- AIDA::IHistogram1D *_hist_pt100_nch2_nch,
- *_hist_pt100_nch20_nch, *_hist_pt500_nch1_nch,
- *_hist_pt500_nch6_nch, *_hist_pt2500_nch1_nch;
-
- AIDA::IHistogram1D *_hist_pt100_nch2_pt,
- *_hist_pt100_nch20_pt, *_hist_pt500_nch1_pt,
- *_hist_pt500_nch6_pt, *_hist_pt2500_nch1_pt;
-
- AIDA::IHistogram1D *_hist_pt100_nch2_eta,
- *_hist_pt100_nch20_eta, *_hist_pt500_nch1_eta,
- *_hist_pt500_nch6_eta, *_hist_pt2500_nch1_eta;
+ Histo1DPtr _hist_pt100_nch2_nch,
+ _hist_pt100_nch20_nch, _hist_pt500_nch1_nch,
+ _hist_pt500_nch6_nch, _hist_pt2500_nch1_nch;
+
+ Histo1DPtr _hist_pt100_nch2_pt,
+ _hist_pt100_nch20_pt, _hist_pt500_nch1_pt,
+ _hist_pt500_nch6_pt, _hist_pt2500_nch1_pt;
+
+ Histo1DPtr _hist_pt100_nch2_eta,
+ _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;
Modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8919674.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8919674.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2010_S8919674.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -187,12 +187,12 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_el_njet_inclusive;
- AIDA::IHistogram1D * _h_mu_njet_inclusive;
- AIDA::IHistogram1D * _h_el_pT_jet1;
- AIDA::IHistogram1D * _h_mu_pT_jet1;
- AIDA::IHistogram1D * _h_el_pT_jet2;
- AIDA::IHistogram1D * _h_mu_pT_jet2;
+ Histo1DPtr _h_el_njet_inclusive;
+ Histo1DPtr _h_mu_njet_inclusive;
+ Histo1DPtr _h_el_pT_jet1;
+ Histo1DPtr _h_mu_pT_jet1;
+ Histo1DPtr _h_el_pT_jet2;
+ Histo1DPtr _h_mu_pT_jet2;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1993_S2742446.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -93,7 +93,7 @@
private:
- AIDA::IHistogram1D *_h_costheta;
+ Histo1DPtr _h_costheta;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1994_S2952106.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -199,7 +199,7 @@
//@{
/// Straightforward output histos
- AIDA::IHistogram1D *_histJet1Et, *_histJet2Et;
+ Histo1DPtr _histJet1Et, _histJet2Et;
/// Output histos which need to have correction factors applied
AIDA::IDataPointSet *_histR23, *_histJet3eta, *_histAlpha;
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3108457.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -117,9 +117,9 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_m[5];
- AIDA::IHistogram1D *_h_costheta[5];
- AIDA::IHistogram1D *_h_pT[5];
+ Histo1DPtr _h_m[5];
+ Histo1DPtr _h_costheta[5];
+ Histo1DPtr _h_pT[5];
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3349578.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3349578.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1996_S3349578.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -424,44 +424,44 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_3_mNJ;
- AIDA::IHistogram1D *_h_3_X3;
- AIDA::IHistogram1D *_h_3_X4;
- AIDA::IHistogram1D *_h_3_costheta3;
- AIDA::IHistogram1D *_h_3_psi3;
- AIDA::IHistogram1D *_h_3_f3;
- AIDA::IHistogram1D *_h_3_f4;
- AIDA::IHistogram1D *_h_3_f5;
-
- AIDA::IHistogram1D *_h_4_mNJ;
- AIDA::IHistogram1D *_h_4_X3;
- AIDA::IHistogram1D *_h_4_X4;
- AIDA::IHistogram1D *_h_4_costheta3;
- AIDA::IHistogram1D *_h_4_psi3;
- AIDA::IHistogram1D *_h_4_f3;
- AIDA::IHistogram1D *_h_4_f4;
- AIDA::IHistogram1D *_h_4_f5;
- AIDA::IHistogram1D *_h_4_XA;
- AIDA::IHistogram1D *_h_4_psiAB;
- AIDA::IHistogram1D *_h_4_fA;
- AIDA::IHistogram1D *_h_4_fB;
-
- AIDA::IHistogram1D *_h_5_mNJ;
- AIDA::IHistogram1D *_h_5_X3;
- AIDA::IHistogram1D *_h_5_X4;
- AIDA::IHistogram1D *_h_5_costheta3;
- AIDA::IHistogram1D *_h_5_psi3;
- AIDA::IHistogram1D *_h_5_f3;
- AIDA::IHistogram1D *_h_5_f4;
- AIDA::IHistogram1D *_h_5_f5;
- AIDA::IHistogram1D *_h_5_XA;
- AIDA::IHistogram1D *_h_5_XC;
- AIDA::IHistogram1D *_h_5_psiAB;
- AIDA::IHistogram1D *_h_5_psiCD;
- AIDA::IHistogram1D *_h_5_fA;
- AIDA::IHistogram1D *_h_5_fB;
- AIDA::IHistogram1D *_h_5_fC;
- AIDA::IHistogram1D *_h_5_fD;
+ Histo1DPtr _h_3_mNJ;
+ Histo1DPtr _h_3_X3;
+ Histo1DPtr _h_3_X4;
+ Histo1DPtr _h_3_costheta3;
+ Histo1DPtr _h_3_psi3;
+ Histo1DPtr _h_3_f3;
+ Histo1DPtr _h_3_f4;
+ Histo1DPtr _h_3_f5;
+
+ Histo1DPtr _h_4_mNJ;
+ Histo1DPtr _h_4_X3;
+ Histo1DPtr _h_4_X4;
+ Histo1DPtr _h_4_costheta3;
+ Histo1DPtr _h_4_psi3;
+ Histo1DPtr _h_4_f3;
+ Histo1DPtr _h_4_f4;
+ Histo1DPtr _h_4_f5;
+ Histo1DPtr _h_4_XA;
+ Histo1DPtr _h_4_psiAB;
+ Histo1DPtr _h_4_fA;
+ Histo1DPtr _h_4_fB;
+
+ Histo1DPtr _h_5_mNJ;
+ Histo1DPtr _h_5_X3;
+ Histo1DPtr _h_5_X4;
+ Histo1DPtr _h_5_costheta3;
+ Histo1DPtr _h_5_psi3;
+ Histo1DPtr _h_5_f3;
+ Histo1DPtr _h_5_f4;
+ Histo1DPtr _h_5_f5;
+ Histo1DPtr _h_5_XA;
+ Histo1DPtr _h_5_XC;
+ Histo1DPtr _h_5_psiAB;
+ Histo1DPtr _h_5_psiCD;
+ Histo1DPtr _h_5_fA;
+ Histo1DPtr _h_5_fB;
+ Histo1DPtr _h_5_fC;
+ Histo1DPtr _h_5_fD;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1997_S3541940.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1997_S3541940.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1997_S3541940.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -246,26 +246,26 @@
private:
- AIDA::IHistogram1D *_h_m6J;
- AIDA::IHistogram1D *_h_X3ppp;
- AIDA::IHistogram1D *_h_X4ppp;
- AIDA::IHistogram1D *_h_costheta3ppp;
- AIDA::IHistogram1D *_h_psi3ppp;
- AIDA::IHistogram1D *_h_f3ppp;
- AIDA::IHistogram1D *_h_f4ppp;
- AIDA::IHistogram1D *_h_f5ppp;
- AIDA::IHistogram1D *_h_XApp;
- AIDA::IHistogram1D *_h_XCp;
- AIDA::IHistogram1D *_h_XE;
- AIDA::IHistogram1D *_h_psiAppBpp;
- AIDA::IHistogram1D *_h_psiCpDp;
- AIDA::IHistogram1D *_h_psiEF;
- AIDA::IHistogram1D *_h_fApp;
- AIDA::IHistogram1D *_h_fBpp;
- AIDA::IHistogram1D *_h_fCp;
- AIDA::IHistogram1D *_h_fDp;
- AIDA::IHistogram1D *_h_fE;
- AIDA::IHistogram1D *_h_fF;
+ Histo1DPtr _h_m6J;
+ Histo1DPtr _h_X3ppp;
+ Histo1DPtr _h_X4ppp;
+ Histo1DPtr _h_costheta3ppp;
+ Histo1DPtr _h_psi3ppp;
+ Histo1DPtr _h_f3ppp;
+ Histo1DPtr _h_f4ppp;
+ Histo1DPtr _h_f5ppp;
+ Histo1DPtr _h_XApp;
+ Histo1DPtr _h_XCp;
+ Histo1DPtr _h_XE;
+ Histo1DPtr _h_psiAppBpp;
+ Histo1DPtr _h_psiCpDp;
+ Histo1DPtr _h_psiEF;
+ Histo1DPtr _h_fApp;
+ Histo1DPtr _h_fBpp;
+ Histo1DPtr _h_fCp;
+ Histo1DPtr _h_fDp;
+ Histo1DPtr _h_fE;
+ Histo1DPtr _h_fF;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_1998_S3618439.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -70,7 +70,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_sumET_20, *_h_sumET_100;
+ Histo1DPtr _h_sumET_20, _h_sumET_100;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4155203.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -66,7 +66,7 @@
private:
- AIDA::IHistogram1D *_hist_zpt;
+ Histo1DPtr _hist_zpt;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2000_S4266730.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -78,7 +78,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_mjj;
+ Histo1DPtr _h_mjj;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4563131.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -69,7 +69,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_ET;
+ Histo1DPtr _h_ET;
//@}
};
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2001_S4751469.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -278,7 +278,7 @@
AIDA::IProfile1D *_numTowardJ20, *_numTransJ20, *_numAwayJ20;
/// Histogram of \f$ p_T \f$ distribution for 3 different \f$ p_{T1} \f$ IR cutoffs.
- AIDA::IHistogram1D *_ptTrans2, *_ptTrans5, *_ptTrans30;
+ 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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2004_S5839831.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -369,15 +369,15 @@
/// Histogram of \f$ p_{T\text{sum}} \f$ distribution for 5 different
/// \f$ E_{T1} \f$ bins.
/// Corresponds to figure 4, and HepData table 3.
- AIDA::IHistogram1D *_pt90Dbn1800Et40, *_pt90Dbn1800Et80, *_pt90Dbn1800Et120,
- *_pt90Dbn1800Et160, *_pt90Dbn1800Et200;
+ Histo1DPtr _pt90Dbn1800Et40, _pt90Dbn1800Et80, _pt90Dbn1800Et120,
+ _pt90Dbn1800Et160, _pt90Dbn1800Et200;
/// Histograms of track multiplicity and \f$ p_T \f$ distributions for
/// minimum bias events.
/// Figure 6, and HepData tables 5 & 6.
/// Figure 10, and HepData tables 10 & 11.
- AIDA::IHistogram1D *_numTracksDbn1800MB, *_ptDbn1800MB;
- AIDA::IHistogram1D *_numTracksDbn630MB, *_ptDbn630MB;
+ Histo1DPtr _numTracksDbn1800MB, _ptDbn1800MB;
+ Histo1DPtr _numTracksDbn630MB, _ptDbn630MB;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2006_S6450792.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -54,7 +54,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_jet_pt;
+ Histo1DPtr _h_jet_pt;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2008_S7540469.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -185,9 +185,9 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_jet_multiplicity;
- AIDA::IHistogram1D * _h_jet_pT_cross_section_incl_1jet;
- AIDA::IHistogram1D * _h_jet_pT_cross_section_incl_2jet;
+ Histo1DPtr _h_jet_multiplicity;
+ Histo1DPtr _h_jet_pT_cross_section_incl_1jet;
+ Histo1DPtr _h_jet_pT_cross_section_incl_2jet;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_NOTE_9936.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -69,7 +69,7 @@
private:
- AIDA::IHistogram1D *_hist_nch;
+ Histo1DPtr _hist_nch;
};
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8233977.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -118,8 +118,8 @@
double _sumWeightSelected;
AIDA::IProfile1D *_hist_pt_vs_multiplicity;
- AIDA::IHistogram1D *_hist_pt;
- AIDA::IHistogram1D *_hist_sumEt;
+ Histo1DPtr _hist_pt;
+ Histo1DPtr _hist_sumEt;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8383952.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -81,8 +81,8 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_yZ;
- AIDA::IHistogram1D *_h_xs;
+ Histo1DPtr _h_yZ;
+ Histo1DPtr _h_xs;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CDF_2009_S8436959.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -82,7 +82,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_Et_photon;
+ Histo1DPtr _h_Et_photon;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/CMS_2011_S8957746.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -83,12 +83,12 @@
private:
- AIDA::IHistogram1D *_hist_T_90;
- AIDA::IHistogram1D *_hist_m_90;
- AIDA::IHistogram1D *_hist_T_125;
- AIDA::IHistogram1D *_hist_m_125;
- AIDA::IHistogram1D *_hist_T_200;
- AIDA::IHistogram1D *_hist_m_200;
+ Histo1DPtr _hist_T_90;
+ Histo1DPtr _hist_m_90;
+ Histo1DPtr _hist_T_125;
+ Histo1DPtr _hist_m_125;
+ Histo1DPtr _hist_T_200;
+ Histo1DPtr _hist_m_200;
};
// This global object acts as a hook for the plugin system
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3214044.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -239,36 +239,36 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_3j_x3;
- AIDA::IHistogram1D *_h_3j_x5;
- AIDA::IHistogram1D *_h_3j_costheta3;
- AIDA::IHistogram1D *_h_3j_psi;
- AIDA::IHistogram1D *_h_3j_mu34;
- AIDA::IHistogram1D *_h_3j_mu35;
- AIDA::IHistogram1D *_h_3j_mu45;
-
- AIDA::IHistogram1D *_h_4j_x3;
- AIDA::IHistogram1D *_h_4j_x4;
- AIDA::IHistogram1D *_h_4j_x5;
- AIDA::IHistogram1D *_h_4j_x6;
- AIDA::IHistogram1D *_h_4j_costheta3;
- AIDA::IHistogram1D *_h_4j_costheta4;
- AIDA::IHistogram1D *_h_4j_costheta5;
- AIDA::IHistogram1D *_h_4j_costheta6;
- AIDA::IHistogram1D *_h_4j_cosomega34;
- AIDA::IHistogram1D *_h_4j_cosomega35;
- AIDA::IHistogram1D *_h_4j_cosomega36;
- AIDA::IHistogram1D *_h_4j_cosomega45;
- AIDA::IHistogram1D *_h_4j_cosomega46;
- AIDA::IHistogram1D *_h_4j_cosomega56;
- AIDA::IHistogram1D *_h_4j_mu34;
- AIDA::IHistogram1D *_h_4j_mu35;
- AIDA::IHistogram1D *_h_4j_mu36;
- AIDA::IHistogram1D *_h_4j_mu45;
- AIDA::IHistogram1D *_h_4j_mu46;
- AIDA::IHistogram1D *_h_4j_mu56;
- AIDA::IHistogram1D *_h_4j_theta_BZ;
- AIDA::IHistogram1D *_h_4j_costheta_NR;
+ Histo1DPtr _h_3j_x3;
+ Histo1DPtr _h_3j_x5;
+ Histo1DPtr _h_3j_costheta3;
+ Histo1DPtr _h_3j_psi;
+ Histo1DPtr _h_3j_mu34;
+ Histo1DPtr _h_3j_mu35;
+ Histo1DPtr _h_3j_mu45;
+
+ Histo1DPtr _h_4j_x3;
+ Histo1DPtr _h_4j_x4;
+ Histo1DPtr _h_4j_x5;
+ Histo1DPtr _h_4j_x6;
+ Histo1DPtr _h_4j_costheta3;
+ Histo1DPtr _h_4j_costheta4;
+ Histo1DPtr _h_4j_costheta5;
+ Histo1DPtr _h_4j_costheta6;
+ Histo1DPtr _h_4j_cosomega34;
+ Histo1DPtr _h_4j_cosomega35;
+ Histo1DPtr _h_4j_cosomega36;
+ Histo1DPtr _h_4j_cosomega45;
+ Histo1DPtr _h_4j_cosomega46;
+ Histo1DPtr _h_4j_cosomega56;
+ Histo1DPtr _h_4j_mu34;
+ Histo1DPtr _h_4j_mu35;
+ Histo1DPtr _h_4j_mu36;
+ Histo1DPtr _h_4j_mu45;
+ Histo1DPtr _h_4j_mu46;
+ Histo1DPtr _h_4j_mu56;
+ Histo1DPtr _h_4j_theta_BZ;
+ Histo1DPtr _h_4j_costheta_NR;
//@}
};
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_1996_S3324664.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -106,7 +106,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_deta;
+ Histo1DPtr _h_deta;
BinnedHistogram<double> _h_dphi;
AIDA::IProfile1D *_h_cosdphi_deta;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2000_S4480767.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2000_S4480767.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2000_S4480767.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -65,7 +65,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_W_pT;
+ Histo1DPtr _h_W_pT;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2007_S7075677.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2007_S7075677.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2007_S7075677.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -68,7 +68,7 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_yZ;
+ Histo1DPtr _h_yZ;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S6879055.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S6879055.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S6879055.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -112,10 +112,10 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _crossSectionRatio;
- AIDA::IHistogram1D * _pTjet1;
- AIDA::IHistogram1D * _pTjet2;
- AIDA::IHistogram1D * _pTjet3;
+ Histo1DPtr _crossSectionRatio;
+ Histo1DPtr _pTjet1;
+ Histo1DPtr _pTjet2;
+ Histo1DPtr _pTjet3;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7554427.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7554427.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7554427.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -73,8 +73,8 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_ZpT;
- AIDA::IHistogram1D * _h_forward_ZpT;
+ Histo1DPtr _h_ZpT;
+ Histo1DPtr _h_forward_ZpT;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7837160.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7837160.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7837160.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -139,9 +139,9 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_dsigplus_deta_25_35, *_h_dsigminus_deta_25_35;
- AIDA::IHistogram1D *_h_dsigplus_deta_35, *_h_dsigminus_deta_35;
- AIDA::IHistogram1D *_h_dsigplus_deta_25, *_h_dsigminus_deta_25;
+ Histo1DPtr _h_dsigplus_deta_25_35, _h_dsigminus_deta_25_35;
+ Histo1DPtr _h_dsigplus_deta_35, _h_dsigminus_deta_35;
+ Histo1DPtr _h_dsigplus_deta_25, _h_dsigminus_deta_25;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2008_S7863608.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -118,15 +118,15 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_jet_pT_cross_section;
- AIDA::IHistogram1D * _h_jet_y_cross_section;
- AIDA::IHistogram1D * _h_Z_pT_cross_section;
- AIDA::IHistogram1D * _h_Z_y_cross_section;
- AIDA::IHistogram1D * _h_total_cross_section;
- AIDA::IHistogram1D * _h_jet_pT_normalised;
- AIDA::IHistogram1D * _h_jet_y_normalised;
- AIDA::IHistogram1D * _h_Z_pT_normalised;
- AIDA::IHistogram1D * _h_Z_y_normalised;
+ Histo1DPtr _h_jet_pT_cross_section;
+ Histo1DPtr _h_jet_y_cross_section;
+ Histo1DPtr _h_Z_pT_cross_section;
+ Histo1DPtr _h_Z_y_cross_section;
+ Histo1DPtr _h_total_cross_section;
+ Histo1DPtr _h_jet_pT_normalised;
+ Histo1DPtr _h_jet_y_normalised;
+ Histo1DPtr _h_Z_pT_normalised;
+ Histo1DPtr _h_Z_y_normalised;
//@}
double _sum_of_weights_inclusive;
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8202443.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8202443.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8202443.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -139,12 +139,12 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_jet1_pT;
- AIDA::IHistogram1D * _h_jet2_pT;
- AIDA::IHistogram1D * _h_jet3_pT;
- AIDA::IHistogram1D * _h_jet1_pT_constrained;
- AIDA::IHistogram1D * _h_jet2_pT_constrained;
- AIDA::IHistogram1D * _h_jet3_pT_constrained;
+ Histo1DPtr _h_jet1_pT;
+ Histo1DPtr _h_jet2_pT;
+ Histo1DPtr _h_jet3_pT;
+ Histo1DPtr _h_jet1_pT_constrained;
+ Histo1DPtr _h_jet2_pT_constrained;
+ Histo1DPtr _h_jet3_pT_constrained;
//@}
double _sum_of_weights, _sum_of_weights_constrained;
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2009_S8349509.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -143,26 +143,26 @@
/// @name Histograms (normalised)
//@{
- AIDA::IHistogram1D *_h_dphi_jet_Z25;
- AIDA::IHistogram1D *_h_dphi_jet_Z45;
+ Histo1DPtr _h_dphi_jet_Z25;
+ Histo1DPtr _h_dphi_jet_Z45;
- AIDA::IHistogram1D *_h_dy_jet_Z25;
- AIDA::IHistogram1D *_h_dy_jet_Z45;
+ Histo1DPtr _h_dy_jet_Z25;
+ Histo1DPtr _h_dy_jet_Z45;
- AIDA::IHistogram1D *_h_yboost_jet_Z25;
- AIDA::IHistogram1D *_h_yboost_jet_Z45;
+ Histo1DPtr _h_yboost_jet_Z25;
+ Histo1DPtr _h_yboost_jet_Z45;
//@}
/// @name Histograms (absolute cross sections)
//@{
- AIDA::IHistogram1D *_h_dphi_jet_Z25_xs;
- AIDA::IHistogram1D *_h_dphi_jet_Z45_xs;
+ Histo1DPtr _h_dphi_jet_Z25_xs;
+ Histo1DPtr _h_dphi_jet_Z45_xs;
- AIDA::IHistogram1D *_h_dy_jet_Z25_xs;
- AIDA::IHistogram1D *_h_dy_jet_Z45_xs;
+ Histo1DPtr _h_dy_jet_Z25_xs;
+ Histo1DPtr _h_dy_jet_Z45_xs;
- AIDA::IHistogram1D *_h_yboost_jet_Z25_xs;
- AIDA::IHistogram1D *_h_yboost_jet_Z45_xs;
+ Histo1DPtr _h_yboost_jet_Z25_xs;
+ Histo1DPtr _h_yboost_jet_Z45_xs;
//@}
double _inclusive_Z_sumofweights;
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8570965.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -134,10 +134,10 @@
private:
- AIDA::IHistogram1D *_h_M;
- AIDA::IHistogram1D *_h_pT;
- AIDA::IHistogram1D *_h_dPhi;
- AIDA::IHistogram1D *_h_costheta;
+ Histo1DPtr _h_M;
+ Histo1DPtr _h_pT;
+ Histo1DPtr _h_dPhi;
+ Histo1DPtr _h_costheta;
BinnedHistogram<double> _h_pT_M;
BinnedHistogram<double> _h_dPhi_M;
BinnedHistogram<double> _h_costheta_M;
Modified: branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/D0_2010_S8671338.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -64,8 +64,8 @@
private:
/// @name Histogram
- AIDA::IHistogram1D * _h_Z_pT_normalised;
- AIDA::IHistogram1D * _h_Z_pT_xs;
+ Histo1DPtr _h_Z_pT_normalised;
+ Histo1DPtr _h_Z_pT_xs;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/DELPHI_1995_S3137023.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/DELPHI_1995_S3137023.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/DELPHI_1995_S3137023.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -96,8 +96,8 @@
double _weightedTotalNumXiMinus;
double _weightedTotalNumSigma1385Plus;
- AIDA::IHistogram1D *_histXpXiMinus;
- AIDA::IHistogram1D *_histXpSigma1385Plus;
+ Histo1DPtr _histXpXiMinus;
+ Histo1DPtr _histXpSigma1385Plus;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/DELPHI_1996_S3430090.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -468,79 +468,79 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_histPtTIn;
- AIDA::IHistogram1D *_histPtTOut;
- AIDA::IHistogram1D *_histPtSIn;
- AIDA::IHistogram1D *_histPtSOut;
+ Histo1DPtr _histPtTIn;
+ Histo1DPtr _histPtTOut;
+ Histo1DPtr _histPtSIn;
+ Histo1DPtr _histPtSOut;
- AIDA::IHistogram1D *_histRapidityT;
- AIDA::IHistogram1D *_histRapidityS;
+ Histo1DPtr _histRapidityT;
+ Histo1DPtr _histRapidityS;
- AIDA::IHistogram1D *_histScaledMom, *_histLogScaledMom;
+ Histo1DPtr _histScaledMom, _histLogScaledMom;
AIDA::IProfile1D *_histPtTOutVsXp, *_histPtVsXp;
- AIDA::IHistogram1D *_hist1MinusT;
- AIDA::IHistogram1D *_histTMajor;
- AIDA::IHistogram1D *_histTMinor;
- AIDA::IHistogram1D *_histOblateness;
-
- AIDA::IHistogram1D *_histSphericity;
- AIDA::IHistogram1D *_histAplanarity;
- AIDA::IHistogram1D *_histPlanarity;
-
- AIDA::IHistogram1D *_histCParam;
- AIDA::IHistogram1D *_histDParam;
-
- AIDA::IHistogram1D *_histHemiMassD;
- AIDA::IHistogram1D *_histHemiMassH;
- AIDA::IHistogram1D *_histHemiMassL;
-
- AIDA::IHistogram1D *_histHemiBroadW;
- AIDA::IHistogram1D *_histHemiBroadN;
- AIDA::IHistogram1D *_histHemiBroadT;
- AIDA::IHistogram1D *_histHemiBroadD;
-
- AIDA::IHistogram1D *_histDiffRate2Durham;
- AIDA::IHistogram1D *_histDiffRate2Jade;
- AIDA::IHistogram1D *_histDiffRate3Durham;
- AIDA::IHistogram1D *_histDiffRate3Jade;
- AIDA::IHistogram1D *_histDiffRate4Durham;
- AIDA::IHistogram1D *_histDiffRate4Jade;
-
- AIDA::IHistogram1D *_histEEC, *_histAEEC;
-
- AIDA::IHistogram1D *_histMultiCharged;
-
- AIDA::IHistogram1D *_histMultiPiPlus;
- AIDA::IHistogram1D *_histMultiPi0;
- AIDA::IHistogram1D *_histMultiKPlus;
- AIDA::IHistogram1D *_histMultiK0;
- AIDA::IHistogram1D *_histMultiEta;
- AIDA::IHistogram1D *_histMultiEtaPrime;
- AIDA::IHistogram1D *_histMultiDPlus;
- AIDA::IHistogram1D *_histMultiD0;
- AIDA::IHistogram1D *_histMultiBPlus0;
-
- AIDA::IHistogram1D *_histMultiF0;
-
- AIDA::IHistogram1D *_histMultiRho;
- AIDA::IHistogram1D *_histMultiKStar892Plus;
- AIDA::IHistogram1D *_histMultiKStar892_0;
- AIDA::IHistogram1D *_histMultiPhi;
- AIDA::IHistogram1D *_histMultiDStar2010Plus;
-
- AIDA::IHistogram1D *_histMultiF2;
- AIDA::IHistogram1D *_histMultiK2Star1430_0;
-
- AIDA::IHistogram1D *_histMultiP;
- AIDA::IHistogram1D *_histMultiLambda0;
- AIDA::IHistogram1D *_histMultiXiMinus;
- AIDA::IHistogram1D *_histMultiOmegaMinus;
- AIDA::IHistogram1D *_histMultiDeltaPlusPlus;
- AIDA::IHistogram1D *_histMultiSigma1385Plus;
- AIDA::IHistogram1D *_histMultiXi1530_0;
- AIDA::IHistogram1D *_histMultiLambdaB0;
+ Histo1DPtr _hist1MinusT;
+ Histo1DPtr _histTMajor;
+ Histo1DPtr _histTMinor;
+ Histo1DPtr _histOblateness;
+
+ Histo1DPtr _histSphericity;
+ Histo1DPtr _histAplanarity;
+ Histo1DPtr _histPlanarity;
+
+ Histo1DPtr _histCParam;
+ Histo1DPtr _histDParam;
+
+ Histo1DPtr _histHemiMassD;
+ Histo1DPtr _histHemiMassH;
+ Histo1DPtr _histHemiMassL;
+
+ Histo1DPtr _histHemiBroadW;
+ Histo1DPtr _histHemiBroadN;
+ Histo1DPtr _histHemiBroadT;
+ Histo1DPtr _histHemiBroadD;
+
+ Histo1DPtr _histDiffRate2Durham;
+ Histo1DPtr _histDiffRate2Jade;
+ Histo1DPtr _histDiffRate3Durham;
+ Histo1DPtr _histDiffRate3Jade;
+ Histo1DPtr _histDiffRate4Durham;
+ Histo1DPtr _histDiffRate4Jade;
+
+ Histo1DPtr _histEEC, _histAEEC;
+
+ Histo1DPtr _histMultiCharged;
+
+ Histo1DPtr _histMultiPiPlus;
+ Histo1DPtr _histMultiPi0;
+ Histo1DPtr _histMultiKPlus;
+ Histo1DPtr _histMultiK0;
+ Histo1DPtr _histMultiEta;
+ Histo1DPtr _histMultiEtaPrime;
+ Histo1DPtr _histMultiDPlus;
+ Histo1DPtr _histMultiD0;
+ Histo1DPtr _histMultiBPlus0;
+
+ Histo1DPtr _histMultiF0;
+
+ Histo1DPtr _histMultiRho;
+ Histo1DPtr _histMultiKStar892Plus;
+ Histo1DPtr _histMultiKStar892_0;
+ Histo1DPtr _histMultiPhi;
+ Histo1DPtr _histMultiDStar2010Plus;
+
+ Histo1DPtr _histMultiF2;
+ Histo1DPtr _histMultiK2Star1430_0;
+
+ Histo1DPtr _histMultiP;
+ Histo1DPtr _histMultiLambda0;
+ Histo1DPtr _histMultiXiMinus;
+ Histo1DPtr _histMultiOmegaMinus;
+ Histo1DPtr _histMultiDeltaPlusPlus;
+ Histo1DPtr _histMultiSigma1385Plus;
+ Histo1DPtr _histMultiXi1530_0;
+ Histo1DPtr _histMultiLambdaB0;
//@}
};
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/DELPHI_2002_069_CONF_603.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -114,8 +114,8 @@
/// particles - used to calculate average number of particles for the
/// inclusive single particle distributions' normalisations.
- AIDA::IHistogram1D *_histXbprim;
- AIDA::IHistogram1D *_histXbweak;
+ Histo1DPtr _histXbprim;
+ Histo1DPtr _histXbweak;
AIDA::IProfile1D *_histMeanXbprim;
AIDA::IProfile1D *_histMeanXbweak;
Modified: branches/2011-07-aida2yoda/src/Analyses/DELPHI_2003_WUD_03_11.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/DELPHI_2003_WUD_03_11.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/DELPHI_2003_WUD_03_11.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -186,14 +186,14 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_histDurhamBZ;
- AIDA::IHistogram1D *_histDurhamKSW;
- AIDA::IHistogram1D *_histDurhamNR;
- AIDA::IHistogram1D *_histDurhamALPHA34;
- AIDA::IHistogram1D *_histJadeBZ;
- AIDA::IHistogram1D *_histJadeKSW;
- AIDA::IHistogram1D *_histJadeNR;
- AIDA::IHistogram1D *_histJadeALPHA34;
+ Histo1DPtr _histDurhamBZ;
+ Histo1DPtr _histDurhamKSW;
+ Histo1DPtr _histDurhamNR;
+ Histo1DPtr _histDurhamALPHA34;
+ Histo1DPtr _histJadeBZ;
+ Histo1DPtr _histJadeKSW;
+ Histo1DPtr _histJadeNR;
+ Histo1DPtr _histJadeALPHA34;
//@}
};
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/H1_1994_S2919893.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -236,14 +236,14 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_histEnergyFlowLowX;
- AIDA::IHistogram1D *_histEnergyFlowHighX;
- AIDA::IHistogram1D *_histEECLowX;
- AIDA::IHistogram1D *_histEECHighX;
- AIDA::IHistogram1D *_histSpectraW77;
- AIDA::IHistogram1D *_histSpectraW122;
- AIDA::IHistogram1D *_histSpectraW169;
- AIDA::IHistogram1D *_histSpectraW117;
+ Histo1DPtr _histEnergyFlowLowX;
+ Histo1DPtr _histEnergyFlowHighX;
+ Histo1DPtr _histEECLowX;
+ Histo1DPtr _histEECHighX;
+ Histo1DPtr _histSpectraW77;
+ Histo1DPtr _histSpectraW122;
+ Histo1DPtr _histSpectraW169;
+ Histo1DPtr _histSpectraW117;
AIDA::IProfile1D *_histPT2;
//@}
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -28,8 +28,8 @@
const FinalStateHCM& fshcm = addProjection(FinalStateHCM(diskin), "FS");
addProjection(CentralEtHCM(fshcm), "Y1HCM");
- _hEtFlow = vector<AIDA::IHistogram1D *>(_nbin);
- _hEtFlowStat = vector<AIDA::IHistogram1D *>(_nbin);
+ _hEtFlow = vector<Histo1DPtr>(_nbin);
+ _hEtFlowStat = vector<Histo1DPtr>(_nbin);
_nev = vector<double>(_nbin);
/// @todo Automate this sort of thing so that the analysis code is more readable.
for (size_t i = 0; i < _nbin; ++i) {
@@ -136,7 +136,7 @@
vector<Histo1DPtr> _hEtFlow, _hEtFlowStat;
/// Histograms for averages in different kinematical bins.
- AIDA::IHistogram1D *_hAvEt, *_hAvX, *_hAvQ2, *_hN;
+ Histo1DPtr _hAvEt, _hAvX, _hAvQ2, _hN;
/// Helper vector;
vector<double> _nev;
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -258,10 +258,10 @@
/// @name Histograms
//@{
- vector<AIDA::IHistogram1D *> _histETLowQa;
- vector<AIDA::IHistogram1D *> _histETHighQa;
- vector<AIDA::IHistogram1D *> _histETLowQb;
- vector<AIDA::IHistogram1D *> _histETHighQb;
+ vector<Histo1DPtr> _histETLowQa;
+ vector<Histo1DPtr> _histETHighQa;
+ vector<Histo1DPtr> _histETLowQb;
+ vector<Histo1DPtr> _histETHighQb;
AIDA::IProfile1D * _histAverETCentral;
AIDA::IProfile1D * _histAverETFrag;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/JADE_1998_S3612880.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/JADE_1998_S3612880.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/JADE_1998_S3612880.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -119,11 +119,11 @@
private:
- AIDA::IHistogram1D *_h_thrust;
- AIDA::IHistogram1D *_h_MH;
- AIDA::IHistogram1D *_h_BT;
- AIDA::IHistogram1D *_h_BW;
- AIDA::IHistogram1D *_h_y23;
+ Histo1DPtr _h_thrust;
+ Histo1DPtr _h_MH;
+ Histo1DPtr _h_BT;
+ Histo1DPtr _h_BW;
+ Histo1DPtr _h_y23;
};
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 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/JADE_OPAL_2000_S4300807.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -183,7 +183,7 @@
//@{
AIDA::IDataPointSet *_h_R_Jade[5];
AIDA::IDataPointSet *_h_R_Durham[5];
- AIDA::IHistogram1D *_h_y_Durham[4];
+ Histo1DPtr _h_y_Durham[4];
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/LHCB_2010_S8758301.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -105,9 +105,9 @@
//@{
- AIDA::IHistogram1D *_h_K0s_pt_y_30;
- AIDA::IHistogram1D *_h_K0s_pt_y_35;
- AIDA::IHistogram1D *_h_K0s_pt_y_40;
+ Histo1DPtr _h_K0s_pt_y_30;
+ Histo1DPtr _h_K0s_pt_y_35;
+ Histo1DPtr _h_K0s_pt_y_40;
double sumKs0_30;
double sumKs0_35;
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_GENERIC.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_GENERIC.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_GENERIC.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -199,15 +199,15 @@
//@{
/// Histograms
- AIDA::IHistogram1D *_histMult, *_histMultCh;
- AIDA::IHistogram1D *_histStablePIDs, *_histDecayedPIDs, *_histAllPIDs;
- AIDA::IHistogram1D *_histEtaPi, *_histEtaK, *_histEtaLambda;
- AIDA::IProfile1D *_histEtaSumEt;
- AIDA::IHistogram1D *_histEta, *_histEtaCh;
- AIDA::IHistogram1D *_histRapidity, *_histRapidityCh;
- AIDA::IHistogram1D *_histPt, *_histPtCh;
- AIDA::IHistogram1D *_histE, *_histECh;
- AIDA::IHistogram1D *_histPhi, *_histPhiCh;
+ Histo1DPtr _histMult, _histMultCh;
+ Histo1DPtr _histStablePIDs, _histDecayedPIDs, _histAllPIDs;
+ Histo1DPtr _histEtaPi, _histEtaK, _histEtaLambda;
+ AIDA::IProfile1D _histEtaSumEt;
+ Histo1DPtr _histEta, _histEtaCh;
+ Histo1DPtr _histRapidity, _histRapidityCh;
+ Histo1DPtr _histPt, _histPtCh;
+ Histo1DPtr _histE, _histECh;
+ Histo1DPtr _histPhi, _histPhiCh;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_HJETS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_HJETS.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_HJETS.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -97,15 +97,15 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_H_mass;
- AIDA::IHistogram1D * _h_H_pT;
- AIDA::IHistogram1D * _h_H_pT_peak;
- AIDA::IHistogram1D * _h_H_y;
- AIDA::IHistogram1D * _h_H_phi;
- AIDA::IHistogram1D * _h_H_jet1_deta;
- AIDA::IHistogram1D * _h_H_jet1_dR;
- AIDA::IHistogram1D * _h_lepton_pT;
- AIDA::IHistogram1D * _h_lepton_eta;
+ Histo1DPtr _h_H_mass;
+ Histo1DPtr _h_H_pT;
+ Histo1DPtr _h_H_pT_peak;
+ Histo1DPtr _h_H_y;
+ Histo1DPtr _h_H_phi;
+ Histo1DPtr _h_H_jet1_deta;
+ Histo1DPtr _h_H_jet1_dR;
+ Histo1DPtr _h_lepton_pT;
+ Histo1DPtr _h_lepton_eta;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_PHOTONJETS.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -115,11 +115,11 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_photon_pT;
- AIDA::IHistogram1D * _h_photon_y;
- AIDA::IHistogram1D * _h_photon_jet1_deta;
- AIDA::IHistogram1D * _h_photon_jet1_dphi;
- AIDA::IHistogram1D * _h_photon_jet1_dR;
+ Histo1DPtr _h_photon_pT;
+ Histo1DPtr _h_photon_y;
+ Histo1DPtr _h_photon_jet1_deta;
+ Histo1DPtr _h_photon_jet1_dphi;
+ Histo1DPtr _h_photon_jet1_dR;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_SUSY.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_SUSY.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_SUSY.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -302,16 +302,16 @@
private:
- AIDA::IHistogram1D *_hist_n_trk, *_hist_phi_trk, *_hist_eta_trk, *_hist_pt_trk;
- AIDA::IHistogram1D *_hist_n_jet, *_hist_phi_jet, *_hist_eta_jet, *_hist_pt_jet;
- AIDA::IHistogram1D *_hist_n_e, *_hist_phi_e, *_hist_eta_e, *_hist_pt_e;
- AIDA::IHistogram1D *_hist_n_mu, *_hist_phi_mu, *_hist_eta_mu, *_hist_pt_mu;
- AIDA::IHistogram1D *_hist_n_gamma, *_hist_phi_gamma, *_hist_eta_gamma, *_hist_pt_gamma;
- AIDA::IHistogram1D *_hist_n_gammaiso, *_hist_phi_gammaiso, *_hist_eta_gammaiso, *_hist_pt_gammaiso;
- AIDA::IHistogram1D *_hist_met;
- AIDA::IHistogram1D *_hist_mll_2_ossf_ee, *_hist_mll_2_ossf_mumu, *_hist_mll_2_osof_emu;
- AIDA::IHistogram1D *_hist_mll_ossf_ee, *_hist_mll_ossf_mumu, *_hist_mll_osof_emu;
- AIDA::IHistogram1D *_hist_mll_all_ossf_ee, *_hist_mll_all_ossf_mumu, *_hist_mll_all_osof_emu;
+ Histo1DPtr _hist_n_trk, _hist_phi_trk, _hist_eta_trk, _hist_pt_trk;
+ Histo1DPtr _hist_n_jet, _hist_phi_jet, _hist_eta_jet, _hist_pt_jet;
+ Histo1DPtr _hist_n_e, _hist_phi_e, _hist_eta_e, _hist_pt_e;
+ Histo1DPtr _hist_n_mu, _hist_phi_mu, _hist_eta_mu, _hist_pt_mu;
+ Histo1DPtr _hist_n_gamma, _hist_phi_gamma, _hist_eta_gamma, _hist_pt_gamma;
+ Histo1DPtr _hist_n_gammaiso, _hist_phi_gammaiso, _hist_eta_gammaiso, _hist_pt_gammaiso;
+ Histo1DPtr _hist_met;
+ Histo1DPtr _hist_mll_2_ossf_ee, _hist_mll_2_ossf_mumu, _hist_mll_2_osof_emu;
+ Histo1DPtr _hist_mll_ossf_ee, _hist_mll_ossf_mumu, _hist_mll_osof_emu;
+ Histo1DPtr _hist_mll_all_ossf_ee, _hist_mll_all_ossf_mumu, _hist_mll_all_osof_emu;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_WJETS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_WJETS.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_WJETS.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -139,20 +139,20 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_W_mass;
- AIDA::IHistogram1D * _h_W_pT;
- AIDA::IHistogram1D * _h_W_pT_peak;
- AIDA::IHistogram1D * _h_W_y;
- AIDA::IHistogram1D * _h_W_phi;
- AIDA::IHistogram1D * _h_W_jet1_deta;
- AIDA::IHistogram1D * _h_W_jet1_dR;
- AIDA::IHistogram1D * _h_Wplus_pT;
- AIDA::IHistogram1D * _h_Wminus_pT;
- AIDA::IHistogram1D * _h_lepton_pT;
- AIDA::IHistogram1D * _h_lepton_eta;
+ Histo1DPtr _h_W_mass;
+ Histo1DPtr _h_W_pT;
+ Histo1DPtr _h_W_pT_peak;
+ Histo1DPtr _h_W_y;
+ Histo1DPtr _h_W_phi;
+ Histo1DPtr _h_W_jet1_deta;
+ Histo1DPtr _h_W_jet1_dR;
+ Histo1DPtr _h_Wplus_pT;
+ Histo1DPtr _h_Wminus_pT;
+ Histo1DPtr _h_lepton_pT;
+ Histo1DPtr _h_lepton_eta;
- AIDA::IHistogram1D * _htmp_dsigminus_deta;
- AIDA::IHistogram1D * _htmp_dsigplus_deta;
+ Histo1DPtr _htmp_dsigminus_deta;
+ Histo1DPtr _htmp_dsigplus_deta;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_WWJETS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_WWJETS.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_WWJETS.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -203,30 +203,30 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_WW_pT;
- AIDA::IHistogram1D * _h_WW_pT_peak;
- AIDA::IHistogram1D * _h_WW_eta;
- AIDA::IHistogram1D * _h_WW_phi;
- AIDA::IHistogram1D * _h_WW_m;
- AIDA::IHistogram1D * _h_WW_dphi;
- AIDA::IHistogram1D * _h_WW_deta;
- AIDA::IHistogram1D * _h_WW_dR;
- AIDA::IHistogram1D * _h_WW_dpT;
- AIDA::IHistogram1D * _h_WW_costheta_planes;
- AIDA::IHistogram1D * _h_W_pT;
- AIDA::IHistogram1D * _h_W_eta;
- AIDA::IHistogram1D * _h_Wl_pT;
- AIDA::IHistogram1D * _h_Wl_eta;
- AIDA::IHistogram1D * _h_WeWm_dphi;
- AIDA::IHistogram1D * _h_WeWm_deta;
- AIDA::IHistogram1D * _h_WeWm_dR;
- AIDA::IHistogram1D * _h_WeWm_m;
- AIDA::IHistogram1D * _h_WW_jet1_deta;
- AIDA::IHistogram1D * _h_WW_jet1_dR;
- AIDA::IHistogram1D * _h_We_jet1_dR;
- AIDA::IHistogram1D * _h_jets_dphi_12;
- AIDA::IHistogram1D * _h_jets_m_12;
- AIDA::IHistogram1D * _h_HT;
+ Histo1DPtr _h_WW_pT;
+ Histo1DPtr _h_WW_pT_peak;
+ Histo1DPtr _h_WW_eta;
+ Histo1DPtr _h_WW_phi;
+ Histo1DPtr _h_WW_m;
+ Histo1DPtr _h_WW_dphi;
+ Histo1DPtr _h_WW_deta;
+ Histo1DPtr _h_WW_dR;
+ Histo1DPtr _h_WW_dpT;
+ Histo1DPtr _h_WW_costheta_planes;
+ Histo1DPtr _h_W_pT;
+ Histo1DPtr _h_W_eta;
+ Histo1DPtr _h_Wl_pT;
+ Histo1DPtr _h_Wl_eta;
+ Histo1DPtr _h_WeWm_dphi;
+ Histo1DPtr _h_WeWm_deta;
+ Histo1DPtr _h_WeWm_dR;
+ Histo1DPtr _h_WeWm_m;
+ Histo1DPtr _h_WW_jet1_deta;
+ Histo1DPtr _h_WW_jet1_dR;
+ Histo1DPtr _h_We_jet1_dR;
+ Histo1DPtr _h_jets_dphi_12;
+ Histo1DPtr _h_jets_m_12;
+ Histo1DPtr _h_HT;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_ZJETS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_ZJETS.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_ZJETS.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -97,15 +97,15 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_Z_mass;
- AIDA::IHistogram1D * _h_Z_pT;
- AIDA::IHistogram1D * _h_Z_pT_peak;
- AIDA::IHistogram1D * _h_Z_y;
- AIDA::IHistogram1D * _h_Z_phi;
- AIDA::IHistogram1D * _h_Z_jet1_deta;
- AIDA::IHistogram1D * _h_Z_jet1_dR;
- AIDA::IHistogram1D * _h_lepton_pT;
- AIDA::IHistogram1D * _h_lepton_eta;
+ Histo1DPtr _h_Z_mass;
+ Histo1DPtr _h_Z_pT;
+ Histo1DPtr _h_Z_pT_peak;
+ Histo1DPtr _h_Z_y;
+ Histo1DPtr _h_Z_phi;
+ Histo1DPtr _h_Z_jet1_deta;
+ Histo1DPtr _h_Z_jet1_dR;
+ Histo1DPtr _h_lepton_pT;
+ Histo1DPtr _h_lepton_eta;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/MC_ZZJETS.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/MC_ZZJETS.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/MC_ZZJETS.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -210,28 +210,28 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_ZZ_pT;
- AIDA::IHistogram1D * _h_ZZ_pT_peak;
- AIDA::IHistogram1D * _h_ZZ_eta;
- AIDA::IHistogram1D * _h_ZZ_phi;
- AIDA::IHistogram1D * _h_ZZ_m;
- AIDA::IHistogram1D * _h_ZZ_dphi;
- AIDA::IHistogram1D * _h_ZZ_deta;
- AIDA::IHistogram1D * _h_ZZ_dR;
- AIDA::IHistogram1D * _h_ZZ_dpT;
- AIDA::IHistogram1D * _h_ZZ_costheta_planes;
- AIDA::IHistogram1D * _h_Z_pT;
- AIDA::IHistogram1D * _h_Z_eta;
- AIDA::IHistogram1D * _h_Zl_pT;
- AIDA::IHistogram1D * _h_Zl_eta;
- AIDA::IHistogram1D * _h_ZeZm_dphi;
- AIDA::IHistogram1D * _h_ZeZm_deta;
- AIDA::IHistogram1D * _h_ZeZm_dR;
- AIDA::IHistogram1D * _h_ZeZm_m;
- AIDA::IHistogram1D * _h_ZZ_jet1_deta;
- AIDA::IHistogram1D * _h_ZZ_jet1_dR;
- AIDA::IHistogram1D * _h_Ze_jet1_dR;
- AIDA::IHistogram1D * _h_HT;
+ Histo1DPtr _h_ZZ_pT;
+ Histo1DPtr _h_ZZ_pT_peak;
+ Histo1DPtr _h_ZZ_eta;
+ Histo1DPtr _h_ZZ_phi;
+ Histo1DPtr _h_ZZ_m;
+ Histo1DPtr _h_ZZ_dphi;
+ Histo1DPtr _h_ZZ_deta;
+ Histo1DPtr _h_ZZ_dR;
+ Histo1DPtr _h_ZZ_dpT;
+ Histo1DPtr _h_ZZ_costheta_planes;
+ Histo1DPtr _h_Z_pT;
+ Histo1DPtr _h_Z_eta;
+ Histo1DPtr _h_Zl_pT;
+ Histo1DPtr _h_Zl_eta;
+ Histo1DPtr _h_ZeZm_dphi;
+ Histo1DPtr _h_ZeZm_deta;
+ Histo1DPtr _h_ZeZm_dR;
+ Histo1DPtr _h_ZeZm_m;
+ Histo1DPtr _h_ZZ_jet1_deta;
+ Histo1DPtr _h_ZZ_jet1_dR;
+ Histo1DPtr _h_Ze_jet1_dR;
+ Histo1DPtr _h_HT;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_1998_S3780481.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/OPAL_1998_S3780481.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/OPAL_1998_S3780481.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -175,18 +175,18 @@
double _SumOfcWeights;
double _SumOfbWeights;
- AIDA::IHistogram1D *_histXpuds;
- AIDA::IHistogram1D *_histXpc;
- AIDA::IHistogram1D *_histXpb;
- AIDA::IHistogram1D *_histXpall;
- AIDA::IHistogram1D *_histLogXpuds;
- AIDA::IHistogram1D *_histLogXpc;
- AIDA::IHistogram1D *_histLogXpb;
- AIDA::IHistogram1D *_histLogXpall;
- AIDA::IHistogram1D *_histMultiChargeduds;
- AIDA::IHistogram1D *_histMultiChargedc;
- AIDA::IHistogram1D *_histMultiChargedb;
- AIDA::IHistogram1D *_histMultiChargedall;
+ Histo1DPtr _histXpuds;
+ Histo1DPtr _histXpc;
+ Histo1DPtr _histXpb;
+ Histo1DPtr _histXpall;
+ Histo1DPtr _histLogXpuds;
+ Histo1DPtr _histLogXpc;
+ Histo1DPtr _histLogXpb;
+ Histo1DPtr _histLogXpall;
+ Histo1DPtr _histMultiChargeduds;
+ Histo1DPtr _histMultiChargedc;
+ Histo1DPtr _histMultiChargedb;
+ Histo1DPtr _histMultiChargedall;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/OPAL_2001_S4553896.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -145,10 +145,10 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_h_BZ;
- AIDA::IHistogram1D *_h_KSW;
- AIDA::IHistogram1D *_h_NR;
- AIDA::IHistogram1D *_h_ALPHA34;
+ Histo1DPtr _h_BZ;
+ Histo1DPtr _h_KSW;
+ Histo1DPtr _h_NR;
+ Histo1DPtr _h_ALPHA34;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -706,60 +706,60 @@
private:
- AIDA::IHistogram1D *_histMeanMultiPiPlus;
- AIDA::IHistogram1D *_histMeanMultiPi0;
- AIDA::IHistogram1D *_histMeanMultiKPlus;
- AIDA::IHistogram1D *_histMeanMultiK0;
- AIDA::IHistogram1D *_histMeanMultiEta;
- AIDA::IHistogram1D *_histMeanMultiEtaPrime;
- AIDA::IHistogram1D *_histMeanMultiDPlus;
- AIDA::IHistogram1D *_histMeanMultiD0;
- AIDA::IHistogram1D *_histMeanMultiDPlus_s;
- AIDA::IHistogram1D *_histMeanMultiBPlus_B0_d;
- AIDA::IHistogram1D *_histMeanMultiBPlus_u;
- AIDA::IHistogram1D *_histMeanMultiB0_s;
- AIDA::IHistogram1D *_histMeanMultiF0_980;
- AIDA::IHistogram1D *_histMeanMultiA0_980Plus;
- AIDA::IHistogram1D *_histMeanMultiRho770_0;
- AIDA::IHistogram1D *_histMeanMultiRho770Plus;
- AIDA::IHistogram1D *_histMeanMultiOmega782;
- AIDA::IHistogram1D *_histMeanMultiKStar892Plus;
- AIDA::IHistogram1D *_histMeanMultiKStar892_0;
- AIDA::IHistogram1D *_histMeanMultiPhi1020;
- AIDA::IHistogram1D *_histMeanMultiDStar2010Plus;
- AIDA::IHistogram1D *_histMeanMultiDStar2007_0;
- AIDA::IHistogram1D *_histMeanMultiDStar_s2112Plus;
- AIDA::IHistogram1D *_histMeanMultiBStar;
- AIDA::IHistogram1D *_histMeanMultiJPsi1S;
- AIDA::IHistogram1D *_histMeanMultiPsi2S;
- AIDA::IHistogram1D *_histMeanMultiUpsilon1S;
- AIDA::IHistogram1D *_histMeanMultiF1_1285;
- AIDA::IHistogram1D *_histMeanMultiF1_1420;
- AIDA::IHistogram1D *_histMeanMultiChi_c1_3510;
- AIDA::IHistogram1D *_histMeanMultiF2_1270;
- AIDA::IHistogram1D *_histMeanMultiF2Prime1525;
- AIDA::IHistogram1D *_histMeanMultiK2Star1430Plus;
- AIDA::IHistogram1D *_histMeanMultiK2Star1430_0;
- AIDA::IHistogram1D *_histMeanMultiBStarStar;
- AIDA::IHistogram1D *_histMeanMultiDs1Plus;
- AIDA::IHistogram1D *_histMeanMultiDs2Plus;
- AIDA::IHistogram1D *_histMeanMultiP;
- AIDA::IHistogram1D *_histMeanMultiLambda;
- AIDA::IHistogram1D *_histMeanMultiSigma0;
- AIDA::IHistogram1D *_histMeanMultiSigmaMinus;
- AIDA::IHistogram1D *_histMeanMultiSigmaPlus;
- AIDA::IHistogram1D *_histMeanMultiSigmaPlusMinus;
- AIDA::IHistogram1D *_histMeanMultiXiMinus;
- AIDA::IHistogram1D *_histMeanMultiDelta1232PlusPlus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385Minus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385Plus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385PlusMinus;
- AIDA::IHistogram1D *_histMeanMultiXi1530_0;
- AIDA::IHistogram1D *_histMeanMultiOmegaMinus;
- AIDA::IHistogram1D *_histMeanMultiLambda_c_Plus;
- AIDA::IHistogram1D *_histMeanMultiLambda_b_0;
- AIDA::IHistogram1D *_histMeanMultiSigma_c_PlusPlus_0;
- AIDA::IHistogram1D *_histMeanMultiLambda1520;
+ Histo1DPtr _histMeanMultiPiPlus;
+ Histo1DPtr _histMeanMultiPi0;
+ Histo1DPtr _histMeanMultiKPlus;
+ Histo1DPtr _histMeanMultiK0;
+ Histo1DPtr _histMeanMultiEta;
+ Histo1DPtr _histMeanMultiEtaPrime;
+ Histo1DPtr _histMeanMultiDPlus;
+ Histo1DPtr _histMeanMultiD0;
+ Histo1DPtr _histMeanMultiDPlus_s;
+ Histo1DPtr _histMeanMultiBPlus_B0_d;
+ Histo1DPtr _histMeanMultiBPlus_u;
+ Histo1DPtr _histMeanMultiB0_s;
+ Histo1DPtr _histMeanMultiF0_980;
+ Histo1DPtr _histMeanMultiA0_980Plus;
+ Histo1DPtr _histMeanMultiRho770_0;
+ Histo1DPtr _histMeanMultiRho770Plus;
+ Histo1DPtr _histMeanMultiOmega782;
+ Histo1DPtr _histMeanMultiKStar892Plus;
+ Histo1DPtr _histMeanMultiKStar892_0;
+ Histo1DPtr _histMeanMultiPhi1020;
+ Histo1DPtr _histMeanMultiDStar2010Plus;
+ Histo1DPtr _histMeanMultiDStar2007_0;
+ Histo1DPtr _histMeanMultiDStar_s2112Plus;
+ Histo1DPtr _histMeanMultiBStar;
+ Histo1DPtr _histMeanMultiJPsi1S;
+ Histo1DPtr _histMeanMultiPsi2S;
+ Histo1DPtr _histMeanMultiUpsilon1S;
+ Histo1DPtr _histMeanMultiF1_1285;
+ Histo1DPtr _histMeanMultiF1_1420;
+ Histo1DPtr _histMeanMultiChi_c1_3510;
+ Histo1DPtr _histMeanMultiF2_1270;
+ Histo1DPtr _histMeanMultiF2Prime1525;
+ Histo1DPtr _histMeanMultiK2Star1430Plus;
+ Histo1DPtr _histMeanMultiK2Star1430_0;
+ Histo1DPtr _histMeanMultiBStarStar;
+ Histo1DPtr _histMeanMultiDs1Plus;
+ Histo1DPtr _histMeanMultiDs2Plus;
+ Histo1DPtr _histMeanMultiP;
+ Histo1DPtr _histMeanMultiLambda;
+ Histo1DPtr _histMeanMultiSigma0;
+ Histo1DPtr _histMeanMultiSigmaMinus;
+ Histo1DPtr _histMeanMultiSigmaPlus;
+ Histo1DPtr _histMeanMultiSigmaPlusMinus;
+ Histo1DPtr _histMeanMultiXiMinus;
+ Histo1DPtr _histMeanMultiDelta1232PlusPlus;
+ Histo1DPtr _histMeanMultiSigma1385Minus;
+ Histo1DPtr _histMeanMultiSigma1385Plus;
+ Histo1DPtr _histMeanMultiSigma1385PlusMinus;
+ Histo1DPtr _histMeanMultiXi1530_0;
+ Histo1DPtr _histMeanMultiOmegaMinus;
+ Histo1DPtr _histMeanMultiLambda_c_Plus;
+ Histo1DPtr _histMeanMultiLambda_b_0;
+ Histo1DPtr _histMeanMultiSigma_c_PlusPlus_0;
+ Histo1DPtr _histMeanMultiLambda1520;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/PDG_Hadron_Multiplicities_Ratios.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -701,59 +701,59 @@
double _weightedTotalNumPiPlus;
- AIDA::IHistogram1D *_histMeanMultiPi0;
- AIDA::IHistogram1D *_histMeanMultiKPlus;
- AIDA::IHistogram1D *_histMeanMultiK0;
- AIDA::IHistogram1D *_histMeanMultiEta;
- AIDA::IHistogram1D *_histMeanMultiEtaPrime;
- AIDA::IHistogram1D *_histMeanMultiDPlus;
- AIDA::IHistogram1D *_histMeanMultiD0;
- AIDA::IHistogram1D *_histMeanMultiDPlus_s;
- AIDA::IHistogram1D *_histMeanMultiBPlus_B0_d;
- AIDA::IHistogram1D *_histMeanMultiBPlus_u;
- AIDA::IHistogram1D *_histMeanMultiB0_s;
- AIDA::IHistogram1D *_histMeanMultiF0_980;
- AIDA::IHistogram1D *_histMeanMultiA0_980Plus;
- AIDA::IHistogram1D *_histMeanMultiRho770_0;
- AIDA::IHistogram1D *_histMeanMultiRho770Plus;
- AIDA::IHistogram1D *_histMeanMultiOmega782;
- AIDA::IHistogram1D *_histMeanMultiKStar892Plus;
- AIDA::IHistogram1D *_histMeanMultiKStar892_0;
- AIDA::IHistogram1D *_histMeanMultiPhi1020;
- AIDA::IHistogram1D *_histMeanMultiDStar2010Plus;
- AIDA::IHistogram1D *_histMeanMultiDStar2007_0;
- AIDA::IHistogram1D *_histMeanMultiDStar_s2112Plus;
- AIDA::IHistogram1D *_histMeanMultiBStar;
- AIDA::IHistogram1D *_histMeanMultiJPsi1S;
- AIDA::IHistogram1D *_histMeanMultiPsi2S;
- AIDA::IHistogram1D *_histMeanMultiUpsilon1S;
- AIDA::IHistogram1D *_histMeanMultiF1_1285;
- AIDA::IHistogram1D *_histMeanMultiF1_1420;
- AIDA::IHistogram1D *_histMeanMultiChi_c1_3510;
- AIDA::IHistogram1D *_histMeanMultiF2_1270;
- AIDA::IHistogram1D *_histMeanMultiF2Prime1525;
- AIDA::IHistogram1D *_histMeanMultiK2Star1430Plus;
- AIDA::IHistogram1D *_histMeanMultiK2Star1430_0;
- AIDA::IHistogram1D *_histMeanMultiBStarStar;
- AIDA::IHistogram1D *_histMeanMultiDs1Plus;
- AIDA::IHistogram1D *_histMeanMultiDs2Plus;
- AIDA::IHistogram1D *_histMeanMultiP;
- AIDA::IHistogram1D *_histMeanMultiLambda;
- AIDA::IHistogram1D *_histMeanMultiSigma0;
- AIDA::IHistogram1D *_histMeanMultiSigmaMinus;
- AIDA::IHistogram1D *_histMeanMultiSigmaPlus;
- AIDA::IHistogram1D *_histMeanMultiSigmaPlusMinus;
- AIDA::IHistogram1D *_histMeanMultiXiMinus;
- AIDA::IHistogram1D *_histMeanMultiDelta1232PlusPlus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385Minus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385Plus;
- AIDA::IHistogram1D *_histMeanMultiSigma1385PlusMinus;
- AIDA::IHistogram1D *_histMeanMultiXi1530_0;
- AIDA::IHistogram1D *_histMeanMultiOmegaMinus;
- AIDA::IHistogram1D *_histMeanMultiLambda_c_Plus;
- AIDA::IHistogram1D *_histMeanMultiLambda_b_0;
- AIDA::IHistogram1D *_histMeanMultiSigma_c_PlusPlus_0;
- AIDA::IHistogram1D *_histMeanMultiLambda1520;
+ Histo1DPtr _histMeanMultiPi0;
+ Histo1DPtr _histMeanMultiKPlus;
+ Histo1DPtr _histMeanMultiK0;
+ Histo1DPtr _histMeanMultiEta;
+ Histo1DPtr _histMeanMultiEtaPrime;
+ Histo1DPtr _histMeanMultiDPlus;
+ Histo1DPtr _histMeanMultiD0;
+ Histo1DPtr _histMeanMultiDPlus_s;
+ Histo1DPtr _histMeanMultiBPlus_B0_d;
+ Histo1DPtr _histMeanMultiBPlus_u;
+ Histo1DPtr _histMeanMultiB0_s;
+ Histo1DPtr _histMeanMultiF0_980;
+ Histo1DPtr _histMeanMultiA0_980Plus;
+ Histo1DPtr _histMeanMultiRho770_0;
+ Histo1DPtr _histMeanMultiRho770Plus;
+ Histo1DPtr _histMeanMultiOmega782;
+ Histo1DPtr _histMeanMultiKStar892Plus;
+ Histo1DPtr _histMeanMultiKStar892_0;
+ Histo1DPtr _histMeanMultiPhi1020;
+ Histo1DPtr _histMeanMultiDStar2010Plus;
+ Histo1DPtr _histMeanMultiDStar2007_0;
+ Histo1DPtr _histMeanMultiDStar_s2112Plus;
+ Histo1DPtr _histMeanMultiBStar;
+ Histo1DPtr _histMeanMultiJPsi1S;
+ Histo1DPtr _histMeanMultiPsi2S;
+ Histo1DPtr _histMeanMultiUpsilon1S;
+ Histo1DPtr _histMeanMultiF1_1285;
+ Histo1DPtr _histMeanMultiF1_1420;
+ Histo1DPtr _histMeanMultiChi_c1_3510;
+ Histo1DPtr _histMeanMultiF2_1270;
+ Histo1DPtr _histMeanMultiF2Prime1525;
+ Histo1DPtr _histMeanMultiK2Star1430Plus;
+ Histo1DPtr _histMeanMultiK2Star1430_0;
+ Histo1DPtr _histMeanMultiBStarStar;
+ Histo1DPtr _histMeanMultiDs1Plus;
+ Histo1DPtr _histMeanMultiDs2Plus;
+ Histo1DPtr _histMeanMultiP;
+ Histo1DPtr _histMeanMultiLambda;
+ Histo1DPtr _histMeanMultiSigma0;
+ Histo1DPtr _histMeanMultiSigmaMinus;
+ Histo1DPtr _histMeanMultiSigmaPlus;
+ Histo1DPtr _histMeanMultiSigmaPlusMinus;
+ Histo1DPtr _histMeanMultiXiMinus;
+ Histo1DPtr _histMeanMultiDelta1232PlusPlus;
+ Histo1DPtr _histMeanMultiSigma1385Minus;
+ Histo1DPtr _histMeanMultiSigma1385Plus;
+ Histo1DPtr _histMeanMultiSigma1385PlusMinus;
+ Histo1DPtr _histMeanMultiXi1530_0;
+ Histo1DPtr _histMeanMultiOmegaMinus;
+ Histo1DPtr _histMeanMultiLambda_c_Plus;
+ Histo1DPtr _histMeanMultiLambda_b_0;
+ Histo1DPtr _histMeanMultiSigma_c_PlusPlus_0;
+ Histo1DPtr _histMeanMultiLambda1520;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/SFM_1984_S1178091.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/SFM_1984_S1178091.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/SFM_1984_S1178091.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -112,8 +112,8 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_hist_multiplicity_inel;
- AIDA::IHistogram1D *_hist_multiplicity_nsd;
+ Histo1DPtr _hist_multiplicity_inel;
+ Histo1DPtr _hist_multiplicity_nsd;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6500200.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -103,10 +103,10 @@
double _sumWeightSelected;
- AIDA::IHistogram1D * _h_pT_piplus;
- AIDA::IHistogram1D * _h_pT_piminus;
- AIDA::IHistogram1D * _h_pT_proton;
- AIDA::IHistogram1D * _h_pT_antiproton;
+ Histo1DPtr _h_pT_piplus;
+ Histo1DPtr _h_pT_piminus;
+ Histo1DPtr _h_pT_proton;
+ Histo1DPtr _h_pT_antiproton;
};
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6860818.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -188,14 +188,14 @@
double _nWeightedBaryon[4];
double _nWeightedAntiBaryon[4];
- AIDA::IHistogram1D * _h_pT_k0s;
- AIDA::IHistogram1D * _h_pT_kminus;
- AIDA::IHistogram1D * _h_pT_kplus;
- AIDA::IHistogram1D * _h_pT_lambda;
- AIDA::IHistogram1D * _h_pT_lambdabar;
- AIDA::IHistogram1D * _h_pT_ximinus;
- AIDA::IHistogram1D * _h_pT_xiplus;
- //AIDA::IHistogram1D * _h_pT_omega;
+ Histo1DPtr _h_pT_k0s;
+ Histo1DPtr _h_pT_kminus;
+ Histo1DPtr _h_pT_kplus;
+ Histo1DPtr _h_pT_lambda;
+ Histo1DPtr _h_pT_lambdabar;
+ Histo1DPtr _h_pT_ximinus;
+ Histo1DPtr _h_pT_xiplus;
+ //Histo1DPtr _h_pT_omega;
AIDA::IDataPointSet* _h_antibaryon_baryon_ratio;
AIDA::IProfile1D* _h_pT_vs_mass;
};
Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2006_S6870392.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -79,8 +79,8 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D * _h_jet_pT_MB;
- AIDA::IHistogram1D * _h_jet_pT_HT;
+ Histo1DPtr _h_jet_pT_MB;
+ Histo1DPtr _h_jet_pT_HT;
//@}
};
Modified: branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/STAR_2008_S7869363.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -155,11 +155,11 @@
private:
- AIDA::IHistogram1D *_h_dNch;
+ Histo1DPtr _h_dNch;
- AIDA::IHistogram1D *_h_dpT_Pi, *_h_dpT_Piplus;
- AIDA::IHistogram1D *_h_dpT_Kaon, *_h_dpT_Kaonplus;
- AIDA::IHistogram1D *_h_dpT_AntiProton, *_h_dpT_Proton;
+ Histo1DPtr _h_dpT_Pi, _h_dpT_Piplus;
+ Histo1DPtr _h_dpT_Kaon, _h_dpT_Kaonplus;
+ Histo1DPtr _h_dpT_AntiProton, _h_dpT_Proton;
AIDA::IProfile1D *_h_pT_vs_Nch;
double nCutsPassed, nPi, nPiPlus, nKaon, nKaonPlus, nProton, nAntiProton;
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:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/UA5_1986_S1583476.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -107,8 +107,8 @@
/// @name Histograms
//@{
- AIDA::IHistogram1D *_hist_eta_nsd;
- AIDA::IHistogram1D *_hist_eta_inelastic;
+ Histo1DPtr _hist_eta_nsd;
+ Histo1DPtr _hist_eta_inelastic;
vector<Histo1DPtr> _hists_eta_nsd;
//@}
Modified: branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Analyses/UA5_1987_S1640666.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -62,8 +62,8 @@
double _sumWPassed;
- AIDA::IHistogram1D *_hist_mean_nch;
- AIDA::IHistogram1D *_hist_nch;
+ Histo1DPtr _hist_mean_nch;
+ Histo1DPtr _hist_nch;
};
Modified: branches/2011-07-aida2yoda/src/Tools/BinnedHistogram.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Tools/BinnedHistogram.cc Tue Jul 19 14:11:00 2011 (r3204)
+++ branches/2011-07-aida2yoda/src/Tools/BinnedHistogram.cc Tue Jul 19 14:49:04 2011 (r3205)
@@ -10,7 +10,7 @@
template<typename T>
const BinnedHistogram<T>& BinnedHistogram<T>::addHistogram(const T& binMin,
const T& binMax,
- AIDA::IHistogram1D *histo){
+ Histo1DPtr histo){
if (binMin > binMax) {
throw Error
("Cannot add a binned histogram where the lower bin edge is above the upper edge");
More information about the Rivet-svn
mailing list
|