diff --git a/Ccs/ccs_function_lib.py b/Ccs/ccs_function_lib.py
index 7f1dfa957ed551d6ef5f24f06823c826d9e19c39..c3d1fc58065bad239cddcf567640f7820ba46977 100644
--- a/Ccs/ccs_function_lib.py
+++ b/Ccs/ccs_function_lib.py
@@ -1397,11 +1397,17 @@ def Tcdata(tm):
         try:
             cname = [p[0] for p in finfo if p[2] == fname][0]
         except IndexError:
-            raise ValueError('Unknown discriminant: {}'.format(fvalue))
+            # raise ValueError('Unknown discriminant: {}'.format(fvalue))
+            logger.info('Unknown discriminant: {}'.format(fvalue))
 
-        que = 'SELECT ccf_cname, ccf_descr, cpc_ptc, cpc_pfc, ccf_npars, cdf_ellen, cdf_pname, cpc_descr,cpc_prfref,' \
-              ' cpc_pafref, cpc_ccaref, cdf_grpsize, cdf_bit, NULL FROM ccf left join cdf on ccf_cname=cdf_cname left join' \
-              ' cpc on cdf_pname=cpc_pname where ccf_cname="{}" order by cdf_bit, ccf_cname'.format(cname)
+            que = 'SELECT ccf_cname, ccf_descr, cpc_ptc, cpc_pfc, ccf_npars, cdf_ellen, cdf_pname, cpc_descr,\
+                         cpc_prfref, cpc_pafref, cpc_ccaref, cdf_grpsize, cdf_bit, NULL FROM ccf left join cdf on \
+                         ccf_cname=cdf_cname left join cpc on cdf_pname=cpc_pname where\
+                         ccf_type={} and ccf_stype={} and ccf_apid={} order by cdf_bit, ccf_cname'.format(st, sst, apid)
+        else:
+            que = 'SELECT ccf_cname, ccf_descr, cpc_ptc, cpc_pfc, ccf_npars, cdf_ellen, cdf_pname, cpc_descr,cpc_prfref,' \
+                  ' cpc_pafref, cpc_ccaref, cdf_grpsize, cdf_bit, NULL FROM ccf left join cdf on ccf_cname=cdf_cname left join' \
+                  ' cpc on cdf_pname=cpc_pname where ccf_cname="{}" order by cdf_bit, ccf_cname'.format(cname)
 
     else:
         que = 'SELECT ccf_cname, ccf_descr, cpc_ptc, cpc_pfc, ccf_npars, cdf_ellen, cdf_pname, cpc_descr,\