diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..a620921 Binary files /dev/null and b/.DS_Store differ diff --git a/Classes/01_transmit/AWG.m b/Classes/01_transmit/AWG.m index 9f2ba69..1193db5 100644 --- a/Classes/01_transmit/AWG.m +++ b/Classes/01_transmit/AWG.m @@ -74,7 +74,7 @@ classdef AWG % normalize to 0dBm before applying the lowpass %signalclass_in = signalclass_in.normalize("mode","milliwatt"); - signalclass_in = signalclass_in.setPower(12,"dBm"); + signalclass_in = signalclass_in.setPower(6,"dBm"); % 4. Apply LPF on the signal if obj.lpf_active @@ -89,7 +89,7 @@ classdef AWG end end - + signalclass_in.power % append to logbook current_class = class(obj); diff --git a/physconst/+Constant/+HA/Boltzmann.m b/Libs/physconst/+Constant/+HA/Boltzmann.m similarity index 100% rename from physconst/+Constant/+HA/Boltzmann.m rename to Libs/physconst/+Constant/+HA/Boltzmann.m diff --git a/physconst/+Constant/+HA/ConductanceQuantum.m b/Libs/physconst/+Constant/+HA/ConductanceQuantum.m similarity index 100% rename from physconst/+Constant/+HA/ConductanceQuantum.m rename to Libs/physconst/+Constant/+HA/ConductanceQuantum.m diff --git a/physconst/+Constant/+HA/Coulomb.m b/Libs/physconst/+Constant/+HA/Coulomb.m similarity index 100% rename from physconst/+Constant/+HA/Coulomb.m rename to Libs/physconst/+Constant/+HA/Coulomb.m diff --git a/physconst/+Constant/+HA/ElectronMass.m b/Libs/physconst/+Constant/+HA/ElectronMass.m similarity index 100% rename from physconst/+Constant/+HA/ElectronMass.m rename to Libs/physconst/+Constant/+HA/ElectronMass.m diff --git a/physconst/+Constant/+HA/ElementaryCharge.m b/Libs/physconst/+Constant/+HA/ElementaryCharge.m similarity index 100% rename from physconst/+Constant/+HA/ElementaryCharge.m rename to Libs/physconst/+Constant/+HA/ElementaryCharge.m diff --git a/physconst/+Constant/+HA/FineStructure.m b/Libs/physconst/+Constant/+HA/FineStructure.m similarity index 100% rename from physconst/+Constant/+HA/FineStructure.m rename to Libs/physconst/+Constant/+HA/FineStructure.m diff --git a/physconst/+Constant/+HA/FluxQuantum.m b/Libs/physconst/+Constant/+HA/FluxQuantum.m similarity index 100% rename from physconst/+Constant/+HA/FluxQuantum.m rename to Libs/physconst/+Constant/+HA/FluxQuantum.m diff --git a/physconst/+Constant/+HA/LightSpeed.m b/Libs/physconst/+Constant/+HA/LightSpeed.m similarity index 100% rename from physconst/+Constant/+HA/LightSpeed.m rename to Libs/physconst/+Constant/+HA/LightSpeed.m diff --git a/physconst/+Constant/+HA/Planck.m b/Libs/physconst/+Constant/+HA/Planck.m similarity index 100% rename from physconst/+Constant/+HA/Planck.m rename to Libs/physconst/+Constant/+HA/Planck.m diff --git a/physconst/+Constant/+HA/ProtonMass.m b/Libs/physconst/+Constant/+HA/ProtonMass.m similarity index 100% rename from physconst/+Constant/+HA/ProtonMass.m rename to Libs/physconst/+Constant/+HA/ProtonMass.m diff --git a/physconst/+Constant/+HA/ReducedPlanck.m b/Libs/physconst/+Constant/+HA/ReducedPlanck.m similarity index 100% rename from physconst/+Constant/+HA/ReducedPlanck.m rename to Libs/physconst/+Constant/+HA/ReducedPlanck.m diff --git a/physconst/+Constant/+P/Boltzmann.m b/Libs/physconst/+Constant/+P/Boltzmann.m similarity index 100% rename from physconst/+Constant/+P/Boltzmann.m rename to Libs/physconst/+Constant/+P/Boltzmann.m diff --git a/physconst/+Constant/+P/Coulomb.m b/Libs/physconst/+Constant/+P/Coulomb.m similarity index 100% rename from physconst/+Constant/+P/Coulomb.m rename to Libs/physconst/+Constant/+P/Coulomb.m diff --git a/physconst/+Constant/+P/Gravitational.m b/Libs/physconst/+Constant/+P/Gravitational.m similarity index 100% rename from physconst/+Constant/+P/Gravitational.m rename to Libs/physconst/+Constant/+P/Gravitational.m diff --git a/physconst/+Constant/+P/LightSpeed.m b/Libs/physconst/+Constant/+P/LightSpeed.m similarity index 100% rename from physconst/+Constant/+P/LightSpeed.m rename to Libs/physconst/+Constant/+P/LightSpeed.m diff --git a/physconst/+Constant/+P/Planck.m b/Libs/physconst/+Constant/+P/Planck.m similarity index 100% rename from physconst/+Constant/+P/Planck.m rename to Libs/physconst/+Constant/+P/Planck.m diff --git a/physconst/+Constant/+P/ReducedPlanck.m b/Libs/physconst/+Constant/+P/ReducedPlanck.m similarity index 100% rename from physconst/+Constant/+P/ReducedPlanck.m rename to Libs/physconst/+Constant/+P/ReducedPlanck.m diff --git a/physconst/+Constant/+QCD/Boltzmann.m b/Libs/physconst/+Constant/+QCD/Boltzmann.m similarity index 100% rename from physconst/+Constant/+QCD/Boltzmann.m rename to Libs/physconst/+Constant/+QCD/Boltzmann.m diff --git a/physconst/+Constant/+QCD/LightSpeed.m b/Libs/physconst/+Constant/+QCD/LightSpeed.m similarity index 100% rename from physconst/+Constant/+QCD/LightSpeed.m rename to Libs/physconst/+Constant/+QCD/LightSpeed.m diff --git a/physconst/+Constant/+QCD/Planck.m b/Libs/physconst/+Constant/+QCD/Planck.m similarity index 100% rename from physconst/+Constant/+QCD/Planck.m rename to Libs/physconst/+Constant/+QCD/Planck.m diff --git a/physconst/+Constant/+QCD/ProtonMass.m b/Libs/physconst/+Constant/+QCD/ProtonMass.m similarity index 100% rename from physconst/+Constant/+QCD/ProtonMass.m rename to Libs/physconst/+Constant/+QCD/ProtonMass.m diff --git a/physconst/+Constant/+QCD/ReducedPlanck.m b/Libs/physconst/+Constant/+QCD/ReducedPlanck.m similarity index 100% rename from physconst/+Constant/+QCD/ReducedPlanck.m rename to Libs/physconst/+Constant/+QCD/ReducedPlanck.m diff --git a/physconst/+Constant/+RA/Boltzmann.m b/Libs/physconst/+Constant/+RA/Boltzmann.m similarity index 100% rename from physconst/+Constant/+RA/Boltzmann.m rename to Libs/physconst/+Constant/+RA/Boltzmann.m diff --git a/physconst/+Constant/+RA/ConductanceQuantum.m b/Libs/physconst/+Constant/+RA/ConductanceQuantum.m similarity index 100% rename from physconst/+Constant/+RA/ConductanceQuantum.m rename to Libs/physconst/+Constant/+RA/ConductanceQuantum.m diff --git a/physconst/+Constant/+RA/Coulomb.m b/Libs/physconst/+Constant/+RA/Coulomb.m similarity index 100% rename from physconst/+Constant/+RA/Coulomb.m rename to Libs/physconst/+Constant/+RA/Coulomb.m diff --git a/physconst/+Constant/+RA/ElectronMass.m b/Libs/physconst/+Constant/+RA/ElectronMass.m similarity index 100% rename from physconst/+Constant/+RA/ElectronMass.m rename to Libs/physconst/+Constant/+RA/ElectronMass.m diff --git a/physconst/+Constant/+RA/ElementaryCharge.m b/Libs/physconst/+Constant/+RA/ElementaryCharge.m similarity index 100% rename from physconst/+Constant/+RA/ElementaryCharge.m rename to Libs/physconst/+Constant/+RA/ElementaryCharge.m diff --git a/physconst/+Constant/+RA/FineStructure.m b/Libs/physconst/+Constant/+RA/FineStructure.m similarity index 100% rename from physconst/+Constant/+RA/FineStructure.m rename to Libs/physconst/+Constant/+RA/FineStructure.m diff --git a/physconst/+Constant/+RA/FluxQuantum.m b/Libs/physconst/+Constant/+RA/FluxQuantum.m similarity index 100% rename from physconst/+Constant/+RA/FluxQuantum.m rename to Libs/physconst/+Constant/+RA/FluxQuantum.m diff --git a/physconst/+Constant/+RA/LightSpeed.m b/Libs/physconst/+Constant/+RA/LightSpeed.m similarity index 100% rename from physconst/+Constant/+RA/LightSpeed.m rename to Libs/physconst/+Constant/+RA/LightSpeed.m diff --git a/physconst/+Constant/+RA/Planck.m b/Libs/physconst/+Constant/+RA/Planck.m similarity index 100% rename from physconst/+Constant/+RA/Planck.m rename to Libs/physconst/+Constant/+RA/Planck.m diff --git a/physconst/+Constant/+RA/ProtonMass.m b/Libs/physconst/+Constant/+RA/ProtonMass.m similarity index 100% rename from physconst/+Constant/+RA/ProtonMass.m rename to Libs/physconst/+Constant/+RA/ProtonMass.m diff --git a/physconst/+Constant/+RA/ReducedPlanck.m b/Libs/physconst/+Constant/+RA/ReducedPlanck.m similarity index 100% rename from physconst/+Constant/+RA/ReducedPlanck.m rename to Libs/physconst/+Constant/+RA/ReducedPlanck.m diff --git a/physconst/+Constant/+S/Boltzmann.m b/Libs/physconst/+Constant/+S/Boltzmann.m similarity index 100% rename from physconst/+Constant/+S/Boltzmann.m rename to Libs/physconst/+Constant/+S/Boltzmann.m diff --git a/physconst/+Constant/+S/Coulomb.m b/Libs/physconst/+Constant/+S/Coulomb.m similarity index 100% rename from physconst/+Constant/+S/Coulomb.m rename to Libs/physconst/+Constant/+S/Coulomb.m diff --git a/physconst/+Constant/+S/ElementaryCharge.m b/Libs/physconst/+Constant/+S/ElementaryCharge.m similarity index 100% rename from physconst/+Constant/+S/ElementaryCharge.m rename to Libs/physconst/+Constant/+S/ElementaryCharge.m diff --git a/physconst/+Constant/+S/Gravitational.m b/Libs/physconst/+Constant/+S/Gravitational.m similarity index 100% rename from physconst/+Constant/+S/Gravitational.m rename to Libs/physconst/+Constant/+S/Gravitational.m diff --git a/physconst/+Constant/+S/LightSpeed.m b/Libs/physconst/+Constant/+S/LightSpeed.m similarity index 100% rename from physconst/+Constant/+S/LightSpeed.m rename to Libs/physconst/+Constant/+S/LightSpeed.m diff --git a/physconst/+Constant/+SI/AtomicMass.m b/Libs/physconst/+Constant/+SI/AtomicMass.m similarity index 100% rename from physconst/+Constant/+SI/AtomicMass.m rename to Libs/physconst/+Constant/+SI/AtomicMass.m diff --git a/physconst/+Constant/+SI/AvogadroNumber.m b/Libs/physconst/+Constant/+SI/AvogadroNumber.m similarity index 100% rename from physconst/+Constant/+SI/AvogadroNumber.m rename to Libs/physconst/+Constant/+SI/AvogadroNumber.m diff --git a/physconst/+Constant/+SI/BohrMagneton.m b/Libs/physconst/+Constant/+SI/BohrMagneton.m similarity index 100% rename from physconst/+Constant/+SI/BohrMagneton.m rename to Libs/physconst/+Constant/+SI/BohrMagneton.m diff --git a/physconst/+Constant/+SI/BohrRadius.m b/Libs/physconst/+Constant/+SI/BohrRadius.m similarity index 100% rename from physconst/+Constant/+SI/BohrRadius.m rename to Libs/physconst/+Constant/+SI/BohrRadius.m diff --git a/physconst/+Constant/+SI/Boltzmann.m b/Libs/physconst/+Constant/+SI/Boltzmann.m similarity index 100% rename from physconst/+Constant/+SI/Boltzmann.m rename to Libs/physconst/+Constant/+SI/Boltzmann.m diff --git a/physconst/+Constant/+SI/ConductanceQuantum.m b/Libs/physconst/+Constant/+SI/ConductanceQuantum.m similarity index 100% rename from physconst/+Constant/+SI/ConductanceQuantum.m rename to Libs/physconst/+Constant/+SI/ConductanceQuantum.m diff --git a/physconst/+Constant/+SI/Coulomb.m b/Libs/physconst/+Constant/+SI/Coulomb.m similarity index 100% rename from physconst/+Constant/+SI/Coulomb.m rename to Libs/physconst/+Constant/+SI/Coulomb.m diff --git a/physconst/+Constant/+SI/ElectronMass.m b/Libs/physconst/+Constant/+SI/ElectronMass.m similarity index 100% rename from physconst/+Constant/+SI/ElectronMass.m rename to Libs/physconst/+Constant/+SI/ElectronMass.m diff --git a/physconst/+Constant/+SI/ElementaryCharge.m b/Libs/physconst/+Constant/+SI/ElementaryCharge.m similarity index 100% rename from physconst/+Constant/+SI/ElementaryCharge.m rename to Libs/physconst/+Constant/+SI/ElementaryCharge.m diff --git a/physconst/+Constant/+SI/Faraday.m b/Libs/physconst/+Constant/+SI/Faraday.m similarity index 100% rename from physconst/+Constant/+SI/Faraday.m rename to Libs/physconst/+Constant/+SI/Faraday.m diff --git a/physconst/+Constant/+SI/FermiCoupling.m b/Libs/physconst/+Constant/+SI/FermiCoupling.m similarity index 100% rename from physconst/+Constant/+SI/FermiCoupling.m rename to Libs/physconst/+Constant/+SI/FermiCoupling.m diff --git a/physconst/+Constant/+SI/FineStructure.m b/Libs/physconst/+Constant/+SI/FineStructure.m similarity index 100% rename from physconst/+Constant/+SI/FineStructure.m rename to Libs/physconst/+Constant/+SI/FineStructure.m diff --git a/physconst/+Constant/+SI/FluxQuantum.m b/Libs/physconst/+Constant/+SI/FluxQuantum.m similarity index 100% rename from physconst/+Constant/+SI/FluxQuantum.m rename to Libs/physconst/+Constant/+SI/FluxQuantum.m diff --git a/physconst/+Constant/+SI/Gravitational.m b/Libs/physconst/+Constant/+SI/Gravitational.m similarity index 100% rename from physconst/+Constant/+SI/Gravitational.m rename to Libs/physconst/+Constant/+SI/Gravitational.m diff --git a/physconst/+Constant/+SI/HartreeEnergy.m b/Libs/physconst/+Constant/+SI/HartreeEnergy.m similarity index 100% rename from physconst/+Constant/+SI/HartreeEnergy.m rename to Libs/physconst/+Constant/+SI/HartreeEnergy.m diff --git a/physconst/+Constant/+SI/LightSpeed.m b/Libs/physconst/+Constant/+SI/LightSpeed.m similarity index 100% rename from physconst/+Constant/+SI/LightSpeed.m rename to Libs/physconst/+Constant/+SI/LightSpeed.m diff --git a/physconst/+Constant/+SI/Loschmidt.m b/Libs/physconst/+Constant/+SI/Loschmidt.m similarity index 100% rename from physconst/+Constant/+SI/Loschmidt.m rename to Libs/physconst/+Constant/+SI/Loschmidt.m diff --git a/physconst/+Constant/+SI/NuclearMagneton.m b/Libs/physconst/+Constant/+SI/NuclearMagneton.m similarity index 100% rename from physconst/+Constant/+SI/NuclearMagneton.m rename to Libs/physconst/+Constant/+SI/NuclearMagneton.m diff --git a/physconst/+Constant/+SI/Planck.m b/Libs/physconst/+Constant/+SI/Planck.m similarity index 100% rename from physconst/+Constant/+SI/Planck.m rename to Libs/physconst/+Constant/+SI/Planck.m diff --git a/physconst/+Constant/+SI/ProtonMass.m b/Libs/physconst/+Constant/+SI/ProtonMass.m similarity index 100% rename from physconst/+Constant/+SI/ProtonMass.m rename to Libs/physconst/+Constant/+SI/ProtonMass.m diff --git a/physconst/+Constant/+SI/ReducedPlanck.m b/Libs/physconst/+Constant/+SI/ReducedPlanck.m similarity index 100% rename from physconst/+Constant/+SI/ReducedPlanck.m rename to Libs/physconst/+Constant/+SI/ReducedPlanck.m diff --git a/physconst/+Constant/+SI/Rydberg.m b/Libs/physconst/+Constant/+SI/Rydberg.m similarity index 100% rename from physconst/+Constant/+SI/Rydberg.m rename to Libs/physconst/+Constant/+SI/Rydberg.m diff --git a/physconst/+Constant/+SI/StefanBoltzmann.m b/Libs/physconst/+Constant/+SI/StefanBoltzmann.m similarity index 100% rename from physconst/+Constant/+SI/StefanBoltzmann.m rename to Libs/physconst/+Constant/+SI/StefanBoltzmann.m diff --git a/physconst/+Constant/+SI/VacuumImpedance.m b/Libs/physconst/+Constant/+SI/VacuumImpedance.m similarity index 100% rename from physconst/+Constant/+SI/VacuumImpedance.m rename to Libs/physconst/+Constant/+SI/VacuumImpedance.m diff --git a/physconst/+Constant/+SI/VacuumPermeability.m b/Libs/physconst/+Constant/+SI/VacuumPermeability.m similarity index 100% rename from physconst/+Constant/+SI/VacuumPermeability.m rename to Libs/physconst/+Constant/+SI/VacuumPermeability.m diff --git a/physconst/+Constant/+SI/VacuumPermittivity.m b/Libs/physconst/+Constant/+SI/VacuumPermittivity.m similarity index 100% rename from physconst/+Constant/+SI/VacuumPermittivity.m rename to Libs/physconst/+Constant/+SI/VacuumPermittivity.m diff --git a/physconst/+Constant/+SI/VonKlitzing.m b/Libs/physconst/+Constant/+SI/VonKlitzing.m similarity index 100% rename from physconst/+Constant/+SI/VonKlitzing.m rename to Libs/physconst/+Constant/+SI/VonKlitzing.m diff --git a/physconst/+Constant/+SI/WienDisplacement.m b/Libs/physconst/+Constant/+SI/WienDisplacement.m similarity index 100% rename from physconst/+Constant/+SI/WienDisplacement.m rename to Libs/physconst/+Constant/+SI/WienDisplacement.m diff --git a/physconst/+Constant/AtomicMass.m b/Libs/physconst/+Constant/AtomicMass.m similarity index 100% rename from physconst/+Constant/AtomicMass.m rename to Libs/physconst/+Constant/AtomicMass.m diff --git a/physconst/+Constant/AvogadroNumber.m b/Libs/physconst/+Constant/AvogadroNumber.m similarity index 100% rename from physconst/+Constant/AvogadroNumber.m rename to Libs/physconst/+Constant/AvogadroNumber.m diff --git a/physconst/+Constant/BohrMagneton.m b/Libs/physconst/+Constant/BohrMagneton.m similarity index 100% rename from physconst/+Constant/BohrMagneton.m rename to Libs/physconst/+Constant/BohrMagneton.m diff --git a/physconst/+Constant/BohrRadius.m b/Libs/physconst/+Constant/BohrRadius.m similarity index 100% rename from physconst/+Constant/BohrRadius.m rename to Libs/physconst/+Constant/BohrRadius.m diff --git a/physconst/+Constant/Boltzmann.m b/Libs/physconst/+Constant/Boltzmann.m similarity index 100% rename from physconst/+Constant/Boltzmann.m rename to Libs/physconst/+Constant/Boltzmann.m diff --git a/physconst/+Constant/ConductanceQuantum.m b/Libs/physconst/+Constant/ConductanceQuantum.m similarity index 100% rename from physconst/+Constant/ConductanceQuantum.m rename to Libs/physconst/+Constant/ConductanceQuantum.m diff --git a/physconst/+Constant/Coulomb.m b/Libs/physconst/+Constant/Coulomb.m similarity index 100% rename from physconst/+Constant/Coulomb.m rename to Libs/physconst/+Constant/Coulomb.m diff --git a/physconst/+Constant/ElectronMass.m b/Libs/physconst/+Constant/ElectronMass.m similarity index 100% rename from physconst/+Constant/ElectronMass.m rename to Libs/physconst/+Constant/ElectronMass.m diff --git a/physconst/+Constant/ElementaryCharge.m b/Libs/physconst/+Constant/ElementaryCharge.m similarity index 100% rename from physconst/+Constant/ElementaryCharge.m rename to Libs/physconst/+Constant/ElementaryCharge.m diff --git a/physconst/+Constant/Faraday.m b/Libs/physconst/+Constant/Faraday.m similarity index 100% rename from physconst/+Constant/Faraday.m rename to Libs/physconst/+Constant/Faraday.m diff --git a/physconst/+Constant/FermiCoupling.m b/Libs/physconst/+Constant/FermiCoupling.m similarity index 100% rename from physconst/+Constant/FermiCoupling.m rename to Libs/physconst/+Constant/FermiCoupling.m diff --git a/physconst/+Constant/FineStructure.m b/Libs/physconst/+Constant/FineStructure.m similarity index 100% rename from physconst/+Constant/FineStructure.m rename to Libs/physconst/+Constant/FineStructure.m diff --git a/physconst/+Constant/FluxQuantum.m b/Libs/physconst/+Constant/FluxQuantum.m similarity index 100% rename from physconst/+Constant/FluxQuantum.m rename to Libs/physconst/+Constant/FluxQuantum.m diff --git a/physconst/+Constant/Gravitational.m b/Libs/physconst/+Constant/Gravitational.m similarity index 100% rename from physconst/+Constant/Gravitational.m rename to Libs/physconst/+Constant/Gravitational.m diff --git a/physconst/+Constant/HartreeEnergy.m b/Libs/physconst/+Constant/HartreeEnergy.m similarity index 100% rename from physconst/+Constant/HartreeEnergy.m rename to Libs/physconst/+Constant/HartreeEnergy.m diff --git a/physconst/+Constant/LightSpeed.m b/Libs/physconst/+Constant/LightSpeed.m similarity index 100% rename from physconst/+Constant/LightSpeed.m rename to Libs/physconst/+Constant/LightSpeed.m diff --git a/physconst/+Constant/Loschmidt.m b/Libs/physconst/+Constant/Loschmidt.m similarity index 100% rename from physconst/+Constant/Loschmidt.m rename to Libs/physconst/+Constant/Loschmidt.m diff --git a/physconst/+Constant/NuclearMagneton.m b/Libs/physconst/+Constant/NuclearMagneton.m similarity index 100% rename from physconst/+Constant/NuclearMagneton.m rename to Libs/physconst/+Constant/NuclearMagneton.m diff --git a/physconst/+Constant/Planck.m b/Libs/physconst/+Constant/Planck.m similarity index 100% rename from physconst/+Constant/Planck.m rename to Libs/physconst/+Constant/Planck.m diff --git a/physconst/+Constant/ProtonMass.m b/Libs/physconst/+Constant/ProtonMass.m similarity index 100% rename from physconst/+Constant/ProtonMass.m rename to Libs/physconst/+Constant/ProtonMass.m diff --git a/physconst/+Constant/ReducedPlanck.m b/Libs/physconst/+Constant/ReducedPlanck.m similarity index 100% rename from physconst/+Constant/ReducedPlanck.m rename to Libs/physconst/+Constant/ReducedPlanck.m diff --git a/physconst/+Constant/Rydberg.m b/Libs/physconst/+Constant/Rydberg.m similarity index 100% rename from physconst/+Constant/Rydberg.m rename to Libs/physconst/+Constant/Rydberg.m diff --git a/physconst/+Constant/StefanBoltzmann.m b/Libs/physconst/+Constant/StefanBoltzmann.m similarity index 100% rename from physconst/+Constant/StefanBoltzmann.m rename to Libs/physconst/+Constant/StefanBoltzmann.m diff --git a/physconst/+Constant/VacuumImpedance.m b/Libs/physconst/+Constant/VacuumImpedance.m similarity index 100% rename from physconst/+Constant/VacuumImpedance.m rename to Libs/physconst/+Constant/VacuumImpedance.m diff --git a/physconst/+Constant/VacuumPermeability.m b/Libs/physconst/+Constant/VacuumPermeability.m similarity index 100% rename from physconst/+Constant/VacuumPermeability.m rename to Libs/physconst/+Constant/VacuumPermeability.m diff --git a/physconst/+Constant/VacuumPermittivity.m b/Libs/physconst/+Constant/VacuumPermittivity.m similarity index 100% rename from physconst/+Constant/VacuumPermittivity.m rename to Libs/physconst/+Constant/VacuumPermittivity.m diff --git a/physconst/+Constant/WienDisplacement.m b/Libs/physconst/+Constant/WienDisplacement.m similarity index 100% rename from physconst/+Constant/WienDisplacement.m rename to Libs/physconst/+Constant/WienDisplacement.m diff --git a/physconst/README.md b/Libs/physconst/README.md similarity index 100% rename from physconst/README.md rename to Libs/physconst/README.md diff --git a/physconst/UnitSystem.m b/Libs/physconst/UnitSystem.m similarity index 100% rename from physconst/UnitSystem.m rename to Libs/physconst/UnitSystem.m diff --git a/test/modulator_test.m b/test/modulator_test.m index 8ae7ffe..b4d2da5 100644 --- a/test/modulator_test.m +++ b/test/modulator_test.m @@ -1,9 +1,9 @@ -datarate = 112e9; -M = 6; +% datarate = 128e9; +M = 4; laser_linewidth = 0; kover = 32; -fsym = round(datarate*1e-9 / log2(M))*1e9; +fsym = 92e9;%round(datarate*1e-9 / log2(M))*1e9; fdac = 256e9; % 1) PRBS Generation @@ -15,87 +15,73 @@ bitpattern=[]; for i = 1:log2(M) [bitpattern(:,i),seed] = prbs(O,N,seed); end - if M == 6 bitpattern = reshape(bitpattern,[],1); bitpattern = bitpattern(1:end-mod(length(bitpattern),5)); end - -% 2 ) Build Inf. signal class bits = Informationsignal(bitpattern); - -alphas = flip([0.01,0.05,0.1,0.2,0.3,0.4]); -LP_awg = Filter('filtdegree',5,"f_cutoff",70e9,"fs",fdac*kover,"filterType",filtertypes.butterworth); -AWG_=AWG("fdac",fdac,"dac_min",-1,"dac_max",1,"H_lpf",LP_awg,"kover",kover,"bit_resolution",16,"lpf_active",1,"normalize2dac",1,"upsampling_method","samplehold"); - - -% 3) Digi modulation -> PAM-M signal +% 2) Digi modulation -> PAM-M signal digimod_out = PAMmapper(M,0).map(bits); digimod_out.fs = fsym; -X = Pulseformer("fsym",fsym,"fdac",fdac,"pulse","rrc","pulselength",16,"rrcalpha",alphas(a)).process(digimod_out); +% 3) Pulseform Raised Cosine +X = Pulseformer("fsym",fsym,"fdac",fdac,"pulse","rrc","pulselength",16,"rrcalpha",0.2).process(digimod_out); -% plot_eye(X.signal,X.fs,fsym); -% 5) AWG (lowpass, quantization, sample and hold) +% Implememt Precompensation + +% Implement Precoding + +% 4) AWG (lowpass, quantization, sample and hold) +LP_awg = Filter('filtdegree',5,"f_cutoff",64e9,"fs",fdac*kover,"filterType",filtertypes.butterworth); +AWG_=AWG("fdac",fdac,"dac_min",-1,"dac_max",1,"H_lpf",LP_awg,"kover",kover,"bit_resolution",16,"lpf_active",1,"normalize2dac",1,"upsampling_method","samplehold"); X = AWG_.process(X); - -f=figure(12); -f.Name = 'spectrum'; -spectrum_plot(X.signal,X.fs,'spectrum'); - -figure(4) -LP_awg.showHere(); - +plot_eye(X.signal,X.fs,fsym); disp(['El. power: ',num2str(X.power),' dBm (into 50 Ohm)']); disp(['El. RMS voltage: ',num2str(sqrt(mean(X.signal.^2))),' V']); disp(['max voltage: ',num2str(max(X.signal)),' V']); -rms_ = rms(X.signal); -max_ = max(X.signal); -min_ = min(X.signal); -figure(1); -hold on -plot(X.signal,'LineWidth',0.1); -yline([max_, min_],'LineWidth',2,'LineStyle','--'); -yline([rms_, -rms_],'LineWidth',2,'LineStyle',':'); -ylim([-3 3]); -title(['AWG output: ',num2str(X.power), 'dBm']); - -f=figure(12); -f.Name = 'spectrum'; -spectrum_plot(X.signal,X.fs,'spectrum'); - -% 6) Lowpass behavior before laser +% 5) Lowpass behavior before laser LP_modulator= Filter('filtdegree',4,"f_cutoff",70e9,"fs",fdac*kover,"filterType",filtertypes.butterworth); X = LP_modulator.process(X); - -% 7) Normalize signal to 0dB rms -figure(1);subplot(1,2,1);plot(X.signal,'LineWidth',0.1);ylim([-3 3]);title(['AWG output: ',num2str(X.power), 'dBm into 50 Ohm']); - -% 1) Laser; Modulation -> OPTICAL DOMAIN -u_pi = 2; -vbias = -1; +% 6) Laser; Modulation -> OPTICAL DOMAIN +u_pi = 4; +vbias = -1.8; extmodlaser = EML("mode",eml_mode.im_cosinus,"power",0,"fsimu",X.fs,"lambda",1290,"bias",vbias,"u_pi",u_pi,"linewidth",laser_linewidth,"randomkey",5); +[Opt,extmodlaser] = extmodlaser.process(X); -E = X.normalize("mode","oneone"); -figure(1);subplot(1,2,2);plot(E.signal,'LineWidth',0.1);ylim([-3 3]);title(['scaled to modulator; ',num2str(E.power), 'dBm']); -disp(['El. power: ',num2str(E.power),' dBm (into 50 Ohm)']); +if 1 + f = figure(22); + tiledlayout(2,2); + nexttile + hold on + scatter(X.signal(1:100000),(abs(Opt.signal(1:100000)).^2)*1e3,0.1,'.','DisplayName','Modulator TF') + xlabel('Input in V') + ylabel('Output in mW') -[Opt,extmodlaser] = extmodlaser.process(E); + nexttile + hold on + plot(X.signal,'LineWidth',0.1); + yline([max_, min_],'LineWidth',2,'LineStyle','--'); + yline([rms_, -rms_],'LineWidth',2,'LineStyle',':'); + ylim([-3 3]); + title(['AWG output: ',num2str(X.power), 'dBm']); + + + nexttile + spectrum_plot(Opt.signal,Opt.fs); + + + rms_ = rms(X.signal); + max_ = max(X.signal); + min_ = min(X.signal); + + +end -f=figure(12); -f.Name = 'spectrum'; -spectrum_plot(X.signal,X.fs,'spectrum'); -plot_eye(E.signal,E.fs,fsym); -figure(111) -hold on -scatter(E.signal(1:100000),(abs(Opt.signal(1:100000)).^2)*1e3,0.1,'.','DisplayName','Modulator TF') -xlabel('Input in V') -ylabel('Output in mW')