diff --git a/bin/isisnet2socet b/bin/isisnet2socet index 62436781ec718bf632a5e9e35cadcdd142349517..5291f162b774e2b0d743ea44eca00c6f0a987159 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 f549df8c8328dbfd9c8b3862a894d2a4d72017e7..53cef03df1d73c4b711bb958125f6e57b109e906 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 1269de6a041f130b3fa53f8bf3bd1ca787e2677f..68d9a9029d20f07dac917cd3d048497058e787b8 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 237f403aee680b52d0461737275f0637502ef7a6..b04e92c5b63003546ea7c65b4071cfd398a6ed38 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):