bumped isis version, add step kwargs to hirise notebook (#30)

* bumped isis version, add step kwargs to hirise notebook * fix case if step_kwargs is none
AndrewAnnex · Sep 15, 2021 · d91738f · d91738f
1 parent 899fef9
commit d91738f
Show file tree

Hide file tree

Showing 4 changed files with 205 additions and 201 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2020, Andrew Michael Annex
+Copyright (c) 2020-2021, Andrew Michael Annex
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/asap_stereo/asap.py b/asap_stereo/asap.py
@@ -1,6 +1,6 @@
 # BSD 3-Clause License
 #
-# Copyright (c) 2020, Andrew Michael Annex
+# Copyright (c) 2020-2021, Andrew Michael Annex
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -156,6 +156,8 @@ def isis3_to_dict(instr: str)-> Dict:
 
 
 def kwarg_parse(kwargs: Dict, key: str)-> str:
+    if kwargs is None:
+        return ''
     key_args = kwargs.get(key, {})
     if isinstance(key_args, str):
         return key_args
@@ -1275,7 +1277,7 @@ def generate_hirise_pair_list(self, one, two):
                 o.write('\n')
 
     @staticmethod
-    def notebook_pipeline_make_dem(left: str, right: str, config: str, refdem: str, gcps: str = '', maxdisp: float = None, downsample: int = None, demgsd: float = 1.0, imggsd: float = 0.25, max_ba_iterations: int = 50, alignment_method = 'rigid', working_dir ='./', out_notebook=None, **kwargs):
+    def notebook_pipeline_make_dem(left: str, right: str, config: str, refdem: str, gcps: str = '', maxdisp: float = None, downsample: int = None, demgsd: float = 1.0, imggsd: float = 0.25, max_ba_iterations: int = 50, alignment_method = 'rigid', step_kwargs = None, working_dir ='./', out_notebook=None, **kwargs):
         """
         First step in HiRISE DEM pipeline that uses papermill to persist log
 
@@ -1295,6 +1297,7 @@ def notebook_pipeline_make_dem(left: str, right: str, config: str, refdem: str,
         :param demgsd: desired GSD of output DEMs (4x image GSD)
         :param imggsd: desired GSD of output ortho images
         :param max_ba_iterations: maximum number of BA steps to use per run (defaults to 50 for slow running hirise BA)
+        :param step_kwargs: Arbitrary dict of kwargs for steps following {'step_#' : {'key': 'value}}
         """
         if not out_notebook:
             out_notebook = f'{working_dir}/log_asap_notebook_pipeline_make_dem_hirise.ipynb'
@@ -1314,6 +1317,7 @@ def notebook_pipeline_make_dem(left: str, right: str, config: str, refdem: str,
                 'alignment_method': alignment_method,
                 'downsample': downsample,
                 'max_ba_iterations': max_ba_iterations,
+                'step_kwargs' : step_kwargs
             },
             request_save_on_cell_execute=True,
             **kwargs