Merge pull request #312 from dmgav/fix-save-txt

Fix formatting of 'txt' file saved by 'Save Spectrum/Fit'

Author: dmgav

.github/workflows/black.yml

@@ -8,12 +8,14 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
+        with:
+          python-version: 3.11
       - name: Install Dependencies
         run: |
           # These packages are installed in the base environment but may be older
           # versions. Explicitly upgrade them because they often create
           # installation problems if out of date.
-          python -m pip install --upgrade pip setuptools numpy
+          # python -m pip install --upgrade pip setuptools numpy
 
           pip install black
       - name: Run black

.github/workflows/flake8.yml

@@ -13,7 +13,7 @@ jobs:
           # These packages are installed in the base environment but may be older
           # versions. Explicitly upgrade them because they often create
           # installation problems if out of date.
-          python -m pip install --upgrade pip setuptools numpy
+          # python -m pip install --upgrade pip setuptools numpy
 
           pip install flake8
       - name: Run flake8

pyxrf/model/fit_spectrum.py

@@ -626,7 +626,7 @@ def output_summed_data_fit(self, save_fit=True, directory=None):
             if (xx is None) or (self.y0 is None) or (self.fit_y is None):
                 msg = "Not enough data to save spectrum/fit data. Total spectrum fitting was not run."
                 raise RuntimeError(msg)
-            data = np.array([self.x0, self.y0, self.fit_y])
+            data = np.array([xx, self.y0, self.fit_y])
         else:
             logger.info("Saving spectrum based on loaded or estimated parameters.")
             if (xx is None) or (self.y0 is None) or (self.param_model.total_y is None):