Update .gitea/workflows/build-appimage.yaml

Reviewed-on: #322

.gitea/workflows/build-appimage.yaml

@@ -3,7 +3,7 @@ run-name: ${{ gitea.actor }} is building THE AppImage 🚀   # a lot of exciteme
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   Explore-Gitea-Actions:

src/gui_qt/data/container.py

@@ -476,7 +476,7 @@ class ExperimentContainer(QtCore.QObject):
         self.data.y = self.data.y * scale_y + shift_y
         self.data.y_err = self.data.y_err * scale_y
 
-        self.update({'shift': scaling_factor, 'scale': shift_factor})
+        self.update({'scale': scaling_factor, 'shift': shift_factor})
 
     def get_namespace(self, i: int = None, j: int = None) -> dict:
         if (i is None) and (j is None):

src/nmreval/io/graceeditor.py

@@ -120,7 +120,7 @@ class GraceEditor:
 
         # we start always with the header
         current_pos = 'header'
-        with self.file.open('r', errors='replace') as f:
+        with self.file.open('r', errors='replace', encoding='iso-8859-15') as f:
             for line_nr, line in enumerate(f):
                 # lots of states to check
                 # agr file order: header, drawing object, region, graph, set
@@ -331,7 +331,7 @@ class GraceEditor:
 
     def write(self, fname):
         outfile = pathlib.Path(fname)
-        with outfile.open('w') as f:
+        with outfile.open('w', encoding='iso-8859-15') as f:
             f.write(str(self.header))
             f.flush()
 

src/nmreval/nmr/coupling.py

@@ -106,7 +106,7 @@ class HomoDipolar(Coupling):
 
     name = 'Homonuclear Dipolar'
     parameter = ['r']
-    unit = ['m']
+    unit = ['nm']
     choice = [
         (r'\gamma', 'nucleus', {k: k for k in gamma}),
         ('Spin', 'spin', OrderedDict([('1/2', 0.5), ('1', 1), ('3/2', 1.5), ('2', 2), ('5/2', 2.5), ('3', 3)])),
@@ -128,7 +128,7 @@ class HomoDipolar(Coupling):
             raise KeyError(f'Unknown nucleus {nucleus}')
 
         try:
-            coupling = mu0 / (4*pi) * hbar_joule * gamma_full[nucleus]**2 / (r+1e-34)**3
+            coupling = mu0 / (4*pi) * hbar_joule * gamma_full[nucleus]**2 / ((r*1e-9) + 1e-34)**3
         except ZeroDivisionError:
             return 1e318
 
@@ -143,7 +143,7 @@ class HeteroDipolar(Coupling):
 
     name = 'Heteronuclear Dipolar'
     parameter = ['r']
-    unit = ['m']
+    unit = ['nm']
     choice = [
         (r'\gamma_{1}', 'nucleus1', {k: k for k in gamma}),
         (r'\gamma_{2}', 'nucleus2', {k: k for k in gamma}),
@@ -172,7 +172,7 @@ class HeteroDipolar(Coupling):
             raise KeyError(f'Unknown nucleus {nucleus2}')
 
         try:
-            coupling = mu0 / (4*pi) * hbar_joule * gamma_full[nucleus1]*gamma_full[nucleus2] / r**3
+            coupling = mu0 / (4*pi) * hbar_joule * gamma_full[nucleus1]*gamma_full[nucleus2] / ((r*1e-9) + 1e-34)**3
         except ZeroDivisionError:
             return 1e318