updated plotting macro
jet flavor now always set