Merge pull request #3087 from ASFHyP3/develop

Release v10.16.1

Author: asjohnston-asf

.github/workflows/deploy-daac-prod.yml

@@ -19,7 +19,7 @@ jobs:
             template_bucket: cf-templates-118mtzosmrltk-us-west-2
             image_tag: latest
             product_lifetime_in_days: 14
-            default_credits_per_user: 8000
+            default_credits_per_user: 4000
             default_application_status: APPROVED
             cost_profile: EDC
             job_files: >-

.github/workflows/deploy-daac-test.yml

@@ -19,7 +19,7 @@ jobs:
             template_bucket: cf-templates-118ylv0o6jp2n-us-west-2
             image_tag: test
             product_lifetime_in_days: 14
-            default_credits_per_user: 8000
+            default_credits_per_user: 4000
             default_application_status: APPROVED
             cost_profile: EDC
             job_files: >-

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [10.16.1]
+
+### Changed
+- Reduced default credits per user to 4,000 from 8,000 for the `hyp3-edc-prod` and `hyp3-edc-uat` deployments.
+
+### Fixed
+- Allow SRG_GSLC and SRG_TIME_SERIES jobs to process Sentinel-1 C and D granules.
+
 ## [10.16.0]
 
 ### Added

apps/api/src/hyp3_api/validation.py

@@ -209,7 +209,17 @@ def check_same_relative_orbits(_, granule_metadata: list[dict]) -> None:
         name_split = granule['name'].split('_')
         absolute_orbit = name_split[7]
         # "Relationship between relative and absolute orbit numbers": https://sentiwiki.copernicus.eu/web/s1-products
-        offset = 73 if name_split[0] == 'S1A' else 27
+        mission = name_split[0]
+        if mission == 'S1A':
+            offset = 73
+        elif mission == 'S1B':
+            offset = 27
+        elif mission == 'S1C':
+            offset = 172
+        elif mission == 'S1D':
+            offset = 42
+        else:
+            raise ValueError(f'Encountered unknown Sentinel-1 mission: {mission}')
         relative_orbit = ((int(absolute_orbit) - offset) % 175) + 1
         if not previous_relative_orbit:
             previous_relative_orbit = relative_orbit