diff --git a/sim_lab/research_calc.py b/sim_lab/research_calc.py
index 449df3ea482e7455492cffb00c9228b30ba70286..5e4114506f0868904b3ec4302e22274825ee79ad 100644
--- a/sim_lab/research_calc.py
+++ b/sim_lab/research_calc.py
@@ -7,10 +7,8 @@
 # python_version  :3.8
 # ==============================================================================
 from bodies import Body, Sun, Earth, Moon
-from objs import Obj
-from objs import Satellite, Satellite2
+from objs import Obj, Satellite, Satellite2
 from common.consts import SECONDS_PER_HOUR, SECONDS_PER_DAY, SECONDS_PER_WEEK, SECONDS_PER_MONTH
-from sim_scenes.func import calc_run
 from bodies.body import AU
 
 
@@ -41,27 +39,30 @@ bodies = [
 ]
 earth = bodies[0]
 moon = bodies[1]
-points = get_lagrangian_points(earth.mass, moon.mass, 363104)
-L1_point = points[0]
-point_z = L1_point[2] + 3301.0505  # 越大，离月球越近
+L1_p, L2_p, L3_p, L4_p, L5_p = get_lagrangian_points(earth.mass, moon.mass, 363104)
+point_z = L1_p[2] + 3301.0505  # 越大，离月球越近
 init_velocity = [-0.890211, 0, 0]
 satellite = Satellite(name=f'卫星', mass=1.4e10, size_scale=1e3, color=(255, 200, 0),
-                      init_position=[L1_point[0], L1_point[1], point_z],
+                      init_position=[L1_p[0], L1_p[1], point_z],
                       init_velocity=init_velocity, gravity_only_for=[earth, moon])
 bodies.append(satellite)
 
 
-def calc_simulator():
+def calc_simulator(target):
+    from sim_scenes.func import calc_run
     from simulators.calc_simulator import CalcSimulator, CalcContext
+
+    CalcSimulator.init(True)
+
     def evolve_next(context: CalcContext):
         return context.evolve_count < 500
 
     def after_evolve(dt, context: CalcContext):
-        target: Body = context.bodies[1]
-        # target: Obj = context.bodies[2]
+        # target: Body = context.bodies[1]  # 月球
+        # target: Obj = context.bodies[2]  # 卫星
 
-        context.init_param("acc_values", []).params["acc_values"].append(target.acceleration_value())
-        context.init_param("vel_values", []).params["vel_values"].append(target.velocity_value())
+        context.init_param("acc_values", []).append(target.acceleration_value())
+        context.init_param("vel_values", []).append(target.velocity_value())
 
         print(satellite.acceleration_value(), satellite.velocity_value())
 
@@ -80,7 +81,7 @@ def calc_simulator():
         ax1.set_ylabel('加速度', fontdict={'weight': 'normal', 'size': 15, 'color': 'blue'})
         # ax1.set_title("加速度/速度", fontdict={'weight': 'normal', 'size': 15})
         plt.title("%s max:%.4f mix:%.4f diff:%.4f" % (
-            moon.init_velocity[0], max_value * 1e6, min_value * 1e6, (max_value - min_value) * 1e6))
+            vel_values[0], max_value * 1e6, min_value * 1e6, (max_value - min_value) * 1e6))
         l1 = ax1.legend(loc='lower left', labels=['加速度'])
 
         ax2 = ax1.twinx()  # this is the important function
@@ -132,5 +133,7 @@ def ursina_simulator():
 
 
 if __name__ == '__main__':
-    calc_simulator()
+    calc_simulator(earth)
+    calc_simulator(moon)
+    calc_simulator(satellite)
     # ursina_simulator()
diff --git a/simulators/calc_simulator.py b/simulators/calc_simulator.py
index fae55452a8dc0deb3854d00b08ed6ef23fa8cadc..107bfdd0c1b35d85f4725497d966dc6e396a5bad 100644
--- a/simulators/calc_simulator.py
+++ b/simulators/calc_simulator.py
@@ -30,7 +30,7 @@ class CalcView(BodyView):
         pass
 
 
-class CalcContext(Singleton):
+class CalcContext:
     def __init__(self, simulator):
         self.simulator = simulator
         self.evolve_count = 0
@@ -47,7 +47,7 @@ class CalcContext(Singleton):
         """
         if key not in self._params:
             self.put_param(key, value)
-        return self
+        return self.params[key]
 
     @property
     def bodies(self) -> []:
@@ -87,8 +87,8 @@ class CalcSimulator(Simulator):
     """
 
     @staticmethod
-    def init():
-        if hasattr(CalcSimulator, "on_reset_funcs"):
+    def init(reset=False):
+        if hasattr(CalcSimulator, "on_reset_funcs") and not reset:
             return
         # 重启运行的订阅事件
         CalcSimulator.on_reset_funcs = []
@@ -178,6 +178,8 @@ class CalcSimulator(Simulator):
             c.evolve_count = 0
 
         CalcSimulator.on_reset_subscription(on_reset)
+        CalcSimulator.on_ready_subscription(on_reset)
+
         context = CalcContext(self)
 
         CalcSimulator.on_ready(context)