Unverified Commit 1d96ba89 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

The parameter 'disable_progressbars' is now correctly passed to SICOR....


The parameter 'disable_progressbars' is now correctly passed to SICOR. Replaced some deprecated method calls. Updated version info and HISTORY.rst.
Signed-off-by: Daniel Scheffler's avatardanschef <daniel.scheffler@gfz-potsdam.de>
parent 0e3c9092
Pipeline #6489 passed with stage
......@@ -9,6 +9,26 @@ New features / improvements:
* Added source code repository link to table of contents of documentation.
* Updated license notes, copyright info, contributor guidelines and logos.
* Updated author info.
* Revised package short description.
* Added arosics to requirements.
* SensorMapGeometryTransformer is now imported from new library sensormapgeo.
* Updated dependencies and added pip to environment_enpt.yml.
* Boolean values are now correctly passed from the command line interface to EnPT.
* Added a tutorial to the docs.
* Some code improvements.
* Added output validation to AC.
* The parameter 'disable_progressbars' is now correctly passed to SICOR.
Bug fixes:
* Fixed "Encoding error: 'ascii' codec can't decode byte 0xc3 in position 320: ordinal not in range(128)".
* Fixed unexpected title exception during 'make docs'.
* Fixed broken badge. Removed ssh links.
* Fixed UTF-8 error when running setup.py. Updated installation instructions.
* Fix for wrong input parameter data types at 'enable_keystone_correction' and 'enable_vnir_swir_coreg'.
* Fixed scheme error: 'scale_factor_boa_ref must be of integer type'.
* Fix for not validating the input data for enmap_image_gapfill
0.9.0 (2019-10-18)
......
......@@ -62,7 +62,7 @@ class AtmosphericCorrector(object):
options["EnMAP"]["Retrieval"]["fn_LUT"] = \
path.join(path.abspath(sicor.__path__[0]), 'tables', 'EnMAP_LUT_MOD5_formatted_1nm')
# options["ECMWF"]["path_db"] = "./ecmwf" # disbled as it is not needed at the moment
# TODO disable_progress_bars?
if enmap_ImageL1.meta.aot is not None:
options["EnMAP"]["FO_settings"]["aot"] = enmap_ImageL1.meta.aot
......@@ -70,6 +70,7 @@ class AtmosphericCorrector(object):
options["EnMAP"]["Retrieval"]["fast"] = True
options["EnMAP"]["Retrieval"]["ice"] = self.cfg.enable_ice_retrieval
options["EnMAP"]["Retrieval"]["cpu"] = self.cfg.CPUs or cpu_count()
options["EnMAP"]["Retrieval"]["disable_progressbars"] = self.cfg.disable_progress_bars
return options
......
......@@ -24,6 +24,6 @@
# You should have received a copy of the GNU Lesser General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.9.13'
__versionalias__ = '20200113.05'
__version__ = '0.9.14'
__versionalias__ = '20200130.01'
__author__ = 'Daniel Scheffler'
......@@ -99,4 +99,4 @@ class Test_DEM_Processor(TestCase):
def test_to_sensor_geometry(self):
dem_sensor_geo = self.DP_mapgeo.to_sensor_geometry(lons=self.lons, lats=self.lats)
self.assertEquals(dem_sensor_geo.shape, (100, 1000))
self.assertEqual(dem_sensor_geo.shape, (100, 1000))
......@@ -133,7 +133,7 @@ class Test_VNIR_SWIR_SensorGeometryTransformer(TestCase):
def test_transform_sensorgeo_VNIR_to_SWIR(self):
data_swir_sensorgeo = self.VS_SGT.transform_sensorgeo_VNIR_to_SWIR(self.data2transform_vnir_sensorgeo)
self.assertIsInstance(data_swir_sensorgeo, np.ndarray)
self.assertEquals(data_swir_sensorgeo.shape, self.data2transform_vnir_sensorgeo.shape)
self.assertEqual(data_swir_sensorgeo.shape, self.data2transform_vnir_sensorgeo.shape)
# GeoArray(data_swir_sensorgeo, nodata=0)\
# .save('enpt_vnir_transformed_to_swir_sensorgeo_nearest.bsq')
# GeoArray(self.data2transform_swir_sensorgeo, nodata=0)\
......@@ -142,7 +142,7 @@ class Test_VNIR_SWIR_SensorGeometryTransformer(TestCase):
def test_transform_sensorgeo_SWIR_to_VNIR(self):
data_vnir_sensorgeo = self.VS_SGT.transform_sensorgeo_SWIR_to_VNIR(self.data2transform_swir_sensorgeo)
self.assertIsInstance(data_vnir_sensorgeo, np.ndarray)
self.assertEquals(data_vnir_sensorgeo.shape, self.data2transform_vnir_sensorgeo.shape)
self.assertEqual(data_vnir_sensorgeo.shape, self.data2transform_vnir_sensorgeo.shape)
GeoArray(data_vnir_sensorgeo, nodata=0)\
.save('/home/gfz-fe/scheffler/temp/enpt_testing/enpt_swir_transformed_to_vnir_sensorgeo_nearest_v4.bsq')
# GeoArray(self.data2transform_vnir_sensorgeo, nodata=0)\
......@@ -152,7 +152,7 @@ class Test_VNIR_SWIR_SensorGeometryTransformer(TestCase):
data2transform_swir_sensorgeo_3D = np.dstack([self.data2transform_swir_sensorgeo] * 2)
data_vnir_sensorgeo = self.VS_SGT.transform_sensorgeo_SWIR_to_VNIR(data2transform_swir_sensorgeo_3D)
self.assertIsInstance(data_vnir_sensorgeo, np.ndarray)
self.assertEquals(data_vnir_sensorgeo.shape, (*self.data2transform_swir_sensorgeo.shape, 2))
self.assertEqual(data_vnir_sensorgeo.shape, (*self.data2transform_swir_sensorgeo.shape, 2))
def test_3D_geolayer(self):
with self.assertRaises(RuntimeError):
......@@ -194,9 +194,9 @@ class Test_RPC_Geolayer_Generator(TestCase):
def test_normalize_coordinates(self):
lon_norm, lat_norm, height_norm = \
self.RPCGG._normalize_map_coordinates(lon=self.lons, lat=self.lats, height=self.heights)
self.assertEquals(lon_norm.shape, self.lons.shape)
self.assertEquals(lat_norm.shape, self.lats.shape)
self.assertEquals(height_norm.shape, self.heights.shape)
self.assertEqual(lon_norm.shape, self.lons.shape)
self.assertEqual(lat_norm.shape, self.lats.shape)
self.assertEqual(height_norm.shape, self.heights.shape)
def test_compute_normalized_image_coordinates(self):
row_norm, col_norm = self.RPCGG._compute_normalized_image_coordinates(
......@@ -216,7 +216,7 @@ class Test_RPC_Geolayer_Generator(TestCase):
def test_compute_geolayer(self):
lons_interp, lats_interp = self.RPCGG.compute_geolayer()
self.assertEquals(lons_interp.shape, lats_interp.shape)
self.assertEquals(lons_interp.shape, self.dims_sensorgeo)
self.assertEqual(lons_interp.shape, lats_interp.shape)
self.assertEqual(lons_interp.shape, self.dims_sensorgeo)
self.assertFalse(np.isnan(lons_interp).any())
self.assertFalse(np.isnan(lats_interp).any())
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment