diff --git a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD.zip b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD.zip index a6db6dbe..f51aca81 100644 Binary files a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD.zip and b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD.zip differ diff --git a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_anais.zip b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_anais.zip index 8e90ba26..9a93c026 100644 Binary files a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_anais.zip and b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_anais.zip differ diff --git a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_beta.zip b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_beta.zip index b27c2478..21fa1370 100644 Binary files a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_beta.zip and b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_beta.zip differ diff --git a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_emille.zip b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_emille.zip index 978883d2..f5c42916 100644 Binary files a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_emille.zip and b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_emille.zip differ diff --git a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_emille_30days.zip b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_emille_30days.zip index 1b5f4023..85760a30 100644 Binary files a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_emille_30days.zip and b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_emille_30days.zip differ diff --git a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_julien.zip b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_julien.zip index 26ce4407..875e2036 100644 Binary files a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_julien.zip and b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_julien.zip differ diff --git a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_maria.zip b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_maria.zip index 01399e31..0971f098 100644 Binary files a/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_maria.zip and b/fink_science/data/models/anomaly_detection/anomaly_detection_forest_AAD_maria.zip differ diff --git a/fink_science/data/models/anomaly_detection/g_means.csv b/fink_science/data/models/anomaly_detection/g_means.csv deleted file mode 100644 index d3902ecc..00000000 --- a/fink_science/data/models/anomaly_detection/g_means.csv +++ /dev/null @@ -1,19 +0,0 @@ -,0 -amplitude,0.21948567063093466 -anderson_darling_normal,0.5738338537540897 -beyond_1_std,0.29759570826452364 -chi2,37.704414101216535 -cusum,0.3407494402523421 -kurtosis,0.2915051629343353 -linear_fit_slope,0.0008679869820436663 -linear_fit_slope_sigma,0.002219643796867831 -linear_trend_noise,0.13955193014231754 -linear_trend_sigma,0.006530832951936966 -magnitude_percentage_ratio_20_10,0.7096091060287604 -magnitude_percentage_ratio_40_5,0.2134530968133973 -maximum_slope,20.197335141851806 -median,16.09982754358941 -median_absolute_deviation,0.07874299095497296 -median_buffer_range_percentage_10,0.226612517162576 -skew,0.06777187504700471 -stetson_K,0.853534164617388 diff --git a/fink_science/data/models/anomaly_detection/r_means.csv b/fink_science/data/models/anomaly_detection/r_means.csv deleted file mode 100644 index 4efa95b3..00000000 --- a/fink_science/data/models/anomaly_detection/r_means.csv +++ /dev/null @@ -1,19 +0,0 @@ -,0 -amplitude,0.2776158101272682 -anderson_darling_normal,0.6324932481221309 -beyond_1_std,0.29842034329236383 -chi2,47.98632140376363 -cusum,0.3353034770643174 -kurtosis,0.19552357158753803 -linear_fit_slope,0.00046779506892350695 -linear_fit_slope_sigma,0.004115135468353504 -linear_trend_noise,0.17699726764662016 -linear_trend_sigma,0.008118738252789576 -magnitude_percentage_ratio_20_10,0.7110312348018119 -magnitude_percentage_ratio_40_5,0.21197547217167437 -maximum_slope,27.23340912206943 -median,17.306199665913482 -median_absolute_deviation,0.09875090359331296 -median_buffer_range_percentage_10,0.22553694294088797 -skew,0.022823198234573093 -stetson_K,0.8580286805997064 diff --git a/fink_science/ztf/anomaly_detection/processor.py b/fink_science/ztf/anomaly_detection/processor.py index 165b78a3..712d8014 100644 --- a/fink_science/ztf/anomaly_detection/processor.py +++ b/fink_science/ztf/anomaly_detection/processor.py @@ -49,6 +49,13 @@ "median_buffer_range_percentage_10", "skew", "stetson_K", + "percent_amplitude", + "linear_fit_reduced_chi2", + "inter_percentile_range_10", + "linear_trend", + "standard_deviation", + "weighted_mean", + "mean", ] ANOMALY_MODELS = ["_beta", "_anais", "_emille", "_julien", "_maria", "_emille_30days"] # noqa @@ -183,12 +190,6 @@ def get_key(x: dict, band: int): path = os.path.dirname(os.path.abspath(__file__)) model_path = f"{path}/data/models/anomaly_detection" - r_means = pd.read_csv( - f"{model_path}/r_means.csv", header=None, index_col=0, squeeze=True - ) - g_means = pd.read_csv( - f"{model_path}/g_means.csv", header=None, index_col=0, squeeze=True - ) data_r = lc_features.apply(lambda x: get_key(x, 1))[MODEL_COLUMNS] data_g = lc_features.apply(lambda x: get_key(x, 2))[MODEL_COLUMNS] @@ -200,12 +201,6 @@ def get_key(x: dict, band: int): else: model = "" - for col in data_r.columns[data_r.isna().any()]: - data_r[col].fillna(r_means[col], inplace=True) # noqa: PD002 - - for col in data_g.columns[data_g.isna().any()]: - data_g[col].fillna(g_means[col], inplace=True) # noqa: PD002 - g_model_path_AAD = f"{model_path}/forest_g_AAD{model}.onnx" r_model_path_AAD = f"{model_path}/forest_r_AAD{model}.onnx" if not (os.path.exists(r_model_path_AAD) and os.path.exists(g_model_path_AAD)):