caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix calibration range calculation

Browse Source
This commit is contained in:
Jan Käberich 2022-11-17 18:06:28 +01:00
parent 94fc6ab840
commit 30aa5f414f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Software/PC_Application/LibreVNA-GUI/Calibration/calibrationmeasurement.cpp
View File

@ -225,7 +225,7 @@ CalStandard::Virtual* CalibrationMeasurement::Base::getStandard() const
double CalibrationMeasurement::OnePort::minFreq() double CalibrationMeasurement::OnePort::minFreq()
{ {
if(points.size() > 0 && standard) { if(points.size() > 0 && standard) {
return min(points.front().frequency, standard->minFrequency()); return max(points.front().frequency, standard->minFrequency());
} else { } else {
return numeric_limits<double>::max(); return numeric_limits<double>::max();
} }
@ -234,7 +234,7 @@ double CalibrationMeasurement::OnePort::minFreq()
double CalibrationMeasurement::OnePort::maxFreq() double CalibrationMeasurement::OnePort::maxFreq()
{ {
if(points.size() > 0 && standard) { if(points.size() > 0 && standard) {
return max(points.back().frequency, standard->maxFrequency()); return min(points.back().frequency, standard->maxFrequency());
} else { } else {
return 0; return 0;
} }
@ -369,7 +369,7 @@ std::vector<CalibrationMeasurement::OnePort::Point> CalibrationMeasurement::OneP
double CalibrationMeasurement::TwoPort::minFreq() double CalibrationMeasurement::TwoPort::minFreq()
{ {
if(points.size() > 0 && standard) { if(points.size() > 0 && standard) {
return min(points.front().frequency, standard->minFrequency()); return max(points.front().frequency, standard->minFrequency());
} else { } else {
return numeric_limits<double>::max(); return numeric_limits<double>::max();
} }
@ -378,7 +378,7 @@ double CalibrationMeasurement::TwoPort::minFreq()
double CalibrationMeasurement::TwoPort::maxFreq() double CalibrationMeasurement::TwoPort::maxFreq()
{ {
if(points.size() > 0 && standard) { if(points.size() > 0 && standard) {
return max(points.back().frequency, standard->maxFrequency()); return min(points.back().frequency, standard->maxFrequency());
} else { } else {
return 0; return 0;
} }