Commit b0333947 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Created a commonly usable base class "Dataset" from which GMS_object is subclassed.

- added submodule 'model' including the module 'dataset'
- moved all GMS specific attributes and functions of GMS_object to new class /models/dataset/Dataset

updated __version__
parent 9b284fe8
...@@ -15,7 +15,7 @@ from . import config ...@@ -15,7 +15,7 @@ from . import config
from .processing.process_controller import process_controller from .processing.process_controller import process_controller
__version__ = '20170428.01' __version__ = '20170523.01'
__author__ = 'Daniel Scheffler' __author__ = 'Daniel Scheffler'
__all__ = ['algorithms', __all__ = ['algorithms',
'io', 'io',
......
...@@ -115,7 +115,7 @@ class METADATA(object): ...@@ -115,7 +115,7 @@ class METADATA(object):
self.map_info = [] self.map_info = []
self.projection = "" self.projection = ""
self.wvlUnit = "" self.wvlUnit = ""
self.spec_vals = {} self.spec_vals = {'fill': None, 'zero': None, 'saturated':None}
"""****OBJECT METHODS******************************************************""" """****OBJECT METHODS******************************************************"""
......
...@@ -39,7 +39,7 @@ if __name__ == "__main__": ...@@ -39,7 +39,7 @@ if __name__ == "__main__":
import sys import sys
from datetime import datetime from datetime import datetime
sys.path.append("/home/danscheff/GeoMultiSens_dev/") # FIXME sys.path.append("/home/danscheff/GeoMultiSens/") # FIXME
fn_l1a = glob("./clfs/ETM+*.pkl")[0] # gms l1a object fn_l1a = glob("./clfs/ETM+*.pkl")[0] # gms l1a object
with open(fn_l1a, "rb") as fl: with open(fn_l1a, "rb") as fl:
......
This diff is collapsed.
...@@ -407,7 +407,7 @@ def get_dem_by_extent(cornerCoords_tgt, prj, tgt_xgsd, tgt_ygsd): ...@@ -407,7 +407,7 @@ def get_dem_by_extent(cornerCoords_tgt, prj, tgt_xgsd, tgt_ygsd):
#for i in [path_tmp_merged, t_xmin, t_ymax, t_xmax, t_ymin, ' '.join(gdalBILPaths)]: #for i in [path_tmp_merged, t_xmin, t_ymax, t_xmax, t_ymin, ' '.join(gdalBILPaths)]:
# print(i) # print(i)
cmd = 'gdal_merge.py -o %s -of Gtiff -ul_lr %s %s %s %s %s' % \ cmd = 'gdal_merge.py -o %s -of Gtiff -ul_lr %s %s %s %s %s' % \
(path_tmp_merged, t_xmin, t_ymax, t_xmax, t_ymin, ' '.join(gdalBILPaths)) (path_tmp_merged, t_xmin, t_ymax, t_xmax, t_ymin, ' '.join(gdalBILPaths)) # FIXME default resampling is nearest neighbour
out, exitcode, err = HLP_F.subcall_with_output(cmd) out, exitcode, err = HLP_F.subcall_with_output(cmd)
if exitcode!=0: if exitcode!=0:
print('Error merging DEM tiles:', err.decode('utf8')) print('Error merging DEM tiles:', err.decode('utf8'))
......
...@@ -14,7 +14,7 @@ except ImportError: ...@@ -14,7 +14,7 @@ except ImportError:
class GMS_logger(logging.Logger): class GMS_logger(logging.Logger):
def __init__(self, name_logfile, fmt_suffix=None, path_logfile=None, log_level='INFO', append=True): def __init__(self, name_logfile, fmt_suffix=None, path_logfile=None, log_level='INFO', append=True):
# type: (str, int, str, bool) -> None # type: (str, any, str, any, bool) -> None
"""Returns a logging.logger instance pointing to the given logfile path. """Returns a logging.logger instance pointing to the given logfile path.
:param name_logfile: :param name_logfile:
:param fmt_suffix: if given, it will be included into log formatter :param fmt_suffix: if given, it will be included into log formatter
......
This diff is collapsed.
...@@ -8,15 +8,8 @@ import warnings ...@@ -8,15 +8,8 @@ import warnings
import matplotlib import matplotlib
matplotlib.use('Agg', warn=False) # switch matplotlib backend to 'Agg' and disable warning in case its already 'Agg' matplotlib.use('Agg', warn=False) # switch matplotlib backend to 'Agg' and disable warning in case its already 'Agg'
try: from GeoMultiSens import process_controller, __version__
from GeoMultiSens import process_controller, __version__ from GeoMultiSens.misc.database_tools import GMS_JOB
from GeoMultiSens.misc.database_tools import GMS_JOB
except ImportError as e:
try:
from GeoMultiSens_dev import process_controller, __version__
from GeoMultiSens_dev.misc.database_tools import GMS_JOB
except:
raise e
def run_from_jobid(args): def run_from_jobid(args):
......
Markdown is supported
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