jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-01-09 01:59:57 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

partial loading of coefficient sets

Browse source
This commit is contained in:
Jan Käberich 2024-09-25 17:58:32 +02:00
parent 74858c1098
commit 6d6ffc60ea
3 changed files with 221 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

212
Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/caldevice.cpp
View file

@ -172,14 +172,24 @@ QString CalDevice::getDateTimeUTC()
}
}
void CalDevice::loadCoefficientSets(QStringList names, bool fast)
void CalDevice::loadCoefficientSets(QStringList names, QList<int> ports, bool fast)
{
coeffSets.clear();
if(ports.isEmpty()) {
for(int i=1;i<=ports.size();i++) {
ports.append(i);
}
} else {
// make sure we are sorted, otherwise the through coefficient naming is wrong
std::sort(ports.begin(), ports.end());
}
abortLoading = false;
if(fast && Util::firmwareEqualOrHigher(firmware, "0.2.1")) {
loadThread = new std::thread(&CalDevice::loadCoefficientSetsThreadFast, this, names);
loadThread = new std::thread(&CalDevice::loadCoefficientSetsThreadFast, this, names, ports);
} else {
loadThread = new std::thread(&CalDevice::loadCoefficientSetsThreadSlow, this, names);
loadThread = new std::thread(&CalDevice::loadCoefficientSetsThreadSlow, this, names, ports);
}
}
@ -202,7 +212,7 @@ void CalDevice::saveCoefficientSets()
}
}
void CalDevice::loadCoefficientSetsThreadSlow(QStringList names)
void CalDevice::loadCoefficientSetsThreadSlow(QStringList names, QList<int> ports)
{
QStringList coeffList = getCoefficientSetNames();
if(coeffList.empty()) {
@ -224,14 +234,16 @@ void CalDevice::loadCoefficientSetsThreadSlow(QStringList names)
// get total number of coefficient points for accurate percentage calculation
unsigned long totalPoints = 0;
for(auto name : coeffList) {
for(int i=1;i<=numPorts;i++) {
for(int idx=0;idx<ports.size();idx++) {
int i = ports[idx];
if(abortLoading) {
return;
}
totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+"_OPEN").toInt();
totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+"_SHORT").toInt();
totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+"_LOAD").toInt();
for(int j=i+1;j<=numPorts;j++) {
for(int jdx=idx+1;jdx<numPorts;jdx++) {
int j = ports[j];
totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+QString::number(j)+"_THROUGH").toInt();
}
}
@ -244,7 +256,8 @@ void CalDevice::loadCoefficientSetsThreadSlow(QStringList names)
set.name = name;
set.ports = numPorts;
// Read this coefficient set
for(int i=1;i<=numPorts;i++) {
for(int idx=0;idx<ports.size();idx++) {
int i = ports[idx];
auto createCoefficient = [&](QString setName, QString paramName) -> CoefficientSet::Coefficient* {
int points = usb->Query(":COEFF:NUM? "+setName+" "+paramName).toInt();
CoefficientSet::Coefficient *c = new CoefficientSet::Coefficient();
@ -282,11 +295,12 @@ void CalDevice::loadCoefficientSetsThreadSlow(QStringList names)
c->t.setFilename("LibreCAL/"+paramName);
return c;
};
set.opens.push_back(createCoefficient(name, "P"+QString::number(i)+"_OPEN"));
set.shorts.push_back(createCoefficient(name, "P"+QString::number(i)+"_SHORT"));
set.loads.push_back(createCoefficient(name, "P"+QString::number(i)+"_LOAD"));
for(int j=i+1;j<=numPorts;j++) {
set.throughs.push_back(createCoefficient(name, "P"+QString::number(i)+QString::number(j)+"_THROUGH"));
set.opens[i] = (createCoefficient(name, "P"+QString::number(i)+"_OPEN"));
set.shorts[i] = (createCoefficient(name, "P"+QString::number(i)+"_SHORT"));
set.loads[i] = (createCoefficient(name, "P"+QString::number(i)+"_LOAD"));
for(int jdx=idx+1;jdx<ports.size();jdx++) {
int j = ports[jdx];
set.throughs[set.portsToThroughIndex(i, j)] = createCoefficient(name, "P"+QString::number(i)+QString::number(j)+"_THROUGH");
}
if(abortLoading) {
return;
@ -297,7 +311,7 @@ void CalDevice::loadCoefficientSetsThreadSlow(QStringList names)
emit updateCoefficientsDone(true);
}
void CalDevice::loadCoefficientSetsThreadFast(QStringList names)
void CalDevice::loadCoefficientSetsThreadFast(QStringList names, QList<int> ports)
{
QStringList coeffList = getCoefficientSetNames();
if(coeffList.empty()) {
@ -317,17 +331,7 @@ void CalDevice::loadCoefficientSetsThreadFast(QStringList names)
coeffList = names;
}
QStringList coeffNames;
for(int i=1;i<=numPorts;i++) {
coeffNames.append("P"+QString::number(i)+"_OPEN");
coeffNames.append("P"+QString::number(i)+"_SHORT");
coeffNames.append("P"+QString::number(i)+"_LOAD");
for(int j=i+1;j<=numPorts;j++) {
coeffNames.append("P"+QString::number(i)+QString::number(j)+"_THROUGH");
}
}
int total_coeffs = coeffNames.size() * names.size();
int total_coeffs = (ports.size() * 3 + ports.size() * (ports.size() - 1) / 2) * names.size();
int read_coeffs = 0;
for(auto name : coeffList) {
@ -389,25 +393,54 @@ void CalDevice::loadCoefficientSetsThreadFast(QStringList names)
}
};
for(auto coeff : coeffNames) {
auto c = createCoefficient(name, coeff);
for(int idx=0;idx<ports.size();idx++) {
int i = ports[idx];
auto c = createCoefficient(name, "P"+QString::number(i)+"_OPEN");
if(abortLoading) {
return;
}
if(c) {
if(coeff.endsWith("_OPEN")) {
set.opens.push_back(c);
} else if(coeff.endsWith("_SHORT")) {
set.shorts.push_back(c);
} else if(coeff.endsWith("_LOAD")) {
set.loads.push_back(c);
} else if(coeff.endsWith("_THROUGH")) {
set.throughs.push_back(c);
}
set.opens[i] = c;
}
read_coeffs++;
emit updateCoefficientsPercent(read_coeffs * 100 / total_coeffs);
c = createCoefficient(name, "P"+QString::number(i)+"_SHORT");
if(abortLoading) {
return;
}
if(c) {
set.shorts[i] = c;
}
read_coeffs++;
emit updateCoefficientsPercent(read_coeffs * 100 / total_coeffs);
c = createCoefficient(name, "P"+QString::number(i)+"_LOAD");
if(abortLoading) {
return;
}
if(c) {
set.loads[i] = c;
}
read_coeffs++;
emit updateCoefficientsPercent(read_coeffs * 100 / total_coeffs);
for(int jdx=idx+1;jdx<ports.size();jdx++) {
int j = ports[jdx];
c = createCoefficient(name, "P"+QString::number(i)+QString::number(j)+"_THROUGH");
if(abortLoading) {
return;
}
if(c) {
set.throughs[set.portsToThroughIndex(i, j)] = c;
}
read_coeffs++;
emit updateCoefficientsPercent(read_coeffs * 100 / total_coeffs);
}
}
coeffSets.push_back(set);
}
emit updateCoefficientsDone(true);
@ -419,23 +452,23 @@ void CalDevice::saveCoefficientSetsThread()
unsigned long totalPoints = 0;
for(auto set : coeffSets) {
for(auto c : set.opens) {
if(c->modified) {
totalPoints += c->t.points();
if(c.second->modified) {
totalPoints += c.second->t.points();
}
}
for(auto c : set.shorts) {
if(c->modified) {
totalPoints += c->t.points();
if(c.second->modified) {
totalPoints += c.second->t.points();
}
}
for(auto c : set.loads) {
if(c->modified) {
totalPoints += c->t.points();
if(c.second->modified) {
totalPoints += c.second->t.points();
}
}
for(auto c : set.throughs) {
if(c->modified) {
totalPoints += c->t.points();
if(c.second->modified) {
totalPoints += c.second->t.points();
}
}
}
@ -488,11 +521,20 @@ void CalDevice::saveCoefficientSetsThread()
return true;
};
for(int i=1;i<=numPorts;i++) {
success &= createCoefficient(set.name, "P"+QString::number(i)+"_OPEN", set.opens[i-1]->t, set.opens[i-1]->modified);
success &= createCoefficient(set.name, "P"+QString::number(i)+"_SHORT", set.shorts[i-1]->t, set.shorts[i-1]->modified);
success &= createCoefficient(set.name, "P"+QString::number(i)+"_LOAD", set.loads[i-1]->t, set.loads[i-1]->modified);
if(set.opens.count(i)) {
success &= createCoefficient(set.name, "P"+QString::number(i)+"_OPEN", set.opens[i]->t, set.opens[i]->modified);
}
if(set.shorts.count(i)) {
success &= createCoefficient(set.name, "P"+QString::number(i)+"_SHORT", set.shorts[i]->t, set.shorts[i]->modified);
}
if(set.loads.count(i)) {
success &= createCoefficient(set.name, "P"+QString::number(i)+"_LOAD", set.loads[i]->t, set.loads[i]->modified);
}
for(int j=i+1;j<=numPorts;j++) {
success &= createCoefficient(set.name, "P"+QString::number(i)+QString::number(j)+"_THROUGH", set.getThrough(i,j)->t, set.getThrough(i,j)->modified);
auto c = set.getThrough(i,j);
if(c) {
success &= createCoefficient(set.name, "P"+QString::number(i)+QString::number(j)+"_THROUGH", c->t, c->modified);
}
}
}
}
@ -509,10 +551,10 @@ void CalDevice::addCoefficientSet(QString name)
CoefficientSet set;
set.name = name;
set.ports = numPorts;
set.loads.resize(numPorts, new CoefficientSet::Coefficient());
set.shorts.resize(numPorts, new CoefficientSet::Coefficient());
set.opens.resize(numPorts, new CoefficientSet::Coefficient());
set.throughs.resize(numPorts*(numPorts-1)/2, new CoefficientSet::Coefficient());
set.loads.clear();
set.shorts.clear();
set.opens.clear();
set.throughs.clear();
coeffSets.push_back(set);
}
@ -529,22 +571,22 @@ bool CalDevice::hasModifiedCoefficients()
{
for(auto set : coeffSets) {
for(auto c : set.opens) {
if(c->modified) {
if(c.second->modified) {
return true;
}
}
for(auto c : set.shorts) {
if(c->modified) {
if(c.second->modified) {
return true;
}
}
for(auto c : set.loads) {
if(c->modified) {
if(c.second->modified) {
return true;
}
}
for(auto c : set.throughs) {
if(c->modified) {
if(c.second->modified) {
return true;
}
}
@ -552,15 +594,59 @@ bool CalDevice::hasModifiedCoefficients()
return false;
}
CalDevice::CoefficientSet::Coefficient *CalDevice::CoefficientSet::getThrough(int port1, int port2) const
CalDevice::CoefficientSet::Coefficient *CalDevice::CoefficientSet::getOpen(int port)
{
if(port1 > ports || port2 > ports || port1 >= port2) {
if(opens.count(port)) {
return opens[port];
} else {
return nullptr;
}
int index = port2 - port1 - 1;
while(port1 > 1) {
index += ports - port1 + 1;
port1--;
}
return throughs[index];
}
CalDevice::CoefficientSet::Coefficient *CalDevice::CoefficientSet::getShort(int port)
{
if(shorts.count(port)) {
return shorts[port];
} else {
return nullptr;
}
}
CalDevice::CoefficientSet::Coefficient *CalDevice::CoefficientSet::getLoad(int port)
{
if(loads.count(port)) {
return loads[port];
} else {
return nullptr;
}
}
CalDevice::CoefficientSet::Coefficient *CalDevice::CoefficientSet::getThrough(int port1, int port2)
{
auto index = portsToThroughIndex(port1, port2);
if(throughs.count(index)) {
return throughs[index];
} else {
return nullptr;
}
}
int CalDevice::CoefficientSet::portsToThroughIndex(int port1, int port2)
{
if(port1 > ports || port2 > ports || port1 >= port2) {
return -1;
}
return port1 * ports + port2;
}
void CalDevice::CoefficientSet::portsFromThroughIndex(int &port1, int &port2, int index)
{
port1 = index / ports;
port2 = index - port1 * ports;
if(port1 < 1 || port1 > ports) {
port1 = -1;
}
if(port2 < 1 || port2 > ports) {
port2 = -1;
}
}

22
Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/caldevice.h
View file

@ -60,18 +60,24 @@ public:
bool modified;
};
std::vector<Coefficient*> opens;
std::vector<Coefficient*> shorts;
std::vector<Coefficient*> loads;
std::vector<Coefficient*> throughs;
Coefficient *getOpen(int port);
Coefficient *getShort(int port);
Coefficient *getLoad(int port);
Coefficient *getThrough(int port1, int port2);
Coefficient *getThrough(int port1, int port2) const;
std::map<int, Coefficient*> opens;
std::map<int, Coefficient*> shorts;
std::map<int, Coefficient*> loads;
std::map<int, Coefficient*> throughs;
int portsToThroughIndex(int port1, int port2);
void portsFromThroughIndex(int &port1, int &port2, int index);
};
// Extracts the coefficients from the device. This is done with a dedicated thread.
// Do not call any other functions until the update is finished. Process can be
// monitored through the updateCoefficientsPercent and updateCoefficientsDone signals
void loadCoefficientSets(QStringList names = QStringList(), bool fast=true);
void loadCoefficientSets(QStringList names = QStringList(), QList<int> ports = {}, bool fast=true);
void abortCoefficientLoading();
// Writes coefficient sets to the device. This will only write modified files to save
@ -95,8 +101,8 @@ signals:
void disconnected();
private:
void loadCoefficientSetsThreadSlow(QStringList names = QStringList());
void loadCoefficientSetsThreadFast(QStringList names = QStringList());
void loadCoefficientSetsThreadSlow(QStringList names, QList<int> ports);
void loadCoefficientSetsThreadFast(QStringList names, QList<int> ports);
void saveCoefficientSetsThread();
USBDevice *usb;

93
Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/librecaldialog.cpp
View file

@ -153,6 +153,9 @@ bool LibreCALDialog::validateCoefficients()
double coeffMaxFreq = numeric_limits<double>::lowest();
auto checkCoefficient = [&](CalDevice::CoefficientSet::Coefficient *c) -> bool {
if(!c) {
return false;
}
if(c->t.points() == 0) {
return false;
} else {
@ -177,17 +180,17 @@ bool LibreCALDialog::validateCoefficients()
// check if coefficients for all ports are available
for(auto i : usedCalPorts) {
// Check if OSL coefficients are there
if(!checkCoefficient(coeffSet.opens[i-1])) {
if(!checkCoefficient(coeffSet.getOpen(i))) {
status = "Open coefficient for LibreCAL port "+QString::number(i)+" is missing.";
canStart = false;
break;
}
if(!checkCoefficient(coeffSet.shorts[i-1])) {
if(!checkCoefficient(coeffSet.getShort(i))) {
status = "Short coefficient for LibreCAL port "+QString::number(i)+" is missing.";
canStart = false;
break;
}
if(!checkCoefficient(coeffSet.loads[i-1])) {
if(!checkCoefficient(coeffSet.getLoad(i))) {
status = "Load coefficient for LibreCAL port "+QString::number(i)+" is missing.";
canStart = false;
break;
@ -296,18 +299,26 @@ void LibreCALDialog::loadCoefficients()
} else {
// can continue with loading coefficients
// they might already be loaded from a previous calibration run, check first
// if(!validateCoefficients()) {
// TODO only load required coefficients
if(!validateCoefficients()) {
// only load required coefficients
ui->progressCal->setValue(0);
ui->lCalibrationStatus->setText("Loading coefficients...");
ui->lCalibrationStatus->setStyleSheet("QLabel { color : green; }");
busy = true;
device->loadCoefficientSets({ui->cbCoefficients->currentText()});
// } else {
// // can proceed with calibration directly
// startCalibration();
// }
// determine the used ports of the LibreCAL
QList<int> usedPorts;
for(auto port : portAssignment) {
if(port > 0) {
usedPorts.append(port);
}
}
busy = true;
device->loadCoefficientSets({ui->cbCoefficients->currentText()}, usedPorts);
} else {
// can proceed with calibration directly
startCalibration();
}
}
}
@ -417,33 +428,45 @@ void LibreCALDialog::startCalibration()
kit.manufacturer = "LibreCAL ("+coeffSet.name+")";
kit.serialnumber = device->serial();
kit.description = "Automatically created from LibreCAL module";
std::vector<CalStandard::Virtual*> openStandards;
std::vector<CalStandard::Virtual*> shortStandards;
std::vector<CalStandard::Virtual*> loadStandards;
std::vector<CalStandard::Virtual*> throughStandards;
for(unsigned int i=1;i<=device->getNumPorts();i++) {
if(coeffSet.opens[i-1]->t.points() > 0) {
// determine the used ports of the LibreCAL
QList<int> usedPorts;
for(auto port : portAssignment) {
if(port > 0) {
usedPorts.append(port);
}
}
std::sort(usedPorts.begin(), usedPorts.end());
std::map<int, CalStandard::Virtual*> openStandards;
std::map<int, CalStandard::Virtual*> shortStandards;
std::map<int, CalStandard::Virtual*> loadStandards;
std::map<int, CalStandard::Virtual*> throughStandards;
for(unsigned int idx=0;idx<usedPorts.size();idx++) {
int i=usedPorts[idx];
if(coeffSet.getOpen(i)->t.points() > 0) {
auto o = new CalStandard::Open();
o->setName("Port "+QString::number(i));
o->setMeasurement(coeffSet.opens[i-1]->t);
openStandards.push_back(o);
o->setMeasurement(coeffSet.getOpen(i)->t);
openStandards[i] = o;
kit.addStandard(o);
}
if(coeffSet.shorts[i-1]->t.points() > 0) {
if(coeffSet.getShort(i)->t.points() > 0) {
auto o = new CalStandard::Short();
o->setName("Port "+QString::number(i));
o->setMeasurement(coeffSet.shorts[i-1]->t);
shortStandards.push_back(o);
o->setMeasurement(coeffSet.getShort(i)->t);
shortStandards[i] = o;
kit.addStandard(o);
}
if(coeffSet.loads[i-1]->t.points() > 0) {
if(coeffSet.getLoad(i)->t.points() > 0) {
auto o = new CalStandard::Load();
o->setName("Port "+QString::number(i));
o->setMeasurement(coeffSet.loads[i-1]->t);
loadStandards.push_back(o);
o->setMeasurement(coeffSet.getLoad(i)->t);
loadStandards[i] = o;
kit.addStandard(o);
}
for(unsigned int j=i+1;j<=device->getNumPorts();j++) {
for(unsigned int jdx=idx+1;jdx<usedPorts.size();jdx++) {
int j=usedPorts[jdx];
auto c = coeffSet.getThrough(i,j);
if(!c) {
continue;
@ -452,7 +475,7 @@ void LibreCALDialog::startCalibration()
auto o = new CalStandard::Through();
o->setName("Port "+QString::number(i)+" to "+QString::number(j));
o->setMeasurement(c->t);
throughStandards.push_back(o);
throughStandards[coeffSet.portsToThroughIndex(i, j)] = o;
kit.addStandard(o);
}
}
@ -471,19 +494,19 @@ void LibreCALDialog::startCalibration()
// Create SOL measurements with correct port of calkit
auto open = new CalibrationMeasurement::Open(cal);
open->setPort(p+1);
open->setStandard(openStandards[portAssignment[p]-1]);
open->setStandard(openStandards[portAssignment[p]]);
openMeasurements.insert(open);
cal->measurements.push_back(open);
auto _short = new CalibrationMeasurement::Short(cal);
_short->setPort(p+1);
_short->setStandard(shortStandards[portAssignment[p]-1]);
_short->setStandard(shortStandards[portAssignment[p]]);
shortMeasurements.insert(_short);
cal->measurements.push_back(_short);
auto load = new CalibrationMeasurement::Load(cal);
load->setPort(p+1);
load->setStandard(loadStandards[portAssignment[p]-1]);
load->setStandard(loadStandards[portAssignment[p]]);
loadMeasurements.insert(load);
cal->measurements.push_back(load);
for(unsigned int p2=p+1;p2<vnaPorts;p2++) {
@ -499,11 +522,11 @@ void LibreCALDialog::startCalibration()
QString forwardName = "Port "+QString::number(libreCALp1)+" to "+QString::number(libreCALp2);
QString reverseName = "Port "+QString::number(libreCALp2)+" to "+QString::number(libreCALp1);
for(auto ts : throughStandards) {
if(ts->getName() == forwardName) {
through->setStandard(ts);
if(ts.second->getName() == forwardName) {
through->setStandard(ts.second);
through->setReverseStandard(false);
} else if(ts->getName() == reverseName) {
through->setStandard(ts);
} else if(ts.second->getName() == reverseName) {
through->setStandard(ts.second);
through->setReverseStandard(true);
}
}
@ -581,7 +604,7 @@ void LibreCALDialog::startCalibration()
};
disconnect(cal, &Calibration::measurementsUpdated, this, nullptr);
connect(cal, &Calibration::measurementsUpdated, this, startNextCalibrationStep);
connect(cal, &Calibration::measurementsUpdated, this, startNextCalibrationStep, Qt::QueuedConnection);
connect(cal, &Calibration::measurementsAborted, this, [=](){
enableUI();
});