[Rivet-svn] r2514 - trunk/src/Core

[blackhole at projects.hepforge.org]

Author: buckley
Date: Wed Jun 23 12:50:12 2010
New Revision: 2514

Log:
Using new search paths function in analysis loader

Modified:
   trunk/src/Core/AnalysisLoader.cc

Modified: trunk/src/Core/AnalysisLoader.cc
==============================================================================
--- trunk/src/Core/AnalysisLoader.cc	Wed Jun 23 12:40:58 2010	(r2513)
+++ trunk/src/Core/AnalysisLoader.cc	Wed Jun 23 12:50:12 2010	(r2514)
@@ -19,8 +19,8 @@
     foreach (const AnalysisBuilderMap::value_type& p, _ptrs) names += p.first;
     return names;
   }
-  
-  
+
+
   set<string> AnalysisLoader::getAllAnalysisNames() {
     set<string> anaset;
     vector<string> anas = analysisNames();
@@ -68,16 +68,7 @@
     if (!_ptrs.empty()) return;
 
     // Build the list of directories to search
-    vector<string> dirs;
-    char* env = 0;
-    env = getenv("RIVET_ANALYSIS_PATH");
-    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();
-    }
+    const vector<string> dirs = getAnalysisLibPaths();
 
     // Find plugin module library files
     const string libsuffix = ".so";