replacement_time to replacement_times + simplified template to use internal method

Author: RemDelaporteMathurin

saved_graphs/baby.json

@@ -175,7 +175,7 @@
         "label": "IV bubbler",
         "conversion_efficiency": "0.95",
         "vial_efficiency": "0.9",
-        "replacement_time": "np.arange(5, 50, step=3)"
+        "replacement_times": "np.arange(5, 50, step=3)"
       },
       "measured": {
         "width": 230,
@@ -233,7 +233,7 @@
         "label": "OV bubbler",
         "conversion_efficiency": "0.95",
         "vial_efficiency": "0.9",
-        "replacement_time": "np.arange(5, 50, step=5)"
+        "replacement_times": "np.arange(5, 50, step=5)"
       },
       "measured": {
         "width": 230,

src/App.jsx

@@ -470,7 +470,7 @@ export default function App() {
         nodeData = { ...nodeData, f1: '1/3', f2: '1/3', f3: '1/3' };
         break;
       case 'bubbler':
-        nodeData = { ...nodeData, conversion_efficiency: '0.95', vial_efficiency: '0.9', replacement_time: '' };
+        nodeData = { ...nodeData, conversion_efficiency: '0.95', vial_efficiency: '0.9', replacement_times: '' };
       default:
         // For any other types, just use basic data
         break;

src/custom_pathsim_blocks.py

@@ -169,4 +169,5 @@ def create_reset_events(self) -> list[pathsim.blocks.Schedule]:
             )
         for i, vial in enumerate(self.vials):
             events.extend(self._create_reset_events_one_vial(vial, reset_times[i]))
+
         return events

src/pathsim_utils.py

@@ -144,8 +144,8 @@ def create_bubbler(node: dict) -> Bubbler:
     block = Bubbler(
         conversion_efficiency=eval(node["data"]["conversion_efficiency"]),
         vial_efficiency=eval(node["data"]["vial_efficiency"]),
-        replacement_times=eval(node["data"]["replacement_time"])
-        if node["data"].get("replacement_time") != ""
+        replacement_times=eval(node["data"]["replacement_times"])
+        if node["data"].get("replacement_times") != ""
         else None,
     )
 

src/templates/block_macros.py

@@ -14,15 +14,15 @@
 {{ create_block(node) }}
 
 {%- if node["data"].get("reset_times") %}
-def reset_itg(_):
+def reset_{{ node["var_name"] }}(_):
     {{ node["var_name"] }}.reset()
 
 for t in {{ node["data"].get("reset_times", "[]") }}:
     events.append(
         pathsim.events.Schedule(
             t_start=t,
             t_end=t,
-            func_act=reset_itg,
+            func_act=reset_{{ node["var_name"] }},
         )
     )
 {%- endif %}
@@ -33,18 +33,9 @@ def reset_itg(_):
 {% macro create_bubbler_block(node) -%}
 {{ create_block(node) }}
 
-{%- if node["data"].get("replacement_time") %}
-def reset_itg(_):
-    {{ node["var_name"] }}.reset()
-
-for t in {{ node["data"].get("replacement_time", "[]") }}:
-    events.append(
-        pathsim.events.Schedule(
-            t_start=t,
-            t_end=t,
-            func_act=reset_itg,
-        )
-    )
+{%- if node["data"].get("replacement_times") %}
+events_{{ node["var_name"] }} = {{ node["var_name"] }}.create_reset_events()
+events += events_{{ node["var_name"] }}
 {%- endif %}
 
 {%- endmacro -%}

test/test_convert_python.py

@@ -136,7 +136,7 @@ def test_bubbler_has_reset_times():
                 "type": "bubbler",
                 "data": {
                     "label": "bubbler_1",
-                    "replacement_time": "[10, 20]",
+                    "replacement_times": "[10, 20]",
                     "conversion_efficiency": "1",
                     "vial_efficiency": "0.8",
                 },