From 1a3ae6085967be4cd76cabb2a630a04464f38748 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 29 Dec 2017 08:42:10 +0100
Subject: DPDCE: Add reset option

---
 dpd/main.py             | 11 ++++++++++-
 dpd/src/GlobalConfig.py |  2 +-
 dpd/src/Model_Poly.py   |  1 -
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'dpd')

diff --git a/dpd/main.py b/dpd/main.py
index 24daa5a..3ca0d35 100755
--- a/dpd/main.py
+++ b/dpd/main.py
@@ -11,6 +11,7 @@
 This engine calculates and updates the parameter of the digital
 predistortion module of ODR-DabMod."""
 
+import sys
 import datetime
 import os
 import argparse
@@ -62,6 +63,8 @@ parser.add_argument('--plot',
                     action="store_true")
 parser.add_argument('--name', default="", type=str,
                     help='Name of the logging directory')
+parser.add_argument('-r', '--reset', action="store_true",
+                    help='Reset the DPD settings to the defaults.')
 
 cli_args = parser.parse_args()
 
@@ -101,7 +104,7 @@ console.setFormatter(formatter)
 # add the handler to the root logger
 logging.getLogger('').addHandler(console)
 
-logging.info(cli_args)
+logging.info("DPDCE starting up with options: {}".format(cli_args))
 
 import numpy as np
 import traceback
@@ -129,6 +132,8 @@ if cli_args.lut:
     model = Lut(c)
 else:
     model = Poly(c)
+
+# Models have the default settings on startup
 adapt.set_predistorter(model.get_dpd_data())
 adapt.set_digital_gain(digital_gain)
 
@@ -170,6 +175,10 @@ elif dpddata[0] == "lut":
 else:
     logging.error("Unknown dpd data format {}".format(dpddata[0]))
 
+if cli_args.reset:
+    logging.info("DPD Settings were reset to default values.")
+    sys.exit(0)
+
 tx_agc = TX_Agc(adapt, c)
 
 # Automatic Gain Control
diff --git a/dpd/src/GlobalConfig.py b/dpd/src/GlobalConfig.py
index 684a881..b84b9d7 100644
--- a/dpd/src/GlobalConfig.py
+++ b/dpd/src/GlobalConfig.py
@@ -11,7 +11,7 @@ import numpy as np
 
 class GlobalConfig:
     def __init__(self, cli_args, plot_location):
-        self.sample_rate = cli_args.sample_rate
+        self.sample_rate = cli_args.samplerate
         assert self.sample_rate == 8192000  # By now only constants for 8192000
 
         self.plot_location = plot_location
diff --git a/dpd/src/Model_Poly.py b/dpd/src/Model_Poly.py
index 3ec717b..cdfd319 100644
--- a/dpd/src/Model_Poly.py
+++ b/dpd/src/Model_Poly.py
@@ -55,7 +55,6 @@ class Poly:
         self.coefs_am = np.zeros(5, dtype=np.float32)
         self.coefs_am[0] = 1
         self.coefs_pm = np.zeros(5, dtype=np.float32)
-        return self.coefs_am, self.coefs_pm
 
     def train(self, tx_abs, rx_abs, phase_diff, lr=None):
         """
-- 
cgit v1.2.3