diff --git a/Dockerfile b/Dockerfile index d9eea1b..4c67abf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM 018923174646.dkr.ecr.us-west-2.amazonaws.com/hls-base-3.5.1 +FROM 018923174646.dkr.ecr.us-west-2.amazonaws.com/hls-base:36 ENV PREFIX=/usr/local \ SRC_DIR=/usr/local/src \ GCTPLIB=/usr/local/lib \ @@ -106,13 +106,14 @@ RUN cd ${SRC_DIR}/trim \ COPY ./hls_libs/L8like/bandpass_parameter.S2A.txt ${PREFIX}/bandpass_parameter.S2A.txt COPY ./hls_libs/L8like/bandpass_parameter.S2B.txt ${PREFIX}/bandpass_parameter.S2B.txt +COPY ./hls_libs/L8like/bandpass_parameter.S2C.txt ${PREFIX}/bandpass_parameter.S2C.txt RUN pip3 install --upgrade awscli RUN pip3 install click==7.1.2 RUN pip3 install rio-cogeo==1.1.10 --no-binary rasterio --user RUN pip3 install git+https://github.com/NASA-IMPACT/hls-thumbnails@v1.3 -RUN pip3 install git+https://github.com/NASA-IMPACT/hls-metadata@v2.5 +RUN pip3 install git+https://github.com/NASA-IMPACT/hls-metadata@v2.6 RUN pip3 install git+https://github.com/NASA-IMPACT/hls-manifest@v2.0 diff --git a/hls_libs/L8like/bandpass_parameter.S2C.txt b/hls_libs/L8like/bandpass_parameter.S2C.txt new file mode 100644 index 0000000..3f13f7e --- /dev/null +++ b/hls_libs/L8like/bandpass_parameter.S2C.txt @@ -0,0 +1,8 @@ +slope_2C offset_2C +1.003 -0.0 +0.9851 -0.0027 +1.0038 -0.0009 +0.9718 0.0011 +0.9995 -0.0003 +0.9994 -0.0007 +0.991 0.0004 diff --git a/scripts/sentinel_granule.sh b/scripts/sentinel_granule.sh index d79efdf..6637eec 100755 --- a/scripts/sentinel_granule.sh +++ b/scripts/sentinel_granule.sh @@ -67,7 +67,7 @@ cloud_cover_valid=$(check_sentinel_clouds "$xml_safe") cd "$safegranuledir" # Run Fmask -run_Fmask.sh >> fmask_out.txt +/usr/local/MATLAB/application/run_Fmask_4_7.sh /usr/local/MATLAB/R2022b /usr/local/MATLAB/application/AuxiData/ >> fmask_out.txt wait fmask_file=$(cat fmask_out.txt) echo "$fmask_file"