@@ -99,12 +99,15 @@ def create_reset_events(self):
9999 else :
100100 raise ValueError ("reset_times must be a single value or a list of times" )
101101
102- return [
103- pathsim .blocks .Schedule (t_start = t , t_end = t , func_act = self .reset )
104- for t in reset_times
105- ]
106- # need https://github.com/milanofthe/pathsim/pull/66
107- # return pathsim.events.ScheduleList(times_evt=reset_times, func_act=self.reset)
102+ def func_act (_ ):
103+ self .reset ()
104+
105+ # can be simplified after https://github.com/milanofthe/pathsim/pull/66
106+ event = pathsim .events .ScheduleList (times_evt = reset_times , func_act = func_act )
107+ event .func_act = func_act
108+ event .t_start = 0
109+ event .t_end = None
110+ return [event ]
108111
109112
110113# BUBBLER SYSTEM
@@ -212,25 +215,18 @@ def __init__(
212215
213216 def _create_reset_events_one_vial (
214217 self , block , reset_times
215- ) -> list [pathsim .blocks .Schedule ]:
216- events = []
217-
218+ ) -> pathsim .events .ScheduleList :
218219 def reset_itg (_ ):
219220 block .reset ()
220221
221- for t in reset_times :
222- events .append (
223- pathsim .blocks .Schedule (t_start = t , t_end = t , func_act = reset_itg )
224- )
225- return events
226-
227- # need https://github.com/milanofthe/pathsim/pull/66
228- # events = pathsim.events.ScheduleList(
229- # times_evt=reset_times, func_act=reset_itg
230- # )
231- # return events
222+ event = pathsim .events .ScheduleList (times_evt = reset_times , func_act = reset_itg )
223+ # won't be needed after https://github.com/milanofthe/pathsim/pull/66
224+ event .func_act = reset_itg
225+ event .t_start = 0
226+ event .t_end = None
227+ return event
232228
233- def create_reset_events (self ) -> list [pathsim .events .Schedule ]:
229+ def create_reset_events (self ) -> list [pathsim .events .ScheduleList ]:
234230 """Create reset events for all vials based on the replacement times.
235231
236232 Raises:
@@ -258,7 +254,7 @@ def create_reset_events(self) -> list[pathsim.events.Schedule]:
258254 "reset_times must be a single value or a list with the same length as the number of vials"
259255 )
260256 for i , vial in enumerate (self .vials ):
261- events .extend (self ._create_reset_events_one_vial (vial , reset_times [i ]))
257+ events .append (self ._create_reset_events_one_vial (vial , reset_times [i ]))
262258
263259 return events
264260
0 commit comments