Index: trunk/FACT++/ScriptsForDimCtrl/TakeMrk421
===================================================================
--- trunk/FACT++/ScriptsForDimCtrl/TakeMrk421	(revision 13161)
+++ trunk/FACT++/ScriptsForDimCtrl/TakeMrk421	(revision 13183)
@@ -1,35 +1,30 @@
 # DIM_CONTROL: MRK421 tracking and data taking
-
 .! echo
 .! echo `date -u`  "----------------------------------------------------" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
-.! echo `date -u`  "Data Taking and tracking script for Mrk 421 starting up... " >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+.! echo `date -u`  "Data tacking and tracking script for Mrk 421 starting up... " >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 .! echo `date -u`  "----------------------------------------------------" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 
 # changing tracking to "Mrk 421" Wobble 1
-
-.! echo `date -u`  "moving telescope to wobble Position 1" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+.! echo `date -u`  "moving telescope to wobble position 1" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 .! echo `date -u`  "...waiting for drivectrl to be ready to move" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 .s DRIVE_CONTROL 5
-.w 5000
+.w 2000
 DRIVE_CONTROL/TRACK_SOURCE 0.6 90 "Mrk 421"
 .! echo `date -u`  "...sent tracking command" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 
 # Wait for drivectrl to repley that its tracking the given source
-
 .s DRIVE_CONTROL 6
 .! echo `date -u`  "...moving" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
-
 .s DRIVE_CONTROL 7
 .! echo `date -u`  "...tracking above written wobble position" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+.! echo `date -u`  "...waiting 30 sec for drive to calm down" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 .! echo
 .w 30000
 
 # starting data taking of "Mrk 421" Wobble 1
+.x ScriptsForDimCtrl/DataTaking1
 
-.x ScriptsForDimCtrl/DataTaking1
-#.! echo `date -u`  "...normaly here DataTaking1 would be started" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 # Stop tracking
-
-.w 4000
+.w 2000
 DRIVE_CONTROL/STOP
 .s DRIVE_CONTROL 5
@@ -37,38 +32,32 @@
 .! echo `date -u` "...stopped tracking of above wobble position" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 .! echo `date -u` "----------------------------------------------------" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
-.! echo
 
 # changing tracking to "Mrk 421" Wobble 2
-
 .! echo
-.! echo `date -u`  "Moving telescope to wobble Position 2" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
-
-.! echo `date -u`  "...waiting for drivectrl to be in state Armed" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+.! echo `date -u`  "moving telescope to wobble position 2" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+.! echo `date -u`  "...waiting for drivectrl to be ready to move" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 .s DRIVE_CONTROL 5
-.w 5000
+.w 2000
 DRIVE_CONTROL/TRACK_SOURCE 0.6 -90 "Mrk 421"
 .! echo `date -u`  "...sent tracking command" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 
-# Wait for drivectrl to repley that its tracking the given source
-
+# Wait for drivectrl to reply that its tracking the given source
 .s DRIVE_CONTROL 6
 .! echo `date -u`  "...moving" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
-
 .s DRIVE_CONTROL 7
 .! echo `date -u`  "...tracking above written wobble position" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+.! echo `date -u`  "...waiting 30 sec for drive to calm down" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 .! echo
 .w 30000
 
 # data taking to "Mrk 421" Wobble 2
-
 .x ScriptsForDimCtrl/DataTaking2
-#.! echo `date -u`  "...normaly here DataTaking2 would be started" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 
 # Stop tracking
-.w 5000
+.w 2000
 DRIVE_CONTROL/STOP
 .s DRIVE_CONTROL 5
 .! echo
-.! echo `date -u` "...stopped tracking of above wobble position" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
+.! echo `date -u` "...stopped tracking of Mrk421 at above wobble position" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 .! echo `date -u` "----------------------------------------------------" >> ~/FACT++/ScriptsForDimCtrl/DataTaking.log
 .! echo