Index: trunk/FACT++/ScriptsForDimCtrl/TakeMrk421
===================================================================
--- trunk/FACT++/ScriptsForDimCtrl/TakeMrk421	(revision 13366)
+++ trunk/FACT++/ScriptsForDimCtrl/TakeMrk421	(revision 13369)
@@ -1,68 +1,37 @@
-# Data taking and tracking script for Mrk 421 starting up...
+# Data taking and tracking script for Mrk 421
 >
 > ----------------------------------------------------
-> Data taking and tracking script for Mrk 421 starting up...
+> Data taking and tracking script for Mrk 421
+> starting up...
 > ----------------------------------------------------
 
-# changing tracking to "Mrk 421" Wobble 1
-> moving telescope to wobble position 1
-> ...waiting for drivectrl to be ready to move
-.s DRIVE_CONTROL 5
-.w 2000
-DRIVE_CONTROL/TRACK_SOURCE 0.6 90 "Mrk 421"
-> ...sent tracking command
+# changing tracking to Mrk 421 Wobble 1
+.x ScriptsForDimCtrl/ServiceScripts/TrackMrk421Wobble1
 
 # Wait for drivectrl to reply that its tracking the given source
-.s DRIVE_CONTROL 6
-> ...moving
-.s DRIVE_CONTROL 7
-> ...tracking above written wobble position
-> ...waiting 30 sec for drive to calm down
->
+.x ScriptsForDimCtrl/ServiceScripts/WaitForTracking
 
-.w 30000
-
-# starting data taking of "Mrk 421" Wobble 1
->
+# starting data taking of Mrk 421 Wobble 1
 .x ScriptsForDimCtrl/DataTaking1
 
 # Stop tracking
-.w 2000
-DRIVE_CONTROL/STOP
-.s DRIVE_CONTROL 5
->
-> ...stopped tracking of above wobble position
-> ----------------------------------------------------
+.x ScriptsForDimCtrl/ServiceScripts/StopTracking
 
-# changing tracking to "Mrk 421" Wobble 2
->
-> moving telescope to wobble position 2
-> ...waiting for drivectrl to be ready to move
-.s DRIVE_CONTROL 5
-.w 2000
-DRIVE_CONTROL/TRACK_SOURCE 0.6 -90 "Mrk 421"
-> ...sent tracking command
+# changing tracking to Mrk 421 Wobble 2
+.x ScriptsForDimCtrl/ServiceScripts/TrackMrk421Wobble2
 
 # Wait for drivectrl to reply that its tracking the given source
-.s DRIVE_CONTROL 6
-> ...moving
-.s DRIVE_CONTROL 7
-> ...tracking above written wobble position
-> ...waiting 30 sec for drive to calm down
->
-.w 30000
+.x ScriptsForDimCtrl/ServiceScripts/WaitForTracking
 
-# data taking to "Mrk 421" Wobble 2
->
+# data taking to Mrk 421 Wobble 2
 .x ScriptsForDimCtrl/DataTaking2
 
 # Stop tracking
-.w 2000
-DRIVE_CONTROL/STOP
-.s DRIVE_CONTROL 5
->
-> ...stopped tracking of Mrk421 at above wobble position
+.x ScriptsForDimCtrl/ServiceScripts/StopTracking
+
+> ----------------------------------------------------
+> Data taking and tracking script for Mrk 421
+> finnished
 > ----------------------------------------------------
 >
-# ...stopped tracking of Mrk421 at above wobble position
-# ----------------------------------------------------
+