ECOv003-L2T-STARS 1.4.1__tar.gz → 1.6.0__tar.gz

{ecov003_l2t_stars-1.4.1 → ecov003_l2t_stars-1.6.0}/ECOv003_L2T_STARS/ECOv003_DL.py

@@ -33,7 +33,7 @@ logger = logging.getLogger(__name__)
 # Define the template for the ECOv003_DL run-config XML
 ECOv003_DL_TEMPLATE = join(abspath(dirname(__file__)), "ECOv003_DL.xml")
 # Default build ID
-DEFAULT_BUILD = "0700"
+BUILD = "0700"
 
 def generate_downloader_runconfig(
         L2G_LSTE_filename: str,
@@ -133,17 +133,17 @@ def generate_downloader_runconfig(
 
     # Determine L2T STARS sources directory
     if L2T_STARS_sources_directory is None:
-        L2T_STARS_sources_directory = join(working_directory, DEFAULT_STARS_SOURCES_DIRECTORY)
+        L2T_STARS_sources_directory = join(working_directory, STARS_SOURCES_DIRECTORY)
     L2T_STARS_sources_directory = abspath(expanduser(L2T_STARS_sources_directory))
 
     # Determine L2T STARS indices directory
     if L2T_STARS_indices_directory is None:
-        L2T_STARS_indices_directory = join(working_directory, DEFAULT_STARS_INDICES_DIRECTORY)
+        L2T_STARS_indices_directory = join(working_directory, STARS_INDICES_DIRECTORY)
     L2T_STARS_indices_directory = abspath(expanduser(L2T_STARS_indices_directory))
 
     # Determine L2T STARS model directory
     if L2T_STARS_model_directory is None:
-        L2T_STARS_model_directory = join(working_directory, DEFAULT_STARS_MODEL_DIRECTORY)
+        L2T_STARS_model_directory = join(working_directory, STARS_MODEL_DIRECTORY)
     L2T_STARS_model_directory = abspath(expanduser(L2T_STARS_model_directory))
 
     # Determine executable filename
@@ -159,7 +159,7 @@ def generate_downloader_runconfig(
 
     # Set build ID
     if build is None:
-        build = DEFAULT_BUILD
+        build = BUILD
 
     # Set processing node
     if processing_node is None:

{ecov003_l2t_stars-1.4.1 → ecov003_l2t_stars-1.6.0}/ECOv003_L2T_STARS/L2T_STARS.py

@@ -10,10 +10,12 @@ import colored_logging as cl
 import pandas as pd
 from dateutil import parser
 
+from sentinel_tiles import sentinel_tiles
+
 # Custom modules for Harmonized Landsat Sentinel (HLS) and ECOSTRESS data
 from harmonized_landsat_sentinel import (
     CMRServerUnreachable,
-    HLS2CMR,
+    HLS2Connection,
     HLSTileNotAvailable,
     HLSSentinelMissing,
     HLSLandsatMissing,
@@ -44,20 +46,20 @@ logger = logging.getLogger(__name__)
 def L2T_STARS(
     runconfig_filename: str,
     date_UTC: Union[date, str] = None,
-    spinup_days: int = DEFAULT_SPINUP_DAYS,
-    target_resolution: int = DEFAULT_TARGET_RESOLUTION,
-    NDVI_resolution: int = DEFAULT_NDVI_RESOLUTION,
-    albedo_resolution: int = DEFAULT_ALBEDO_RESOLUTION,
-    use_VNP43NRT: bool = DEFAULT_USE_VNP43NRT,
-    calibrate_fine: bool = DEFAULT_CALIBRATE_FINE,
-    sources_only: bool = False,
-    remove_input_staging: bool = True,
-    remove_prior: bool = True,
-    remove_posterior: bool = True,
-    initialize_julia: bool = False,
-    threads: Union[int, str] = "auto",
-    num_workers: int = 4,
-    overwrite: bool = False, # New parameter for overwriting existing files
+    spinup_days: int = SPINUP_DAYS,
+    target_resolution: int = TARGET_RESOLUTION,
+    NDVI_resolution: int = NDVI_RESOLUTION,
+    albedo_resolution: int = ALBEDO_RESOLUTION,
+    use_VNP43NRT: bool = USE_VNP43NRT,
+    calibrate_fine: bool = CALIBRATE_FINE,
+    sources_only: bool = SOURCES_ONLY,
+    remove_input_staging: bool = REMOVE_INPUT_STAGING,
+    remove_prior: bool = REMOVE_PRIOR,
+    remove_posterior: bool = REMOVE_POSTERIOR,
+    initialize_julia: bool = INITIALIZE_JULIA,
+    threads: Union[int, str] = THREADS,
+    num_workers: int = WORKERS,
+    overwrite: bool = OVERWRITE, # New parameter for overwriting existing files
 ) -> int:
     """
     ECOSTRESS Collection 3 L2T_STARS PGE (Product Generation Executive).
@@ -217,27 +219,27 @@ def L2T_STARS(
         prior_date_UTC = prior.prior_date_UTC
 
         # Define various product and download directories
-        products_directory = join(working_directory, DEFAULT_STARS_PRODUCTS_DIRECTORY)
+        products_directory = join(working_directory, STARS_PRODUCTS_DIRECTORY)
         logger.info(f"STARS products directory: {cl.dir(products_directory)}")
-        HLS_download_directory = join(sources_directory, DEFAULT_HLS_DOWNLOAD_DIRECTORY)
+        HLS_download_directory = join(sources_directory, HLS_DOWNLOAD_DIRECTORY)
         logger.info(f"HLS download directory: {cl.dir(HLS_download_directory)}")
-        HLS_products_directory = join(sources_directory, DEFAULT_HLS_PRODUCTS_DIRECTORY)
+        HLS_products_directory = join(sources_directory, HLS_PRODUCTS_DIRECTORY)
         logger.info(f"HLS products directory: {cl.dir(HLS_products_directory)}")
-        VIIRS_download_directory = join(sources_directory, DEFAULT_VIIRS_DOWNLOAD_DIRECTORY)
+        VIIRS_download_directory = join(sources_directory, VIIRS_DOWNLOAD_DIRECTORY)
         logger.info(f"VIIRS download directory: {cl.dir(VIIRS_download_directory)}")
-        VIIRS_products_directory = join(sources_directory, DEFAULT_VIIRS_PRODUCTS_DIRECTORY)
+        VIIRS_products_directory = join(sources_directory, VIIRS_PRODUCTS_DIRECTORY)
         logger.info(f"VIIRS products directory: {cl.dir(VIIRS_products_directory)}")
-        VIIRS_mosaic_directory = join(sources_directory, DEFAUL_VIIRS_MOSAIC_DIRECTORY)
+        VIIRS_mosaic_directory = join(sources_directory, VIIRS_MOSAIC_DIRECTORY)
         logger.info(f"VIIRS mosaic directory: {cl.dir(VIIRS_mosaic_directory)}")
-        GEOS5FP_download_directory = join(sources_directory, DEFAULT_GEOS5FP_DOWNLOAD_DIRECTORY)
+        GEOS5FP_download_directory = join(sources_directory, GEOS5FP_DOWNLOAD_DIRECTORY)
         logger.info(f"GEOS-5 FP download directory: {cl.dir(GEOS5FP_download_directory)}")
-        GEOS5FP_products_directory = join(sources_directory, DEFAULT_GEOS5FP_PRODUCTS_DIRECTORY)
+        GEOS5FP_products_directory = join(sources_directory, GEOS5FP_PRODUCTS_DIRECTORY)
         logger.info(f"GEOS-5 FP products directory: {cl.dir(GEOS5FP_products_directory)}")
-        VNP09GA_products_directory = join(sources_directory, DEFAULT_VNP09GA_PRODUCTS_DIRECTORY)
+        VNP09GA_products_directory = join(sources_directory, VNP09GA_PRODUCTS_DIRECTORY)
         logger.info(f"VNP09GA products directory: {cl.dir(VNP09GA_products_directory)}")
-        VNP43NRT_products_directory = join(sources_directory, DEFAULT_VNP43NRT_PRODUCTS_DIRECTORY)
+        VNP43NRT_products_directory = join(sources_directory, VNP43NRT_PRODUCTS_DIRECTORY)
         logger.info(f"VNP43NRT products directory: {cl.dir(VNP43NRT_products_directory)}")
-        DOWNSAMPLED_products_directory = join(sources_directory, DEFAULT_STARS_DOWNSAMPLED_DIRECTORY)
+        DOWNSAMPLED_products_directory = join(sources_directory, STARS_DOWNSAMPLED_DIRECTORY)
         logger.info(f"DOWNSAMPLED products directory: {cl.dir(DOWNSAMPLED_products_directory)}")
 
         # Re-check for existing product (double-check in case another process created it) with overwrite option
@@ -255,7 +257,7 @@ def L2T_STARS(
         # Initialize HLS data connection
         logger.info(f"Connecting to CMR Search server: {CMR_SEARCH_URL}")
         try:
-            HLS_connection = HLS2CMR(
+            HLS_connection = HLS2Connection(
                 working_directory=working_directory,
                 download_directory=HLS_download_directory,
                 # products_directory=HLS_products_directory,
@@ -268,7 +270,7 @@ def L2T_STARS(
             )
 
         # Check if the tile is on land (HLS tiles cover land and ocean, STARS is for land)
-        if not HLS_connection.tile_grid.land(tile=tile):
+        if not sentinel_tiles.land(tile=tile):
             raise LandFilter(f"Sentinel tile {tile} is not on land. Skipping processing.")
 
         # Initialize VIIRS data connections based on 'use_VNP43NRT' flag