From d11bd6c914350d2d9a9f7fbf266fb32c03dfa646 Mon Sep 17 00:00:00 2001
From: sgorbuno <se.gorbunov@gsi.de>
Date: Wed, 20 Jan 2021 09:42:49 +0000
Subject: [PATCH] update of the Much macros from Anna Senger
---
macro/much/batch_run_bg.sh | 10 ++--------
macro/much/batch_run_sgn.sh | 10 ++--------
macro/much/run_batch_jobs.sh | 13 ++++++-------
3 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/macro/much/batch_run_bg.sh b/macro/much/batch_run_bg.sh
index 506af4a950..7250f7bf2e 100644
--- a/macro/much/batch_run_bg.sh
+++ b/macro/much/batch_run_bg.sh
@@ -1,16 +1,10 @@
#!/bin/bash
-#SBATCH -J cbmroot
-#SBATCH -D batch
-#SBATCH -o %j.out
-#SBATCH -e %j.err
-#SBATCH --time=08:00:00
-#SBATCH -p main
-#SBATCH --array=0-999
+#SBATCH --output %j.out
cbmroot_dir=$1
cd ${cbmroot_dir}/build
-. ./config.sh
+. ./config.sh -a
export DISPLAY=localhost:0.0
DATASET="muons"
diff --git a/macro/much/batch_run_sgn.sh b/macro/much/batch_run_sgn.sh
index 62f74a20f7..2866cfb254 100644
--- a/macro/much/batch_run_sgn.sh
+++ b/macro/much/batch_run_sgn.sh
@@ -1,16 +1,10 @@
#!/bin/bash
-#SBATCH -J cbmroot
-#SBATCH -D batch
-#SBATCH -o %j.out
-#SBATCH -e %j.err
-#SBATCH --time=08:00:00
-#SBATCH -p main
-#SBATCH --array=0-999
+#SBATCH --output %j.out
cbmroot_dir=$1
cd ${cbmroot_dir}/build
-. ./config.sh
+. ./config.sh -a
export DISPLAY=localhost:0.0
DATASET="muons"
diff --git a/macro/much/run_batch_jobs.sh b/macro/much/run_batch_jobs.sh
index 43a82a219f..c03eee5235 100644
--- a/macro/much/run_batch_jobs.sh
+++ b/macro/much/run_batch_jobs.sh
@@ -1,17 +1,16 @@
#!/bin/bash
-batch_dir=batch
-if [ ! -d $batch_dir ]; then
- mkdir $batch_dir
-fi
-
cbmroot_dir=$1
-sbatch batch_run_bg.sh $cbmroot_dir
+chmod +x batch_run_bg.sh
+chmod +x batch_run_sgn.sh
+
+sbatch -p main --array=0-99 --time=08:00:00 -- /lustre/cbm/users/anna/trunk_NOV20/macro/much/batch_run_bg.sh $cbmroot_dir
for i in `seq 0 6`;
do
- sbatch batch_run_sgn.sh $cbmroot_dir $i
+ sbatch -p main --array=0-99 --time=08:00:00 -- /lustre/cbm/users/anna/trunk_NOV20/macro/much/batch_run_sgn.sh $cbmroot_dir $i
done
+
--
GitLab