Index: /fact/tools/PyDimCtrl/ScriptsForPyDimCtrl.py
===================================================================
--- /fact/tools/PyDimCtrl/ScriptsForPyDimCtrl.py	(revision 14459)
+++ /fact/tools/PyDimCtrl/ScriptsForPyDimCtrl.py	(revision 14460)
@@ -10,4 +10,6 @@
 
 bias_calibration = {}
+
+report_length = None
 
 def wait_nice(self, state_num, timeout=None):                            
@@ -23,9 +25,16 @@
     time.sleep(0.1)
     if time.time() - intermed >= 1.:
-      print fad_control.events()[0], 'events @', ftm_control.trigger_rates()[3], 'Hz'
+      report = str(fad_control.events()[0]) + ' events @ ' +
+                str( ftm_control.trigger_rates()[3]) + ' Hz'
+      if report_length:
+        print '\b'*report_length,
+      print report,
+      report_length = len(report)
       intermed = time.time()
     
     if time.time() >= start+timeout:
+      print
       return False
+  print
   return True
 
@@ -246,41 +255,26 @@
 
 
-def waitForTracking():
+def WaitForTracking( verbose = False):
   """ Wait for drivectrl to reply that its tracking the given source
   """
-  
-  print "...waiting for DRIVE_CONTROL"
-  print "   to be in state 7: Moving"
+  if verbose:
+    print "...waiting for DRIVE_CONTROL"
+    print "   to be in state 7: Moving"
   drive_control.wait(7)
-  print "...moving"
-  
-  print "...waiting for DRIVE_CONTROL"
-  print "   to be in state 8: Tracking"
+  if verbose:
+    print "...moving"
+  
+  if verbose:
+    print "...waiting for DRIVE_CONTROL"
+    print "   to be in state 8: Tracking"
   drive_control.wait(8)
-  print "...tracking requested wobble position"
-
-  print "waiting 10 sec for drive to calm down"
-  print "and tracking beeing stable"
+  if verbose:
+    print "...tracking requested wobble position"
+
+  if verbose:
+    print "waiting 10 sec for drive to calm down"
+    print "and tracking beeing stable"
   time.sleep(10)
 
-
-
-def TakeExtLpRun():
-  """ Take a external Lightpulser Run
-  """
-  # check if all subsystems are in the correct state
-  IsReadyForDataTaking()
-
-  print 'taking External Light Pulser with BIAS on 1000 ...'
-  Take(-1, 1000, 'light-pulser-ext')
-  
-def TakePedestalOnRun():
-  """ Take a Pedestal 1000 run with Bias ON
-  """
-  # check if all subsystems are in the correct state
-  IsReadyForDataTaking()
-
-  print 'taking External Light Pulser with BIAS on 1000 ...'
-  Take(-1, 1000, 'pedestal')
 
 
@@ -312,9 +306,13 @@
   # take a Pedestal run
   IsTracking()
-  TakePedestalOnRun()
+  IsReadyForDataTaking()
+  print 'taking External Light Pulser with BIAS on 1000 ...'
+  Take(-1, 1000, 'pedestal')
   
   # take a ExtLP run
   IsTracking()
-  TakeExtLpRun()
+  IsReadyForDataTaking()
+  print 'taking External Light Pulser with BIAS on 1000 ...'
+  Take(-1, 1000, 'light-pulser-ext')
 
   #Data Taking with Full Trigger Area (4x5min)
@@ -322,13 +320,6 @@
     print 'taking data run', run+1, 'out of 4'
     IsTracking()
-
-    TakeDataRun()
-
-def TakeDataRun():
-  """ Take a 5min Data Run
-  """
-  # check if all subsystems are in the correct state  
-  IsReadyForDataTaking()
-  Take( 300, -1, 'data')
+    IsReadyForDataTaking()
+    Take( 300, -1, 'data')
 
 
@@ -868,9 +859,4 @@
     print time.strftime('%d %b %Y %H:%M:%S UTC', time.gmtime()), GetBiasCurrent()
 
-def WaitForTracking():
-  drive_control.wait(7) #Moving
-  drive_control.wait(8) #Tracking
-  time.sleep(10)
-
 
 if __name__ == '__main__':