Merge branch 'master' into develop

edosl0util/headers.py

@@ -104,18 +104,16 @@ class SpacecraftBusSecondaryHeader(BaseStruct):
 
 
 def amsu_headers():
-    return {
+    apids = [
         # AMSU-A1
-        (257, GROUP_FIRST): GirdSecondaryHeader,
-        (259, GROUP_FIRST): GirdSecondaryHeader,
-        (260, GROUP_FIRST): GirdSecondaryHeader,
-        (261, GROUP_FIRST): GirdSecondaryHeader,
-        (262, GROUP_FIRST): GirdSecondaryHeader,
+        257, 259, 260, 261, 262,
         # AMSU-A2
-        (288, GROUP_FIRST): GirdSecondaryHeader,
-        (289, GROUP_FIRST): GirdSecondaryHeader,
-        (290, GROUP_STANDALONE): GirdSecondaryHeader,
-    }
+        288, 289, 290
+    ]
+    flags = [GROUP_FIRST, GROUP_CONTINUING, GROUP_LAST, GROUP_STANDALONE]
+    return {(apid, flag): GirdSecondaryHeader
+            for apid in apids
+            for flag in flags}
 
 
 def airs_headers():
@@ -218,7 +216,7 @@ def jpss_header_lookup(primary_header):
 
 
 _aqua_headers = aqua_headers()
-def aqua_header_lookup(primary_header):
+def aqua_header_lookup(primary_header):  # noqa
     apid = primary_header.apid
     grouping = primary_header.sequence_grouping
     return _aqua_headers.get((apid, grouping))