Skip to content

Commit d8fb6f3

Browse files
committed
safety replay: use lr.first()
1 parent a744fa7 commit d8fb6f3

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

tests/safety_replay/replay_drive.py

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,13 @@ def replay_drive(lr, safety_mode, param, alternative_experience, segment=False):
8585
lr = LogReader(args.route_or_segment_name[0], sort_by_time=True)
8686

8787
if None in (args.mode, args.param, args.alternative_experience):
88-
for msg in lr:
89-
if msg.which() == 'carParams':
90-
if args.mode is None:
91-
args.mode = msg.carParams.safetyConfigs[-1].safetyModel.raw
92-
if args.param is None:
93-
args.param = msg.carParams.safetyConfigs[-1].safetyParam
94-
if args.alternative_experience is None:
95-
args.alternative_experience = msg.carParams.alternativeExperience
96-
break
97-
else:
98-
raise Exception("carParams not found in log. Set safety mode and param manually.")
99-
100-
lr.reset()
88+
CP = lr.first('carParams')
89+
if args.mode is None:
90+
args.mode = CP.safetyConfigs[-1].safetyModel.raw
91+
if args.param is None:
92+
args.param = CP.safetyConfigs[-1].safetyParam
93+
if args.alternative_experience is None:
94+
args.alternative_experience = CP.alternativeExperience
10195

10296
print(f"replaying {args.route_or_segment_name[0]} with safety mode {args.mode}, param {args.param}, alternative experience {args.alternative_experience}")
10397
replay_drive(lr, args.mode, args.param, args.alternative_experience, segment=len(lr.logreader_identifiers) == 1)

0 commit comments

Comments
 (0)