[Rivet-svn] r3505 - branches/2011-07-aida2yoda/src/Analyses

[blackhole at projects.hepforge.org]

Author: hoeth
Date: Tue Dec  6 13:39:12 2011
New Revision: 3505

Log:
merge r3472 from trunk

Added:
   branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9225137.cc
      - copied, changed from r3472, trunk/src/Analyses/ATLAS_2011_S9225137.cc
Modified:
   branches/2011-07-aida2yoda/src/Analyses/Makefile.am

Copied and modified: branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9225137.cc (from r3472, trunk/src/Analyses/ATLAS_2011_S9225137.cc)
==============================================================================
--- trunk/src/Analyses/ATLAS_2011_S9225137.cc	Mon Nov  7 09:47:24 2011	(r3472, copy source)
+++ branches/2011-07-aida2yoda/src/Analyses/ATLAS_2011_S9225137.cc	Tue Dec  6 13:39:12 2011	(r3505)
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 #include "Rivet/Analysis.hh"
 #include "Rivet/Tools/BinnedHistogram.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 #include "Rivet/Tools/Logging.hh"
 #include "Rivet/Projections/FinalState.hh"
 #include "Rivet/Projections/ChargedFinalState.hh"
@@ -72,18 +72,18 @@
       addProjection(ChargedFinalState(-3.0,3.0),"cfs");
 
       /// Book histograms
-      _etmissHTA = bookHistogram1D("etmissHTA", 64, 0., 16.);
-      _etmissHTB = bookHistogram1D("etmissHTB", 64, 0., 16.);
+      _etmissHTA = bookHisto1D("etmissHTA", 64, 0., 16.);
+      _etmissHTB = bookHisto1D("etmissHTB", 64, 0., 16.);
 
-      _njet55A = bookHistogram1D("njet55A", 14, 0.5, 14.5);
-      _njet55B = bookHistogram1D("njet55B", 14, 0.5, 14.5);
-      _njet80A = bookHistogram1D("njet80A", 14, 0.5, 14.5);
-      _njet80B = bookHistogram1D("njet80B", 14, 0.5, 14.5);
-
-      _count_7j55 = bookHistogram1D("count_7j55", 1, 0., 1.);
-      _count_8j55 = bookHistogram1D("count_8j55", 1, 0., 1.);
-      _count_6j80 = bookHistogram1D("count_6j80", 1, 0., 1.);
-      _count_7j80 = bookHistogram1D("count_7j80", 1, 0., 1.);
+      _njet55A = bookHisto1D("njet55A", 14, 0.5, 14.5);
+      _njet55B = bookHisto1D("njet55B", 14, 0.5, 14.5);
+      _njet80A = bookHisto1D("njet80A", 14, 0.5, 14.5);
+      _njet80B = bookHisto1D("njet80B", 14, 0.5, 14.5);
+
+      _count_7j55 = bookHisto1D("count_7j55", 1, 0., 1.);
+      _count_8j55 = bookHisto1D("count_8j55", 1, 0., 1.);
+      _count_6j80 = bookHisto1D("count_6j80", 1, 0., 1.);
+      _count_7j80 = bookHisto1D("count_7j80", 1, 0., 1.);
 
     }
 
@@ -279,16 +279,16 @@
 
     /// @name Histograms
     //@{
-    AIDA::IHistogram1D* _etmissHTA;
-    AIDA::IHistogram1D* _etmissHTB;
-    AIDA::IHistogram1D* _njet55A;
-    AIDA::IHistogram1D* _njet55B;
-    AIDA::IHistogram1D* _njet80A;
-    AIDA::IHistogram1D* _njet80B;
-    AIDA::IHistogram1D* _count_7j55;
-    AIDA::IHistogram1D* _count_8j55;
-    AIDA::IHistogram1D* _count_6j80;
-    AIDA::IHistogram1D* _count_7j80;
+    Histo1DPtr _etmissHTA;
+    Histo1DPtr _etmissHTB;
+    Histo1DPtr _njet55A;
+    Histo1DPtr _njet55B;
+    Histo1DPtr _njet80A;
+    Histo1DPtr _njet80B;
+    Histo1DPtr _count_7j55;
+    Histo1DPtr _count_8j55;
+    Histo1DPtr _count_6j80;
+    Histo1DPtr _count_7j80;
     //@}
 
   };

Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Dec  6 13:36:13 2011	(r3504)
+++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Dec  6 13:39:12 2011	(r3505)
@@ -69,7 +69,8 @@
     ATLAS_2011_S9041966.cc \
     ATLAS_2011_CONF_2011_090.cc \
     ATLAS_2011_CONF_2011_098.cc \
-    ATLAS_2011_S9108483.cc
+    ATLAS_2011_S9108483.cc\
+    ATLAS_2011_S9225137.cc
 endif