Changeset 20104 for trunk/Mars/hawc/processing/DiskToDB/run-star2.sh

Timestamp:

09/05/21 07:13:17 (3 years ago)

Author:

maslowski

Message:

Added Telescope as command line parameter. And fixed some bugs.

File:

• trunk/Mars/hawc/processing/DiskToDB/run-star2.sh (modified) (4 diffs)

trunk/Mars/hawc/processing/DiskToDB/run-star2.sh

@@ -32 +32 @@
 readonly STAR=star
 # Directory to Mars environment (usually Mars/build)
-readonly MARS="/home/frankm/Dateien/Mars-6.24.00/build4/"
+readonly MARS="/home/hawc/Desktop/Mars/"
 # Absolut path to macros
-readonly MACROS="/home/frankm/Dateien/Mars-6.24.00/hawc"
+readonly MACROS="/home/hawc/Desktop/Mars-src/hawc"
 readonly PROGRAM=$0
 REPLACE=false
@@ -110 +110 @@
 "\
 SELECT 
-        NIGHT, RUNID
+        Calibration.NIGHT,
+        Calibration.RUNID
 FROM 
-        Calibration
+        Calibration
+INNER JOIN
+        DataOnDisk
+ON
+        DataOnDisk.Telescope = Calibration.Telescope
+AND
+        DataOnDisk.NIGHT = Calibration.NIGHT
+AND
+        DataOnDisk.RUNID = Calibration.RUNID
 WHERE
-        Telescope=${TEL}
+        Calibration.Telescope = ${TEL}
+AND     
+        Calibration.NIGHT = ${NIGHT}
 AND
-        NIGHT=${NIGHT}
+        DataOnDisk.callisto = 0
 ORDER BY
-        NIGHT, RUNID\
+        Calibration.NIGHT, Calibration.RUNID\
 "\
  |  mysql \
@@ -165 +176 @@
                         touch "${OUT}"/.${PREFIX}.running
 
+                        RC=0
+                        # set +o pipefail
                         # Execute image parameter calculation and write log-file
                         root -b -q -l ${MACROS}/star.C'("'"${IN}"/${DATNAME}'","'"${OUT}"'")' \
-                                2>&1 | tee "${OUT}"/${PREFIX}.log
-
-                        # Remember exit status of callisto
-                        RC=${PIPESTATUS[0]}
+                                2>&1 | tee "${OUT}"/${PREFIX}.log || RC=1
+
+                        # RC=$?
+                        # set -o pipefail
+
+                        # Remember exit status of star
+                        # RC=${PIPESTATUS[0]}
 
                         echo RC=${RC} | tee -a "${OUT}"/${PREFIX}.log
@@ -182 +198 @@
                         then
                                 touch "${OUT}"/.${PREFIX}.success
-                        else
-                                UpdateStatus ${TEL} ${NIGHT} ${DATRUNID} 1
                         fi