Changeset 20103 for trunk/Mars/hawc/processing/DiskToDB/run-callisto2.sh

Timestamp:

09/01/21 07:56:42 (3 years ago)

Author:

maslowski

Message:

Added better error handeling and tracking in the databas.

File:

• trunk/Mars/hawc/processing/DiskToDB/run-callisto2.sh (modified) (7 diffs)

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

@@ -32 +32 @@
 readonly STAR=star
 # Directory to Mars environment (usually Mars/build)
-readonly MARS="/home/frankm/Dateien/Mars/build/"
+readonly MARS="/home/frankm/Dateien/Mars-6.24.00/build4/"
 # Absolut path to macros
-readonly MACROS="/home/frankm/Dateien/Mars/hawc"
+readonly MACROS="/home/frankm/Dateien/Mars-6.24.00/hawc"
 readonly PROGRAM=$0
 REPLACE=false
@@ -60 +60 @@
 if [ ! -d "${MARS}" ]
 then
-        echo "Mars does not exists at ${MARS}. Please change in \
+        echo "Mars does not exists at ${MARS}. Please change in \\
                 script ${PROGRAM}."
         exit 1
@@ -68 +68 @@
 if [ ! -d "${MACROS}" ]
 then
-        echo "Macros directorey does not exists at ${MACROS}. Please change in \
+        echo "Macros directorey does not exists at ${MACROS}. Please change in \\
                 script ${PROGRAM}."
         exit 1
@@ -88 +88 @@
 NIGHT="${4}"
 
+function UpdateStatus()
+{
+        local tel="${1}"
+        local night="${2}"
+        local runid="${3}"
+        local stat="${4}"
+
+        mysql --defaults-file=${CRED} \
+                --compress \
+                -e "UPDATE DataOnDisk \
+                SET DataOnDisk.callisto = ${stat} \
+                WHERE DataOnDisk.Telescope = ${tel} \
+                AND DataOnDisk.NIGHT = ${night} \
+                AND DataOnDisk.RUNID = ${runid};"
+}
+
 # Get all runs that can (and should) be calibrated
 # Pipe the output to mysql and read the
@@ -94 +110 @@
 "\
 SELECT 
-        NIGHT, RUNID, DrsNight, DrsRunID
+        Calibration.NIGHT,
+        Calibration.RUNID,
+        Calibration.DrsNight,
+        Calibration.DrsRunID
 FROM 
         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     
-        NIGHT=${NIGHT}
+        Calibration.NIGHT = ${NIGHT}
+AND
+        DataOnDisk.calibration = 0
 ORDER BY
-        NIGHT, RUNID\
+        Calibration.NIGHT, Calibration.RUNID\
 "\
 |  mysql \
@@ -161 +190 @@
 
                        # Execute the calibration and write output to log-file
-                       root -b -q -l ${MACROS}/callisto.C'("'"${DATA}"/${DATPATH}/${DATNAME}'","'"${DATA}"/${DRSPATH}/${DRSNAME}'","'"${OUT}"'")' \
+                       root -b -q -l ${MACROS}/callisto.C'("'"${DATA}"/${DATPATH}/${DATNAME}'","'"${DATA}"/${DRSPATH}/${DRSNAME}'", 0 ,"'"${OUT}"'")' \
                                2>&1 | tee "${OUT}"/${PREFIX}.log
 
@@ -176 +205 @@
                        if [ "${RC}" == "0" ]
                        then
-                               touch "${OUT}"/.${PREFIX}.success
+                                touch "${OUT}"/.${PREFIX}.success
+                       else
+                                UpdateStatus ${TEL} ${NIGHT} ${DATRUNID} 1
                        fi