Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions aw_scenario_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,26 +145,14 @@ def run_scenario(
route_config.agent = self.aw_agent
except Exception as e: # Forces the simulation to run synchronously # pylint: disable=broad-except
logger.error("Could not setup required agent due to {}".format(e))
# self._cleanup()
self._cleanup()
return False

ego.prepare_ego()

logger.info("Loading route...")

try:
scenario = RouteScenario(
world=self.carla_world,
config=route_config,
debug_mode=self.DEBUG,
ego_vehicle=ego,
)
except Exception:
logger.info("Could not load Route Scenario")
traceback.print_exc()
return False

logger.info("Updating world settings:")

# tick asynchronously until then
settings = CarlaDataProvider.get_world().get_settings()
settings.synchronous_mode = True
Expand All @@ -181,6 +169,17 @@ def run_scenario(

tm.set_random_device_seed(int(self._tm_config["seed"])) # ADD TO CONFIG
tm.set_synchronous_mode(self._tm_config["sync"])
try:
scenario = RouteScenario(
world=self.carla_world,
config=route_config,
debug_mode=self.DEBUG,
ego_vehicle=ego._actor,
)
except Exception:
logger.info("Could not load Route Scenario")
traceback.print_exc()
return False

logger.info("Starting scenario...")
try:
Expand Down
2 changes: 1 addition & 1 deletion srunner/scenarios/route_scenario.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def _update_ego_pos(self, ego: carla.Actor) -> None:
elevate_transform = self.route[0][0]
elevate_transform.location.z += 0.5

ego.set_transform()
ego.set_transform(elevate_transform)

def _estimate_route_timeout(self):
"""
Expand Down