From 34cd5e74a5a4cdb4965268586c9d41ead21ff89e Mon Sep 17 00:00:00 2001 From: JulienPeloton Date: Mon, 5 Jan 2026 14:00:30 +0100 Subject: [PATCH 1/4] Rename func_hg1g2_with_spin into func_shg1g2 --- apps/routes/v1/ztf/sso/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/routes/v1/ztf/sso/utils.py b/apps/routes/v1/ztf/sso/utils.py index aee39e0..d82223b 100644 --- a/apps/routes/v1/ztf/sso/utils.py +++ b/apps/routes/v1/ztf/sso/utils.py @@ -27,7 +27,7 @@ from apps.utils.decoding import format_hbase_output from fink_utils.sso.miriade import get_miriade_data -from fink_utils.sso.spins import func_hg1g2_with_spin, estimate_sso_params +from fink_utils.sso.spins import func_shg1g2, estimate_sso_params from line_profiler import profile @@ -248,7 +248,7 @@ def extract_sso_data(payload: dict) -> pd.DataFrame: pdf["residuals_shg1g2"] = 0.0 for filt in np.unique(pdf["i:fid"]): cond = pdf["i:fid"] == filt - model = func_hg1g2_with_spin( + model = func_shg1g2( [phase[cond], ra[cond], dec[cond]], outdic["H_{}".format(filt)], outdic["G1_{}".format(filt)], From 998f0fa9ebcf4ddcc123fa2ea5be6197128d66f5 Mon Sep 17 00:00:00 2001 From: JulienPeloton Date: Mon, 5 Jan 2026 14:03:29 +0100 Subject: [PATCH 2/4] Rename COLUMNS_SSHG1G2 into COLUMNS_SOCCA --- apps/routes/v1/ztf/ssoft/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/routes/v1/ztf/ssoft/utils.py b/apps/routes/v1/ztf/ssoft/utils.py index 569494d..aa8564a 100644 --- a/apps/routes/v1/ztf/ssoft/utils.py +++ b/apps/routes/v1/ztf/ssoft/utils.py @@ -27,7 +27,7 @@ COLUMNS_HG, COLUMNS_HG1G2, COLUMNS_SHG1G2, - COLUMNS_SSHG1G2, + COLUMNS_SOCCA, ) from line_profiler import profile From faf30b7177630171090c73e9b11dc14038232678 Mon Sep 17 00:00:00 2001 From: JulienPeloton Date: Mon, 5 Jan 2026 14:05:17 +0100 Subject: [PATCH 3/4] Rename COLUMNS_SSHG1G2 into COLUMNS_SOCCA --- apps/routes/v1/ztf/ssoft/utils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/routes/v1/ztf/ssoft/utils.py b/apps/routes/v1/ztf/ssoft/utils.py index aa8564a..2a85cf8 100644 --- a/apps/routes/v1/ztf/ssoft/utils.py +++ b/apps/routes/v1/ztf/ssoft/utils.py @@ -53,14 +53,14 @@ def get_ssoft(payload: dict) -> pd.DataFrame: if schema: if "flavor" in payload: flavor = payload["flavor"] - if flavor not in ["SSHG1G2", "SHG1G2", "HG1G2", "HG"]: + if flavor not in ["SOCCA", "SHG1G2", "HG1G2", "HG"]: rep = { "status": "error", - "text": "flavor needs to be in ['SSHG1G2', 'SHG1G2', 'HG1G2', 'HG']\n", + "text": "flavor needs to be in ['SOCCA', 'SHG1G2', 'HG1G2', 'HG']\n", } return Response(str(rep), 400) - elif flavor == "SSHG1G2": - ssoft_columns = {**COLUMNS, **COLUMNS_SSHG1G2} + elif flavor == "SOCCA": + ssoft_columns = {**COLUMNS, **COLUMNS_SOCCA} elif flavor == "SHG1G2": ssoft_columns = {**COLUMNS, **COLUMNS_SHG1G2} elif flavor == "HG1G2": @@ -99,10 +99,10 @@ def get_ssoft(payload: dict) -> pd.DataFrame: if "flavor" in payload: flavor = payload["flavor"] - if flavor not in ["SSHG1G2", "SHG1G2", "HG1G2", "HG"]: + if flavor not in ["SOCCA", "SHG1G2", "HG1G2", "HG"]: rep = { "status": "error", - "text": "flavor needs to be in ['SSHG1G2', 'SHG1G2', 'HG1G2', 'HG']\n", + "text": "flavor needs to be in ['SOCCA', 'SHG1G2', 'HG1G2', 'HG']\n", } return Response(str(rep), 400) else: From 7a310448da18dfe13247c20378a540a9bbe887a4 Mon Sep 17 00:00:00 2001 From: JulienPeloton Date: Mon, 5 Jan 2026 14:05:59 +0100 Subject: [PATCH 4/4] Bump fink-utils --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3caef6b..181e9fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ flask-restx pandas numpy fink-filters==7.7 -fink-utils==0.45.0 +fink-utils==0.48.0 line_profiler requests pyarrow