Fix trace generation

[MarechalAlex]

Trace generation has been adapted for the new trace language. It needs to be checked.