From 99b583d6280fdba73e1aacaa7f751ce7c8d42bff Mon Sep 17 00:00:00 2001 From: Christine Banek Date: Thu, 19 Dec 2019 13:54:46 -0700 Subject: [PATCH] [DM-21176] Add remaining scisql functions to TAP's list This will allow the TAP service to know how to parse these functions and what types they return, which is needed to transform these things into a VOTable. --- .../opencadc/tap/schema/ALMATapSchemaDAO.java | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opencadc/tap/schema/ALMATapSchemaDAO.java b/src/main/java/org/opencadc/tap/schema/ALMATapSchemaDAO.java index b7de553..4ccfc41 100644 --- a/src/main/java/org/opencadc/tap/schema/ALMATapSchemaDAO.java +++ b/src/main/java/org/opencadc/tap/schema/ALMATapSchemaDAO.java @@ -103,13 +103,39 @@ protected List getFunctionDescs() { functionDescs.add(new FunctionDesc("qserv_areaspec_ellipse", TapDataType.INTEGER)); functionDescs.add(new FunctionDesc("qserv_areaspec_poly", TapDataType.INTEGER)); - // SciSQL specific functions. + // SciSQL functions: https://lsst-web.ncsa.illinois.edu/schema/sciSQL/ + // SciSQL Spherical Geometry functions. functionDescs.add(new FunctionDesc("scisql_angSep", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_s2CPolyHtmRanges", TapDataType.STRING)); + functionDescs.add(new FunctionDesc("scisql_s2CPolyToBin", TapDataType.STRING)); + functionDescs.add(new FunctionDesc("scisql_s2CircleHtmRanges", TapDataType.STRING)); + functionDescs.add(new FunctionDesc("scisql_s2HtmId", TapDataType.LONG)); + functionDescs.add(new FunctionDesc("scisql_s2HtmLevel", TapDataType.INTEGER)); functionDescs.add(new FunctionDesc("scisql_s2PtInBox", TapDataType.INTEGER)); functionDescs.add(new FunctionDesc("scisql_s2PtInCPoly", TapDataType.INTEGER)); functionDescs.add(new FunctionDesc("scisql_s2PtInCircle", TapDataType.INTEGER)); functionDescs.add(new FunctionDesc("scisql_s2PtInEllipse", TapDataType.INTEGER)); + // SciSQL Photometry functions + functionDescs.add(new FunctionDesc("scisql_abMagToDn", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_abMagToDnSigma", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_abMagToFlux", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_abMagToFluxSigma", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_dnToAbMag", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_dnToAbMagSigma", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_dnToFlux", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_dnToFluxSigma", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_fluxToAbMag", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_fluxToAbMagSigma", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_fluxToDn", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_fluxToDnSigma", TapDataType.DOUBLE)); + + // SciSQL Statistics + functionDescs.add(new FunctionDesc("scisql_median", TapDataType.DOUBLE)); + functionDescs.add(new FunctionDesc("scisql_percentile", TapDataType.DOUBLE)); + + // SciSQL misc + functionDescs.add(new FunctionDesc("scisql_getVersion", TapDataType.CHAR)); return functionDescs; } }