From a11c76defb28a8f66f2ac7466105ddd6d853b3ac Mon Sep 17 00:00:00 2001
From: Eric Trautman <trautmane@janelia.hhmi.org>
Date: Tue, 4 Jun 2024 08:55:54 -0400
Subject: [PATCH] minor batch script improvements

---
 .../batch_info/64_gen_masked_clahe_dataset_csv.sh        | 9 ++++++---
 .../batch_info/71_gen_flat_dataset_csv.sh                | 9 ++++++---
 .../batch_info/72_gen_face_dataset_csv.sh                | 9 ++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/run_scripts/multi-sem/wafer-53-center7/batch_info/64_gen_masked_clahe_dataset_csv.sh b/run_scripts/multi-sem/wafer-53-center7/batch_info/64_gen_masked_clahe_dataset_csv.sh
index 584b3090..2ae99f74 100755
--- a/run_scripts/multi-sem/wafer-53-center7/batch_info/64_gen_masked_clahe_dataset_csv.sh
+++ b/run_scripts/multi-sem/wafer-53-center7/batch_info/64_gen_masked_clahe_dataset_csv.sh
@@ -10,7 +10,9 @@ source "${SCRIPT_DIR}"/../00_config.sh "NA"
 SLABS_PER_FILE=35
 COUNT=0
 BATCH_COUNT=0
-CSV_PREFIX="64_masked_clahe_dataset"
+
+RUN_DIR="${SCRIPT_DIR}/run_64_masked_clahe_$(date +"%Y%m%d_%H%M%S")"
+mkdir -p "${RUN_DIR}"
 
 for SLAB in ${ALL_SLABS}; do
 
@@ -18,7 +20,7 @@ for SLAB in ${ALL_SLABS}; do
 
   if ! (( COUNT % SLABS_PER_FILE )); then
     BC_VAL=$(printf '%03d' ${BATCH_COUNT})
-    CSV_FILE="${CSV_PREFIX}.batch_${BC_VAL}.csv"
+    CSV_FILE="${RUN_DIR}/batch_${BC_VAL}.csv"
     echo -n "" > "${CSV_FILE}"
     BATCH_COUNT=$((BATCH_COUNT+=1))
   fi
@@ -47,4 +49,5 @@ for SLAB in ${ALL_SLABS}; do
 
 done
 
-ls -alh ${CSV_PREFIX}.batch_*.csv
+echo "Created ${RUN_DIR} with:"
+ls -alh ${RUN_DIR}/*.csv
diff --git a/run_scripts/multi-sem/wafer-53-center7/batch_info/71_gen_flat_dataset_csv.sh b/run_scripts/multi-sem/wafer-53-center7/batch_info/71_gen_flat_dataset_csv.sh
index fb5a73db..9438148c 100755
--- a/run_scripts/multi-sem/wafer-53-center7/batch_info/71_gen_flat_dataset_csv.sh
+++ b/run_scripts/multi-sem/wafer-53-center7/batch_info/71_gen_flat_dataset_csv.sh
@@ -10,7 +10,9 @@ source "${SCRIPT_DIR}"/../00_config.sh "NA"
 SLABS_PER_FILE=31 # 31 slabs should take about 6 hours to complete, 402 / 31 = 13 files
 COUNT=0
 BATCH_COUNT=0
-CSV_PREFIX="71_flat_dataset"
+
+RUN_DIR="${SCRIPT_DIR}/run_71_flat_$(date +"%Y%m%d_%H%M%S")"
+mkdir -p "${RUN_DIR}"
 
 for SLAB in ${ALL_SLABS}; do
 
@@ -18,7 +20,7 @@ for SLAB in ${ALL_SLABS}; do
 
   if ! (( COUNT % SLABS_PER_FILE )); then
     BC_VAL=$(printf '%03d' ${BATCH_COUNT})
-    CSV_FILE="${CSV_PREFIX}.batch_${BC_VAL}.csv"
+    CSV_FILE="${RUN_DIR}/batch_${BC_VAL}.csv"
     echo -n "" > "${CSV_FILE}"
     BATCH_COUNT=$((BATCH_COUNT+=1))
   fi
@@ -49,4 +51,5 @@ for SLAB in ${ALL_SLABS}; do
 
 done
 
-ls -alh ${CSV_PREFIX}.batch_*.csv
+echo "Created ${RUN_DIR} with:"
+ls -alh ${RUN_DIR}/*.csv
diff --git a/run_scripts/multi-sem/wafer-53-center7/batch_info/72_gen_face_dataset_csv.sh b/run_scripts/multi-sem/wafer-53-center7/batch_info/72_gen_face_dataset_csv.sh
index 7bcfe022..f2d565a8 100755
--- a/run_scripts/multi-sem/wafer-53-center7/batch_info/72_gen_face_dataset_csv.sh
+++ b/run_scripts/multi-sem/wafer-53-center7/batch_info/72_gen_face_dataset_csv.sh
@@ -14,7 +14,9 @@ FACE_SUFFIX="${SURFACE_DEPTH}${COLOR}"
 
 COUNT=0
 BATCH_COUNT=0
-CSV_PREFIX="72_face_dataset"
+
+RUN_DIR="${SCRIPT_DIR}/run_72_face_$(date +"%Y%m%d_%H%M%S")"
+mkdir -p "${RUN_DIR}"
 
 for SLAB in ${ALL_SLABS}; do
 
@@ -22,7 +24,7 @@ for SLAB in ${ALL_SLABS}; do
 
   if ! (( COUNT % SLABS_PER_FILE )); then
     BC_VAL=$(printf '%03d' ${BATCH_COUNT})
-    CSV_FILE="${CSV_PREFIX}.batch_${BC_VAL}.csv"
+    CSV_FILE="${RUN_DIR}/batch_${BC_VAL}.csv"
     echo -n "" > "${CSV_FILE}"
     BATCH_COUNT=$((BATCH_COUNT+=1))
   fi
@@ -74,4 +76,5 @@ for SLAB in ${ALL_SLABS}; do
 
 done
 
-ls -alh ${CSV_PREFIX}.batch_*.csv
+echo "Created ${RUN_DIR} with:"
+ls -alh ${RUN_DIR}/*.csv