[Rivet-svn] r3936 - trunk/test

[blackhole at projects.hepforge.org]

Author: dgrell
Date: Mon Sep 24 10:29:32 2012
New Revision: 3936

Log:
Merged NaN tests r3933 from AIDA. Fails!

Added:
   trunk/test/testNaN.cc
      - copied, changed from r3933, branches/2012-06-aidarivet/test/testNaN.cc
Modified:
   trunk/test/Makefile.am

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	Mon Sep 24 10:20:37 2012	(r3935)
+++ trunk/test/Makefile.am	Mon Sep 24 10:29:32 2012	(r3936)
@@ -1,4 +1,4 @@
-check_PROGRAMS = testMath testMatVec testBoost testCmp testApi
+check_PROGRAMS = testMath testMatVec testBoost testCmp testApi testNaN
 
 testBoost_SOURCES = testBoost.cc
 testBoost_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
@@ -17,6 +17,10 @@
 testApi_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
 testApi_LDADD = ../src/libRivet.la $(HEPMCLDFLAGS) $(HEPMCLDLIBS)
 
+testNaN_SOURCES = testNaN.cc
+testNaN_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
+testNaN_LDADD = ../src/libRivet.la $(HEPMCLDFLAGS) $(HEPMCLDLIBS)
+
 TESTS_ENVIRONMENT = \
   RIVET_REF_PATH=$(top_builddir)/data/refdata \
   RIVET_INFO_PATH=$(top_builddir)/data/anainfo \
@@ -25,7 +29,7 @@
   PYTHON_BUILD_DIR=$(top_builddir)/pyext/build \
   PATH=$(top_builddir)/bin:$(PATH)
 
-TESTS = testMath testMatVec testBoost testCmp testApi testCmdLine.sh
+TESTS = testMath testMatVec testBoost testCmp testApi testNaN testCmdLine.sh
 
 EXTRA_DIST = testApi.hepmc testCmdLine.sh
 

Copied and modified: trunk/test/testNaN.cc (from r3933, branches/2012-06-aidarivet/test/testNaN.cc)
==============================================================================
--- branches/2012-06-aidarivet/test/testNaN.cc	Mon Sep 24 10:03:31 2012	(r3933, copy source)
+++ trunk/test/testNaN.cc	Mon Sep 24 10:29:32 2012	(r3936)
@@ -2,7 +2,7 @@
 #include "HepMC/GenEvent.h"
 #include "HepMC/IO_GenEvent.h"
 #include "Rivet/Analysis.hh"
-#include "Rivet/RivetAIDA.hh"
+#include "Rivet/RivetYODA.hh"
 
 using namespace std;
 
@@ -11,7 +11,7 @@
   Test() : Analysis("Test") {}
 
   void init() {
-    _h_test = bookHistogram1D("test", 50, 66.0, 116.0);
+    _h_test = bookHisto1D("test", 50, 66.0, 116.0);
   }
 
   void analyze(const Rivet::Event & e) {
@@ -23,7 +23,7 @@
   }
 
 private:
-  AIDA::IHistogram1D * _h_test;
+  Rivet::Histo1DPtr _h_test;
 };
 
 DECLARE_RIVET_PLUGIN(Test);