Changeset 16762 for trunk

Timestamp:

06/06/13 22:06:56 (11 years ago)

Author:

tbretz

Message:

Do not add zero values, they just bias the average.

Location:

trunk/FACT++/munin

Files:

• agilent_curr (modified) (1 diff)
• agilent_volt (modified) (1 diff)

trunk/FACT++/munin/agilent_curr

@@ -14 +14 @@
 esac
 
-DATA220=( `echo -e -n "meas:curr?\n" | nc 10.0.100.220 5025` )
-RC220=$?
-
-if [ "$RC220" == "0" ] ; then
-   echo agilent_cur1.value `printf %.3f ${DATA220}`
+DATA=`echo -e -n "meas:curr?\n" | nc 10.0.100.220 5025`
+RC=$?
+#echo $RC $DATA
+DATA=`printf %.3f ${DATA}`
+if [ "$RC" == "0" -a $DATA != "0.000" ] ; then
+   echo agilent_cur1.value $DATA
 fi
 
-DATA224=( `echo -e -n "meas:curr?\n" | nc 10.0.100.224 5025` )
-RC224=$?
-
-if [ "$RC224" == "0" ] ; then
-   echo agilent_cur2.value `printf %.3f ${DATA224}`
+DATA=`echo -e -n "meas:curr?\n" | nc 10.0.100.224 5025`
+RC=$?
+#echo $RC $DATA
+DATA=`printf %.3f ${DATA}`
+if [ "$RC" == "0" -a $DATA != "0.000" ] ; then
+   echo agilent_cur2.value $DATA
 fi
 
-DATA222=( `echo -e -n "meas:curr?\n" | nc 10.0.100.222 5025` )
-RC222=$?
-
-if [ "$RC222" == "0" ] ; then
-   echo agilent_cur3.value `printf %.3f ${DATA222}`
+DATA=`echo -e -n "meas:curr?\n" | nc 10.0.100.222 5025`
+RC=$?
+#echo $RC $DATA
+DATA=`printf %.3f ${DATA}`
+if [ "$RC" == "0" -a $DATA != "0.000" ] ; then
+   echo agilent_cur3.value $DATA
 fi
 

trunk/FACT++/munin/agilent_volt

@@ -14 +14 @@
 esac
 
-DATA220=`echo -e -n "meas:volt?\n" | nc 10.0.100.220 5025`
-RC220=$?
+DATA=`echo -e -n "meas:volt?\n" | nc 10.0.100.220 5025`
+RC=$?
+DATA=`printf %.3f ${DATA}`
 
-if [ "$RC220" == "0" ] ; then
-   echo agilent_volt1.value `printf %.3f ${DATA220}`
+if [ "$RC" == "0" -a "$DATA" != "0.000"  ] ; then
+   echo agilent_volt1.value $DATA
 fi
 
-DATA222=`echo -e -n "meas:volt?\n" | nc 10.0.100.222 5025`
-RC222=$?
+DATA=`echo -e -n "meas:volt?\n" | nc 10.0.100.224 5025`
+RC=$?
+DATA=`printf %.3f ${DATA}`
 
-if [ "$RC222" == "0" ] ; then
-   echo agilent_volt3.value `printf %.3f ${DATA222}`
+if [ "$RC" == "0" -a "$DATA" != "0.000"  ] ; then
+   echo agilent_volt2.value $DATA
 fi
 
-DATA224=`echo -e -n "meas:volt?\n" | nc 10.0.100.224 5025`
-RC224=$?
+DATA=`echo -e -n "meas:volt?\n" | nc 10.0.100.222 5025`
+RC=$?
+DATA=`printf %.3f ${DATA}`
 
-if [ "$RC224" == "0" ] ; then
-   echo agilent_volt2.value `printf %.3f ${DATA224}`
+if [ "$RC" == "0" -a "$DATA" != "0.000" ] ; then
+   echo agilent_volt3.value $DATA
 fi