Index: trunk/FACT++/ScriptsForDimCtrl/DataTaking1.dim
===================================================================
--- trunk/FACT++/ScriptsForDimCtrl/DataTaking1.dim	(revision 13728)
+++ trunk/FACT++/ScriptsForDimCtrl/DataTaking1.dim	(revision 13729)
@@ -9,134 +9,17 @@
 > Operator: make sure that telescope is tracking wobble position 1 of source
 >
-#> ... This script will wait 10sec for you
-#.w 10000
 
-FEEDBACK/ENABLE_OUTPUT 1
+# Take a DRS-Calibration before beginning to take physics Data
+.x ScriptsForDimCtrl/ServiceScripts/TakeDrsCalibration.dim
 
-# Making sure bias is off
-BIAS_CONTROL/SET_ZERO_VOLTAGE
-.s BIAS_CONTROL 7
-FAD_CONTROL/START_DRS_CALIBRATION
-> bias voltage is switched off
+> Operator: make sure that telescope is tracking correct wobble position of source
 >
-> taking DRS:Pedestal 1000 ...
-.s FAD_CONTROL 4
-MCP/START -1 1000 drs-pedestal
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-> taking DRS:Gain 1000 ...
-MCP/START -1 1000 drs-gain
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-> taking DRS:Pedestal 1000 ...
-MCP/START -1 1000 drs-pedestal
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-> taking crosscheck DRS:Pedestal 1000 ...
-FAD_CONTROL/SET_FILE_FORMAT 2
-MCP/START -1 1000 drs-pedestal
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-> taking DRS:Time 1000 ...
-MCP/START -1 1000 drs-time
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-> taking DRS:Time upshifted 1000 ...
-MCP/START -1 1000 drs-time-upshifted
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-> taking Pedestal 1000 for secondary baseline...
-FAD_CONTROL/RESET_SECONDARY_DRS_BASELINE
-MCP/START -1 1000 pedestal
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-> taking crosscheck Pedestal 1000 ...
-FAD_CONTROL/SET_FILE_FORMAT 2
-MCP/START -1 1000 pedestal
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
 > Operator: Measure Sky Brightness
 
-# switch BIAS ON and ramp to nominal Voltage
-> checking feedback state
-.s FEEDBACK 12
-> ... Current/Temp control active and voltage output enabled
-> switching on bias ...
-BIAS_CONTROL/SET_GLOBAL_DAC 1
-.s BIAS_CONTROL 9 # Voltage ON
-> ...set 1 DAC
-.s BIAS_CONTROL 5 # Ramping
-> ...ramping
-.s BIAS_CONTROL 9 # Voltage ON
-> ...bias ON
-# here one should wait 30..45sec according to TB
-> bias is on, and feedback-program is working, but we wait 45sec for the current readings...
-.w 45000
-> ... done
+# check feedback state before switching BIAS ON and ramping up to nominal Voltage
+.x ScriptsForDimCtrl/ServiceScripts/PrepareBiasForDataTaking.dim
 
-# check if all subsystems are in the correct state
-.x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking.dim
-> taking Pedestal with BIAS on 1000 ...
-MCP/START -1 1000 pedestal
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-# check if all subsystems are in the correct state
-.x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking.dim
-> taking External Light Pulser with BIAS on 1000 ...
-MCP/START -1 1000 light-pulser-ext
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-#Data Taking with Full Trigger Area (4x5min)
-
-# check if all subsystems are in the correct state
-.x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking.dim
-> taking Data:FullTriggerArea 5min Run 1 ...
-MCP/START 300 -1 data
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-# check if all subsystems are in the correct state
-.x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking.dim
-> taking Data:FullTriggerArea 5min Run 2 ...
-MCP/START 300 -1 data
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-# check if all subsystems are in the correct state
-.x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking.dim
-> taking Data:FullTriggerArea 5min Run 3 ...
-MCP/START 300 -1 data
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
-
-# check if all subsystems are in the correct state
-.x ScriptsForDimCtrl/ServiceScripts/IsReadyForDataTaking.dim
-> taking Data:FullTriggerArea 5min Run 4 ...
-MCP/START 300 -1 data
-.s FAD_CONTROL 8
-.s FAD_CONTROL 4
-> ... done
+# taking a Data Set (1x Pedestal 1000 Bias On, 1x LPext 1000, 4x5min DataRun)
+.x ScriptsForDimCtrl/ServiceScripts/TakeData.dim
 
 > ----------------------------------------------------