Merge branch 'devel' of https://github.com/GERSL/pycold into devel

Author: SuYe99

src/python/pycold/imagetool/export_change_map.py

@@ -365,7 +365,8 @@ def main(
         assert all(elem in band_names for elem in coefs_bands)
 
     if rank == 0:
-        os.makedirs(out_path, exist_ok=True)
+        if not os.path.exists(out_path):
+            os.makedirs(out_path)
 
         ref_image = gdal.Open(reference_path, gdal.GA_ReadOnly)
         trans = ref_image.GetGeoTransform()
@@ -485,7 +486,7 @@ def main(
             current_dist_type = 0
             year_list_to_predict = list(range(year_lowbound, year_uppbound + 1))
             ordinal_day_list = [
-                pd.Timestamp.toordinal(datetime.datetime(year, 7, 1)) for year in year_list_to_predict
+                pd.Timestamp.toordinal(datetime.date(year, 7, 1)) for year in year_list_to_predict
             ]
             for count, curve in enumerate(cold_block):
                 if curve["pos"] != current_processing_pos:
@@ -526,7 +527,7 @@ def main(
                 results_block[break_year - year_lowbound][i_row][i_col] = (
                     current_dist_type * 1000
                     + curve["t_break"]
-                    - (pd.Timestamp.toordinal(datetime.datetime(break_year, 1, 1)))
+                    - (pd.Timestamp.toordinal(datetime.date(break_year, 1, 1)))
                     + 1
                 )
                 # e.g., 1315 means that disturbance happens at doy of 315

src/python/pycold/imagetool/prepare_ard.py

@@ -40,7 +40,7 @@
 import fiona
 from pycold.common import DatasetInfo
 from pycold.utils import class_from_dict
-from pathlib import Path
+
 
 # define constant here
 QA_CLEAR = 0
@@ -220,12 +220,12 @@ def single_image_stacking_hls(
     :return:
     """
     try:
-        QA_band = gdal_array.LoadFile(join(folder, "{}.Fmask.tif".format(folder.split('/')[-1])))
+        QA_band = gdal_array.LoadFile(join(join(source_dir, folder), "{}.Fmask.tif".format(folder)))
     except ValueError as e:
         # logger.error('Cannot open QA band for {}: {}'.format(folder, e))
-        logger.error("Cannot open QA band for {}: {}".format(folder.split('/')[-1], e))
+        logger.error("Cannot open QA band for {}: {}".format(folder, e))
         return False
-    
+
     # convertQA = np.vectorize(qabitval)
     QA_band_unpacked = qabitval_array_HLS(QA_band).astype(np.short)
     if clear_threshold > 0:
@@ -236,7 +236,7 @@ def single_image_stacking_hls(
         clear_ratio = 1
 
     if clear_ratio > clear_threshold:
-        [collection, sensor, tile_id, imagetime, version1, version2] = folder.split('/')[-1].rsplit(".")
+        [collection, sensor, tile_id, imagetime, version1, version2] = folder.rsplit(".")
         year = imagetime[0:4]
         doy = imagetime[4:7]
         file_name = sensor + tile_id + year + doy + collection + version1
@@ -250,54 +250,54 @@ def single_image_stacking_hls(
         if sensor == "L30":
             try:
                 B1 = gdal_array.LoadFile(
-                    join(folder, "{}.B02.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B02.tif".format(folder))
                 )
                 B2 = gdal_array.LoadFile(
-                    join(folder, "{}.B03.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B03.tif".format(folder))
                 )
                 B3 = gdal_array.LoadFile(
-                    join(folder, "{}.B04.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B04.tif".format(folder))
                 )
                 B4 = gdal_array.LoadFile(
-                    join(folder, "{}.B05.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B05.tif".format(folder))
                 )
                 B5 = gdal_array.LoadFile(
-                    join(folder, "{}.B06.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B06.tif".format(folder))
                 )
                 B6 = gdal_array.LoadFile(
-                    join(folder, "{}.B07.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B07.tif".format(folder))
                 )
                 B7 = np.full(B6.shape, 0)  # assign zero
 
             except Exception as e:
                 # logger.error('Cannot open spectral bands for {}: {}'.format(folder, e))
-                logger.error("Cannot open Landsat bands for {}: {}".format(folder.split('/')[-1], e))
+                logger.error("Cannot open Landsat bands for {}: {}".format(folder, e))
                 return False
         elif sensor == "S30":
             try:
                 B1 = gdal_array.LoadFile(
-                    join(folder, "{}.B02.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B02.tif".format(folder))
                 )
                 B2 = gdal_array.LoadFile(
-                    join(folder, "{}.B03.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B03.tif".format(folder))
                 )
                 B3 = gdal_array.LoadFile(
-                    join(folder, "{}.B04.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B04.tif".format(folder))
                 )
                 B4 = gdal_array.LoadFile(
-                    join(folder, "{}.B8A.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B8A.tif".format(folder))
                 )
                 B5 = gdal_array.LoadFile(
-                    join(folder, "{}.B11.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B11.tif".format(folder))
                 )
                 B6 = gdal_array.LoadFile(
-                    join(folder, "{}.B12.tif".format(folder.split('/')[-1]))
+                    join(join(source_dir, folder), "{}.B12.tif".format(folder))
                 )
                 B7 = np.full(B6.shape, 0)
 
             except Exception as e:
                 # logger.error('Cannot open spectral bands for {}: {}'.format(folder, e))
-                logger.error("Cannot open Landsat bands for {}: {}".format(folder.split('/')[-1], e))
+                logger.error("Cannot open Landsat bands for {}: {}".format(folder, e))
                 return False
 
         if (
@@ -1840,8 +1840,6 @@ def main(
         ]
     elif collection == "HLS":
         folder_list = [f for f in listdir(source_dir) if f.startswith("HLS")]
-        if folder_list == []:
-            folder_list = [folder for folder, dir, file in os.walk(source_dir) if Path(folder).name.startswith('HLS.')]
     elif collection == "HLS14":
         folder_list = [y for x in os.walk(source_dir) for y in glob(os.path.join(x[0], "*.hdf"))]
 
@@ -1866,16 +1864,18 @@ def main(
             "AutoPrepareDataARD starts: {}".format(datetime.now(tz).strftime("%Y-%m-%d %H:%M:%S"))
         )
 
-        os.makedirs(out_dir, exist_ok=True)
+        if not os.path.exists(out_dir):
+            os.mkdir(out_dir)
 
         if is_partition is True:
             for i in range(dataset_info.n_block_y):
                 for j in range(dataset_info.n_block_x):
                     block_folder = "block_x{}_y{}".format(j + 1, i + 1)
                     if not os.path.exists(join(out_dir, block_folder)):
-                        os.makedirs(join(out_dir, block_folder))
+                        os.mkdir(join(out_dir, block_folder))
 
-        os.makedirs(tmp_path, exist_ok=True)
+        if not os.path.exists(tmp_path):
+            os.mkdir(tmp_path)
 
         if hpc is True:
             if collection == "ARD" or collection == "ARD-C2":
@@ -1937,8 +1937,8 @@ def main(
             ]
         elif collection == "HLS":
             ordinal_dates = [
-                pd.Timestamp.toordinal(dt.datetime(int(folder.split('/')[-1][15:19]), 1, 1))
-                + int(folder.split('/')[-1][19:22])
+                pd.Timestamp.toordinal(dt.datetime(int(folder[15:19]), 1, 1))
+                + int(folder[19:22])
                 - 1
                 for folder in folder_list
             ]