From f0ae4f798a0ffc3466fbc40742322908ebf6879a Mon Sep 17 00:00:00 2001 From: Antsalacia Date: Mon, 9 Dec 2024 14:27:04 +0100 Subject: [PATCH 1/2] Adding User input --- earthspy/earthspy.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/earthspy/earthspy.py b/earthspy/earthspy.py index de6581d..400f6e9 100644 --- a/earthspy/earthspy.py +++ b/earthspy/earthspy.py @@ -85,6 +85,7 @@ def set_query_parameters( download_mode: str = "SM", remove_splitboxes: bool = True, verbose: bool = True, + label: str = None, ) -> None: """Define a set of parameters used for the API request. @@ -145,6 +146,10 @@ def set_query_parameters( :param verbose: Whether to print processing status or not, defaults to True. :type verbose: bool, optional + + :param label: User input string put at the end of the file name, + defaults to None. + :type label: str, optionnal """ # set processing attributes @@ -178,6 +183,9 @@ def set_query_parameters( # find available data within user time range self.get_available_data() + + # set user input string for file name + self.label = label # set download mode if download_mode == "D": @@ -934,7 +942,7 @@ def rename_output_files(self) -> None: if self.download_mode == "D": # build new file name new_filename = ( - f"{self.store_folder}/" + "{date}_{self.data_collection_str}.tif" + f"{self.store_folder}/" + "{date}_{self.data_collection_str}_{self.label}.tif" ) # If SICE, don't rename file but move to date folder @@ -964,7 +972,7 @@ def rename_output_files(self) -> None: # build new file name new_filename = ( f"{self.store_folder}/" - + f"{date}_{self.data_collection_str}_{split_box_id}.tif" + + f"{date}_{self.data_collection_str}_{split_box_id}_{self.label}.tif" ) # if SICE, add split box id in all names and move to date folder From 8110c31e18f6a5f6b57ef37cf9792b8d7c7451a6 Mon Sep 17 00:00:00 2001 From: Antsalacia Date: Mon, 16 Dec 2024 10:02:33 +0100 Subject: [PATCH 2/2] Adding user input after mosaic --- earthspy/earthspy.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/earthspy/earthspy.py b/earthspy/earthspy.py index 400f6e9..4791e1a 100644 --- a/earthspy/earthspy.py +++ b/earthspy/earthspy.py @@ -942,7 +942,7 @@ def rename_output_files(self) -> None: if self.download_mode == "D": # build new file name new_filename = ( - f"{self.store_folder}/" + "{date}_{self.data_collection_str}_{self.label}.tif" + f"{self.store_folder}/" + "{date}_{self.data_collection_str}.tif" ) # If SICE, don't rename file but move to date folder @@ -972,7 +972,7 @@ def rename_output_files(self) -> None: # build new file name new_filename = ( f"{self.store_folder}/" - + f"{date}_{self.data_collection_str}_{split_box_id}_{self.label}.tif" + + f"{date}_{self.data_collection_str}_{split_box_id}.tif" ) # if SICE, add split box id in all names and move to date folder @@ -1048,7 +1048,7 @@ def merge_rasters(self) -> None: # and add download method name (SM) date_output_filename = date_response_files[0].replace( "_0.tif", - "_SM_mosaic.tif", + f"_SM_mosaic_{self.label}.tif", ) # open files to merge