Index: trunk/FACT++/ScriptsForDimCtrl/TakeCrab
===================================================================
--- trunk/FACT++/ScriptsForDimCtrl/TakeCrab	(revision 13369)
+++ trunk/FACT++/ScriptsForDimCtrl/TakeCrab	(revision 13370)
@@ -1,67 +1,38 @@
-# Data taking and tracking script for Crab starting up...
+# Data taking and tracking script for Crab
 >
 > ----------------------------------------------------
-> Data taking and tracking script for Crab starting up...
+> Data taking and tracking script for Crab
+> starting up...
 > ----------------------------------------------------
 
 # changing tracking to Crab Wobble 1
-> moving telescope to wobble position 1
-> ...waiting for drivectrl to be ready to move
-.s DRIVE_CONTROL 5
-.w 5000
-DRIVE_CONTROL/TRACK_SOURCE 0.6 50 Crab
-> ...sent tracking command
+.x ScriptsForDimCtrl/ServiceScripts/TrackCrabWobble1
 
 # 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 downe
->
-.w 30000
+.x ScriptsForDimCtrl/ServiceScripts/WaitForTracking
 
 # starting data taking of Crab Wobble 1
->
 .x ScriptsForDimCtrl/DataTaking1
 
 # Stop tracking
-.w 3000
-DRIVE_CONTROL/STOP
-.s DRIVE_CONTROL 5
->
-> ...stopped tracking of above wobble position
+.x ScriptsForDimCtrl/ServiceScripts/StopTracking
+
+# changing tracking to Crab Wobble 2
+
+.x ScriptsForDimCtrl/ServiceScripts/TrackCrabWobble2
+
+# Wait for drivectrl to reply that its tracking the given source
+.x ScriptsForDimCtrl/ServiceScripts/WaitForTracking
+
+# data taking to Crab Wobble 2
+.x ScriptsForDimCtrl/DataTaking2
+
+# Stop tracking
+.x ScriptsForDimCtrl/ServiceScripts/StopTracking
+
+> ----------------------------------------------------
+> Data taking and tracking script for Crab
+> finnished
 > ----------------------------------------------------
 >
 
-# changing tracking to Crab Wobble 2
->
-> Moving telescope to wobble Position 2
-> ...waiting for drivectrl to be ready to move
-.s DRIVE_CONTROL 5
-.w 5000
-DRIVE_CONTROL/TRACK_SOURCE 0.6 -130 Crab
-> ...sent tracking command
-
-# 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 downe
-.w 30000
-
-# data taking to Crab Wobble 2
->
-.x ScriptsForDimCtrl/DataTaking2
-
-# Stop tracking
-.w 3000
-DRIVE_CONTROL/STOP
-.s DRIVE_CONTROL 5
->
-> ...stopped tracking of Crab at above wobble position
-> ----------------------------------------------------
->
-# ...stopped tracking of Crab at above wobble position
-# ----------------------------------------------------