change return type to dict

neutrons · Jan 14, 2025 · 77a55e4 · 77a55e4
1 parent b326d0e
commit 77a55e4
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/hyspecppt/hppt/hppt_model.py b/src/hyspecppt/hppt/hppt_model.py
@@ -223,12 +223,19 @@ def calculate_graph_data(self) -> list[float]:
             Q_hi = np.sqrt(ki**2 + kf**2 - 2 * ki * kf * np.cos(np.radians(self.S2 + 30)))
 
             if self.plot_type == PLOT_TYPES[0]:  # alpha
-                return [Q_low, Q_hi, E, Q2d, E2d, ang_PQ]
+                return dict(Q_low=Q_low, Q_hi=Q_hi, E=E, Q2d=Q2d, E2d=E2d, ang_PQ=ang_PQ)
 
             if self.plot_type == PLOT_TYPES[1]:  # cos^2(alpha)
-                return [Q_low, Q_hi, E, Q2d, E2d, np.cos(np.radians(ang_PQ)) ** 2]
+                return dict(Q_low=Q_low, Q_hi=Q_hi, E=E, Q2d=Q2d, E2d=E2d, cos2_ang_PQ=np.cos(np.radians(ang_PQ)) ** 2)
 
             if self.plot_type == PLOT_TYPES[2]:  # "(cos^2(a)+1)/2"
-                return [Q_low, Q_hi, E, Q2d, E2d, (np.cos(np.radians(ang_PQ)) ** 2 + 1) / 2]
+                return dict(
+                    Q_low=Q_low,
+                    Q_hi=Q_hi,
+                    E=E,
+                    Q2d=Q2d,
+                    E2d=E2d,
+                    cos2_ang_PQ_plus_1_div_2=(np.cos(np.radians(ang_PQ)) ** 2 + 1) / 2,
+                )
         except AttributeError:
             logger.error("The parameters were not initialized")