Index: trunk/FACT++/scripts/CheckUnderflow.js
===================================================================
--- trunk/FACT++/scripts/CheckUnderflow.js	(revision 15115)
+++ trunk/FACT++/scripts/CheckUnderflow.js	(revision 15116)
@@ -79,9 +79,8 @@
     //console.out("Most probablay the camera has not been checked for underflows yet.");
 
+    var service_event = new Subscription("FAD_CONTROL/EVENT_DATA");
+
     dim.send("FAD_CONTROL/START_DRS_CALIBRATION");
     dim.send("FAD_CONTROL/SET_FILE_FORMAT", 0);
-
-    var service_event = new Subscription("FAD_CONTROL/EVENT_DATA");
-    var event = service_event.get(5000, false);
 
     // This needs a better solution! The problem is that the
@@ -91,11 +90,12 @@
     // events. Thus there is no real guarantee that we do not receive
     // data of the previous run after we have started a new one.
-    dim.wait("Connected", 10000);
+    dim.wait("FAD_CONTROL", "Connected", 10000);
     v8.sleep(1000); // Let 'timeout' in SendRawData pass
 
+    var event = service_event.get(5000, false);
     var event_counter = event.counter;
 
     console.out("Starting drs-gain");
-    dim.send("MCP/START", -1, 5, "drs-gain");
+    dim.send("MCP/START", -1, 3, "drs-gain");
 
     console.out("Waiting for new event");
@@ -103,4 +103,6 @@
     var d = new Date();
     v8.timeout(10000, function() { if (service_event.get(0, false).counter>event_counter) return true; });
+    //while (service_event.get(0, false).counter<=event_counter)
+    //    v8.sleep();
 
     console.out("Event received: "+(new Date()-d)+"ms");