Merge pull request #166 from NASA-IMPACT/dev

Merge dev into master in preparation for new release to support Sentinel S2C.

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:v3.5.1
 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/[email protected]
 
-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/[email protected]
 

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

scripts/sentinel.sh

@@ -210,7 +210,7 @@ else
   # Copy all intermediate files to debug bucket.
   echo "Copy files to debug bucket"
   debug_bucket_key=s3://${debug_bucket}/${outputname}
-  aws s3 cp "$workingdir" "$debug_bucket_key" --recursive --acl public-read
+  aws s3 cp "$workingdir" "$debug_bucket_key" --recursive --profile gccprofile
 fi
 
 # Generate GIBS browse subtiles
@@ -247,7 +247,8 @@ for gibs_id_dir in "$gibs_dir"/* ; do
         # Copy all intermediate files to debug bucket.
         echo "Copy files to debug bucket"
         debug_bucket_key=s3://${debug_bucket}/${outputname}
-        aws s3 cp "$gibs_id_dir" "$debug_bucket_key" --recursive --quiet --acl public-read
+        aws s3 cp "$gibs_id_dir" "$debug_bucket_key" --recursive --quiet \
+        --profile gccprofile
       fi
     fi
 done

scripts/sentinel_granule.sh

@@ -66,7 +66,9 @@ xml_safe="${safedirectory}/MTD_MSIL1C.xml"
 cloud_cover_valid=$(check_sentinel_clouds "$xml_safe")
 
 cd "$safegranuledir"
+
 # Run Fmask
+echo "Running Fmask"
 run_Fmask.sh >> fmask_out.txt
 wait
 fmask_file=$(cat fmask_out.txt)