Center axis correction now behaves properly

Author: sebasj13

topasgraphsim/src/classes/dose_figure_handler.py

@@ -177,15 +177,6 @@ def difference_plot(self):
             data = []
             for index, plot_data in enumerate(self.data[:2]):
 
-                if self.calcparams == True:
-
-                    if self.caxcorrection == True:
-                        plot_data[0] = [
-                            x
-                            + dp.calculate_parameters(plot_data[0], plot_data[2], True)
-                            for x in plot_data[0]
-                        ]
-
                 data += [[plot_data[0], plot_data[2]]]
 
             if np.all(np.diff(data[1][0]) > 0) == False:
@@ -211,8 +202,8 @@ def difference_plot(self):
                 label=self.text.error[self.lang],
             )
             if self.errlim == None:
-                self.errlim = max(difference) + 1
-            self.diffax.set_ylim(-self.errlim, self.errlim)
+                self.errlim = [min(difference) - 1, max(difference) + 1]
+            self.diffax.set_ylim(self.errlim)
             self.diffax.legend(
                 loc="upper right",
                 framealpha=0.6,
@@ -306,9 +297,6 @@ def add_descriptors(self):
         """Adds the calculated parameters as descriptors
         """
 
-        #if self.diffplot == True:
-        #    return
-
         temp = self.data
         new_data = []
         for index, data in enumerate(self.data):
@@ -449,10 +437,12 @@ def create_plots_from_data(self):
 
         for index, plot_data in enumerate(self.data):
 
-            if self.calcparams == True:
+            if self.caxcorrection == True:
 
-                if self.caxcorrection == True:
-                    plot_data[0] = [x + self.plots[index].cax for x in plot_data[0]]
+                plot_data[0] = [
+                    x + dp.calculate_parameters(plot_data[0], plot_data[2], True)
+                    for x in plot_data[0]
+                ]
 
             if self.errorbars == True:
                 try:

topasgraphsim/src/classes/main_viewer.py

@@ -654,12 +654,17 @@ def differenceplot(self):
 
     def change_errlims(self, boolean):
         if boolean == True:
-            self.DoseFigureHandler.errlim += 2
+            self.DoseFigureHandler.errlim[0] -= 2
+            self.DoseFigureHandler.errlim[1] += 2
         else:
-            self.DoseFigureHandler.errlim -= 2
-
-        if self.DoseFigureHandler.errlim == 0:
-            self.DoseFigureHandler.errlim = 2
+            self.DoseFigureHandler.errlim[0] += 2
+            self.DoseFigureHandler.errlim[1] -= 2
+
+        if (
+            self.DoseFigureHandler.errlim[0] <= 0
+            or self.DoseFigureHandler.errlim[1] <= 0
+        ):
+            self.DoseFigureHandler.errlim = [-2, 2]
 
         self.refresh()
 

topasgraphsim/src/functions/dp.py

@@ -3,7 +3,7 @@
 import scipy.interpolate as interpolate
 
 
-def calculate_parameters(axis, dose, hwb=False):
+def calculate_parameters(axis, dose, cax=False):
 
     """
     A function to calculate the relevant
@@ -73,9 +73,9 @@ def calculate_parameters(axis, dose, hwb=False):
     ]
 
     HWB = round(abs(XR50 - XL50), 3)
-    if hwb == True:
-        return HWB
     CAXdev = round(XL50 + 0.5 * HWB, 3)
+    if cax == True:
+        return CAXdev
 
     flat_krieger = round(
         max([value for value in dose if value >= 0.95 * max(dose)])