From 8321330f34e6f1b90db0c0250bd9517d14659a0b Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Thu, 20 Mar 2014 14:24:20 +0000
Subject: [PATCH] Task #3017: ACCmain no longer uses the ConfigLocator to
locate the parset-file given on the command-line
---
LCS/ACC/PLC/src/ACCmain.cc | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/LCS/ACC/PLC/src/ACCmain.cc b/LCS/ACC/PLC/src/ACCmain.cc
index d3bce5cc2bf..b22ce83a02e 100644
--- a/LCS/ACC/PLC/src/ACCmain.cc
+++ b/LCS/ACC/PLC/src/ACCmain.cc
@@ -26,7 +26,6 @@
//# Includes
#include <libgen.h>
#include <Common/LofarLogger.h>
-#include <Common/LofarLocators.h>
#include <Common/ParameterSet.h>
#include <Common/Exceptions.h>
#include <PLC/ProcControlServer.h>
@@ -103,15 +102,11 @@ namespace LOFAR {
}
// Read in the parameterset.
- ConfigLocator CL;
string ParsetFile;
int argpsf = 1 + (ACCmode ? 1 : 0);
string parsetFile = (argc > argpsf) ? argv[argpsf] : programName + ".parset";
- string locatedParsetFile = CL.locate(parsetFile);
-
- ASSERTSTR(!locatedParsetFile.empty(), "Could not find parameterset " << parsetFile);
- LOG_INFO_STR("Using parameterset " << locatedParsetFile);
- globalParameterSet()->adoptFile(locatedParsetFile);
+ LOG_INFO_STR("Using parameterset " << parsetFile);
+ globalParameterSet()->adoptFile(parsetFile);
// Use a local parameterset to pass arguments.
ParameterSet arg;
--
GitLab