Index: /trunk/FACT++/scripts/CheckUnderflow.js
===================================================================
--- /trunk/FACT++/scripts/CheckUnderflow.js	(revision 17353)
+++ /trunk/FACT++/scripts/CheckUnderflow.js	(revision 17354)
@@ -164,21 +164,17 @@
     if (nn>0)
     {
-        dim.log("Trying to restore last DRS calibration #"+nn+"  ["+runs.time+"]");
-
-        var night;
-        if (Sun.horizon(null, runs.time).isUp)
-            night = new Date(runs.time);
-        else
-            night = new Date(runs.time-1000*60*60*12);
-
-        var yy = night.getUTCFullYear();
-        var mm = night.getUTCMonth()+1;
-        var dd = night.getUTCDate();
-
-        var filefmt = "/loc_data/raw/%d/%02d/%02d/%4d%02d%02d_%03d.drs.fits";
+        var night = runs.obj['night'];
+
+        var yy =  night/10000;
+        var mm = (night/100)%100;
+        var dd =  night%100;
+
+        var filefmt = "/loc_data/raw/%d/%02d/%02d/%8d_%03d.drs.fits";
+
+        dim.log("Trying to restore last DRS calibration #"+nn+"  ["+runs.time+"; "+night+"]");
 
         // FIXME: Timeout
         var drs_counter = service_drs.get(0, false).counter;
-        dim.send("FAD_CONTROL/LOAD_DRS_CALIBRATION", filefmt.$(yy, mm, dd, yy, mm, dd, nn));
+        dim.send("FAD_CONTROL/LOAD_DRS_CALIBRATION", filefmt.$(yy, mm, dd, night, nn));
 
         var now = new Date();