Index: trunk/FACT++/scripts/Startup.js
===================================================================
--- trunk/FACT++/scripts/Startup.js	(revision 17182)
+++ trunk/FACT++/scripts/Startup.js	(revision 17187)
@@ -218,5 +218,5 @@
 {
     dim.send("BIAS_CONTROL/SET_ZERO_VOLTAGE");
-    dim.wait("BIAS_CONTROL", "VoltageOff", 15000);
+    dim.wait("BIAS_CONTROL", "VoltageOff", 30000); // waS: 15000
 
     var now = new Date();
@@ -227,10 +227,10 @@
 
     console.out("Wait for calibration to end");
-    dim.wait("FEEDBACK", "Calibrated", 60000);
+    dim.wait("FEEDBACK", "Calibrated", 90000);
 
     console.out("Calibration finished ["+(new Date()-now)+"ms]");
 
     console.out("Wait for voltage to be off");
-    dim.wait("BIAS_CONTROL", "VoltageOff", 5000);
+    dim.wait("BIAS_CONTROL", "VoltageOff", 30000); // was: 15000
 }
 
@@ -258,11 +258,4 @@
 
 service_calibration.close();
-
-// ================================================================
-
-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/SET_EXPERT_MODE", false);
-dim.send("FEEDBACK/ENABLE_OLD_ALGORITHM", false);
 
 // ================================================================
@@ -283,5 +276,5 @@
  [ "PWR_CONTROL",     [ "SystemOn"                        ] ],
  [ "AGILENT_CONTROL", [ "VoltageOn"                       ] ],
- [ "BIAS_CONTROL",    [ "VoltageOn", "VoltageOff"         ] ],
+ [ "BIAS_CONTROL",    [ "VoltageOff"                      ] ],
  [ "FEEDBACK",        [ "Calibrated"                      ] ],
  [ "RATE_SCAN",       [ "Connected"                       ] ],