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

Deactivated call of L1A_obj.calc_cloud_mask() during L1A processing.

Former-commit-id: e9a36a15
Former-commit-id: 77288436
parent c0ec2141
......@@ -745,6 +745,12 @@ class AtmCorr(object):
# get nodata value
self.options['cld_mask']['nodata_value_mask'] = cm_geoarray.nodata
# append cloud mask to input object with the same spatial resolution if there was no mask before
for i, inObj in enumerate(self.inObjs):
if inObj.arr.xgsd == cm_geoarray.xgsd:
self.inObjs[i].mask_clouds = cm_geoarray
break # appending it to one inObj is enough
return S2Mask(mask_array = cm_array,
mask_legend = cm_legend,
geo_coding = cm_geocoding)
......
......@@ -138,8 +138,8 @@ class Job:
'Landsat-5': 'FMASK',
'Landsat-7': 'FMASK',
'Landsat-8': 'FMASK',
'Sentinel-2A': 'FMASK',
'Sentinel-2B': 'FMASK',
'Sentinel-2A': 'SICOR',
'Sentinel-2B': 'SICOR',
} # 'FMASK', 'Classical Bayesian', 'SICOR'
self.SZA_SAA_calculation_accurracy = 'coarse' # hardcoded
self.export_VZA_SZA_SAA_RAA_stats = True # hardcoded
......
......@@ -1038,6 +1038,8 @@ class GMS_object(Dataset):
# loop through all attributes to write and execute writer
attributes2write = ['arr', 'masks'] + (['mask_clouds'] if write_masks_as_ENVI_classification else [])
attributes2write = attributes2write if self.proc_level not in ['L1A', 'L1B'] else ['arr', 'masks']
for arrayname in attributes2write:
descriptor = '%s_%s' % (image_type_dict[arrayname], self.proc_level)
......
......@@ -33,7 +33,7 @@ def L1A_map(dataset_dict): #map (scene-wise parallelization)
L1A_obj.add_rasterInfo_to_MetaObj()
L1A_obj.reference_data('UTM')
L1A_obj.calc_TOARadRefTemp()
L1A_obj.calc_cloud_mask()
#L1A_obj.calc_cloud_mask()
L1A_obj.calc_corner_positions() # requires mask_nodata
L1A_obj.calc_center_AcqTime() # (if neccessary); requires corner positions
L1A_obj.calc_mean_VAA()
......
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