|
|
[Rivet-svn] r1850 - trunk/src/Analyses
blackhole at projects.hepforge.org
blackhole at projects.hepforge.org
Sun Oct 4 16:48:47 BST 2009
Author: buckley
Date: Sun Oct 4 16:48:47 2009
New Revision: 1850
Log:
Moving projection registration into init for SPS analyses
Modified:
trunk/src/Analyses/UA1_1990_S2044935.cc
trunk/src/Analyses/UA5_1982_S875503.cc
trunk/src/Analyses/UA5_1986_S1583476.cc
trunk/src/Analyses/UA5_1988_S1867512.cc
trunk/src/Analyses/UA5_1989_S1926373.cc
Modified: trunk/src/Analyses/UA1_1990_S2044935.cc
==============================================================================
--- trunk/src/Analyses/UA1_1990_S2044935.cc Sun Oct 4 16:39:06 2009 (r1849)
+++ trunk/src/Analyses/UA1_1990_S2044935.cc Sun Oct 4 16:48:47 2009 (r1850)
@@ -14,11 +14,17 @@
class UA1_1990_S2044935 : public Analysis {
public:
- /// Default constructor
- UA1_1990_S2044935()
- : Analysis("UA1_1990_S2044935")
- {
+ /// Constructor
+ UA1_1990_S2044935() : Analysis("UA1_1990_S2044935") {
setBeams(PROTON, ANTIPROTON);
+ }
+
+
+ /// @name Analysis methods
+ //@{
+
+ /// Book projections and histograms
+ void init() {
const ChargedFinalState cfs(-2.5, 2.5);
const FinalState fs2(-6., 6.);
const FinalState fs(-2.5,2.5);
@@ -27,14 +33,7 @@
addProjection(ChargedFinalState(-2.5, 2.5), "CFS");
addProjection(Beam(), "Beam");
addProjection(TotalVisibleMomentum(fs), "Mom");
- }
-
-
- /// @name Analysis methods
- //@{
- /// Book histograms
- void init() {
_hist_sigma200 = bookHistogram1D(1,1,1);
_hist_sigma500 = bookHistogram1D(1,1,2);
_hist_sigma900 = bookHistogram1D(1,1,3);
Modified: trunk/src/Analyses/UA5_1982_S875503.cc
==============================================================================
--- trunk/src/Analyses/UA5_1982_S875503.cc Sun Oct 4 16:39:06 2009 (r1849)
+++ trunk/src/Analyses/UA5_1982_S875503.cc Sun Oct 4 16:48:47 2009 (r1850)
@@ -11,20 +11,19 @@
public:
/// Default constructor
- UA5_1982_S875503()
- : Analysis("UA5_1982_S875503")
- {
- const ChargedFinalState cfs(-3.5, 3.5);
- addProjection(Beam(), "Beam");
- addProjection(cfs, "CFS");
+ UA5_1982_S875503() : Analysis("UA5_1982_S875503") {
+ //
}
/// @name Analysis methods
//@{
- void init()
- {
+ void init() {
+ const ChargedFinalState cfs(-3.5, 3.5);
+ addProjection(Beam(), "Beam");
+ addProjection(cfs, "CFS");
+
_hist_nch_pp = bookHistogram1D(2,1,1);
_hist_nch_ppbar = bookHistogram1D(2,1,2);
_hist_eta_pp = bookHistogram1D(3,1,1);
Modified: trunk/src/Analyses/UA5_1986_S1583476.cc
==============================================================================
--- trunk/src/Analyses/UA5_1986_S1583476.cc Sun Oct 4 16:39:06 2009 (r1849)
+++ trunk/src/Analyses/UA5_1986_S1583476.cc Sun Oct 4 16:48:47 2009 (r1850)
@@ -11,10 +11,16 @@
public:
/// Constructor
- UA5_1986_S1583476()
- : Analysis("UA5_1986_S1583476")
- {
+ UA5_1986_S1583476() : Analysis("UA5_1986_S1583476") {
setBeams(PROTON, ANTIPROTON);
+ }
+
+
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
addProjection(Beam(), "Beams");
// All charged final state particles, needed for triggers
@@ -23,18 +29,12 @@
// Charged particles in |eta| < 5.0
const ChargedFinalState cfs50(-5.0, 5.0);
addProjection(cfs50, "CFS50");
- }
-
-
- /// @name Analysis methods
- //@{
-
- void init() {
- _hist_eta_nsd_200 = bookHistogram1D(1,1,1);
- _hist_eta_inelastic_200 = bookHistogram1D(1,1,2);
- _hist_eta_nsd_900 = bookHistogram1D(1,1,3);
- _hist_eta_inelastic_900 = bookHistogram1D(1,1,4);
+ // Histograms
+ _hist_eta_nsd_200 = bookHistogram1D(1,1,1);
+ _hist_eta_inelastic_200 = bookHistogram1D(1,1,2);
+ _hist_eta_nsd_900 = bookHistogram1D(1,1,3);
+ _hist_eta_inelastic_900 = bookHistogram1D(1,1,4);
_hist_eta_nsd_n_2_200 = bookHistogram1D(2,1,1);
_hist_eta_nsd_n_12_200 = bookHistogram1D(2,1,2);
Modified: trunk/src/Analyses/UA5_1988_S1867512.cc
==============================================================================
--- trunk/src/Analyses/UA5_1988_S1867512.cc Sun Oct 4 16:39:06 2009 (r1849)
+++ trunk/src/Analyses/UA5_1988_S1867512.cc Sun Oct 4 16:48:47 2009 (r1850)
@@ -47,70 +47,52 @@
}
+
namespace Rivet {
class UA5_1988_S1867512 : public Analysis {
public:
- UA5_1988_S1867512()
- : Analysis("UA5_1988_S1867512")
+ UA5_1988_S1867512() : Analysis("UA5_1988_S1867512")
{
- /// @todo Set approriate for your analysis
setBeams(PROTON, ANTIPROTON);
+ }
+
+
+ /// @name Analysis methods
+ //@{
+
+ void init() {
addProjection(Beam(), "Beams");
// All charged final state particles, needed for trigger implementation only
const ChargedFinalState cfs;
- addProjection(cfs, "CFSAll");
+ addProjection(cfs, "CFSAll");
- // Symmetric intervals first
- // Maybe its possible to define symmetric eta intervals with gaps
+ // Symmetric eta interval
+ addProjection(ChargedFinalState(-0.5, 0.5), "CFS05");
+
+ // Asymmetric intervals first
// Forward eta intervals
- const ChargedFinalState cfs10f(0.0, 1.0);
- const ChargedFinalState cfs15f(0.5, 1.5);
- const ChargedFinalState cfs20f(1.0, 2.0);
- const ChargedFinalState cfs25f(1.5, 2.5);
- const ChargedFinalState cfs30f(2.0, 3.0);
- const ChargedFinalState cfs35f(2.5, 3.5);
- const ChargedFinalState cfs40f(3.0, 4.0);
+ addProjection(ChargedFinalState(0.0, 1.0), "CFS10F");
+ addProjection(ChargedFinalState(0.5, 1.5), "CFS15F");
+ addProjection(ChargedFinalState(1.0, 2.0), "CFS20F");
+ addProjection(ChargedFinalState(1.5, 2.5), "CFS25F");
+ addProjection(ChargedFinalState(2.0, 3.0), "CFS30F");
+ addProjection(ChargedFinalState(2.5, 3.5), "CFS45F");
+ addProjection(ChargedFinalState(3.0, 4.0), "CFS40F");
// Backward eta intervals
- const ChargedFinalState cfs10b(-1.0, 0.0);
- const ChargedFinalState cfs15b(-1.5, -0.5);
- const ChargedFinalState cfs20b(-2.0, -1.0);
- const ChargedFinalState cfs25b(-2.5, -1.5);
- const ChargedFinalState cfs30b(-3.0, -2.0);
- const ChargedFinalState cfs35b(-3.5, -2.5);
- const ChargedFinalState cfs40b(-4.0, -3.0);
-
- // Symmetric eta interval
- const ChargedFinalState cfs05(-0.5, 0.5);
-
- addProjection(cfs10f, "CFS10F");
- addProjection(cfs15f, "CFS15F");
- addProjection(cfs20f, "CFS20F");
- addProjection(cfs25f, "CFS25F");
- addProjection(cfs30f, "CFS30F");
- addProjection(cfs35f, "CFS35F");
- addProjection(cfs40f, "CFS40F");
-
- addProjection(cfs10b, "CFS10B");
- addProjection(cfs15b, "CFS15B");
- addProjection(cfs20b, "CFS20B");
- addProjection(cfs25b, "CFS25B");
- addProjection(cfs30b, "CFS30B");
- addProjection(cfs35b, "CFS35B");
- addProjection(cfs40b, "CFS40B");
-
- addProjection(cfs05, "CFS05");
- }
-
-
- /// @name Analysis methods
- //@{
+ addProjection(ChargedFinalState(-1.0, 0.0), "CFS10B");
+ addProjection(ChargedFinalState(-1.5, -0.5), "CFS15B");
+ addProjection(ChargedFinalState(-2.0, -1.0), "CFS20B");
+ addProjection(ChargedFinalState(-2.5, -1.5), "CFS25B");
+ addProjection(ChargedFinalState(-3.0, -2.0), "CFS30B");
+ addProjection(ChargedFinalState(-3.5, -2.5), "CFS45B");
+ addProjection(ChargedFinalState(-4.0, -3.0), "CFS40B");
+
- void init() {
// Histogram booking, we have sqrt(s) = 200, 546 and 900 GeV
_hist_correl_10_200 = bookHistogram1D(1, 1, 1);
_hist_correl_10_546 = bookHistogram1D(1, 1, 2);
Modified: trunk/src/Analyses/UA5_1989_S1926373.cc
==============================================================================
--- trunk/src/Analyses/UA5_1989_S1926373.cc Sun Oct 4 16:39:06 2009 (r1849)
+++ trunk/src/Analyses/UA5_1989_S1926373.cc Sun Oct 4 16:48:47 2009 (r1850)
@@ -12,9 +12,7 @@
public:
/// Constructor
- UA5_1989_S1926373()
- : Analysis("UA5_1989_S1926373")
- {
+ UA5_1989_S1926373() : Analysis("UA5_1989_S1926373") {
setBeams(PROTON, ANTIPROTON);
_numVetoed = 0;
}
@@ -33,18 +31,20 @@
addProjection(ChargedFinalState(-5.0, 5.0), "CFS50");
// NB. _hist_nch{200,900} and _hist_nch{200,900}eta50 use the same data but different binning
- _hist_nch200 = bookHistogram1D(1,1,1);
- _hist_nch900 = bookHistogram1D(2,1,1);
- _hist_nch200eta05 = bookHistogram1D(3,1,1);
- _hist_nch200eta15 = bookHistogram1D(4,1,1);
- _hist_nch200eta30 = bookHistogram1D(5,1,1);
- _hist_nch200eta50 = bookHistogram1D(6,1,1);
- _hist_nch900eta05 = bookHistogram1D(7,1,1);
- _hist_nch900eta15 = bookHistogram1D(8,1,1);
- _hist_nch900eta30 = bookHistogram1D(9,1,1);
- _hist_nch900eta50 = bookHistogram1D(10,1,1);
- _hist_mean_nch_200 = bookHistogram1D(11,1,1);
- _hist_mean_nch_900 = bookHistogram1D(12,1,1);
+ _hist_nch200 = bookHistogram1D(1, 1, 1);
+ _hist_nch900 = bookHistogram1D(2, 1, 1);
+ _hist_nch200eta05 = bookHistogram1D(3, 1, 1);
+ _hist_nch200eta15 = bookHistogram1D(4, 1, 1);
+ _hist_nch200eta30 = bookHistogram1D(5, 1, 1);
+ _hist_nch200eta50 = bookHistogram1D(6, 1, 1);
+ _hist_nch900eta05 = bookHistogram1D(7, 1, 1);
+ _hist_nch900eta15 = bookHistogram1D(8, 1, 1);
+ _hist_nch900eta30 = bookHistogram1D(9, 1, 1);
+ _hist_nch900eta50 = bookHistogram1D(10, 1, 1);
+ _hist_mean_nch_200 = bookHistogram1D(11, 1, 1);
+ _hist_mean_nch_900 = bookHistogram1D(12, 1, 1);
+
+ /// @todo Moments of distributions
}
More information about the Rivet-svn
mailing list
|