Commit 7326daf6 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Merge branch 'enhancement/separate_sensorspecs' into 'master'

Enhancement/separate sensorspecs

See merge request !8
parents 8ebc2c1f cf74b030
Pipeline #8035 passed with stages
in 18 minutes and 22 seconds
...@@ -24,6 +24,7 @@ test_gms_preprocessing: ...@@ -24,6 +24,7 @@ test_gms_preprocessing:
- export GMS_db_host=${GMS_DB_HOST} - export GMS_db_host=${GMS_DB_HOST}
- export GMS_index_host=${GMS_INDEX_HOST} - export GMS_index_host=${GMS_INDEX_HOST}
- export GMS_index_port=${GMS_INDEX_PORT} - export GMS_index_port=${GMS_INDEX_PORT}
- pip install "pyrsr>=0.3.1" # TODO remove as soon as docker runner is recreated
# update sicor # update sicor
# - conda install -y -q -c conda-forge basemap # - conda install -y -q -c conda-forge basemap
# - rm -rf context/sicor # - rm -rf context/sicor
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
History History
======= =======
0.18.0 (coming soon) 0.18.0 (2020-03-31)
-------------------- -------------------
* Added pyrsr dependency. * Added pyrsr dependency.
* Removed anything related to spectral response functions (now part of pyrsr). * Removed anything related to spectral response functions (now part of pyrsr).
......
...@@ -42,6 +42,7 @@ from ecmwfapi.api import APIException as ECMWFAPIException ...@@ -42,6 +42,7 @@ from ecmwfapi.api import APIException as ECMWFAPIException
from geoarray import GeoArray from geoarray import GeoArray
from py_tools_ds.geo.map_info import mapinfo2geotransform from py_tools_ds.geo.map_info import mapinfo2geotransform
from pyrsr import RSR
from ..options.config import GMS_config as CFG from ..options.config import GMS_config as CFG
from . import geoprocessing as GEOP from . import geoprocessing as GEOP
...@@ -49,7 +50,6 @@ from .L1B_P import L1B_object ...@@ -49,7 +50,6 @@ from .L1B_P import L1B_object
from ..model.metadata import get_LayerBandsAssignment from ..model.metadata import get_LayerBandsAssignment
from ..misc.definition_dicts import get_outFillZeroSaturated, proc_chain, get_mask_classdefinition from ..misc.definition_dicts import get_outFillZeroSaturated, proc_chain, get_mask_classdefinition
from ..misc.locks import MultiSlotLock from ..misc.locks import MultiSlotLock
from ..io.input_reader import SRF
# from .cloud_masking import Cloud_Mask_Creator # circular dependencies # from .cloud_masking import Cloud_Mask_Creator # circular dependencies
from sicor.sicor_ac import ac_gms from sicor.sicor_ac import ac_gms
...@@ -699,13 +699,22 @@ class AtmCorr(object): ...@@ -699,13 +699,22 @@ class AtmCorr(object):
def _get_srf(self): def _get_srf(self):
"""Returns an instance of SRF in the same structure like sicor.sensors.SRF.SensorSRF """Returns an instance of SRF in the same structure like sicor.sensors.SRF.SensorSRF
""" """
# FIXME calculation of center wavelengths within SRF() used not the GMS algorithm # FIXME calculation of center wavelengths within RSR() used not the GMS algorithm
# SRF instance must be created for all bands and the previous proc level # SRF instance must be created for all bands and the previous proc level
GMS_identifier_fullScene = self.inObjs[0].GMS_identifier GMSid_fullScene = self.inObjs[0].GMS_identifier
GMS_identifier_fullScene.subsystem = '' GMSid_fullScene.subsystem = ''
GMS_identifier_fullScene.proc_level = proc_chain[proc_chain.index(self.inObjs[0].proc_level) - 1] GMSid_fullScene.proc_level = proc_chain[proc_chain.index(self.inObjs[0].proc_level) - 1]
return SRF(GMS_identifier_fullScene, wvl_unit='nanometers', format_bandnames=True) return RSR(satellite=GMSid_fullScene.satellite,
sensor=GMSid_fullScene.sensor,
subsystem=GMSid_fullScene.subsystem,
wvl_unit='nanometers',
format_bandnames=True,
no_pan=CFG.skip_pan,
no_thermal=CFG.skip_thermal,
after_ac=GMSid_fullScene.proc_level in ['L1C', 'L2A', 'L2B', 'L2C'],
sort_by_cwl=CFG.sort_bands_by_cwl
)
def _get_mask_clouds(self): def _get_mask_clouds(self):
"""Returns an instance of S2Mask in case cloud mask is given by input GMS objects. Otherwise None is returned. """Returns an instance of S2Mask in case cloud mask is given by input GMS objects. Otherwise None is returned.
......
303 band001.rsp
0.4050 0.0001
0.4060 0.0001
0.4070 0.0001
0.4080 0.0001
0.4090 0.0001
0.4100 0.0001
0.4110 0.0001
0.4120 0.0001
0.4130 0.0001
0.4140 0.0002
0.4150 0.0002
0.4160 0.0002
0.4170 0.0002
0.4180 0.0003
0.4190 0.0003
0.4200 0.0003
0.4210 0.0004
0.4220 0.0004
0.4230 0.0005
0.4240 0.0005
0.4250 0.0006
0.4260 0.0007
0.4270 0.0007
0.4280 0.0008
0.4290 0.0009
0.4300 0.0010
0.4310 0.0011
0.4320 0.0013
0.4330 0.0014
0.4340 0.0016
0.4350 0.0018
0.4360 0.0020
0.4370 0.0022
0.4380 0.0024
0.4390 0.0027
0.4400 0.0029
0.4410 0.0032
0.4420 0.0036
0.4430 0.0040
0.4440 0.0044
0.4450 0.0048
0.4460 0.0053
0.4470 0.0058
0.4480 0.0064
0.4490 0.0070
0.4500 0.0077
0.4510 0.0084
0.4520 0.0092
0.4530 0.0101
0.4540 0.0110
0.4550 0.0120
0.4560 0.0131
0.4570 0.0143
0.4580 0.0156
0.4590 0.0170
0.4600 0.0185
0.4610 0.0200
0.4620 0.0218
0.4630 0.0236
0.4640 0.0256
0.4650 0.0277
0.4660 0.0299
0.4670 0.0323
0.4680 0.0349
0.4690 0.0377
0.4700 0.0406
0.4710 0.0437
0.4720 0.0470
0.4730 0.0506
0.4740 0.0543
0.4750 0.0583
0.4760 0.0625
0.4770 0.0670
0.4780 0.0717
0.4790 0.0766
0.4800 0.0819
0.4810 0.0874
0.4820 0.0933
0.4830 0.0994
0.4840 0.1058
0.4850 0.1126
0.4860 0.1197
0.4870 0.1271
0.4880 0.1349
0.4890 0.1430
0.4900 0.1515
0.4910 0.1604
0.4920 0.1696
0.4930 0.1792
0.4940 0.1891
0.4950 0.1995
0.4960 0.2102
0.4970 0.2213
0.4980 0.2329
0.4990 0.2447
0.5000 0.2570
0.5010 0.2697
0.5020 0.2827
0.5030 0.2961
0.5040 0.3099
0.5050 0.3241
0.5060 0.3386
0.5070 0.3534
0.5080 0.3686
0.5090 0.3841
0.5100 0.3998
0.5110 0.4159
0.5120 0.4323
0.5130 0.4489
0.5140 0.4657
0.5150 0.4828
0.5160 0.5000
0.5170 0.5174
0.5180 0.5350
0.5190 0.5526
0.5200 0.5704
0.5210 0.5882
0.5220 0.6060
0.5230 0.6239
0.5240 0.6417
0.5250 0.6595
0.5260 0.6771
0.5270 0.6947
0.5280 0.7120
0.5290 0.7292
0.5300 0.7461
0.5310 0.7628
0.5320 0.7792
0.5330 0.7952
0.5340 0.8108
0.5350 0.8261
0.5360 0.8409
0.5370 0.8552
0.5380 0.8690
0.5390 0.8823
0.5400 0.8950
0.5410 0.9071
0.5420 0.9186
0.5430 0.9294
0.5440 0.9395
0.5450 0.9489
0.5460 0.9576
0.5470 0.9655
0.5480 0.9727
0.5490 0.9790
0.5500 0.9845
0.5510 0.9892
0.5520 0.9931
0.5530 0.9961
0.5540 0.9983
0.5550 0.9996
0.5560 1.0000
0.5570 0.9996
0.5580 0.9983
0.5590 0.9961
0.5600 0.9931
0.5610 0.9892
0.5620 0.9845
0.5630 0.9790
0.5640 0.9727
0.5650 0.9655
0.5660 0.9576
0.5670 0.9489
0.5680 0.9395
0.5690 0.9294
0.5700 0.9186
0.5710 0.9071
0.5720 0.8950
0.5730 0.8823
0.5740 0.8690
0.5750 0.8552
0.5760 0.8409
0.5770 0.8261
0.5780 0.8108
0.5790 0.7952
0.5800 0.7792
0.5810 0.7628
0.5820 0.7461
0.5830 0.7292
0.5840 0.7120
0.5850 0.6947
0.5860 0.6771
0.5870 0.6595
0.5880 0.6417
0.5890 0.6239
0.5900 0.6060
0.5910 0.5882
0.5920 0.5704
0.5930 0.5526
0.5940 0.5350
0.5950 0.5174
0.5960 0.5000
0.5970 0.4828
0.5980 0.4657
0.5990 0.4489
0.6000 0.4323
0.6010 0.4159
0.6020 0.3998
0.6030 0.3841
0.6040 0.3686
0.6050 0.3534
0.6060 0.3386
0.6070 0.3241
0.6080 0.3099
0.6090 0.2961
0.6100 0.2827
0.6110 0.2697
0.6120 0.2570
0.6130 0.2447
0.6140 0.2329
0.6150 0.2213
0.6160 0.2102
0.6170 0.1995
0.6180 0.1891
0.6190 0.1792
0.6200 0.1696
0.6210 0.1604
0.6220 0.1515
0.6230 0.1430
0.6240 0.1349
0.6250 0.1271
0.6260 0.1197
0.6270 0.1126
0.6280 0.1058
0.6290 0.0994
0.6300 0.0933
0.6310 0.0874
0.6320 0.0819
0.6330 0.0766
0.6340 0.0717
0.6350 0.0670
0.6360 0.0625
0.6370 0.0583
0.6380 0.0543
0.6390 0.0506
0.6400 0.0470
0.6410 0.0437
0.6420 0.0406
0.6430 0.0377
0.6440 0.0349
0.6450 0.0323
0.6460 0.0299
0.6470 0.0277
0.6480 0.0256
0.6490 0.0236
0.6500 0.0218
0.6510 0.0200
0.6520 0.0185
0.6530 0.0170
0.6540 0.0156
0.6550 0.0143
0.6560 0.0131
0.6570 0.0120
0.6580 0.0110
0.6590 0.0101
0.6600 0.0092
0.6610 0.0084
0.6620 0.0077
0.6630 0.0070
0.6640 0.0064
0.6650 0.0058
0.6660 0.0053
0.6670 0.0048
0.6680 0.0044
0.6690 0.0040
0.6700 0.0036
0.6710 0.0032
0.6720 0.0029
0.6730 0.0027
0.6740 0.0024
0.6750 0.0022
0.6760 0.0020
0.6770 0.0018
0.6780 0.0016
0.6790 0.0014
0.6800 0.0013
0.6810 0.0011
0.6820 0.0010
0.6830 0.0009
0.6840 0.0008
0.6850 0.0007
0.6860 0.0007
0.6870 0.0006
0.6880 0.0005
0.6890 0.0005
0.6900 0.0004
0.6910 0.0004
0.6920 0.0003
0.6930 0.0003
0.6940 0.0003
0.6950 0.0002
0.6960 0.0002
0.6970 0.0002
0.6980 0.0002
0.6990 0.0001
0.7000 0.0001
0.7010 0.0001
0.7020 0.0001
0.7030 0.0001
0.7040 0.0001
0.7050 0.0001
0.7060 0.0001
0.7070 0.0001
375 aster-Band1
8.0225 0.0005
8.0250 0.0011
8.0274 0.0016
8.0300 0.0022
8.0324 0.0047
8.0350 0.0072
8.0374 0.0097
8.0400 0.0123
8.0424 0.0168
8.0449 0.0214
8.0475 0.0260
8.0499 0.0306
8.0525 0.0383
8.0549 0.0461
8.0575 0.0539
8.0599 0.0616
8.0625 0.0740
8.0649 0.0865
8.0674 0.0990
8.0700 0.1115
8.0724 0.1294
8.0750 0.1474
8.0774 0.1654
8.0800 0.1834
8.0824 0.2082
8.0850 0.2330
8.0875 0.2578
8.0899 0.2827
8.0925 0.3136
8.0949 0.3446
8.0975 0.3756
8.0999 0.4066
8.1025 0.4424
8.1049 0.4783
8.1074 0.5142
8.1100 0.5500
8.1124 0.5864
8.1150 0.6228
8.1174 0.6592
8.1200 0.6956
8.1224 0.7239
8.1250 0.7520
8.1274 0.7802
8.1299 0.8083
8.1325 0.8256
8.1349 0.8426
8.1375 0.8596
8.1399 0.8766
8.1425 0.8823
8.1449 0.8876
8.1474 0.8930
8.1499 0.8984
8.1524 0.9022
8.1549 0.9060
8.1574 0.9097
8.1599 0.9135
8.1624 0.9190
8.1649 0.9246
8.1674 0.9301
8.1699 0.9357
8.1724 0.9373
8.1749 0.9388
8.1774 0.9403
8.1799 0.9419
8.1824 0.9359
8.1849 0.9297
8.1874 0.9236
8.1899 0.9174
8.1924 0.9072
8.1949 0.8968
8.1974 0.8865
8.1999 0.8761
8.2024 0.8703
8.2049 0.8645
8.2074 0.8588
8.2099 0.8530
8.2124 0.8519
8.2149 0.8509
8.2174 0.8499
8.2199 0.8489
8.2224 0.8478
8.2249 0.8467
8.2274 0.8456
8.2299 0.8445
8.2324 0.8425
8.2349 0.8404
8.2374 0.8383
8.2399 0.8363
8.2424 0.8373
8.2449 0.8384
8.2474 0.8395
8.2499 0.8407
8.2524 0.8482
8.2549 0.8559
8.2574 0.8636
8.2599 0.8713
8.2624 0.8808
8.2649 0.8903
8.2674 0.8998
8.2699 0.9093
8.2724 0.9149
8.2749 0.9205
8.2774 0.9260
8.2799 0.9316
8.2824 0.9333
8.2849 0.9350
8.2874 0.9366
8.2899 0.9383
8.2924 0.9409
8.2949 0.9435
8.2974 0.9461
8.2999 0.9487
8.3024 0.9530
8.3049 0.9572
8.3074 0.9615
8.3099 0.9658
8.3124 0.9695
8.3149 0.9732
8.3174 0.9769
8.3199 0.9806
8.3224 0.9797
8.3249 0.9787
8.3274 0.9777
8.3299 0.9766
8.3324 0.9756
8.3349 0.9746
8.3374 0.9736
8.3399 0.9726
8.3424 0.9738
8.3449 0.9751
8.3474 0.9764
8.3499 0.9777
8.3524 0.9820
8.3549 0.9864
8.3574 0.9909
8.3599 0.9953
8.3624 0.9965
8.3649 0.9977
8.3674 0.9988
8.3699 1.0000
8.3724 0.9982
8.3749 0.9963
8.3774 0.9944
8.3799 0.9926
8.3824 0.9883
8.3849 0.9839
8.3874 0.9796
8.3899 0.9752
8.3924 0.9708
8.3949 0.9663
8.3974 0.9618
8.3999 0.9573
8.4024 0.9469
8.4049 0.9363
8.4074 0.9257
8.4099 0.9151
8.4124 0.8973
8.4149 0.8793
8.4174 0.8613
8.4199 0.8432
8.4224 0.8199
8.4249 0.7964
8.4274 0.7728
8.4299 0.7493
8.4324 0.7202
8.4349 0.6910
8.4374 0.6617
8.4399 0.6325
8.4424 0.6000
8.4449 0.5674
8.4474 0.5349
8.4499 0.5023
8.4524 0.4652
8.4549 0.4280
8.4574 0.3909
8.4599 0.3537
8.4624 0.3199
8.4649 0.2863
8.4674 0.2526
8.4699 0.2190
8.4724 0.1948
8.4749 0.1709
8.4774 0.1470
8.4799 0.1232
8.4824 0.1094
8.4849 0.0960
8.4874 0.0826
8.4899 0.0691
8.4924 0.0623
8.4949 0.0558
8.4974 0.0492
8.4999 0.0426
8.5024 0.0390
8.5049 0.0356
8.5074 0.0321
8.5099 0.0286
8.5124 0.0268
8.5149 0.0251
8.5174 0.0234
8.5199 0.0217
8.5224 0.0207
8.5249 0.0198
8.5274 0.0189
8.5299 0.0179
8.5324 0.0174
8.5349 0.0170
8.5374 0.0165
8.5399 0.0160
8.5424 0.0157
8.5449 0.0155
8.5474 0.0152
8.5499 0.0149
8.5524 0.0145
8.5549 0.0141
8.5574 0.0137
8.5599 0.0133
8.5624 0.0130
8.5649 0.0128
8.5674 0.0125
8.5699 0.0122
8.5724 0.0119
8.5749 0.0116
8.5774 0.0113
8.5799 0.0110
8.5824 0.0107
8.5849 0.0104
8.5874 0.0101
8.5899 0.0098
8.5924 0.0096
8.5949 0.0094
8.5974 0.0092
8.5999 0.0090
8.6024 0.0087
8.6049 0.0085
8.6074 0.0082
8.6099 0.0079
8.6124 0.0076