From 5da2071a0ade8d776709fc2137f173c9fdf6cb68 Mon Sep 17 00:00:00 2001
From: Adam Paquette <acp263@nau.edu>
Date: Fri, 4 May 2018 17:38:50 -0700
Subject: [PATCH] Update to bin script and moved read atf.
---
bin/Socetnet2ISIS.py | 47 +---------------------------------
plio/io/io_bae.py | 60 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 61 insertions(+), 46 deletions(-)
diff --git a/bin/Socetnet2ISIS.py b/bin/Socetnet2ISIS.py
index 7976517..047e35f 100644
--- a/bin/Socetnet2ISIS.py
+++ b/bin/Socetnet2ISIS.py
@@ -1,49 +1,4 @@
import os
import numpy as np
-# Reads a .atf file and outputs all of the
-# .ipf, .gpf, .sup, .prj, and path to locate the
-# .apf file (should be the same as all others)
-def read_atf(atf_file):
- with open(atf_file) as f:
-
- files = []
- ipf = []
- sup = []
- files_dict = []
-
- # Grabs every PRJ, GPF, SUP, and IPF image from the ATF file
- for line in f:
- if line[-4:-1] == 'prj' or line[-4:-1] == 'gpf' or line[-4:-1] == 'sup' or line[-4:-1] == 'ipf' or line[-4:-1] == 'atf':
- files.append(line)
-
- files = np.array(files)
-
- # Creates appropriate arrays for certain files in the right format
- for file in files:
- file = file.strip()
- file = file.split(' ')
-
- # Grabs all the IPF files
- if file[1].endswith('.ipf'):
- ipf.append(file[1])
-
- # Grabs all the SUP files
- if file[1].endswith('.sup'):
- sup.append(file[1])
-
- files_dict.append(file)
-
- # Creates a dict out of file lists for GPF, PRJ, IPF, and ATF
- files_dict = (dict(files_dict))
-
- # Sets the value of IMAGE_IPF to all IPF images
- files_dict['IMAGE_IPF'] = ipf
-
- # Sets the value of IMAGE_SUP to all SUP images
- files_dict['IMAGE_SUP'] = sup
-
- # Sets the value of PATH to the path of the ATF file
- files_dict['PATH'] = os.path.dirname(os.path.abspath(atf_file))
-
- return files_dict
+from plio.io.io_bae import read_atf, read_gpf, read_ipf
diff --git a/plio/io/io_bae.py b/plio/io/io_bae.py
index 37e5abc..2810a8e 100644
--- a/plio/io/io_bae.py
+++ b/plio/io/io_bae.py
@@ -271,3 +271,63 @@ def save_gpf(df, output_file):
outGPF.close()
return
+
+def read_atf(atf_file):
+ """
+ Reads a .atf file and outputs all of the
+ .ipf, .gpf, .sup, .prj, and path to locate the
+ .apf file (should be the same as all others)
+
+ Parameters
+ ----------
+ atf_file : str
+ Full path to a socet atf file
+
+ Returns
+ -------
+ files_dict : dict
+ Dict of files and data associated with a socet
+ project
+ """
+ with open(atf_file) as f:
+
+ files = []
+ ipf = []
+ sup = []
+ files_dict = []
+
+ # Grabs every PRJ, GPF, SUP, and IPF image from the ATF file
+ for line in f:
+ if line[-4:-1] == 'prj' or line[-4:-1] == 'gpf' or line[-4:-1] == 'sup' or line[-4:-1] == 'ipf' or line[-4:-1] == 'atf':
+ files.append(line)
+
+ files = np.array(files)
+
+ # Creates appropriate arrays for certain files in the right format
+ for file in files:
+ file = file.strip()
+ file = file.split(' ')
+
+ # Grabs all the IPF files
+ if file[1].endswith('.ipf'):
+ ipf.append(file[1])
+
+ # Grabs all the SUP files
+ if file[1].endswith('.sup'):
+ sup.append(file[1])
+
+ files_dict.append(file)
+
+ # Creates a dict out of file lists for GPF, PRJ, IPF, and ATF
+ files_dict = (dict(files_dict))
+
+ # Sets the value of IMAGE_IPF to all IPF images
+ files_dict['IMAGE_IPF'] = ipf
+
+ # Sets the value of IMAGE_SUP to all SUP images
+ files_dict['IMAGE_SUP'] = sup
+
+ # Sets the value of PATH to the path of the ATF file
+ files_dict['PATH'] = os.path.dirname(os.path.abspath(atf_file))
+
+ return files_dict
--
GitLab