Fix generation bug for CP-eigenstate case
Generation of true tag needed to be inside accept/reject loop Also introduce enum for flavour convention