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

Revised SICOR implementation.

Former-commit-id: 7f9b01f8
Former-commit-id: 71fc1d2b
parent ca0d8e78
...@@ -34,7 +34,7 @@ from ..misc.definition_dicts import get_outFillZeroSaturated, proc_chain ...@@ -34,7 +34,7 @@ from ..misc.definition_dicts import get_outFillZeroSaturated, proc_chain
from ..io.Input_reader import SRF from ..io.Input_reader import SRF
from sicor.sicor_ac import ac_gms from sicor.sicor_ac import ac_gms
from sicor.sensors.S2MSI import RSImage from sicor.sensors import RSImage
from sicor.Mask import S2Mask from sicor.Mask import S2Mask
......
...@@ -331,8 +331,8 @@ def get_path_ac_options(GMS_identifier): ...@@ -331,8 +331,8 @@ def get_path_ac_options(GMS_identifier):
fName_optFile = None fName_optFile = None
if fName_optFile: if fName_optFile:
import S2SCAPEM import sicor
return os.path.join(os.path.dirname(S2SCAPEM.__file__), fName_optFile) return os.path.join(os.path.dirname(sicor.__file__), fName_optFile)
else: else:
return None return None
......
...@@ -46,7 +46,7 @@ from geomultisens.misc import database_tools as DB_T ...@@ -46,7 +46,7 @@ from geomultisens.misc import database_tools as DB_T
from geomultisens.misc.path_generator import path_generator, get_path_ac_options from geomultisens.misc.path_generator import path_generator, get_path_ac_options
from geomultisens.misc.definition_dicts import get_GMS_sensorcode from geomultisens.misc.definition_dicts import get_GMS_sensorcode
from S2SCAPEM.options import get_options as get_ac_options from sicor.options import get_options as get_ac_options
class METADATA(object): class METADATA(object):
......
...@@ -29,7 +29,7 @@ from py_tools_ds.geo.coord_grid import is_coord_grid_equal ...@@ -29,7 +29,7 @@ from py_tools_ds.geo.coord_grid import is_coord_grid_equal
from py_tools_ds.geo.map_info import geotransform2mapinfo, mapinfo2geotransform from py_tools_ds.geo.map_info import geotransform2mapinfo, mapinfo2geotransform
from py_tools_ds.geo.coord_calc import calc_FullDataset_corner_positions from py_tools_ds.geo.coord_calc import calc_FullDataset_corner_positions
from py_tools_ds.geo.coord_trafo import pixelToLatLon, pixelToMapYX from py_tools_ds.geo.coord_trafo import pixelToLatLon, pixelToMapYX
from S2SCAPEM.options import get_options as get_ac_options from sicor.options import get_options as get_ac_options
from ..misc.logging import GMS_logger as DatasetLogger from ..misc.logging import GMS_logger as DatasetLogger
from ..misc.mgrs_tile import MGRS_tile from ..misc.mgrs_tile import MGRS_tile
......
...@@ -2,8 +2,6 @@ git+https://gitext.gfz-potsdam.de/danschef/py_tools_ds.git ...@@ -2,8 +2,6 @@ git+https://gitext.gfz-potsdam.de/danschef/py_tools_ds.git
git+https://gitext.gfz-potsdam.de/danschef/geoarray.git git+https://gitext.gfz-potsdam.de/danschef/geoarray.git
git+https://gitext.gfz-potsdam.de/danschef/arosics.git git+https://gitext.gfz-potsdam.de/danschef/arosics.git
git+https://gitext.gfz-potsdam.de/hollstei/sicor.git git+https://gitext.gfz-potsdam.de/hollstei/sicor.git
git+https://gitext.gfz-potsdam.de/hollstei/S2SCAPEM.git
git+https://gitext.gfz-potsdam.de/hollstei/S2MSI.git
matplotlib matplotlib
numpy numpy
scikit-learn scikit-learn
......
...@@ -16,8 +16,6 @@ requirements = [ ...@@ -16,8 +16,6 @@ requirements = [
#'geoarray', # pip install git+https://gitext.gfz-potsdam.de/danschef/geoarray.git #'geoarray', # pip install git+https://gitext.gfz-potsdam.de/danschef/geoarray.git
#'arosics', # pip install git+https://gitext.gfz-potsdam.de/danschef/arosics.git # FIXME replace CoReg_Sat by arosics #'arosics', # pip install git+https://gitext.gfz-potsdam.de/danschef/arosics.git # FIXME replace CoReg_Sat by arosics
#'sicor', # pip install git+https://gitext.gfz-potsdam.de/hollstei/sicor.git #'sicor', # pip install git+https://gitext.gfz-potsdam.de/hollstei/sicor.git
#'S2SCAPEM', # pip install git+https://gitext.gfz-potsdam.de/hollstei/S2SCAPEM.git
#'S2MSI', # pip install git+https://gitext.gfz-potsdam.de/hollstei/S2MSI.git
] ]
setup_requirements = [] # TODO(danschef): put setup requirements (distutils extensions, etc.) here setup_requirements = [] # TODO(danschef): put setup requirements (distutils extensions, etc.) here
test_requirements = requirements+ ['coverage'] test_requirements = requirements+ ['coverage']
......
...@@ -21,14 +21,6 @@ git clone https://gitext.gfz-potsdam.de/danschef/arosics.git ./context/arosics ...@@ -21,14 +21,6 @@ git clone https://gitext.gfz-potsdam.de/danschef/arosics.git ./context/arosics
rm -rf context/sicor rm -rf context/sicor
git clone https://gitext.gfz-potsdam.de/hollstei/sicor.git ./context/sicor git clone https://gitext.gfz-potsdam.de/hollstei/sicor.git ./context/sicor
# get S2SCAPEM project # TODO move this to setup.py as soon as package is public
rm -rf context/S2SCAPEM
git clone https://gitext.gfz-potsdam.de/hollstei/S2SCAPEM.git ./context/S2SCAPEM
# get S2MSI project # TODO move this to setup.py as soon as package is public
rm -rf context/S2MSI
git clone https://gitext.gfz-potsdam.de/hollstei/S2MSI.git ./context/S2MSI
echo "#### Build runner docker image" echo "#### Build runner docker image"
sudo docker rmi ${tag} sudo docker rmi ${tag}
sudo docker build -f ${context_dir}/${dockerfile} -m 20G -t ${tag} ${context_dir} sudo docker build -f ${context_dir}/${dockerfile} -m 20G -t ${tag} ${context_dir}
......
...@@ -32,13 +32,11 @@ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \ ...@@ -32,13 +32,11 @@ RUN /bin/bash -i -c "source /root/anaconda3/bin/activate ; \
#COPY *.pkl /root/ # EXAMPLE #COPY *.pkl /root/ # EXAMPLE
#COPY *.h5 /root/ # EXAMPLE #COPY *.h5 /root/ # EXAMPLE
# copy py_tools_ds and geoarray code to /tmp # copy py_tools_ds, geoarray, arosics ans sicor code to /tmp
COPY py_tools_ds /tmp/py_tools_ds COPY py_tools_ds /tmp/py_tools_ds
COPY geoarray /tmp/geoarray COPY geoarray /tmp/geoarray
COPY arosics /tmp/arosics COPY arosics /tmp/arosics
COPY sicor /tmp/sicor COPY sicor /tmp/sicor
COPY sicor /tmp/S2SCAPEM
COPY sicor /tmp/S2MSI
# install git lfs # install git lfs
RUN /bin/bash -i -c "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash" RUN /bin/bash -i -c "curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.rpm.sh | bash"
......
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