Merge pull request #2 from emit-sds/develop

Merge develop into main for v1.2.0
emit-sds · Jul 22, 2022 · 80acdd5 · 80acdd5
2 parents 9f56b96 + 1b3d9cc
commit 80acdd5
Show file tree

Hide file tree

Showing 31 changed files with 126 additions and 1,326 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,19 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v1.2.0](https://github.com/emit-sds/emit-sds-l2a/compare/v1.1.0...v1.2.0)
+
+> 18 July 2022
+
+- renamed main directory, and new config [`b236d96`](https://github.com/emit-sds/emit-sds-l2a/commit/b236d9685edf336a983c23ff1762c86b0af50a67)
+- renamed, and removed some cruft [`5e894b5`](https://github.com/emit-sds/emit-sds-l2a/commit/5e894b5d03bc6580eec5c68caf4ea59774f01451)
+- include alternate keystrings for aerosols (facilitates emulator) [`2337c93`](https://github.com/emit-sds/emit-sds-l2a/commit/2337c93c2f4a0f900cdd658950abc68908bfc39f)
+
 #### [v1.1.0](https://github.com/emit-sds/emit-sds-l2a/compare/v1.0.0...v1.1.0)
 
-> 3 June 2022
+> 6 June 2022
 
+- Merge develop to main for v1.1.0 [`#1`](https://github.com/emit-sds/emit-sds-l2a/pull/1)
 - spec_quality checker cleanup [`#7`](https://github.com/emit-sds/emit-sds-l2a/pull/7)
 - Parallel mask [`#6`](https://github.com/emit-sds/emit-sds-l2a/pull/6)
 - Add environment.yml and requirements.txt for working emit-isofit environment. [`e2e5f61`](https://github.com/emit-sds/emit-sds-l2a/commit/e2e5f61d930837b6e2af57cfc6b4929d10da41d3)

diff --git a/make_emit_masks.py b/make_emit_masks.py
@@ -168,7 +168,7 @@ def main():
     for i, name in enumerate(state_hdr['band names']):
         if 'H2O' in name:
             h2o_band.append(i)
-        elif 'AER' in name:
+        elif 'AER' in name or 'AOT' in name or 'AOD' in name:
             aod_bands.append(i)
 
     # find pixel size

diff --git a/surface_v2/filtered_ocean → surface/filtered_ocean b/surface_v2/filtered_ocean → surface/filtered_ocean
diff --git a/surface_v2/filtered_ocean.hdr → surface/filtered_ocean.hdr b/surface_v2/filtered_ocean.hdr → surface/filtered_ocean.hdr
diff --git a/surface_v2/filtered_other → surface/filtered_other b/surface_v2/filtered_other → surface/filtered_other
diff --git a/surface_v2/filtered_other.hdr → surface/filtered_other.hdr b/surface_v2/filtered_other.hdr → surface/filtered_other.hdr
diff --git a/surface_v2/filtered_veg → surface/filtered_veg b/surface_v2/filtered_veg → surface/filtered_veg
diff --git a/surface_v2/filtered_veg.hdr → surface/filtered_veg.hdr b/surface_v2/filtered_veg.hdr → surface/filtered_veg.hdr
diff --git a/surface_v2/surface.json → surface/surface_20210811.json b/surface_v2/surface.json → surface/surface_20210811.json
diff --git a/surface/surface_20220714.json b/surface/surface_20220714.json
@@ -0,0 +1,115 @@
+{
+  "output_model_file": "./surface.mat",
+  "wavelength_file":   "./wavelengths.txt",
+  "normalize":"Euclidean",
+  "reference_windows":[[400,1250],[1450,1750],[2050,2450]],
+  "sources":
+    [
+      {
+        "input_spectrum_files":
+          [
+            "filtered_other"
+          ],
+        "n_components": 1,
+        "windows": [
+          {
+            "interval":[300,785],
+            "regularizer":10,
+            "correlation":"decorrelated"
+          },
+          {
+            "interval":[785,1250],
+            "regularizer":1e-6,
+            "correlation":"EM"
+          },
+          {
+            "interval":[1250,2500],
+            "regularizer":10,
+            "correlation":"decorrelated"
+          }
+        ]
+      },
+      {
+        "input_spectrum_files":
+          [
+            "filtered_veg"
+          ],
+        "n_components": 1,
+        "windows": [
+          {
+            "interval":[300,350],
+            "regularizer":10,
+            "correlation":"decorrelated"
+          },
+          {
+            "interval":[350,480],
+            "regularizer":1e-6,
+            "correlation":"EM"
+          },
+          {
+            "interval":[480,785],
+            "regularizer":10,
+            "correlation":"decorrelated"
+          },
+          {
+            "interval":[785,1250],
+            "regularizer":1e-6,
+            "correlation":"EM"
+          },
+          {
+            "interval":[1250,2500],
+            "regularizer":10,
+            "correlation":"decorrelated"
+          }
+        ]
+      },
+      {
+        "input_spectrum_files":
+          [
+            "filtered_ocean"
+          ],
+        "n_components": 1,
+        "windows": [
+          {
+            "interval":[300,880],
+            "regularizer":10,
+            "correlation":"decorrelated"
+          },
+          {
+            "interval":[880,1250],
+            "regularizer":1e-6,
+            "correlation":"EM"
+          },
+          {
+            "interval":[1250,2500],
+            "regularizer":10,
+            "correlation":"decorrelated"
+          }
+        ]
+      },
+      {
+        "input_spectrum_files":
+          [
+            "surface_Liquids"
+          ],
+        "n_components": 2,
+        "windows": [
+          {
+            "interval":[300,880],
+            "regularizer":10,
+            "correlation":"decorrelated"
+          },
+          {
+            "interval":[880,1250],
+            "regularizer":1e-6,
+            "correlation":"EM"
+          },
+          {
+            "interval":[1250,2500],
+            "regularizer":10,
+            "correlation":"decorrelated"
+          }
+        ]
+      }
+  ]
+}
diff --git a/surface_v1/binary/surface_Liquids → surface/surface_Liquids b/surface_v1/binary/surface_Liquids → surface/surface_Liquids
diff --git a/surface_v1/binary/surface_Liquids.hdr → surface/surface_Liquids.hdr b/surface_v1/binary/surface_Liquids.hdr → surface/surface_Liquids.hdr
diff --git a/surface_v1/binary/ocean_spectra_rev2 b/surface_v1/binary/ocean_spectra_rev2
diff --git a/surface_v1/binary/ocean_spectra_rev2.hdr b/surface_v1/binary/ocean_spectra_rev2.hdr
diff --git a/surface_v1/binary/purdue_river_library_fullrng b/surface_v1/binary/purdue_river_library_fullrng
diff --git a/surface_v1/binary/purdue_river_library_fullrng.hdr b/surface_v1/binary/purdue_river_library_fullrng.hdr
diff --git a/surface_v1/binary/surface_ArtificialMaterials b/surface_v1/binary/surface_ArtificialMaterials