Skip to content

Commit

Permalink
added gcp param for notebook hirise workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
AndrewAnnex committed Jun 28, 2021
1 parent 43a2f68 commit 5892a7c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 3 additions & 1 deletion asap_stereo/asap.py
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,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, 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', working_dir ='./', out_notebook=None, **kwargs):
"""
First step in HiRISE DEM pipeline that uses papermill to persist log
Expand All @@ -1184,6 +1184,7 @@ def notebook_pipeline_make_dem(left: str, right: str, config: str, refdem: str,
:param alignment_method: alignment method to use for pc_align
:param downsample: Factor to downsample images for faster production
:param refdem: path to reference DEM or PEDR csv file
:param gcps: path to gcp file todo: currently only one gcp file allowed
:param maxdisp: Maximum expected displacement in meters, specify none to determine it automatically
:param demgsd: desired GSD of output DEMs (4x image GSD)
:param imggsd: desired GSD of output ortho images
Expand All @@ -1200,6 +1201,7 @@ def notebook_pipeline_make_dem(left: str, right: str, config: str, refdem: str,
'config': config,
'output_path' : working_dir,
'refdem' : refdem,
'gcps' : gcps,
'maxdisp' : maxdisp,
'demgsd' : demgsd,
'imggsd' : imggsd,
Expand Down
5 changes: 3 additions & 2 deletions asap_stereo/asap_hirise_workflow.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"alignment_method = 'rigid'\n",
"output_path = None\n",
"downsample = None\n",
"max_ba_iterations = 50"
"max_ba_iterations = 50\n",
"gcps=''"
]
},
{
Expand Down Expand Up @@ -256,7 +257,7 @@
},
"outputs": [],
"source": [
"!asap hirise step-five --gsd {img_gsd if downsample else None} 2>&1 | tee -i -a ./5_cam2map.log ./full_log.log"
"!asap hirise step-five {gcps} --gsd {img_gsd if downsample else None} 2>&1 | tee -i -a ./5_cam2map.log ./full_log.log"
]
},
{
Expand Down

0 comments on commit 5892a7c

Please sign in to comment.