And back again :)

DiCarloLab-Delft · Aug 16, 2018 · c6f3b4a · c6f3b4a
1 parent df4e375
commit c6f3b4a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/pycqed/analysis_v2/base_analysis.py b/pycqed/analysis_v2/base_analysis.py
@@ -137,8 +137,6 @@ def __init__(self, t_start: str = None, t_stop: str = None,
         # These options determine what data to extract #
         ################################################
         scan_label = self.options_dict.get('scan_label', label)
-        if scan_label is None:
-            scan_label = ''
         if type(scan_label) is not list:
             self.labels = [scan_label]
         else:

diff --git a/pycqed/analysis_v2/spectroscopy_analysis.py b/pycqed/analysis_v2/spectroscopy_analysis.py
@@ -18,7 +18,7 @@ class Spectroscopy(ba.BaseDataAnalysis):
     def __init__(self, t_start: str,
                  t_stop: str = None,
                  options_dict: dict = None,
-                 label: str = None,
+                 label: str = '',
                  extract_only: bool = False,
                  auto: bool = True,
                  do_fitting: bool = False):