Index: trunk/FACT++/ScriptsForDimCtrl/DataTaking2
===================================================================
--- trunk/FACT++/ScriptsForDimCtrl/DataTaking2	(revision 13279)
+++ trunk/FACT++/ScriptsForDimCtrl/DataTaking2	(revision 13349)
@@ -1,54 +1,61 @@
 # Move Telescope to Wobble Position 2
-.! echo `date -u` "data taking script for Wobble 2 starting up... " >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
-.! echo `date -u` "----------------------------------------------------" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
-.! echo
-.! echo `date -u`  "Operator: make sure that telescope is tracking wobble position 2 of source" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
-.! echo `date -u`  "Operator: Measure Sky Brightness" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> data taking script for Wobble 2 starting up...
+> ----------------------------------------------------
+>
+> Operator: make sure that telescope is tracking wobble position 2 of source
+> Operator: Measure Sky Brightness
+>
 
+# check if all subsystems are in the correct state
 .x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking
-.! echo `date -u` "taking Pedestal with BIAS on 1000 ..." >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> taking Pedestal with BIAS on 1000 ...
 .s FAD_CONTROL 4
 MCP/START -1 1000 pedestal
 .s FAD_CONTROL 8
 .s FAD_CONTROL 4
-.! echo `date -u` "... done" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> ... done
 
+# check if all subsystems are in the correct state
 .x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking
-.! echo `date -u` "taking External Light Pulser with BIAS on 1000 ..." >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> taking External Light Pulser with BIAS on 1000 ...
 MCP/START -1 1000 light-pulser-ext
 .s FAD_CONTROL 8
 .s FAD_CONTROL 4
-.! echo `date -u` "... done" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> ... done
 
 #Data Taking with Full Trigger Area (4x5min)
 
+# check if all subsystems are in the correct state
 .x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking
-.! echo `date -u` "taking Data:FullTriggerArea 5min Run 1 ..." >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> taking Data:FullTriggerArea 5min Run 1 ...
 MCP/START 300 -1 data
 .s FAD_CONTROL 8
 .s FAD_CONTROL 4
-.! echo `date -u` "... done" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> ... done
 
+# check if all subsystems are in the correct state
 .x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking
-.! echo `date -u` "taking Data:FullTriggerArea 5min Run 2 ..." >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> taking Data:FullTriggerArea 5min Run 2 ...
 MCP/START 300 -1 data
 .s FAD_CONTROL 8
 .s FAD_CONTROL 4
-.! echo `date -u` "... done" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> ... done
 
+# check if all subsystems are in the correct state
 .x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking
-.! echo `date -u` "taking Data:FullTriggerArea 5min Run 3 ..." >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> taking Data:FullTriggerArea 5min Run 3 ...
 MCP/START 300 -1 data
 .s FAD_CONTROL 8
 .s FAD_CONTROL 4
-.! echo `date -u` "... done" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> ... done
 
+# check if all subsystems are in the correct state
 .x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking
-.! echo `date -u` "taking Data:FullTriggerArea 5min Run 4 ..." >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> taking Data:FullTriggerArea 5min Run 4 ...
 MCP/START 300 -1 data
 .s FAD_CONTROL 8
 .s FAD_CONTROL 4
-.! echo `date -u` "... done" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> ... done
 
-.! echo `date -u` "----------------------------------------------------" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
-.! echo `date -u` "This is the end of data taking of Wobble 2" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+> ----------------------------------------------------
+> This is the end of data taking of Wobble 2