From a2bc261650a007865da614a37f746ee9bc8e6aa1 Mon Sep 17 00:00:00 2001
From: FaserMC <fasermc@cern.ch>
Date: Wed, 10 Aug 2022 21:20:27 +0200
Subject: [PATCH] Fix submission script syntax

---
 .../Digitization/scripts/submit_faserMDC_digi.sh   |  6 +++---
 .../scripts/submit_faserMDC_digi_merge.sh          |  6 +++---
 .../Reconstruction/scripts/submit_faserMDC_reco.sh |  7 ++++---
 .../Reconstruction/scripts/submit_faser_reco.sh    | 14 ++++++++------
 .../Simulation/scripts/submit_faserMDC_simulate.sh |  6 +++---
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi.sh b/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi.sh
index 21ac59fb..b6b0c80c 100755
--- a/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi.sh
+++ b/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi.sh
@@ -186,7 +186,7 @@ then
     ls -l
     echo "copy *-RDO.root to $outdest"
     mkdir -p $outdest
-    eos cp *-RDO.root $outdest
+    eos cp *-RDO.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -196,12 +196,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi_merge.sh b/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi_merge.sh
index e5d45909..ca2e27fc 100755
--- a/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi_merge.sh
+++ b/Control/CalypsoExample/Digitization/scripts/submit_faserMDC_digi_merge.sh
@@ -209,7 +209,7 @@ then
     ls -l
     echo "copy *-RDO.root to $outdest"
     mkdir -p $outdest
-    eos cp *-RDO.root $outdest
+    eos cp *-RDO.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -219,12 +219,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Reconstruction/scripts/submit_faserMDC_reco.sh b/Control/CalypsoExample/Reconstruction/scripts/submit_faserMDC_reco.sh
index 819cfeb4..5dacef1c 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/submit_faserMDC_reco.sh
+++ b/Control/CalypsoExample/Reconstruction/scripts/submit_faserMDC_reco.sh
@@ -175,7 +175,8 @@ then
     ls -l
     echo "copy *-RDO.root to $outdest"
     mkdir -p $outdest
-    eos cp *-xAOD.root $outdest
+    # Keep this line from stopping script, so we might get a log file
+    eos cp *-xAOD.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -185,12 +186,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile\ $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh b/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
index 81db602a..f7cdf39c 100755
--- a/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
+++ b/Control/CalypsoExample/Reconstruction/scripts/submit_faser_reco.sh
@@ -156,11 +156,11 @@ else
 fi
 cd "$file_stem"
 #
-# Run job, || True ensures script continues even if job fails
+# Run job
 if [[ -z "$tag" ]]; then
-    faser_reco.py "--nevents=$nevents" "$file_path" || True
+    faser_reco.py "--nevents=$nevents" "$file_path" 
 else
-    faser_reco.py "--nevents=$nevents" "--reco=$tag" "$file_path" || True
+    faser_reco.py "--nevents=$nevents" "--reco=$tag" "$file_path" 
 fi
 #
 # Print out ending time
@@ -176,7 +176,9 @@ then
     ls -l
     echo "copy *-RDO.root to $outdest"
     mkdir -p $outdest
-    eos cp *-xAOD.root $outdest || True
+    # Keep this line from stopping script, so we might get a log file
+    # || true ensures script continues even if copy fails
+    eos cp *-xAOD.root ${outdest}/ || true   
 fi
 #
 # Copy log file second
@@ -186,12 +188,12 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile\ $outdest
+    eos cp $logfile $outdest/$logfile
 fi
diff --git a/Control/CalypsoExample/Simulation/scripts/submit_faserMDC_simulate.sh b/Control/CalypsoExample/Simulation/scripts/submit_faserMDC_simulate.sh
index bedbb591..03b8a836 100755
--- a/Control/CalypsoExample/Simulation/scripts/submit_faserMDC_simulate.sh
+++ b/Control/CalypsoExample/Simulation/scripts/submit_faserMDC_simulate.sh
@@ -199,7 +199,7 @@ then
     ls -l
     echo "copy *-HITS.root to $outdest"
     mkdir -p $outdest
-    eos cp *-HITS.root $outdest
+    eos cp *-HITS.root ${outdest}/ || true
 fi
 #
 # Also copy log file
@@ -209,13 +209,13 @@ then
     ls -l
     echo "copy $logfile to $logdest"
     mkdir -p $logdest
-    eos cp $logfile $logdest
+    eos cp $logfile $logdest/$logfile
 elif ! [ -z "$outdest" ]
 then 
     cd ..
     ls -l
     echo "copy $logfile to $outdest"
     mkdir -p $outdest
-    eos cp $logfile $outdest
+    eos cp $logfile $outdest/$logfile
 fi
 
-- 
GitLab