Commit 9f297b4d authored by Thomas Edwards's avatar Thomas Edwards
Browse files

Modified to work with TRE's configuration

parent 5077c6d9
......@@ -61,7 +61,7 @@ int main(int argc, char* argv[]) {
// Set the calibration constants.
// Will be done in driver_obs_obsdaq constructor in future, and parameter
// file will be given as argument to constructor
double R,X_s,Y_s,Z_s,S1_s,S2_s,S3_s,S1_o,S2_o,S3_o;
double R,X_s,Y_s,Z_s,S1_s,S2_s,S3_s,S4_s,S5_s,S1_o,S2_o,S3_o,S4_o,S5_o;
R = par.get_dbl("R",1.0);
X_s = par.get_dbl("X_s",1.0);
Y_s = par.get_dbl("Y_s",1.0);
......@@ -72,9 +72,13 @@ int main(int argc, char* argv[]) {
S2_o = par.get_dbl("S2_o",0.0);
S3_s = par.get_dbl("S3_s",1.0);
S3_o = par.get_dbl("S3_o",0.0);
S4_s = par.get_dbl("S4_s",1.0);
S4_o = par.get_dbl("S4_o",0.0);
S5_s = par.get_dbl("S5_s",1.0);
S5_o = par.get_dbl("S5_o",0.0);
std::cout << "R: " << R << " X_s: " << X_s << std::endl;
std::vector<double> offset = {0.0, 0.0, 0.0, 0.0, 0.0, S1_o, S2_o, S3_o};
std::vector<double> scale = {X_s/R,Y_s/R,Z_s/R,1.0,1.0,S1_s,S2_s,S3_s};
std::vector<double> offset = {0.0, 0.0, 0.0, S1_o, S2_o, S3_o, S4_o, S5_o};
std::vector<double> scale = {X_s/R,Y_s/R,Z_s/R,S1_s,S2_s,S3_s,S4_s,S5_s};
// Add standard pipe buffer to multi buffer
buffer_obs_mult mult = new buffer_obs_mult(new buffer_obs_pipe(5));
......@@ -82,7 +86,7 @@ int main(int argc, char* argv[]) {
// Add file buffer, if file_format is given
if (par.get_str("FILE_RAW")!="") {
std::cerr << "FILE_RAW BUFFER ADDED" << std::endl;
mult.add(new buffer_obs_file(5,par.get_str("DIR_VEC"),
mult.add(new buffer_obs_file(par.get_str("FILE_RAW_FORMAT"),par.get_str("DIR_RAW"),
par.get_str("FILE_RAW")));
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment