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

[blackhole at projects.hepforge.org]

Author: buckley
Date: Thu Feb 11 15:56:55 2010
New Revision: 2255

Log:
Analysis loader now ONLY attempts to search paths from RIVET_ANALYSIS_PATH (if set), otherwise falling back to the standard install dir. Should only impact users of personal plugin analyses, who should now explicitly set RIVET_ANALYSIS_PATH to load their analysis... and who can now create personal versions of standard analyses without getting an error message about duplicate loading.

Modified:
   trunk/ChangeLog
   trunk/src/Core/AnalysisLoader.cc

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Thu Feb 11 14:49:03 2010	(r2254)
+++ trunk/ChangeLog	Thu Feb 11 15:56:55 2010	(r2255)
@@ -1,3 +1,13 @@
+2010-02-11  Andy Buckley  <andy at insectnation.org>
+
+	* Change analysis loader behaviour to use ONLY RIVET_ANALYSIS_PATH
+	locations if set, otherwise use ONLY the standard Rivet analysis
+	install path. Should only impact users of personal plugin
+	analyses, who should now explicitly set RIVET_ANALYSIS_PATH to
+	load their analysis... and who can now create personal versions of
+	standard analyses without getting an error message about duplicate
+	loading.
+
 2010-01-15  Andy Buckley  <andy at insectnation.org>
 
 	* Add tests for "stable" heavy flavour hadrons in jets (rather

Modified: trunk/src/Core/AnalysisLoader.cc
==============================================================================
--- trunk/src/Core/AnalysisLoader.cc	Thu Feb 11 14:49:03 2010	(r2254)
+++ trunk/src/Core/AnalysisLoader.cc	Thu Feb 11 15:56:55 2010	(r2255)
@@ -70,17 +70,14 @@
     // Build the list of directories to search
     vector<string> dirs;
     char* env = 0;
-    // First use the Rivet analysis path variable
     env = getenv("RIVET_ANALYSIS_PATH");
-    if (env) dirs += split(env);
-    // Then the Rivet library install path
-    dirs += getLibPath();
-    // And then the user's (non-system) library path
-    env = getenv("LD_LIBRARY_PATH");
-    if (env) dirs += split(env);
-    // Use the current dir, and its libtool subdir, too.
-    dirs += ".";
-    dirs += ".libs";
+    if (env) {
+      // Use the Rivet analysis path variable if set...
+      dirs += split(env);
+    } else {
+      // ... otherwise fall back to the Rivet library install path
+      dirs += getLibPath();
+    }
 
     // Find plugin module library files
     const string libsuffix = ".so";