From 247ab6ebff7bdb03632c028a25f520a3fff31ee1 Mon Sep 17 00:00:00 2001
From: acpaquette <acp263@nau.edu>
Date: Wed, 13 Jun 2018 13:12:34 -0700
Subject: [PATCH] PRadius Fix (#54)

* Small updates to get the scripts working.

* Fixed pradius calculations, and made some small changes.
---
 bin/isisnet2socet               | 11 ++++++-----
 bin/socetnet2isis               |  8 ++++----
 plio/__init__.py                |  1 +
 plio/spatial/transformations.py |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/bin/isisnet2socet b/bin/isisnet2socet
index 6243678..5291f16 100644
--- a/bin/isisnet2socet
+++ b/bin/isisnet2socet
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import argparse
 import os
+import math
 
 import pandas as pd
 
@@ -15,7 +16,7 @@ def parse_args():
     # Add args here
     parser.add_argument('cnet_file', help='Path to an isis control network.')
     parser.add_argument('e_radius', type=float, help='The semimajor radius of a given target.')
-    parser.add_argument('p_radius', type=float, help='The semiminor radius of a given target.')
+    parser.add_argument('eccentricity', type=float, help='The eccentricity of a given target.')
     parser.add_argument('cub_path', help='Path to the cub files associated with a control network.')
     parser.add_argument('cub_extension', help='Extension for all cubes.')
     parser.add_argument('cub_list', help='Path to a list file of all cubes being used')
@@ -31,7 +32,7 @@ def main(args):
     df = cn.from_isis(args.cnet_file)
 
     e_radius = args.e_radius
-    p_radius = e_radius * (1 - args.p_radius)
+    p_radius = e_radius * math.sqrt((1 - (args.eccentricity ** 2)))
 
     cub_path = args.cub_path
     extension = args.cub_extension
@@ -65,9 +66,9 @@ def main(args):
     # Begin translation
     # Remap the ISIS columns to socet column names
     column_map = {'id': 'pt_id', 'line': 'l.', 'sample': 's.',
-                  'lineResidual': 'res_l', 'sampleResidual': 'res_s', 'type': 'known',
-                  'aprioriLatitudeSigma': 'sig0', 'aprioriLongitudeSigma': 'sig1', 'aprioriRadiusSigma': 'sig2',
-                  'linesigma': 'sig_l', 'samplesigma': 'sig_s', 'ignore': 'stat'}
+                               'lineResidual': 'res_l', 'sampleResidual': 'res_s', 'type': 'known',
+                               'aprioriLatitudeSigma': 'sig0', 'aprioriLongitudeSigma': 'sig1', 'aprioriRadiusSigma': 'sig2',
+                               'linesigma': 'sig_l', 'samplesigma': 'sig_s', 'ignore': 'stat'}
 
     # Depending on the adjusted flag, set the renames for columns appropriately
     if adjusted_flag:
diff --git a/bin/socetnet2isis b/bin/socetnet2isis
index f549df8..53cef03 100644
--- a/bin/socetnet2isis
+++ b/bin/socetnet2isis
@@ -64,10 +64,10 @@ def main(args):
 
     # Define column remap for socet dataframe
     column_map = {'pt_id': 'id', 'l.': 'y', 's.': 'x',
-                  'res_l': 'lineResidual', 'res_s': 'sampleResidual', 'known': 'Type',
-                  'lat_Y_North': 'aprioriY', 'long_X_East': 'aprioriX', 'ht': 'aprioriZ',
-                  'sig0': 'aprioriLatitudeSigma', 'sig1': 'aprioriLongitudeSigma', 'sig2': 'aprioriRadiusSigma',
-                  'sig_l': 'linesigma', 'sig_s': 'samplesigma'}
+                               'res_l': 'lineResidual', 'res_s': 'sampleResidual', 'known': 'Type',
+                               'lat_Y_North': 'aprioriY', 'long_X_East': 'aprioriX', 'ht': 'aprioriZ',
+                               'sig0': 'aprioriLatitudeSigma', 'sig1': 'aprioriLongitudeSigma', 'sig2': 'aprioriRadiusSigma',
+                               'sig_l': 'linesigma', 'sig_s': 'samplesigma'}
 
     # Rename the columns using the column remap above
     socet_df.rename(columns = column_map, inplace=True)
diff --git a/plio/__init__.py b/plio/__init__.py
index 1269de6..68d9a90 100755
--- a/plio/__init__.py
+++ b/plio/__init__.py
@@ -21,3 +21,4 @@ from . import data
 from . import examples
 from . import geofuncs
 from . import utils
+from . import spatial
diff --git a/plio/spatial/transformations.py b/plio/spatial/transformations.py
index 237f403..b04e92c 100644
--- a/plio/spatial/transformations.py
+++ b/plio/spatial/transformations.py
@@ -567,7 +567,7 @@ def fix_sample_line(record, serial_dict, extension, cub_path):
 
     new_line = record['l.'] - (int(line_size/2.0)) - 1
     new_sample = record['s.'] - (int(sample_size/2.0)) - 1
-    
+
     return new_line, new_sample
 
 def ignore_toggle(record):
-- 
GitLab