diff options
| -rwxr-xr-x | dpd/main.py | 14 | ||||
| -rw-r--r-- | dpd/src/Model.py | 83 |
2 files changed, 63 insertions, 34 deletions
diff --git a/dpd/main.py b/dpd/main.py index 1682a59..853f669 100755 --- a/dpd/main.py +++ b/dpd/main.py @@ -41,6 +41,14 @@ parser.add_argument('--samplerate', default='8192000', parser.add_argument('--coefs', default='poly.coef', help='File with DPD coefficients, which will be read by ODR-DabMod', required=False) +parser.add_argument('--txgain', default=65, + help='TX Gain', + required=False, + type=int) +parser.add_argument('--rxgain', default=30, + help='TX Gain', + required=False, + type=int) parser.add_argument('--samps', default='10240', help='Number of samples to request from ODR-DabMod', required=False) @@ -56,6 +64,8 @@ cli_args = parser.parse_args() port = int(cli_args.port) port_rc = int(cli_args.rc_port) coef_path = cli_args.coefs +txgain = cli_args.txgain +rxgain = cli_args.rxgain num_req = int(cli_args.samps) samplerate = int(cli_args.samplerate) num_iter = int(cli_args.iterations) @@ -68,8 +78,8 @@ if cli_args.load_poly: model = Model.Model(coefs_am, coefs_pm) else: model = Model.Model([1, 0, 0, 0, 0], [0, 0, 0, 0, 0]) -adapt.set_txgain(70) -adapt.set_rxgain(30) +adapt.set_txgain(txgain) +adapt.set_rxgain(rxgain) tx_gain = adapt.get_txgain() rx_gain = adapt.get_rxgain() diff --git a/dpd/src/Model.py b/dpd/src/Model.py index b962140..64c8857 100644 --- a/dpd/src/Model.py +++ b/dpd/src/Model.py @@ -27,10 +27,6 @@ class Model: self.errs_phase = [0, ] def get_next_coefs(self, txframe_aligned, rxframe_aligned): - dt = datetime.datetime.now().isoformat() - txframe_aligned.tofile(logging_path + "/txframe_" + dt + ".iq") - rxframe_aligned.tofile(logging_path + "/rxframe_" + dt + ".iq") - # Calculate new coefficients for AM/AM correction rx_abs = np.abs(rxframe_aligned) rx_A = np.vstack([rx_abs, @@ -148,9 +144,9 @@ class Model: dt = datetime.datetime.now().isoformat() fig_path = logging_path + "/" + dt + "_Model.pdf" - fig, axs = plt.subplots(8, figsize=(6, 4 * 6)) + fig = plt.figure(figsize=(3*6, 1.5 * 6)) - ax = axs[0] + ax = plt.subplot(3,3,1) ax.plot(np.abs(txframe_aligned[:128]), label="TX sent", linestyle=":") @@ -160,9 +156,14 @@ class Model: ax.set_title("Synchronized Signals of Iteration {}".format(len(self.coefs_history))) ax.set_xlabel("Samples") ax.set_ylabel("Amplitude") + ax.text(0, 0, "TX (max {:01.3f}, mean {:01.3f}, median {:01.3f})".format( + np.max(np.abs(txframe_aligned)), + np.mean(np.abs(txframe_aligned)), + np.median(np.abs(txframe_aligned)) + ), size = 8) ax.legend(loc=4) - ax = axs[1] + ax = plt.subplot(3,3,2) ax.plot(np.real(txframe_aligned[:128]), label="TX sent", linestyle=":") @@ -174,28 +175,7 @@ class Model: ax.set_ylabel("Real Part") ax.legend(loc=4) - ax = axs[2] - ax.scatter( - np.abs(txframe_aligned[:1024]), - np.abs(rxframe_aligned[:1024]), - s=0.1) - ax.plot(rx_range_dpd / self.coefs_am[0], rx_range, linewidth=0.25) - ax.set_title("Amplifier Characteristic") - ax.set_xlabel("TX Amplitude") - ax.set_ylabel("RX Amplitude") - - ax = axs[3] - ax.scatter( - np.abs(txframe_aligned[:1024]), - phase_diff_rad[:1024] * 180 / np.pi, - s=0.1 - ) - ax.plot(tx_range, phase_range_dpd * 180 / np.pi, linewidth=0.25) - ax.set_title("Amplifier Characteristic") - ax.set_xlabel("TX Amplitude") - ax.set_ylabel("Phase Difference [deg]") - - ax = axs[4] + ax = plt.subplot(3,3,3) ax.plot(np.abs(txframe_aligned[:128]), label="TX Frame", linestyle=":", @@ -217,7 +197,46 @@ class Model: ax.set_xlabel("Samples") ax.set_ylabel("Amplitude") - ax = axs[5] + ax = plt.subplot(3,3,4) + ax.scatter( + np.abs(txframe_aligned[:1024]), + np.abs(rxframe_aligned[:1024]), + s=0.1) + ax.plot(rx_range_dpd / self.coefs_am[0], rx_range, linewidth=0.25) + ax.set_title("Amplifier Characteristic") + ax.set_xlabel("TX Amplitude") + ax.set_ylabel("RX Amplitude") + + ax = plt.subplot(3,3,5) + ax.scatter( + np.abs(txframe_aligned[:1024]), + phase_diff_rad[:1024] * 180 / np.pi, + s=0.1 + ) + ax.plot(tx_range, phase_range_dpd * 180 / np.pi, linewidth=0.25) + ax.set_title("Amplifier Characteristic") + ax.set_xlabel("TX Amplitude") + ax.set_ylabel("Phase Difference [deg]") + + ax = plt.subplot(3,3,6) + ccdf_min, ccdf_max = 0, 1 + tx_hist, ccdf_edges = np.histogram(np.abs(txframe_aligned), + bins=60, + range=(ccdf_min, ccdf_max)) + tx_hist_normalized = tx_hist.astype(float)/np.sum(tx_hist) + ccdf = 1.0 - np.cumsum(tx_hist_normalized) + ax.semilogy(ccdf_edges[:-1], ccdf, label="CCDF") + ax.semilogy(ccdf_edges[:-1], + tx_hist_normalized, + label="Histogram", + drawstyle='steps') + ax.legend(loc=4) + ax.set_ylim(1e-5,2) + ax.set_title("Complementary Cumulative Distribution Function") + ax.set_xlabel("TX Amplitude") + ax.set_ylabel("Ratio of Samples larger than x") + + ax = plt.subplot(3,3,7) coefs_history = np.array(self.coefs_history) for idx, coef_hist in enumerate(coefs_history.T): ax.plot(coef_hist, @@ -228,7 +247,7 @@ class Model: ax.set_xlabel("Iterations") ax.set_ylabel("Coefficient Value") - ax = axs[6] + ax = plt.subplot(3,3,8) coefs_history = np.array(self.coefs_pm_history) for idx, coef_hist in enumerate(coefs_history.T): ax.plot(coef_hist, @@ -239,7 +258,7 @@ class Model: ax.set_xlabel("Iterations") ax.set_ylabel("Coefficient Value") - ax = axs[7] + ax = plt.subplot(3,3,9) coefs_history = np.array(self.coefs_history) ax.plot(self.mses, label="MSE") ax.plot(self.errs, label="ERR") |