diff --git a/config/diffcalc/test1.json b/config/diffcalc/test1.json
index 2570e0a..98b218a 100644
--- a/config/diffcalc/test1.json
+++ b/config/diffcalc/test1.json
@@ -6,22 +6,22 @@
             "tag": null, 
             "hkl": "[0.0, 1.0, 2.0]", 
             "pos": "[5.0, 9.379, 19.7895, 102.6162, 0, 0]", 
-            "energy": 9.5007, 
-            "time": "2019-02-18T11:52:32.627000"
+            "energy": 9.5, 
+            "time": "2019-03-07T16:58:43.508000"
         }, 
         "2": {
             "tag": null, 
             "hkl": "[2.0, 0.0, 2.0]", 
             "pos": "[5.0, 19.0754, 20.1865, 11.9693, 0, 0]", 
-            "energy": 9.5007, 
-            "time": "2019-02-18T11:52:32.648000"
+            "energy": 9.5, 
+            "time": "2019-03-07T16:58:43.549000"
         }, 
         "3": {
             "tag": null, 
             "hkl": "[2.0, 2.0, 2.0]", 
             "pos": "[5.0, 27.1234, 21.2368, 60.0354, 0, 0]", 
-            "energy": 9.5007, 
-            "time": "2019-02-18T11:52:32.691000"
+            "energy": 9.5, 
+            "time": "2019-03-07T16:58:43.607000"
         }
     }, 
     "orientlist": {}, 
diff --git a/config/settings.properties b/config/settings.properties
index 2260da3..304ad7c 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,4 +1,4 @@
-#Thu Mar 07 16:55:50 CET 2019
+#Thu Mar 07 16:58:43 CET 2019
 count_time=0.1
 geometry=fourcv
 roi=190 45 290 125
diff --git a/script/daq/daq1.py b/script/daq/daq1.py
index 8f9e1ff..c70595a 100644
--- a/script/daq/daq1.py
+++ b/script/daq/daq1.py
@@ -7,6 +7,6 @@ pixel.set_threshold(40, 500, 8000, 100000)
 pixel.show()
 pixel.assert_ready()
 
-lscan (l, detectors, 1.9, 2.1, 40 ,  before_read=trigger_detectors, after_read=save_metadata)
+lscan (l, detectors, 1.9, 2.1, 40 ,  before_read=before_sample, after_read=after_sample)
 
 
diff --git a/script/daq/daq3.py b/script/daq/daq3.py
index 9c7c29d..0997789 100644
--- a/script/daq/daq3.py
+++ b/script/daq/daq3.py
@@ -11,8 +11,8 @@ pixel.show()
 pixel.assert_ready()
 
 
-#tscan(detectors, 1, 1.0 ,  before_read=trigger_detectors, after_read=save_metadata)
+#tscan(detectors, 1, 1.0 ,  before_read=before_sample, after_read=after_sample)
 
-lscan (l, detectors, 1.9, 2.1, 40 ,  before_read=trigger_detectors, after_read=save_metadata)
+lscan (l, detectors, 1.9, 2.1, 40 ,  before_read=before_sample, after_read=after_sample)
 
 
diff --git a/script/test/TestPixScan.py b/script/test/TestPixScan.py
index 4d2fea9..d9114b9 100644
--- a/script/test/TestPixScan.py
+++ b/script/test/TestPixScan.py
@@ -10,6 +10,6 @@ pixel.show()
 pixel.assert_ready()
 
 
-#tscan(detectors, 1, 1.0 ,  before_read=trigger_detectors, after_read=save_metadata)
+#tscan(detectors, 1, 1.0 ,  before_read=before_sample, after_read=after_sample)
 
-tscan (detectors, 20, 0.1,  before_read=trigger_detectors, after_read=save_metadata)
\ No newline at end of file
+tscan (detectors, 20, 0.1,  before_read=before_sample, after_read=after_sample)
\ No newline at end of file