Harrison L3 - GSTU/EYEA - Match 'spxnbs' as a valid quantity in a map descriptor

Author: Menlo Innovations - CAVA Project

imap_l3_processing/maps/map_descriptors.py

@@ -54,6 +54,7 @@ class PixelSize(enum.IntEnum):
 class MapQuantity(enum.Enum):
     Intensity = "Intensity"
     SpectralIndex = "SpectralIndex"
+    SpectralIndexNBS = "SpectralIndexNBS"
     ISNBackgroundSubtracted = "ISNBackgroundSubtracted"
 
 
@@ -84,6 +85,7 @@ class MapDescriptorParts:
 
 quantity_mapping = [
     ("spx", MapQuantity.SpectralIndex),
+    ("spxnbs", MapQuantity.SpectralIndexNBS),
     ("ena", MapQuantity.Intensity),
     ("isn", MapQuantity.ISNBackgroundSubtracted)
 ]
@@ -117,7 +119,7 @@ class MapDescriptorParts:
 def parse_map_descriptor(descriptor: str) -> Optional[MapDescriptorParts]:
     descriptor_regex = """
         (?P<sensor>hic|h45|h90|l090|ulc|u45|u90|ilo)-
-        (?P<quantity>ena|spx|isn)(?P<spectral_index_range>[0-9]{4})?(?P<quantity_suffix>[a-zA-Z]*)-
+        (?P<quantity>ena|spxnbs|spx|isn)(?P<spectral_index_range>[0-9]{4})?(?P<quantity_suffix>[a-zA-Z]*)-
         (?P<species>h|o)-
         (?P<frame>sf|hf|hk)-
         (?P<survival_corrected>sp|nsp)-

tests/maps/test_map_descriptors.py

@@ -114,12 +114,23 @@ def test_parse_map_descriptor(self):
                                                                       no_sp, SpinPhase.RamOnly, "hae",
                                                                       PixelSize.SixDegrees,
                                                                       "1yr",
-                                                                      MapQuantity.SpectralIndex, "nbs")),
+                                                                      MapQuantity.SpectralIndexNBS, "")),
+            ("l090-spxnbs1111-h-sf-nsp-ram-hae-6deg-1yr", MapDescriptorParts(Sensor.Lo90, ReferenceFrame.Spacecraft,
+                                                                         no_sp, SpinPhase.RamOnly, "hae",
+                                                                         PixelSize.SixDegrees,
+                                                                         "1yr",
+                                                                         MapQuantity.SpectralIndexNBS, "", (11, 11))),
+            ("l090-spxnbs1111thisisdense-h-sf-nsp-ram-hae-6deg-1yr", MapDescriptorParts(Sensor.Lo90, ReferenceFrame.Spacecraft,
+                                                                             no_sp, SpinPhase.RamOnly, "hae",
+                                                                             PixelSize.SixDegrees,
+                                                                             "1yr",
+                                                                             MapQuantity.SpectralIndexNBS, "thisisdense",
+                                                                             (11, 11))),
             ("l090-spxnbs-h-hk-nsp-ram-hae-6deg-1yr", MapDescriptorParts(Sensor.Lo90, ReferenceFrame.HeliosphericKinematic,
                                                                          no_sp, SpinPhase.RamOnly, "hae",
                                                                          PixelSize.SixDegrees,
                                                                          "1yr",
-                                                                         MapQuantity.SpectralIndex, "nbs")),
+                                                                         MapQuantity.SpectralIndexNBS, "")),
             ("h45-spx0607-h-hf-sp-full-hae-4deg-6mo", MapDescriptorParts(Sensor.Hi45, cg, sp, SpinPhase.FullSpin, "hae",
                                                                      PixelSize.FourDegrees, "6mo",
                                                                      MapQuantity.SpectralIndex, "", (6, 7))),