From 915dfd8510b1bed8054e80813e176daf187ce063 Mon Sep 17 00:00:00 2001
From: Felix Delattre <felix@delattre.de>
Date: Wed, 4 Mar 2026 14:43:59 +0100
Subject: [PATCH] Simplified efast run.

---
 fusion.py | 13 ++-----------
 run.py    |  3 ++-
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/fusion.py b/fusion.py
index 0dd1b40..75a5fb5 100644
--- a/fusion.py
+++ b/fusion.py
@@ -1,14 +1,7 @@
 """EFAST fusion: S2/S3 reflectance fusion for four scenarios."""
-from pathlib import Path
 from datetime import datetime, timedelta
 
-from preselection import create_timeseries
-from preparation import (
-    prepare_s2,
-    prepare_s3,
-    _get_base_dir,
-    RESOLUTION_RATIO,
-)
+from preparation import _get_base_dir, RESOLUTION_RATIO
 
 
 def _import_efast():
@@ -68,9 +61,7 @@ def run_efast(season, site_position, site_name, cleaning_strategy="aggressive",
 
 
 def run_all_efast_scenarios(season, site_position, site_name, sigma_value=30, date_range=None):
-    create_timeseries(season, site_position, site_name)
+    """Run EFAST fusion for all 4 scenarios. Expects prepared_*/s2 and prepared_*/s3 to exist."""
     for strategy in ["aggressive", "nonaggressive"]:
-        prepare_s2(season, site_position, site_name, cleaning_strategy=strategy, date_range=date_range)
-        prepare_s3(season, site_position, site_name, cleaning_strategy=strategy, date_range=date_range)
         run_efast(season, site_position, site_name, cleaning_strategy=strategy, sigma=None, date_range=date_range)
         run_efast(season, site_position, site_name, cleaning_strategy=strategy, sigma=sigma_value, date_range=date_range)
diff --git a/run.py b/run.py
index cc824d9..23de893 100644
--- a/run.py
+++ b/run.py
@@ -1,4 +1,4 @@
-# from fusion import run_all_efast_scenarios
+from fusion import run_all_efast_scenarios
 # from postprocessing import process_all_scenarios
 # from metrics_indices import (
 #     create_ndvi_timeseries_post_process,
@@ -31,6 +31,7 @@ def run_pipeline(season, site_position, site_name):
 
         print(f"Running EFAST fusion for all scenarios: {site_name}, {season}")
         run_all_efast_scenarios(season, site_position, site_name)
+        
         # print(f"Post-processing data: {site_name}, {season}")
         # process_all_scenarios(season, site_position, site_name)
         # print(f"Generating NDVI for final outputs: {site_name}, {season}")