fixed some bugs with reading files with prefixes

PennyWieser · Jul 16, 2023 · 1362831 · 1362831
1 parent 315956d
commit 1362831
Show file tree

Hide file tree

Showing 9 changed files with 619 additions and 6,784 deletions.
diff --git a/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step1_Fit_Your_Ne_Lines.ipynb b/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step1_Fit_Your_Ne_Lines.ipynb
diff --git a/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step1_Fit_Your_Ne_Lines_v66.ipynb b/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step1_Fit_Your_Ne_Lines_v66.ipynb
diff --git a/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step2_Filtering_Numerical.ipynb b/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step2_Filtering_Numerical.ipynb
diff --git a/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step3_FitAll_Together.ipynb b/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step3_FitAll_Together.ipynb
diff --git a/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step3_FitAll_Together_v66.ipynb b/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step3_FitAll_Together_v66.ipynb
diff --git a/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step3b(optional)_Secondary_Peaks.ipynb b/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step3b(optional)_Secondary_Peaks.ipynb
diff --git a/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step4_Stitch_Outputs_Together.ipynb b/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step4_Stitch_Outputs_Together.ipynb
diff --git a/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step5_CalcDensity_and_other_funcs.ipynb b/docs/Examples/Example1b_CO2_Fluid_Inclusions/Step5_CalcDensity_and_other_funcs.ipynb
diff --git a/src/DiadFit/densimeters.py b/src/DiadFit/densimeters.py
@@ -627,7 +627,7 @@ def save_settings(meta_path, spectra_path, filetype, prefix, prefix_str, file_ex
         'spectra_path': spectra_path,
         'filetype': filetype,
         'prefix': prefix,
-        'prefix_str': prefix_str,
+        'prefix_str': repr(prefix_str),
         'file_ext': file_ext,
         'TruPower': TruPower,
     }
@@ -655,6 +655,9 @@ def get_settings():
             if line:
                 key, value = line.split('=')
                 settings[key] = value
+                if key == 'prefix_str':
+                    value = eval(value)  # Evaluate the string to retrieve the original value
+                settings[key] = value
 
     if 'prefix' in settings:
         settings['prefix'] = settings['prefix'].lower() == 'true'