Merge pull request DOI-USGS#2 from acpaquette/master

Final working notebook.
ladoramkershner · May 5, 2018 · 2d0053b · 2d0053b
2 parents 10997c2 + 2777c52
commit 2d0053b
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/notebooks/Socet2ISIS.ipynb b/notebooks/Socet2ISIS.ipynb
@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -16,7 +16,7 @@
     "import math\n",
     "import pyproj\n",
     "\n",
-    "sys.path.insert(0, \"/home/tthatcher/Desktop/Projects/Plio/plio\")\n",
+    "# sys.path.insert(0, \"/home/tthatcher/Desktop/Projects/Plio/plio\")\n",
     "\n",
     "from plio.examples import get_path\n",
     "from plio.io.io_bae import read_gpf, read_ipf\n",
@@ -26,7 +26,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -212,7 +212,7 @@
     "    apply_transformations(atf_dict, socet_df)\n",
     "    \n",
     "    # Define column remap for socet dataframe\n",
-    "    column_remap = {'l.': 'x', 's.': 'y',\n",
+    "    column_remap = {'l.': 'y', 's.': 'x',\n",
     "                    'res_l': 'LineResidual', 'res_s': 'SampleResidual', 'known': 'Type',\n",
     "                    'lat_Y_North': 'AprioriY', 'long_X_East': 'AprioriX', 'ht': 'AprioriZ',\n",
     "                    'sig0': 'AprioriLatitudeSigma', 'sig1': 'AprioriLongitudeSigma', 'sig2': 'AprioriRadiusSigma'}\n",
@@ -228,13 +228,15 @@
     "    serial_dict = dict()\n",
     "    \n",
     "    for image in images:\n",
-    "        serial_dict[image] = sn.generate_serial_number(os.path.join(path, image + extension))\n",
+    "        snum = sn.generate_serial_number(os.path.join(path, image + extension))\n",
+    "        snum = snum.replace('Mars_Reconnaissance_Orbiter', 'MRO')\n",
+    "        serial_dict[image] = snum\n",
     "    return serial_dict"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 10,
    "metadata": {
     "scrolled": false
    },
@@ -255,7 +257,6 @@
     "# Setup stuffs for the cub information namely the path and extension\n",
     "path = '/Volumes/Blueman/'\n",
     "extension = '.lev1.cub'\n",
-    "\n",
     "prj_file = get_path('CTX_Athabasca_Middle_step0.atf')\n",
     "\n",
     "socet_df = socet2isis(prj_file)\n",
@@ -265,7 +266,7 @@
     "serial_dict = serial_numbers(images, path, extension)\n",
     "\n",
     "# creates the control network\n",
-    "cnet = cn.to_isis('/Volumes/Blueman/cn.csv', socet_df, serial_dict)"
+    "cn.to_isis('/Volumes/Blueman/cn.net', socet_df, serial_dict)"
    ]
   },
   {