From 4167836c37333e21665154221c741e09c0813163 Mon Sep 17 00:00:00 2001
From: "edward.safford" <edward.safford@noaa.gov>
Date: Fri, 12 Jan 2024 14:12:38 +0000
Subject: [PATCH] Ref #173

Modify 1-d read to handle both fortran and perl binary files.
---
 src/eva/data/mon_data_space.py | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/eva/data/mon_data_space.py b/src/eva/data/mon_data_space.py
index 51f1ffad..44570769 100644
--- a/src/eva/data/mon_data_space.py
+++ b/src/eva/data/mon_data_space.py
@@ -123,7 +123,7 @@ def execute(self, dataset_config, data_collections, timing):
             else:
                 # read data file
                 darr, cycle_tm = self.read_ieee(filename, coords, dims, ndims_used,
-                                                dims_arr, nvars, vars)
+                                                dims_arr, nvars, vars, gsistat=attribs['gsistat'])
 
             # add cycle as a variable to data array
             cyc_darr = self.var_to_np_array(dims, ndims_used, dims_arr, cycle_tm)
@@ -317,7 +317,7 @@ def get_ctl_dict(self, control_file):
         coord_list = []
         dims = {'xdef': 0, 'ydef': 0, 'zdef': 0}
         dim_list = []
-        attribs = {'sensor': None, 'sat': None, 'datatype': None}
+        attribs = {'sensor': None, 'sat': None, 'datatype': None, 'gsistat': False}
         vars = []
         nvars = 0
         chans_dict = None
@@ -396,6 +396,9 @@ def get_ctl_dict(self, control_file):
                 if line.find('datatype station') != -1 or line.find('DTYPE station') != -1:
                     attribs['datatype'] = 'station'
 
+                if line.find('gsistat') != -1:
+                    attribs['gsistat'] = True
+
                 if line.find('subtype') != -1:
                     strs = line.split()
                     datatype.append(strs[self.type_con] + strs[self.datatype_con] + '_' +
@@ -514,7 +517,7 @@ def get_stn_ctl_dict(self, control_file):
         coords = {'xdef': 'Level', 'ydef': 'Nobs', 'zdef': None}
         dims = {'xdef': 0, 'ydef': 0, 'zdef': 0}
         dim_list = []
-        attribs = {'sensor': None, 'sat': None, 'datatype': 'station'}
+        attribs = {'sensor': None, 'sat': None, 'datatype': 'station', 'gsistat': False}
         vars = []
         nvars = 0
         chans_dict = None
@@ -605,7 +608,8 @@ def get_stn_ctl_dict(self, control_file):
 
     # ----------------------------------------------------------------------------------------------
 
-    def read_ieee(self, file_name, coords, dims, ndims_used, dims_arr, nvars, vars, file_path=None):
+    def read_ieee(self, file_name, coords, dims, ndims_used, dims_arr, nvars, vars,
+                  file_path=None, gsistat=False):
 
         """
         Read data from an IEEE file and arrange it into a numpy array.
@@ -643,8 +647,8 @@ def read_ieee(self, file_name, coords, dims, ndims_used, dims_arr, nvars, vars,
             self.logger.info(f"WARNING:  file {filename} is missing")
             load_data = False
 
-        if ndims_used == 1:		# MinMon
-            rtn_array = np.empty((0, dims[dims_arr[0]]), datatype=float)
+        if ndims_used == 1:		# MinMon, regional RadMon time,bcoef,bcor
+            rtn_array = np.empty((0, dims[dims_arr[0]]), dtype=float)
             if not load_data:
                 zarray = np.zeros((dims[dims_arr[0]]), float)
             dimensions = [dims[dims_arr[0]]]
@@ -688,11 +692,14 @@ def read_ieee(self, file_name, coords, dims, ndims_used, dims_arr, nvars, vars,
             for x in range(nvars):
                 if load_data:
                     if ndims_used == 1:
-                        with open(filename, 'rb') as infile:
-                            binary_data = infile.read()
+                        if gsistat:
+                            with open(filename, 'rb') as infile:
+                                binary_data = infile.read()
+                            arr = array.array('f')
+                            arr.frombytes(binary_data)
+                        else:
+                            arr = f.read_reals(dtype=np.dtype('>f4'))
 
-                        arr = array.array('f')
-                        arr.frombytes(binary_data)
                     else:
                         arr = np.transpose(f.read_reals(dtype=np.dtype('>f4')).reshape(dimensions))
                 else: