Merge pull request #333 from johntruckenbrodt/feature/S1C_CDSE

support Sentinel-1C scenes from CDSE

Author: johntruckenbrodt

pyroSAR/S1/auxil.py

@@ -1,7 +1,7 @@
 ###############################################################################
 # general utilities for Sentinel-1
 
-# Copyright (c) 2016-2024, the pyroSAR Developers.
+# Copyright (c) 2016-2025, the pyroSAR Developers.
 
 # This file is part of the pyroSAR Project. It is subject to the
 # license terms in the LICENSE.txt file found in the top-level
@@ -246,21 +246,22 @@ def __catch_step_auxdata(self, sensor, start, stop, osvtype='POE'):
                                           month=date_search.month)
                 log.info(url_sub)
                 response = requests.get(url_sub, timeout=self.timeout)
-                response.raise_for_status()
-                result = response.text
-                files_sub = list(set(re.findall(self.pattern, result)))
-                if len(files_sub) == 0:
-                    break
-                for file in files_sub:
-                    match = re.match(self.pattern_fine, file)
-                    start2 = datetime.strptime(match.group('start'), '%Y%m%dT%H%M%S')
-                    stop2 = datetime.strptime(match.group('stop'), '%Y%m%dT%H%M%S')
-                    if start2 < stop and stop2 > start:
-                        files.append({'filename': file,
-                                      'href': url_sub + '/' + file + '.zip',
-                                      'auth': None})
-                    if date_search == date_search_final:
-                        busy = False
+                if response.status_code != 404:
+                    response.raise_for_status()
+                    result = response.text
+                    files_sub = list(set(re.findall(self.pattern, result)))
+                    if len(files_sub) == 0:
+                        break
+                    for file in files_sub:
+                        match = re.match(self.pattern_fine, file)
+                        start2 = datetime.strptime(match.group('start'), '%Y%m%dT%H%M%S')
+                        stop2 = datetime.strptime(match.group('stop'), '%Y%m%dT%H%M%S')
+                        if start2 < stop and stop2 > start:
+                            files.append({'filename': file,
+                                          'href': url_sub + '/' + file + '.zip',
+                                          'auth': None})
+                if date_search == date_search_final:
+                    busy = False
                 date_search += relativedelta(months=1)
                 if date_search > datetime.now():
                     busy = False

pyroSAR/drivers.py

@@ -759,8 +759,9 @@ def _unpack(self, directory, offset=None, overwrite=False, exist_ok=False):
                             outname = os.path.join(directory, repl)
                             outname = outname.replace('/', os.path.sep)
                             if item.endswith('/'):
-                                os.makedirs(outname)
+                                os.makedirs(outname, exist_ok=True)
                             else:
+                                os.makedirs(os.path.dirname(outname), exist_ok=True)
                                 try:
                                     with open(outname, 'wb') as outfile:
                                         outfile.write(archive.read(item))
@@ -1662,7 +1663,7 @@ def __init__(self, scene):
 
         self.pattern = patterns.safe
 
-        self.pattern_ds = r'^s1[ab]-' \
+        self.pattern_ds = r'^s1[abcd]-' \
                           r'(?P<swath>s[1-6]|iw[1-3]?|ew[1-5]?|wv[1-2]|n[1-6])-' \
                           r'(?P<product>slc|grd|ocn)-' \
                           r'(?P<pol>hh|hv|vv|vh)-' \

pyroSAR/gamma/util.py

@@ -705,7 +705,7 @@ def geocode(scene, dem, tmpdir, outdir, spacing, scaling='linear', func_geoback=
     scenes = identify_many(scenes)
     ref = scenes[0]
 
-    if ref.sensor not in ['S1A', 'S1B', 'PALSAR-2']:
+    if ref.sensor not in ['S1A', 'S1B', 'S1C', 'PALSAR-2']:
         raise RuntimeError(
             'this function currently only supports Sentinel-1 and PALSAR-2 Path data. Please stay tuned...')
 

pyroSAR/patterns.py

@@ -88,7 +88,7 @@
       r'(?P<counter>[0-9]{4,})\.' \
       r'(?P<satellite_ID>[EN][12])'
 
-safe = r'^(?P<sensor>S1[AB])_' \
+safe = r'^(?P<sensor>S1[ABCD])_' \
        r'(?P<beam>S1|S2|S3|S4|S5|S6|IW|EW|WV|EN|N1|N2|N3|N4|N5|N6|IM)_' \
        r'(?P<product>SLC|GRD|OCN)' \
        r'(?P<resolution>F|H|M|_)_' \

pyroSAR/snap/util.py

@@ -1,7 +1,7 @@
 ###############################################################################
 # Convenience functions for SAR image batch processing with ESA SNAP
 
-# Copyright (c) 2016-2024, the pyroSAR Developers.
+# Copyright (c) 2016-2025, the pyroSAR Developers.
 
 # This file is part of the pyroSAR Project. It is subject to the
 # license terms in the LICENSE.txt file found in the top-level
@@ -270,7 +270,7 @@ def geocode(infile, outdir, t_srs=4326, spacing=20, polarizations='all', shapefi
 
     if id.sensor in ['ASAR', 'ERS1', 'ERS2']:
         formatName = 'ENVISAT'
-    elif id.sensor in ['S1A', 'S1B']:
+    elif re.search('S1[A-Z]', id.sensor):
         if id.product == 'SLC':
             removeS1BorderNoise = False
             process_S1_SLC = True