Merge pull request #90 from salomoneliassonSMHI/SBAFsv3

Adding v3 SBAFs

Author: ninahakansson

.gitignore

@@ -1,3 +1,4 @@
+build
 *py~
 *pyc
 *~

bin/vgac2pps.py

@@ -21,11 +21,12 @@
 #   Martin Raspaud <martin.raspaud@smhi.se>
 #   Nina Hakansson <nina.hakansson@smhi.se>
 #   Adam.Dybbroe <adam.dybbroe@smhi.se>
+#   Salomon.Eliasson <salomon.eliasson@smhi.se>
 
 """Script to convert VIIRS level-1 to PPS level-1c format using Pytroll/Satpy."""
 
 import argparse
-from level1c4pps.vgac2pps_lib import process_one_scene
+from level1c4pps.vgac2pps_lib import SBAF, process_one_scene
 
 
 if __name__ == "__main__":
@@ -44,8 +45,11 @@
                         help="Engine for saving netcdf files netcdf4 or h5netcdf (default).")
     parser.add_argument('-all_ch', '--all_channels', action='store_true',
                         help="Save all 21 channels to level1c4pps file.")
-    parser.add_argument('-n19', '--as_noaa19', action='store_true',
-                        help="Save only the AVHRR (1,2, 3B, 4, 5) channels to level1c4pps file. And apply SBAFs to the channels.")
+    parser.add_argument('-n19', '--as_noaa19',
+                        options=[version for version in SBAF],
+                        default=None,
+                        help=("Save only the AVHRR (1,2, 3B, 4, 5) channels to level1c4pps file. "
+                              "And apply SBAFs to the channels."))
     parser.add_argument('-pps_ch', '--pps_channels', action='store_true',
                         help="Save only the necessary (for PPS) channels to level1c4pps file.")
     parser.add_argument('-avhrr_ch', '--avhrr_channels', action='store_true',
@@ -58,5 +62,6 @@
     options = parser.parse_args()
     process_one_scene(options.files, options.out_dir, engine=options.nc_engine,
                       all_channels=options.all_channels, pps_channels=options.pps_channels,
-                      orbit_n=options.orbit_number, as_noaa19=options.as_noaa19, avhrr_channels=options.avhrr_channels,
-                      split_files_at_midnight = not options.don_split_files_at_midnight)
+                      orbit_n=options.orbit_number, noaa19_sbaf_version=options.as_noaa19,
+                      avhrr_channels=options.avhrr_channels,
+                      split_files_at_midnight=not options.don_split_files_at_midnight)

level1c4pps/__init__.py

@@ -25,7 +25,7 @@
 from importlib.metadata import version
 import numpy as np
 import xarray as xr
-from datetime import datetime
+from datetime import datetime, timezone
 import os
 import logging
 import satpy
@@ -244,16 +244,16 @@ def centered_modulus(daz, divisor=360):
 def dt64_to_datetime(dt64):
     """Conversion of numpy.datetime64 to datetime objects."""
     # https://stackoverflow.com/questions/13703720/converting-between-datetime-timestamp-and-datetime64/46921593#46921593
-    if type(dt64) == np.datetime64:
+    if type(dt64) is np.datetime64:
         unix_epoch = np.datetime64(0, 's')
         one_second = np.timedelta64(1, 's')
         seconds_since_epoch = (dt64 - unix_epoch) / one_second
-        dt = datetime.utcfromtimestamp(seconds_since_epoch)
+        dt = datetime.fromtimestamp(seconds_since_epoch, timezone.utc).replace(tzinfo=None)
         return dt
-    elif type(dt64) == np.float64:
+    elif type(dt64) is np.float64:
         seconds_since_epoch = dt64
-        dt = datetime.utcfromtimestamp(seconds_since_epoch)
-        return dt  
+        dt = datetime.fromtimestamp(seconds_since_epoch, timezone.utc).replace(tzinfo=None)
+        return dt
     return dt64
 
 
@@ -341,7 +341,7 @@ def rename_latitude_longitude(scene):
     for alt_latname in ['lat_pixels', 'm_latitude', 'latitude_m', 'i_latitude']:
         if alt_latname in scene and 'latitude' not in scene:
             lat_name_satpy = alt_latname
-    for alt_lonname in ['lon_pixels', 'm_longitude','longitude_m', 'i_longitude']:
+    for alt_lonname in ['lon_pixels', 'm_longitude', 'longitude_m', 'i_longitude']:
         if alt_lonname in scene and 'longitude' not in scene:
             lon_name_satpy = alt_lonname
     scene[lat_name_satpy].attrs['name'] = 'lat'
@@ -565,12 +565,15 @@ def compose_filename(scene, out_path, instrument, band=None):
     return filename
 
 
-def get_header_attrs(scene, band, sensor='avhrr'):
+def get_header_attrs(scene, band, sensor='avhrr', sbaf_version='NO_SBAF'):
     """Get global netcdf attributes."""
     header_attrs = scene.attrs.copy()
     header_attrs['start_time'] = datetime.strftime(dt64_to_datetime(band.attrs['start_time']),
                                                    "%Y-%m-%d %H:%M:%S")
     header_attrs['end_time'] = datetime.strftime(dt64_to_datetime(band.attrs['end_time']),
                                                  "%Y-%m-%d %H:%M:%S")
     header_attrs['sensor'] = sensor
+
+    header_attrs['sbaf_version'] = sbaf_version
+
     return header_attrs

level1c4pps/tests/test_vgac2pps.py

@@ -24,7 +24,7 @@
 
 import netCDF4
 import unittest
-from datetime import datetime
+from datetime import datetime, timezone
 try:
     from unittest import mock
 except ImportError:
@@ -46,8 +46,8 @@ def setUp(self):
         ir_108 = mock.MagicMock(attrs={'name': 'image1',
                                        'id_tag': 'ch_tb11',
                                        'wavelength': [1, 2, 3, 'um'],
-                                       'start_time': datetime.utcnow(),
-                                       'end_time': datetime.utcnow(),
+                                       'start_time': datetime.now(timezone.utc),
+                                       'end_time': datetime.now(timezone.utc),
                                        'history': 'dummy',
                                        'platform_name': 'tirosn',
                                        'orbit_number': 99999})
@@ -97,7 +97,7 @@ def test_process_one_scene(self):
 
         vgac2pps.process_one_scene(
             ['./level1c4pps/tests/VGAC_VJ102MOD_A2018305_1042_n004946_K005.nc'],
-            out_path='./level1c4pps/tests/',
+            out_path='./level1c4pps/tests/'
         )
         filename = './level1c4pps/tests/S_NWC_viirs_noaa20_00000_20181101T1042080Z_20181101T1224090Z.nc'
         # written with hfnetcdf read with NETCDF4 ensure compatability
@@ -121,13 +121,14 @@ def test_process_one_scene(self):
 
         np.testing.assert_almost_equal(pps_nc.variables['image1'].sun_earth_distance_correction_factor,
                                        1.0, decimal=4)
+
     def test_process_one_scene_n19(self):
         """Test process one scene for one example file."""
 
         vgac2pps.process_one_scene(
             ['./level1c4pps/tests/VGAC_VJ102MOD_A2018305_1042_n004946_K005.nc'],
             out_path='./level1c4pps/tests/',
-            as_noaa19=True,
+            noaa19_sbaf_version='v6'
         )
         filename = './level1c4pps/tests/S_NWC_avhrr_vgac20_00000_20181101T1042080Z_20181101T1224090Z.nc'
         filename_viirs = './level1c4pps/tests/S_NWC_viirs_noaa20_00000_20181101T1042080Z_20181101T1224090Z.nc'
@@ -155,14 +156,14 @@ def test_process_one_scene_n19(self):
                                        1.0, decimal=4)
 
         np.testing.assert_equal(pps_nc.__dict__["platform"], "vgac20")
-        self.assertTrue(np.abs(pps_nc.variables['image1'][0,0,0] - pps_nc_viirs.variables['image1'][0,0,0])>0.01)
-        
+        self.assertTrue(np.abs(pps_nc.variables['image1'][0, 0, 0] - pps_nc_viirs.variables['image1'][0, 0, 0]) > 0.01)
+
     def test_process_one_scene_midnight(self):
         """Test process one scene for one example file."""
 
         vgac2pps.process_one_scene(
             ['./level1c4pps/tests/VGAC_VNPP02MOD_A2012365_2304_n06095_K005.nc'],
-            out_path='./level1c4pps/tests/',
+            out_path='./level1c4pps/tests/'
         )
         filename = './level1c4pps/tests/S_NWC_viirs_npp_00000_20121230T2359563Z_20121230T2359599Z.nc'
         # written with hfnetcdf read with NETCDF4 ensure compatability