Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HCS Parser: Create ome.tiff well by well #3251

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deploy/docker/cp-tools/research/hcs-parser/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ RUN yum install -y curl \
openssh-server \
wget \
unzip \
python && \
python-devel && \
python \
python-devel \
gcc && \
curl https://cloud-pipeline-oss-builds.s3.amazonaws.com/tools/pip/2.7/get-pip.py | python - && \
pip install pillow==9.2.0 tifffile==2019.7.26.2 numpy==1.16.6 imagecodecs-lite==2019.12.3 pandas==0.24.2 openpyxl==2.6.4
Expand All @@ -51,7 +51,7 @@ RUN mkdir -p "$ANACONDA_HOME" && \
ImageMagick \
java-1.8.0-openjdk-devel && \
pip3 install $CP_PIP_EXTRA_ARGS -I -q generate-tiff-offsets==0.1.7 && \
pip3 install $CP_PIP_EXTRA_ARGS -I -q awscli
pip3 install $CP_PIP_EXTRA_ARGS -I -q awscli && \
conda deactivate

ARG BIOFORMATS_TO_RAW_VERSION=0.4.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
INDEX_FILE_PATH="$1"
IMAGE_PREVIEW_DATA_ROOT="$2"
SEQUENCE_ID="$3"
OME_TIFF_IMAGE_NAME="$4"
WELL_ID="$4"
OME_TIFF_IMAGE_NAME="$5"

RAW_IMAGE_DIR=$(mktemp -d --dry-run "$IMAGE_PREVIEW_DATA_ROOT/$SEQUENCE_ID/data_XXXXX.raw/")
RAW_IMAGE_DIR=$(mktemp -d --dry-run "$IMAGE_PREVIEW_DATA_ROOT/$SEQUENCE_ID/$WELL_ID/data_XXXXX.raw/")
if [[ -z "$OME_TIFF_IMAGE_NAME" ]]; then
OME_TIFF_IMAGE_NAME="${HCS_PARSER_OME_TIFF_FILE_NAME:-data.ome.tiff}"
fi
OME_TIFF_IMAGE_PATH="$IMAGE_PREVIEW_DATA_ROOT/$SEQUENCE_ID/$OME_TIFF_IMAGE_NAME"
OME_TIFF_IMAGE_PATH="$IMAGE_PREVIEW_DATA_ROOT/$SEQUENCE_ID/$WELL_ID/$OME_TIFF_IMAGE_NAME"

HCS_PROCESSING_TASK="${HCS_PROCESSING_TASK:-HCS processing}"

Expand Down
Loading