[Rivet-svn] r2615 - in trunk: . src/Core

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Jul 27 11:19:30 2010
New Revision: 2615

Log:
Adding definitions of datarootdir to rivetenv.*sh scripts

Modified:
   trunk/rivetenv.csh.in
   trunk/rivetenv.sh.in
   trunk/src/Core/AnalysisHandler.cc

Modified: trunk/rivetenv.csh.in
==============================================================================
--- trunk/rivetenv.csh.in	Tue Jul 27 10:35:31 2010	(r2614)
+++ trunk/rivetenv.csh.in	Tue Jul 27 11:19:30 2010	(r2615)
@@ -1,6 +1,7 @@
 # These variables need to exist
 set prefix=@prefix@
 set exec_prefix=@exec_prefix@
+set datarootdir=@datarootdir@
 
 setenv PATH "$exec_prefix/bin:$PATH"
 setenv @LIBPATHVARNAME@ "@libdir@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@:$@LIBPATHVARNAME@"

Modified: trunk/rivetenv.sh.in
==============================================================================
--- trunk/rivetenv.sh.in	Tue Jul 27 10:35:31 2010	(r2614)
+++ trunk/rivetenv.sh.in	Tue Jul 27 11:19:30 2010	(r2615)
@@ -1,6 +1,7 @@
 # These variables need to exist
 prefix=@prefix@
 exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
 
 export PATH="$exec_prefix/bin:$PATH"
 export @LIBPATHVARNAME@="@libdir@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@:$@LIBPATHVARNAME@"

Modified: trunk/src/Core/AnalysisHandler.cc
==============================================================================
--- trunk/src/Core/AnalysisHandler.cc	Tue Jul 27 10:35:31 2010	(r2614)
+++ trunk/src/Core/AnalysisHandler.cc	Tue Jul 27 11:19:30 2010	(r2615)
@@ -117,7 +117,7 @@
     // Weights
     const double weight = event.weight();
     _sumOfWeights += weight;
-    //getLog() << Log::DEBUG << "Event #" << _numEvents << " weight = " << weight << endl;
+    getLog() << Log::DEBUG << "Event #" << _numEvents << " weight = " << weight << endl;
     #ifdef HEPMC_HAS_CROSS_SECTION
     if (ge.cross_section()) {
       const double xs = ge.cross_section()->cross_section();