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

general Y parameters

Browse source
This commit is contained in:
Jan Käberich 2025-02-21 15:17:04 +01:00
parent 3e0f3df48c
commit 3f64653ed3
2 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Software/PC_Application/LibreVNA-GUI/Tools/parameters.cpp
View file

@ -166,24 +166,21 @@ void Parameters::fromJSON(nlohmann::json j)
}
}
Yparam::Yparam(const Sparam &s, Type Z01, Type Z02)
Yparam::Yparam(const Sparam &S, std::vector<Type> Z0n)
: Yparam(Zparam(S, Z0n))
{
// TODO can this be done for any number of ports
if(s.ports() != 2) {
throw std::runtime_error("Can only create Y parameter from 2 port S parameters");
}
data = Eigen::MatrixXcd(2,2);
// from https://www.rfcafe.com/references/electrical/s-h-y-z.htm
auto denom = (conj(Z01)+s.get(1,1)*Z01)*(conj(Z02)+s.get(2,2)*Z02)-s.get(1,2)*s.get(2,1)*Z01*Z02;
set(1,1, ((1.0-s.get(1,1))*(conj(Z02)+s.get(2,2)*Z02)+s.get(1,2)*s.get(2,1)*Z02) / denom);
set(1,2, -2.0*s.get(1,2)*sqrt(real(Z01)*real(Z02)));
set(2,1, -2.0*s.get(2,1)*sqrt(real(Z01)*real(Z02)));
set(2,2, ((conj(Z01)+s.get(1,1)*Z01)*(1.0-s.get(2,2))+s.get(1,2)*s.get(2,1)*Z01) / denom);
}
Yparam::Yparam(const Sparam &s, Type Z0)
: Yparam(s, Z0, Z0)
Yparam::Yparam(const Sparam &S, Type Z0)
: Yparam(S, std::vector<Type>(S.ports(), Z0))
{
}
Yparam::Yparam(const Zparam &Z)
{
data = Z.data.inverse();
}
Zparam::Zparam(const Sparam &S, std::vector<Type> Z0n)
@ -215,3 +212,8 @@ Zparam::Zparam(const Sparam &S, Type Z0)
{
}
Zparam::Zparam(const Yparam &Y)
{
data = Y.data.inverse();
}

8
Software/PC_Application/LibreVNA-GUI/Tools/parameters.h
View file

@ -31,6 +31,7 @@ public:
// forward declaration of parameter classes
class Sparam;
class Zparam;
class Yparam;
class Tparam;
class ABCDparam;
@ -66,6 +67,7 @@ public:
Zparam(int num_ports) : Parameters(num_ports){}
Zparam(const Sparam &S, std::vector<Type> Z0n);
Zparam(const Sparam &S, Type Z0);
Zparam(const Yparam &Y);
};
class ABCDparam : public Parameters {
@ -160,8 +162,10 @@ public:
class Yparam : public Parameters {
public:
using Parameters::Parameters;
Yparam(const Sparam &s, Type Z01, Type Z02);
Yparam(const Sparam &s, Type Z0);
Yparam(int num_ports) : Parameters(num_ports){}
Yparam(const Sparam &S, std::vector<Type> Z0n);
Yparam(const Sparam &S, Type Z0);
Yparam(const Zparam &Z);
};
#endif // TPARAM_H