Changeset 18694 for trunk/DataCheck/QuickLook/SendData_Internal.sh

Timestamp:

12/18/16 23:46:07 (8 years ago)

Author:

Daniela Dorner

Message:

introduced usage of file for mysql pw to avoid warnings

File:

• trunk/DataCheck/QuickLook/SendData_Internal.sh (modified) (4 diffs)

trunk/DataCheck/QuickLook/SendData_Internal.sh

@@ -83 +83 @@
    printprocesslog "DEBUG sendquery QUERY: "$query
    echo "DEBUG sendquery QUERY: "$query
-   mysql -s -u $us --password=$pw --host=$ho $db -e " $query "
+   mysql $pwfile -s -u $us $pw --host=$ho $db -e " $query "
    if [ "$table" == "AnalysisResultsRunLP" ]
    then 
       query2=`echo $query | sed -e 's/AnalysisResultsRunLP/AnalysisResultsRunISDC/g'`
       echo "# QUERY: "$query2
-      mysql -s -u $us --password=$pw --host=$ho factdata_cp20150811 -e " $query2 "
-   fi
+      mysql $pwfile -s -u $us $pw --host=$ho factdata_cp20150811 -e " $query2 "
+      fi
 }
 
@@ -132 +132 @@
    mjd)  timeselect="Mjd(Min(fRunStart)) AS start, Mjd(MAX(fRunStop)) AS stop, "
          timeselect2=" Mjd(MIN(o.start)) AS start, Mjd(MAX(o.stop)) AS stop, "
-         break;;
+         ;;
    unix) timeselect="Unix_timestamp(CONVERT_TZ(Min(fRunStart), '+00:00', 'SYSTEM')) AS start, Unix_timestamp(CONVERT_TZ(Max(fRunStop), '+00:00', 'SYSTEM')) AS stop, "
          timeselect2=" Unix_timestamp(CONVERT_TZ(MIN(o.start), '+00:00', 'SYSTEM')) AS start, Unix_timestamp(CONVERT_TZ(MAX(o.stop), '+00:00', 'SYSTEM')) AS stop, "
-         break;;
+         ;;
    *)    timeselect="MIN(fRunStart) AS start, MAX(fRunStop) AS stop, "
          timeselect2=" MIN(o.start) AS start, MAX(o.stop) as stop, "
-         break;;
+         ;;
 esac
 
@@ -155 +155 @@
    query="SELECT "$timeselect" SUM(fNumExcEvts)/SUM("$ontimeif")*3600 AS excrate, "
    query=$query" ExcErr(Sum(fNumSigEvts), SUM(fNumBgEvts))/SUM("$ontimeif")*3600 AS excerr, "
+   query=$query" SUM("$ontimeif"/60.) AS ontime, "
    query=$query" IF (SUM(fNumSigEvts)>10 AND SUM(fNumBgEvts)>10, LiMa(SUM(fNumSigEvts), SUM(fNumBgEvts)), IF (SUM(fNumSigEvts)-SUM(fNumBgEvts)>10, concat('(', LiMa(SUM(fNumSigEvts), SUM(fNumBgEvts)), ')'), '-')) AS significance, "
    query=$query" LiMa(SUM(fNumSigEvts), SUM(fNumBgEvts)) AS significance2, "
@@ -179 +180 @@
 #echo $query
 
-printinfo | mail -s 'test internal downloading data ' -c dorner@astro.uni-wuerzburg.de -r dorner@astro.uni-wuerzburg.de $email
+printinfo | mail -s 'test internal downloading data ' -b dorner@astro.uni-wuerzburg.de -r dorner@astro.uni-wuerzburg.de $email
 #printinfo