Index: trunk/Mars/hawc/processing/currents.C
===================================================================
--- trunk/Mars/hawc/processing/currents.C	(revision 20028)
+++ trunk/Mars/hawc/processing/currents.C	(revision 20030)
@@ -117,40 +117,23 @@
     {
         if (diff<5./24/3600)
-        {
-            cout << "result";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << " NULL";
-            cout << endl;
             return;
-        }
 
-        cout << "result";
-        cout << " " << Umed;
-        cout << " " << Uavg;
-        cout << " " << Udev;
-        cout << " " << Urms;
+        cout << "result ";
+        cout << Umed << ", ";
+        cout << Uavg << ", ";
+        cout << Udev << ", ";
+        cout << Urms << ", ";
 
-        cout << " " << Imed;
-        cout << " " << Iavg;
-        cout << " " << Idev;
-        cout << " " << Irms;
+        cout << Imed << ", ";
+        cout << Iavg << ", ";
+        cout << Idev << ", ";
+        cout << Irms << ", ";
 
-        cout << " " << Tmed;
-        cout << " " << Tavg;
-        cout << " " << Tdev;
-        cout << " " << Trms;
+        cout << Tmed << ", ";
+        cout << Tavg << ", ";
+        cout << Tdev << ", ";
+        cout << Trms << ", ";
 
-        cout << " " << psu;
+        cout << psu;
         cout << endl;
         return;
@@ -177,20 +160,20 @@
 
     cout << "result";
-    cout << " " << AvgUmed;
-    cout << " " << AvgUavg;
-    cout << " " << AvgUdev;
-    cout << " " << AvgUrms;
+    cout << AvgUmed << ", ";
+    cout << AvgUavg << ", ";
+    cout << AvgUdev << ", ";
+    cout << AvgUrms << ", ";
 
-    cout << " " << AvgImed;
-    cout << " " << AvgIavg;
-    cout << " " << AvgIdev;
-    cout << " " << AvgIrms;
+    cout << AvgImed << ", ";
+    cout << AvgIavg << ", ";
+    cout << AvgIdev << ", ";
+    cout << AvgIrms << ", ";
 
-    cout << " " << AvgTmed;
-    cout << " " << AvgTavg;
-    cout << " " << AvgTdev;
-    cout << " " << AvgTrms;
+    cout << AvgTmed << ", ";
+    cout << AvgTavg << ", ";
+    cout << AvgTdev << ", ";
+    cout << AvgTrms << ", ";
 
-    cout << " " << AvgPsu;
+    cout << AvgPsu;
 
     cout << endl;
Index: trunk/Mars/hawc/processing/drstemp.C
===================================================================
--- trunk/Mars/hawc/processing/drstemp.C	(revision 20028)
+++ trunk/Mars/hawc/processing/drstemp.C	(revision 20030)
@@ -74,5 +74,5 @@
             return;
 
-        cout << "result " << lastavgmin << " " << lastavgmax << " " << lastrmsmin << " " << lastrmsmax << endl;
+        cout << "result " << lastavgmin << ", " << lastavgmax << ", " << lastrmsmin << ", " << lastrmsmax << endl;
         return;
     }
@@ -83,5 +83,5 @@
     rmsmax /= cnt;
 
-    cout << "result " << avgmin << " " << avgmax << " " << rmsmin << " " << rmsmax << endl;
+    cout << "result " << avgmin << ", " << avgmax << ", " << rmsmin << ", " << rmsmax << endl;
 }
 
@@ -145,5 +145,5 @@
             return;
 
-        cout << "result " << lastavg << " " << lastavg << " " << lastrms << " " << lastrms << endl;
+        cout << "result " << lastavg << ", " << lastavg << ", " << lastrms << ", " << lastrms << endl;
         return;
     }
@@ -152,5 +152,5 @@
     rms /= cnt;
 
-    cout << "result " << avg << " " << avg << " " << rms << " " << rms << " " << endl;
+    cout << "result " << avg << ", " << avg << ", " << rms << ", " << rms << ", " << endl;
 }
 
Index: trunk/Mars/hawc/processing/extract-aux-data.sh
===================================================================
--- trunk/Mars/hawc/processing/extract-aux-data.sh	(revision 20028)
+++ trunk/Mars/hawc/processing/extract-aux-data.sh	(revision 20030)
@@ -95,102 +95,34 @@
 
   # Return corresponding data for DRS temperatures from FAD_CONTROL_TEMPEREATURE
-  RESULT=`root -b -q -l '${MACROS}/drstemp.C("'${FNAME}'.FAD_CONTROL_TEMPERATURE.fits",'${BEG}','${END}')' | grep result`
-  if [ -n "${RESULT}" ]
+  DRSTEMP=`root -b -q -l '${MACROS}/drstemp.C("'${FNAME}'.FAD_CONTROL_TEMPERATURE.fits",'${BEG}','${END}')' | grep result | cut -f2- -d" "`
+  if [ ! -n "${DRSTEMP}" ]
   then
-     TEMP_AVG=`echo ${RESULT} | cut -f2 -d' '`
-     TEMP_RMS=`echo ${RESULT} | cut -f4 -d' '`
-  else
-     TEMP_AVG="NULL"
-     TEMP_RMS="NULL"
+  	DRSTEMP="NULL, NULL"
   fi
-  echo ${RESULT}
+  echo ${DRSTEMP}
 
   # Return corresponding data for currents from BIAS_CONTROL_DYNAMIC_DATA
-  RESULT=`root -b -q -l '${MACROS}/currents.C("'${FNAME}'.BIAS_CONTROL_DYNAMIC_DATA.fits",'${BEG}','${END}')' | grep result`
-  if [ -n "${RESULT}" ]
+  BIAS_DATA=`root -b -q -l '${MACROS}/currents.C("'${FNAME}'.BIAS_CONTROL_DYNAMIC_DATA.fits",'${BEG}','${END}')' | grep result | cut -f2- -d" "`
+  if [ ! -n "${BIAS_DATA}" ]
   then  
-     BIAS_UMED=`echo ${RESULT} | cut -f2  -d' '`
-     BIAS_UAVG=`echo ${RESULT} | cut -f3  -d' '`
-     BIAS_UDEV=`echo ${RESULT} | cut -f4  -d' '`
-     BIAS_URMS=`echo ${RESULT} | cut -f5  -d' '`
-     BIAS_IMED=`echo ${RESULT} | cut -f6  -d' '`
-     BIAS_IAVG=`echo ${RESULT} | cut -f7  -d' '`
-     BIAS_IDEV=`echo ${RESULT} | cut -f8  -d' '`
-     BIAS_IRMS=`echo ${RESULT} | cut -f9  -d' '`
-     BIAS_TMED=`echo ${RESULT} | cut -f10 -d' '`
-     BIAS_TAVG=`echo ${RESULT} | cut -f11 -d' '`
-     BIAS_TDEV=`echo ${RESULT} | cut -f12 -d' '`
-     BIAS_TRMS=`echo ${RESULT} | cut -f13 -d' '`
-     BIAS_PSU=`echo  ${RESULT} | cut -f14 -d' '`
-  else
-     BIAS_UMED="NULL"
-     BIAS_UAVG="NULL"
-     BIAS_UDEV="NULL"
-     BIAS_URMS="NULL"
-     BIAS_IMED="NULL"
-     BIAS_IAVG="NULL"
-     BIAS_IDEV="NULL"
-     BIAS_IRMS="NULL"
-     BIAS_TMED="NULL"
-     BIAS_TAVG="NULL"
-     BIAS_TDEV="NULL"
-     BIAS_TRMS="NULL"
-     BIAS_PSU="NULL"
+  	BIAS_DATA="NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL"
   fi
-  echo ${RESULT}
+  echo ${BIAS_DATA}
 
   # Return corresponding data for trigger information from FTM_CONTROL_DATA
-  RESULT=`root -b -q -l '${MACROS}/trigger.C("'${FNAME}'.FTM_CONTROL_DATA.fits",'${BEG}','${END}')' | grep result`
-  if [ -n "${RESULT}" ]
+  FTM_DATA=`root -b -q -l '${MACROS}/trigger.C("'${FNAME}'.FTM_CONTROL_DATA.fits",'${BEG}','${END}')' | grep result | cut -f2- -d" "`
+  if [ ! -n "${RESULT}" ]
   then
-     TOT_TIME=`echo ${RESULT} | cut -f2 -d' '`
-     TOT_DEAD=`echo ${RESULT} | cut -f3 -d' '`
-     EFF=`echo      ${RESULT} | cut -f4 -d' '`
-     TM_AVG=`echo   ${RESULT} | cut -f5 -d' '`
-  else
-     TOT_TIME="NULL"
-     TOT_DEAD="NULL"
-     EFF="NULL"
-     TM_AVG="NULL"
+  	FTM_DATA="NULL, NULL, NULL, NULL"
   fi
-  echo ${RESULT}
+  echo ${FTM_DATA}
 
   # Return corresponding data for threshold seeting from FTU_CONTROL_DATA
-  RESULT=`root -b -q -l '${MACROS}/threshold.C("'${FNAME}'.FTU_CONTROL_DATA.fits",'${BEG}','${END}')' | grep result`
-  if [ -n "${RESULT}" ]
+  FTU_DATA=`root -b -q -l '${MACROS}/threshold.C("'${FNAME}'.FTU_CONTROL_DATA.fits",'${BEG}','${END}')' | grep result | cut -f2- -d" "`
+  if [ ! -n "${FTU_DATA}" ]
   then
-     DAC_CH_MIN=`echo  ${RESULT} | cut -f2  -d' '`
-     DAC_CH_MED=`echo  ${RESULT} | cut -f3  -d' '`
-     DAC_CH_MAX=`echo  ${RESULT} | cut -f4  -d' '`
-     DAC_SUM_MIN=`echo ${RESULT} | cut -f5  -d' '`
-     DAC_SUM_MAX=`echo ${RESULT} | cut -f6  -d' '`
-     RATE_CH1=`echo    ${RESULT} | cut -f7  -d' '`
-     RATE_CH2=`echo    ${RESULT} | cut -f8  -d' '`
-     RATE_CH3=`echo    ${RESULT} | cut -f9  -d' '`
-     RATE_CH4=`echo    ${RESULT} | cut -f10 -d' '`
-     RATE_CH5=`echo    ${RESULT} | cut -f11 -d' '`
-     RATE_CH6=`echo    ${RESULT} | cut -f12 -d' '`
-     RATE_CH7=`echo    ${RESULT} | cut -f13 -d' '`
-     RATE_CH8=`echo    ${RESULT} | cut -f14 -d' '`
-     RATE_SUM1=`echo   ${RESULT} | cut -f15 -d' '`
-     RATE_SUM2=`echo   ${RESULT} | cut -f16 -d' '`
-  else
-     DAC_CH_MIN="NULL"
-     DAC_CH_MED="NULL"
-     DAC_CH_MAX="NULL"
-     DAC_SUM_MIN="NULL"
-     DAC_SUM_MAX="NULL"
-     RATE_CH1="NULL"
-     RATE_CH2="NULL"
-     RATE_CH3="NULL"
-     RATE_CH4="NULL"
-     RATE_CH5="NULL"
-     RATE_CH6="NULL"
-     RATE_CH7="NULL"
-     RATE_CH8="NULL"
-     RATE_SUM1="NULL"
-     RATE_SUM2="NULL"
+	FTU_DATA="NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL"
   fi
-  echo ${RESULT}
+  echo ${FTU_DATA}
 
   cd -
@@ -200,15 +132,8 @@
   echo "ROW(" >> insert-data.sql
   echo " "${NIGHT}, ${RUNID}, >> insert-data.sql
-  echo " "${TEMP_AVG}, ${TEMP_RMS}, >> insert-data.sql
-  echo " "\
-     ${BIAS_UMED}, ${BIAS_UAVG}, ${BIAS_UDEV}, ${BIAS_URMS}, \
-     ${BIAS_IMED}, ${BIAS_IAVG}, ${BIAS_IDEV}, ${BIAS_IRMS}, \
-     ${BIAS_TMED}, ${BIAS_TAVG}, ${BIAS_TDEV}, ${BIAS_TRMS}, \
-     ${BIAS_PSU},  >> insert-data.sql
-  echo " "${TOT_TIME}, ${TOT_DEAD}, ${EFF}, ${TM_AVG},  >> insert-data.sql
-  echo " "\
-     ${DAC_CH_MIN}, ${DAC_CH_MED}, ${DAC_CH_MAX}, ${DAC_SUM_MIN}, ${DAC_SUM_MAX}, \
-     ${RATE_CH1}, ${RATE_CH2}, ${RATE_CH3}, ${RATE_CH4}, ${RATE_CH5}, ${RATE_CH6}, ${RATE_CH7}, ${RATE_CH8}, \
-     ${RATE_SUM1}, ${RATE_SUM2} >> insert-data.sql
+  echo " "${DRS_TEMP},        >> insert-data.sql
+  echo " "${BIAS_DATA},       >> insert-data.sql
+  echo " "${FTU_DATA},        >> insert-data.sql
+  echo " "${FTM_DATA}         >> insert-data.sql
   echo ")," >> insert-data.sql
 
Index: trunk/Mars/hawc/processing/threshold.C
===================================================================
--- trunk/Mars/hawc/processing/threshold.C	(revision 20028)
+++ trunk/Mars/hawc/processing/threshold.C	(revision 20030)
@@ -95,11 +95,8 @@
     {
         if (diff<5./24/3600)
-        {
-            cout << "result NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL" << endl;
             return;
-        }
 
-        cout << "result " << dac_ch_min << " " << dac_ch_med << " " << dac_ch_max << " " << dac_sum_min << " " << dac_sum_max;
-        cout << " NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL" << endl;
+        cout << "result " << dac_ch_min << ", " << dac_ch_med << ", " << dac_ch_max << ", " << dac_sum_min << ", " << dac_sum_max;
+        cout << ", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL" << endl;
         return;
     }
@@ -108,9 +105,9 @@
 
 
-    cout << "result " << min_dac_ch <<" " << avg_dac_ch << " " << max_dac_ch << " " << min_dac_sum << " " << max_dac_sum;
+    cout << "result " << min_dac_ch << ", " << avg_dac_ch << ", " << max_dac_ch << ", " << min_dac_sum << ", " << max_dac_sum;
     for (int i=0;i<8; i++)
-        cout << " " << rate_ch[i] / sum_dt;
-    cout << " " << rate_sum[0] / sum_dt;
-    cout << " " << rate_sum[1] / sum_dt;
+        cout << ", " << rate_ch[i] / sum_dt;
+    cout << ", " << rate_sum[0] / sum_dt;
+    cout << ", " << rate_sum[1] / sum_dt;
     cout << endl;
 }
Index: trunk/Mars/hawc/processing/trigger.C
===================================================================
--- trunk/Mars/hawc/processing/trigger.C	(revision 20028)
+++ trunk/Mars/hawc/processing/trigger.C	(revision 20030)
@@ -73,10 +73,7 @@
     {
         if (diff<5./24/3600)
-        {
-            cout << "result NULL NULL NULL NULL" << endl;
             return;
-        }
 
-        cout << "result NULL NULL NULL " << temp_last << endl;
+        cout << "result NULL, NULL, NULL, " << temp_last << endl;
         return;
     }
@@ -85,4 +82,4 @@
     avg_temp /= count;
 
-    cout << "result " << tot_run*10e-9 << " " << tot_dead*10e-9 << " " << 1.-tot_dead/tot_run << " " << avg_temp << endl;
+    cout << "result " << tot_run*10e-9 << ", " << tot_dead*10e-9 << ", " << 1.-tot_dead/tot_run << ", " << avg_temp << endl;
 }