[Rivet-svn] r2258 - in trunk: doc src/Core test

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Feb 11 16:13:56 2010
New Revision: 2258

Log:
Rename RIVET_DATA_PATH to RIVET_INFO_PATH to reduce confusion with RIVET_REF_PATH

Modified:
   trunk/doc/Makefile.am
   trunk/src/Core/AnalysisInfo.cc
   trunk/test/Makefile.am

Modified: trunk/doc/Makefile.am
==============================================================================
--- trunk/doc/Makefile.am	Thu Feb 11 16:11:41 2010	(r2257)
+++ trunk/doc/Makefile.am	Thu Feb 11 16:13:56 2010	(r2258)
@@ -14,7 +14,7 @@
 analyses.html: $(top_srcdir)/include/Rivet/Analyses mk-analysis-html
 	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(LD_LIBRARY_PATH):$(prefix)/lib \
 DYLD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(DYLD_LIBRARY_PATH):$(prefix)/lib \
-RIVET_DATA_PATH=$(top_srcdir)/data/anainfo \
+RIVET_INFO_PATH=$(top_srcdir)/data/anainfo \
 ./mk-analysis-html analyses.html
 
 endif
@@ -31,7 +31,7 @@
 analyses.tex: $(top_srcdir)/include/Rivet/Analyses $(top_srcdir)/data/plotinfo $(top_srcdir)/data/anainfo mk-analysis-latex
 	LD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(LD_LIBRARY_PATH):$(prefix)/lib \
 DYLD_LIBRARY_PATH=$(top_srcdir)/src/.libs:$(FASTJETLIBPATH):$(HEPMCLIBPATH):$(DYLD_LIBRARY_PATH):$(prefix)/lib \
-RIVET_DATA_PATH=$(top_srcdir)/data/anainfo \
+RIVET_INFO_PATH=$(top_srcdir)/data/anainfo \
 ./mk-analysis-latex analyses.tex
 
 else

Modified: trunk/src/Core/AnalysisInfo.cc
==============================================================================
--- trunk/src/Core/AnalysisInfo.cc	Thu Feb 11 16:11:41 2010	(r2257)
+++ trunk/src/Core/AnalysisInfo.cc	Thu Feb 11 16:13:56 2010	(r2258)
@@ -11,7 +11,7 @@
 
 
   /// Ideas:
-  ///  * search RIVET_DATA_PATH etc. for <name>.info.yaml
+  ///  * search RIVET_INFO_PATH etc. for <name>.info.yaml
   ///  * how to determine the name?
   ///  * only populate pointer on Analysis when requested
   ///  * use smart pointer: deletes automatically when Analysis
@@ -24,7 +24,7 @@
     vector<string> dirs;
     char* env = 0;
     // First try to use the Rivet data path variable
-    env = getenv("RIVET_DATA_PATH");
+    env = getenv("RIVET_INFO_PATH");
     if (env) dirs += split(env);
     // Then try to use the Rivet data install path
     dirs += getRivetDataPath();

Modified: trunk/test/Makefile.am
==============================================================================
--- trunk/test/Makefile.am	Thu Feb 11 16:11:41 2010	(r2257)
+++ trunk/test/Makefile.am	Thu Feb 11 16:13:56 2010	(r2258)
@@ -17,7 +17,7 @@
 ## TODO: Move these non-POSIX shell escapes into variable exports from configure.ac
 TESTS_ENVIRONMENT = \
   RIVET_REF_PATH=$(top_builddir)/data/refdata \
-  RIVET_DATA_PATH=$(top_builddir)/data/anainfo \
+  RIVET_INFO_PATH=$(top_builddir)/data/anainfo \
   RIVET_ANALYSIS_PATH=$(top_builddir)/src/Analyses/.libs \
   LD_LIBRARY_PATH=$(top_builddir)/src:$(top_builddir)/src/.libs:$(HEPMCLIBPATH):$(FASTJETLIBPATH) \
   PYTHONPATH=$(shell ls -d $(top_builddir)/pyext/build/lib.*) \