added unit tests for new functionality, minor changes to read/write functions for CR coordinate file

Author: Thomas Fuhrmann

coral/dataio.py

@@ -5,7 +5,7 @@
 import numpy as np
 import rasterio as rio
 from rasterio.windows import Window
-import os
+import sys, os
 
 
 def readfile(file, sub_im, cr):
@@ -90,10 +90,11 @@ def read_radar_coords(filename):
             # get site name
             line = line.strip("\n")
             site.append(line.split("\t")[0])
-            az.append(line.split("\t")[6])
-            rg.append(line.split("\t")[7])
-            idx = idx + 1
+            az.append(line.split("\t")[-2])
+            rg.append(line.split("\t")[-1])
+            idx = idx + 1  
         print("Radar coordinates at %d sites read" % (idx))
+        f.close()
     else:
         print("ERROR: Can't read file", filename)
         sys.exit()
@@ -121,6 +122,8 @@ def write_radar_coords(filename_init, filename, sites, geom):
                 out_line = temp2 + "\t" + str(cr[1][1]) + \
                        "\t" + str(cr[1][0]) + "\n"           
             fout.write(out_line)
+        f.close()
+        fout.close()    
     else:
         print("ERROR: Can't read file", filename_init)
         sys.exit()

data/site_az_rg.txt

@@ -0,0 +1 @@
+SERF	110	87

data/site_lat_lon_hgt_date1_date2_az_rg.txt

@@ -0,0 +1 @@
+SERF	-12.34	123.45	67.89	20180701	99999999	110	87

tests/test_coral.py

@@ -5,7 +5,7 @@
 import os.path
 import numpy as np
 from coral.corner_reflector import *
-from coral.dataio import readpar, readmli
+from coral.dataio import readpar, readmli, read_radar_coords, write_radar_coords
 
 class TestCoral(unittest.TestCase):
     @classmethod
@@ -157,6 +157,59 @@ def test_loop(self):
 
         # test the mean value of the average intensity image
         self.assertEqual(round(np.mean(avgI), 6), -11.385613) # -11.385613198856245
+        
+        
+class TestShift(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.files = []
+        for file in glob.glob("data/*.mli"):
+            cls.files.append(file)
+
+        cls.files.sort()
+        cls.sub_im = 51
+        cls.targ_win_sz = 5
+        cls.clt_win_sz = 9
+        cls.cr = [ 86, 111] # coordinates changed to check shift
+
+    def test_loop(self):
+        '''test the coordinate shift'''
+        avgI, rcs, scr, Avg_clt, t, cr_new, cr_pos = loop(self.files, self.sub_im, self.cr, self.targ_win_sz, self.clt_win_sz)
+
+        # test array containing values of shift to be applied to radar coordinates
+        self.assertEqual(cr_pos[0], 52)  
+        self.assertEqual(cr_pos[1], 50)         
+
+        
+class TestCRfiles(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.file_in1 = "data/site_az_rg.txt"
+        cls.file_in2 = "data/site_lat_lon_hgt_date1_date2_az_rg.txt"
+        cls.file_out1 = "data/site_az_rg_new.txt"
+        cls.file_out2 = "data/site_lat_lon_hgt_date1_date2_az_rg_new.txt"
+        cls.sites = {'SERF' : np.array([[-999, -999],[ 87, 110]])}  
+        cls.geom = "desc"
+    
+    def test_cr_file(self):           
+        '''test the calculation loop function'''
+        # open reduced CR coordinate file
+        site, az, rg = read_radar_coords(self.file_in1)
+        self.assertEqual(int(rg[0]), 87)
+        self.assertEqual(int(az[0]), 110)
+        # write to new file
+        write_radar_coords(self.file_in1, self.file_out1, self.sites, self.geom)
+        assert os.path.exists(self.file_out1) == 1
+        os.remove(self.file_out1)
+        
+        # open full CR coordinate file
+        site, az, rg = read_radar_coords(self.file_in2)
+        self.assertEqual(int(rg[0]), 87)
+        self.assertEqual(int(az[0]), 110)
+        # write to new file
+        write_radar_coords(self.file_in2, self.file_out2, self.sites, self.geom)
+        assert os.path.exists(self.file_out2) == 1
+        os.remove(self.file_out2)
 
 
 if __name__ == '__main__':