- added variants of dirac_trace() and color_trace() that take the trace over