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

Bugfix. Improved some log messages.

parent ade6fb76
...@@ -672,10 +672,10 @@ class L1A_object(GMS_object): ...@@ -672,10 +672,10 @@ class L1A_object(GMS_object):
GEOP.calc_VAA_using_fullSceneCornerLonLat(self.fullSceneCornerLonLat, self.MetaObj.orbitParams) GEOP.calc_VAA_using_fullSceneCornerLonLat(self.fullSceneCornerLonLat, self.MetaObj.orbitParams)
else: else:
# e.g. Sentinel-2 / RapidEye # e.g. Sentinel-2 / RapidEye
self.logger.warning('No precise calculation of mean viewing azimuth angle possible because orbit track ' self.logger.debug('No precise calculation of mean viewing azimuth angle possible because orbit track '
'cannot be reconstructed from dataset since full scene corner positions are unknown. ' 'cannot be reconstructed from dataset since full scene corner positions are unknown. '
'Mean VAA angle is filled with the mean value of the viewing azimuth array provided ' 'Mean VAA angle is filled with the mean value of the viewing azimuth array provided '
'in metadata.') 'in metadata.')
self.VAA_mean = self.MetaObj.IncidenceAngle self.VAA_mean = self.MetaObj.IncidenceAngle
self.logger.info('Calculation of mean VAA...: %s' % round(self.VAA_mean, 2)) self.logger.info('Calculation of mean VAA...: %s' % round(self.VAA_mean, 2))
...@@ -270,9 +270,8 @@ class AtmCorr(object): ...@@ -270,9 +270,8 @@ class AtmCorr(object):
# [setattr(L1C_obj, 'AtmCorr', self) for L1C_obj in self.inObjs] # too big for serialization # [setattr(L1C_obj, 'AtmCorr', self) for L1C_obj in self.inObjs] # too big for serialization
if not re.search('Sentinel-2', self.inObjs[0].satellite, re.I): if not re.search('Sentinel-2', self.inObjs[0].satellite, re.I):
self.logger.warning('Calculation of acquisition geometry arrays is currently only validated for ' self.logger.debug('Calculation of acquisition geometry arrays is currently only validated for Sentinel-2!')
'Sentinel-2!') # validation possible by comparing S2 angles provided by ESA with own angles # TODO
# validation possible by comparing S2 angles provided by ESA with own angles
@property @property
def logger(self): def logger(self):
...@@ -1115,6 +1114,12 @@ class AtmCorr(object): ...@@ -1115,6 +1114,12 @@ class AtmCorr(object):
if not joined: if not joined:
self.logger.warning('Cloud mask confidence array has not been appended to one of the AC inputs because ' self.logger.warning('Cloud mask confidence array has not been appended to one of the AC inputs because '
'there was no input GMS object with the same dimensions.') 'there was no input GMS object with the same dimensions.')
elif CFG.cloud_masking_algorithm[self.inObjs[0].satellite] == 'FMASK':
self.logger.info("Cloud mask confidence array is not appended to AC outputs because "
"'cloud_masking_algorithm' was set to FMASK in the job configuration and FMASK does not "
"confidence arrays.")
elif not CFG.ac_estimate_accuracy: elif not CFG.ac_estimate_accuracy:
self.logger.info("Cloud mask confidence array is not appended to AC outputs because " self.logger.info("Cloud mask confidence array is not appended to AC outputs because "
"'ac_estimate_accuracy' was set to False in the job configuration.") "'ac_estimate_accuracy' was set to False in the job configuration.")
......
...@@ -271,10 +271,6 @@ class MemoryReserver(object): ...@@ -271,10 +271,6 @@ class MemoryReserver(object):
self.release() self.release()
return True if exc_type is None else False return True if exc_type is None else False
def __exit__(self, exc_type, exc_val, exc_tb):
self.logger.close()
return super(MemoryReserver, self).__exit__(exc_type, exc_val, exc_tb)
def acquire_process_lock(**processlock_kwargs): def acquire_process_lock(**processlock_kwargs):
"""Decorator function for ProcessLock. """Decorator function for ProcessLock.
......
...@@ -2055,7 +2055,7 @@ class GMS_object(object): ...@@ -2055,7 +2055,7 @@ class GMS_object(object):
else: else:
if not is_tempfile: if not is_tempfile:
self.logger.warning("%s can not be written, because there is no corresponding attribute." self.logger.warning("The %s can not be written, because there is no corresponding attribute."
% print_dict[descriptor]) % print_dict[descriptor])
###################################### ######################################
......
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