From 22cf11e712b541b96a5eddcb2d21770a207d44a0 Mon Sep 17 00:00:00 2001 From: JulienPeloton Date: Tue, 3 Sep 2024 16:22:43 +0200 Subject: [PATCH 1/4] Update SSOFT generation. Need fink-utils>=0.21 and fink-science>=3.16 --- bin/generate_ssoft.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/generate_ssoft.py b/bin/generate_ssoft.py index a7e3de3e..028d231f 100644 --- a/bin/generate_ssoft.py +++ b/bin/generate_ssoft.py @@ -21,7 +21,7 @@ from fink_broker.logging_utils import get_fink_logger, inspect_application from fink_broker.spark_utils import init_sparksession -from fink_spins.ssoft import build_the_ssoft +from fink_science.ssoft.processor import build_the_ssoft def main(): From 45c798496a7eab8d8ea13cb2092a07dfbe4bb407 Mon Sep 17 00:00:00 2001 From: Julien Date: Wed, 4 Sep 2024 08:38:23 +0200 Subject: [PATCH 2/4] Update Fink internal dependencies (#881) * Bump requirements * Update requirements * Bump fink-utils --- deps/requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/requirements.txt b/deps/requirements.txt index 06d75353..27e3eec9 100644 --- a/deps/requirements.txt +++ b/deps/requirements.txt @@ -18,10 +18,10 @@ avro-python3 fastavro==1.6.0 # Fink core -fink_filters>=3.33 -git+https://github.com/astrolabsoftware/fink-science@5.15.0 -fink-utils>=0.19.0 -fink-spins>=0.3.7 +fink_filters>=3.35 +git+https://github.com/astrolabsoftware/fink-science@5.16.0 +fink-utils>=0.23.0 +fink-spins>=0.3.8 fink-tns>=0.9 # Misc From 5c8b3ed466aaa8aedc531505b45e654f5dd9f82e Mon Sep 17 00:00:00 2001 From: JulienPeloton Date: Wed, 4 Sep 2024 16:47:06 +0200 Subject: [PATCH 3/4] Add new parameter for the lombscargle. Need fink-science>=5.17.1 --- bin/generate_ssoft.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/generate_ssoft.py b/bin/generate_ssoft.py index 028d231f..fb1ddfd7 100644 --- a/bin/generate_ssoft.py +++ b/bin/generate_ssoft.py @@ -106,6 +106,7 @@ def main(): frac=args.frac, model=args.model, version=version, + sb_method="auto" # TODO: nifty crashes on the cluster ) pdf.to_parquet("ssoft_{}_{}.parquet".format(args.model, version)) From d6bc958f43f814e084ff64c5d3e2212bb3c125fb Mon Sep 17 00:00:00 2001 From: JulienPeloton Date: Wed, 9 Oct 2024 11:41:53 +0200 Subject: [PATCH 4/4] [SONAR] fix code smell --- bin/raw2science_batch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/raw2science_batch.py b/bin/raw2science_batch.py index 33423c02..66347250 100644 --- a/bin/raw2science_batch.py +++ b/bin/raw2science_batch.py @@ -67,7 +67,7 @@ def main(): df = df.filter(df["candidate.nbad"] == 0).filter(df["candidate.rb"] >= 0.55) # Apply science modules - df = apply_science_modules(df, logger) + df = apply_science_modules(df) # Add tracklet information df_trck = spark.read.format("parquet").load(input_raw)