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

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Tue Jul 19 18:27:04 2011
New Revision: 3217

Log:
HERA

Modified:
   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/Makefile.am

Modified: branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc	Tue Jul 19 18:21:30 2011	(r3216)
+++ branches/2011-07-aida2yoda/src/Analyses/H1_1995_S3167097.cc	Tue Jul 19 18:27:04 2011	(r3217)
@@ -100,23 +100,24 @@
 
     void finalize() {
       for (size_t ibin = 0; ibin < _nbin; ++ibin) {
-        _hEtFlow[ibin]->scale(1.0/(_nev[ibin]*double(_nb)/(_xmax-_xmin)));
-        _hEtFlowStat[ibin]->scale(1.0/(_nev[ibin]*double(_nb)/(_xmax-_xmin)));
+        scale( _hEtFlow[ibin], 1.0/(_nev[ibin]*double(_nb)/(_xmax-_xmin)));
+        scale( _hEtFlowStat[ibin], 1.0/(_nev[ibin]*double(_nb)/(_xmax-_xmin)));
       }
 
       /// @todo Automate this sort of thing so that the analysis code is more readable.
-      Scatter2DPtr h = 0;
-      h = histogramFactory().divide("/H1_1995_S3167097/21", *_hAvEt, *_hN);
-      h->setTitle(_hAvEt->title());
-      histogramFactory().destroy(_hAvEt);
-
-      h = histogramFactory().divide("/H1_1995_S3167097/22", *_hAvX, *_hN);
-      h->setTitle(_hAvX->title());
-      histogramFactory().destroy(_hAvX);
-
-      h = histogramFactory().divide("/H1_1995_S3167097/23", *_hAvQ2, *_hN);
-      h->setTitle(_hAvQ2->title());
-      histogramFactory().destroy(_hAvQ2);
+      // \todo YODA divide
+      // Scatter2DPtr h;
+      // h = histogramFactory().divide("/H1_1995_S3167097/21", *_hAvEt, *_hN);
+      // h->setTitle(_hAvEt->title());
+      // histogramFactory().destroy(_hAvEt);
+
+      // h = histogramFactory().divide("/H1_1995_S3167097/22", *_hAvX, *_hN);
+      // h->setTitle(_hAvX->title());
+      // histogramFactory().destroy(_hAvX);
+
+      // h = histogramFactory().divide("/H1_1995_S3167097/23", *_hAvQ2, *_hN);
+      // h->setTitle(_hAvQ2->title());
+      // histogramFactory().destroy(_hAvQ2);
     }
 
     //@}

Modified: branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc	Tue Jul 19 18:21:30 2011	(r3216)
+++ branches/2011-07-aida2yoda/src/Analyses/H1_2000_S4129130.cc	Tue Jul 19 18:27:04 2011	(r3217)
@@ -189,7 +189,7 @@
       addProjection(FinalState(), "FS");
    
       // Histos
-      IHistogram1D* h = 0;
+      Histo1DPtr h;
    
       // Histograms and weight vectors for low Q^2 a
       _histETLowQa.reserve(17);

Modified: branches/2011-07-aida2yoda/src/Analyses/Makefile.am
==============================================================================
--- branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Jul 19 18:21:30 2011	(r3216)
+++ branches/2011-07-aida2yoda/src/Analyses/Makefile.am	Tue Jul 19 18:27:04 2011	(r3217)
@@ -155,15 +155,15 @@
 # endif
 
 
-# lib_LTLIBRARIES += RivetHERAAnalyses.la
-# RivetHERAAnalyses_la_SOURCES = \
-#     H1_1994_S2919893.cc \
-#     H1_2000_S4129130.cc
-# if ENABLE_UNVALIDATED
-# RivetHERAAnalyses_la_SOURCES += \
-#     H1_1995_S3167097.cc \
-#     ZEUS_2001_S4815815.cc
-# endif
+lib_LTLIBRARIES += RivetHERAAnalyses.la
+RivetHERAAnalyses_la_SOURCES = \
+    H1_1994_S2919893.cc \
+    H1_2000_S4129130.cc
+if ENABLE_UNVALIDATED
+RivetHERAAnalyses_la_SOURCES += \
+    H1_1995_S3167097.cc \
+    ZEUS_2001_S4815815.cc
+endif
 
 lib_LTLIBRARIES += RivetPetraAnalyses.la
 RivetPetraAnalyses_la_SOURCES = \