[TCOD] Merged cif_dft.dic and cif_tcod.dic