From 66b7dea706d26cfe94b9fa0c8046f25404ec4ad8 Mon Sep 17 00:00:00 2001
From: ann-christin <Ann-Christin.Koch@ruhr-uni-bochum.de>
Date: Mon, 14 Nov 2022 14:14:12 +0100
Subject: [PATCH] [update] pylot.in no longer mandatory

---
 PyLoT.py                    | 12 ++++++++----
 pylot/core/util/defaults.py |  4 +---
 pylot/core/util/utils.py    |  7 +++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/PyLoT.py b/PyLoT.py
index 610a8f3c..ef1b1b05 100755
--- a/PyLoT.py
+++ b/PyLoT.py
@@ -117,15 +117,19 @@ class MainWindow(QMainWindow):
         if not infile:
             infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in')
             print('Using default input file {}'.format(infile))
-        if os.path.isfile(infile) == False:
+        if os.path.isfile(infile) is False:
             infile = QFileDialog().getOpenFileName(caption='Choose PyLoT-input file')[0]
 
             if not os.path.exists(infile):
                 QMessageBox.warning(self, "PyLoT Warning",
-                                    "No PyLoT-input file declared!")
-                sys.exit(0)
-        self.infile = infile
+                                    "No PyLoT-input file declared! Using default parameters!")
+                infile = None
+
         self._inputs = PylotParameter(infile)
+        if not infile:
+            self._inputs.reset_defaults()
+
+        self.infile = infile
         self._props = None
 
         self.gain = 1.
diff --git a/pylot/core/util/defaults.py b/pylot/core/util/defaults.py
index d982da8c..5d64422a 100644
--- a/pylot/core/util/defaults.py
+++ b/pylot/core/util/defaults.py
@@ -26,9 +26,7 @@ elif system_name == "Windows":
 # suffix for phase name if not phase identified by last letter (P, p, etc.)
 ALTSUFFIX = ['diff', 'n', 'g', '1', '2', '3']
 
-FILTERDEFAULTS = readDefaultFilterInformation(os.path.join(os.path.expanduser('~'),
-                                                           '.pylot',
-                                                           'pylot.in'))
+FILTERDEFAULTS = readDefaultFilterInformation()
 
 TIMEERROR_DEFAULTS = os.path.join(os.path.expanduser('~'),
                                   '.pylot',
diff --git a/pylot/core/util/utils.py b/pylot/core/util/utils.py
index 2567b079..af5f0e0c 100644
--- a/pylot/core/util/utils.py
+++ b/pylot/core/util/utils.py
@@ -37,15 +37,14 @@ def getAutoFilteroptions(phase, parameter):
     return filteroptions
 
 
-def readDefaultFilterInformation(fname):
+def readDefaultFilterInformation():
     """
     Read default filter information from pylot.in file
-    :param fname: path to pylot.in file
-    :type fname: str
     :return: dictionary containing the defailt filter information
     :rtype: dict
     """
-    pparam = PylotParameter(fname)
+    pparam = PylotParameter()
+    pparam.reset_defaults()
     return readFilterInformation(pparam)