cbc_template_fir.py, svd_bank.py : simplify the recent change and put everything into condition_psd()