Commit 08691913 authored by ILBERT Olivier's avatar ILBERT Olivier
Browse files

remaining problem of conflict to be solved

parent b4a2cf50
No preview for this file type
......@@ -53,23 +53,16 @@ void flt::read(string fltFile) {
litOne.ori=0; // origin at 0 to indicate that this element refers to a filter
// build the filter by adding this element
lamb_trans.push_back(litOne);
<<<<<<< HEAD
=======
>>>>>>> u/jct/dev
}
}
//Close the stream
sflt.close();
<<<<<<< HEAD
//Close the stream
sflt.close();
// Sort the filter, remove the low values on the edge, be sure that the extreme points are ending with 0
clean();
return;
=======
// Sort the filter, remove the low values on the edge, be sure that the extreme points are ending with 0
clean();
......@@ -80,7 +73,6 @@ void flt::read(string fltFile) {
trans();
return;
>>>>>>> u/jct/dev
}
......@@ -158,31 +150,20 @@ double flt::lmin() const{
if(lamb_trans.size() > 0) {
//lamb_trans is expected to be sorted already
return lamb_trans.front().lamb;
<<<<<<< HEAD
} else {cout<<"flt::lmin called on non initialized lamb_trans vector"<<endl;exit(1);}
=======
} else {throw runtime_error("flt::lmin called on non initialized lamb_trans vector");}
>>>>>>> u/jct/dev
}
/*
RETURN THE MAXIMUM CONSIDERED LAMBDA
*/
double flt::lmax() const{
<<<<<<< HEAD
//protect against constructor that does not initialize lamb_trans
=======
//protect against constructor that does not initialize lamb_trans
>>>>>>> u/jct/dev
if(lamb_trans.size() > 0) {
//lamb_trans is expected to be sorted already
return lamb_trans.back().lamb;
} else {
<<<<<<< HEAD
cout<<"flt::lmax called on non initialized lamb_trans vector"<<endl;exit(1);
=======
throw runtime_error("flt::lmax called on non initialized lamb_trans vector");
>>>>>>> u/jct/dev
}
}
......@@ -430,11 +411,7 @@ double flt::fcorrec() {
}
// int (Fcalib T lambda) dLambda / int ( Fcalib T ) dLambda
<<<<<<< HEAD
double leff2= magCalib[4]/magCalib[3];
=======
double leff2 = magCalib[4]/magCalib[3];
>>>>>>> u/jct/dev
// Compute Fcalib at leff2
double B0;
......
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