Skip to content
Snippets Groups Projects
Commit 6e9d54e6 authored by Pieter Donker's avatar Pieter Donker
Browse files

Now right number of fpgas in TR_* if < 16

parent 8cad675b
Branches
No related tags found
No related merge requests found
......@@ -48,8 +48,8 @@ ip_prefix = 10.99.
n_beamsets = 1
[LTS]
n_fpgas = 16
first_fpga_nr = 0
n_fpgas = 4
first_fpga_nr = 8
ip_prefix = 10.99.
n_beamsets = 1
......
......@@ -113,7 +113,7 @@ void monitor()
}
}
void server_init(bool warm_start)
void read_configuration()
{
cout << "read sdptr config file '" << SD.configfile << "'" << endl;
ConfigReader* p = ConfigReader::getInstance(); // create object of the class ConfigReader
......@@ -129,7 +129,11 @@ void server_init(bool warm_start)
cerr << "ERROR, no settings found for '" << SD.ant_band_station_type << "'" <<endl;
exit(EXIT_FAILURE);
}
}
void server_init(bool warm_start)
{
list<class NODE_config> NC;
for (int i=0; i<SD.n_fpgas; i++) {
NODE_config nc;
......@@ -181,6 +185,7 @@ static void stopHandler(int signal)
static void hupHandler(int signal)
{
cerr << "received HUP signal: reload" << endl;
read_configuration();
server_init(true);
}
......@@ -210,6 +215,7 @@ int main (int argc, char* argv[])
("nodaemon", po::value<bool>(&nodaemon)->zero_tokens(),
"With this flag, sdptr runs NOT as daemon")
("debug", po::value(&debug), "Prints out debug info (default=0)")
("configfile", po::value<string>(&SD.configfile)->default_value(SD.configfile),
"Specify uniboard configuration file location")
("type", po::value<string>(&SD.ant_band_station_type)->default_value(SD.ant_band_station_type),
......@@ -259,6 +265,7 @@ int main (int argc, char* argv[])
if (daemon(1, 0) < 0) cerr << "Error fork as daemon: " << strerror(errno) << endl;
}
read_configuration();
SD.tr = new TranslatorMap();
server_init(false);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment