Index: /trunk/FACT++/scripts/Startup.js
===================================================================
--- /trunk/FACT++/scripts/Startup.js	(revision 17180)
+++ /trunk/FACT++/scripts/Startup.js	(revision 17181)
@@ -218,5 +218,5 @@
 {
     dim.send("BIAS_CONTROL/SET_ZERO_VOLTAGE");
-    dim.wait("BIAS_CONTROL", "VoltageOff", 30000); // waS: 15000
+    dim.wait("BIAS_CONTROL", "VoltageOff", 15000);
 
     var now = new Date();
@@ -227,10 +227,10 @@
 
     console.out("Wait for calibration to end");
-    dim.wait("FEEDBACK", "Calibrated", 90000);
+    dim.wait("FEEDBACK", "Calibrated", 60000);
 
     console.out("Calibration finished ["+(new Date()-now)+"ms]");
 
     console.out("Wait for voltage to be off");
-    dim.wait("BIAS_CONTROL", "VoltageOff", 30000); // was: 15000
+    dim.wait("BIAS_CONTROL", "VoltageOff", 5000);
 }
 
@@ -261,11 +261,8 @@
 // ================================================================
 
-dim.log("Switching to old bias calibration and feedback.");
-dim.send("BIAS_CONTROL/EXPERT_MODE", true);
+dim.send("BIAS_CONTROL/SET_EXPERT_MODE", true);
 dim.send("BIAS_CONTROL/EXPERT_LOAD_MAP_FILE", "/home/fact/operation/GAPDmap_with_spare_module-new.txt");
-dim.send("BIAS_CONTROL/EXPERT_MODE", false);
-dim.send("FEEDBACK/ENABLE_OLD_ALGORITHM", true);
-dim.send("FEEDBACK/ENABLE_TEMP_OFFSETS", false);
-v8.sleep(3000);
+dim.send("BIAS_CONTROL/SET_EXPERT_MODE", false);
+dim.send("FEEDBACK/ENABLE_OLD_ALGORITHM", false);
 
 // ================================================================
@@ -286,5 +283,5 @@
  [ "PWR_CONTROL",     [ "SystemOn"                        ] ],
  [ "AGILENT_CONTROL", [ "VoltageOn"                       ] ],
- [ "BIAS_CONTROL",    [ "VoltageOff"                      ] ],
+ [ "BIAS_CONTROL",    [ "VoltageOn", "VoltageOff"         ] ],
  [ "FEEDBACK",        [ "Calibrated"                      ] ],
  [ "RATE_SCAN",       [ "Connected"                       ] ],