diff --git a/overnight.py b/overnight.py
index 2026273..5e5894b 100644
--- a/overnight.py
+++ b/overnight.py
@@ -3,7 +3,7 @@ from time import sleep, time
 import numpy as np
 from epics import PV
 from slic.utils import nice_arange
-
+from slic.devices.general.motor import Motor
 
 
 #def kescan3D():
@@ -954,62 +954,174 @@ from slic.utils import nice_arange
 
 
 
-def mourning():
-    currents = [
-        10.0,
-        31.99314930809352,
-        39.18320176115609,
-        43.80,
-        50.5,
-        62.0,
-        80.0,
-        100.0
-    ]
-
-    end_time = datetime(2021, 11, 29, 7, 45)
-
-    for i in range(100):
-        now = datetime.now()
-        if now > end_time:
-            break
-
-        for I in currents:
-            chic_delay.set(I).wait()
-
-            for energy1 in (406,): # if done, switch to: 403
-                und1.set(energy1).wait()
-
-                for energy2 in range(530, 545+1):
-                    und2.set(energy2).wait()
-
-                    fname = f"afternoon17_N2O_{i:04}_{energy1}eV_{energy2}eV_{I}A"
-                    print(datetime.now(), fname)
-
-                    while check_intensity.wants_repeat():
-                        daq.acquire(fname, n_pulses=1000 * 2).wait()
-
-        cycle_magnet().wait()
+#def mourning():
+#    currents = [
+#        10.0,
+#        31.99314930809352,
+#        39.18320176115609,
+#        43.80,
+#        50.5,
+#        62.0,
+#        80.0,
+#        100.0
+#    ]
+#
+#    end_time = datetime(2021, 11, 29, 7, 45)
+#
+#    for i in range(100):
+#        now = datetime.now()
+#        if now > end_time:
+#            break
+#
+#        for I in currents:
+#            chic_delay.set(I).wait()
+#
+#            for energy1 in (406,): # if done, switch to: 403
+#                und1.set(energy1).wait()
+#
+#                for energy2 in range(530, 545+1):
+#                    und2.set(energy2).wait()
+#
+#                    fname = f"afternoon17_N2O_{i:04}_{energy1}eV_{energy2}eV_{I}A"
+#                    print(datetime.now(), fname)
+#
+#                    while check_intensity.wants_repeat():
+#                        daq.acquire(fname, n_pulses=1000 * 2).wait()
+#
+#        cycle_magnet().wait()
+#
+#
+#
+#def klappe_zu():
+#    shutter1 = PV("SATFE10-OPSH066:REQUEST")
+#    shutter2 = PV("SATOP21-OPSH138:REQUEST")
+#
+#    end_time = datetime(2021, 11, 29, 8)
+#
+#    while True:
+#        now = datetime.now()
+#        if now > end_time:
+#            break
+#        print(now)
+#        sleep(30)
+#
+#    print("close shutters", datetime.now())
+#    shutter1.put(0)
+#    shutter2.put(0)
 
 
 
-def klappe_zu():
-    shutter1 = PV("SATFE10-OPSH066:REQUEST")
-    shutter2 = PV("SATOP21-OPSH138:REQUEST")
 
-    end_time = datetime(2021, 11, 29, 8)
+def TTmeasurements(daq, numIterations, nBackground, nMeas):
+    #increment run number    
+    print(daq.pgroup)
+    repratefactor = 10 #check reprate of machine
 
+    shutter266 = PV('SLAAT21-LDIO-LAS6291:SET_BO01')
+    exp_delay = Motor("SLAAT21-LMOT-M704:MOT", name="Laser Exp delay")
+
+    dsStart = exp_delay.get()
+
+    ### take background Time tool:
+    for i in range(0,numIterations):
+        
+#        #close shutter
+#        shutter266.put(1)
+#        ### Take data
+#        #timestamp = datetime.today().strftime("%d_%m_%H_%M")
+#        fname = f"TimeToolBackground_{i}"
+#        daq.acquire(fname, n_pulses=nBackground * repratefactor)
+#        #Open shutter
+#        shutter266.put(0)
+
+        
+        ### take spectrometer bacground Time tool:
+        #while shutters open
+        #move away from T0
+        exp_delay.set(dsStart-1)
+        sleep(3)
+        ### Take data
+        #timestamp = datetime.today().strftime("%d_%m_%H_%M")
+        fname = f"SpectrometerBackground_{i}"
+        daq.acquire(fname, n_pulses=nBackground * repratefactor)
+        #move back to T0
+        exp_delay.set(dsStart)
+        sleep(3)
+        ### measure:
+        
+        #timestamp = datetime.today().strftime("%d_%m_%H_%M")
+        fname = f"Measurement_{i}"
+        daq.acquire(fname, n_pulses=nMeas * repratefactor)
+
+#        n_pulses=nMeas * repratefactor
+#        scan.scan1D(exp_delay, start, stop, step, n_pulses, fname, return_to_initial_values=True)
+
+    
+def TTmeasurementsScan(daq, scan, sStage, numIterations, nBackground, nMeas, start, stop, step):
+    #increment run number    
+    print(daq.pgroup)
+    repratefactor = 10 #check reprate of machine
+    print(sStage.name)
+    print(sStage.get())
+
+    shutter266 = PV('SLAAT21-LDIO-LAS6291:SET_BO01')
+#    delayStage = PV('SLAAT21-LMOT-M704:MOT.VAL')
+    delay = Motor("SLAAT21-LMOT-M704:MOT", name="Laser Exp delay")
+
+    dsStart = delay.get()
+
+    ### take background Time tool:
+    for i in range(0,numIterations):
+        
+#        #close shutter
+#        shutter266.put(1)
+#        ### Take data
+#        #timestamp = datetime.today().strftime("%d_%m_%H_%M")
+#        fname = f"TimeToolBackground_{i}"
+#        daq.acquire(fname, n_pulses=nBackground * repratefactor)
+#        #Open shutter
+#        shutter266.put(0)
+
+        
+        ### take spectrometer bacground Time tool:
+        #while shutters open
+        #move away from T0
+        delay.set(dsStart-1)
+        sleep(3)
+        ### Take data
+        #timestamp = datetime.today().strftime("%d_%m_%H_%M")
+        fname = f"SpectrometerBackground_{i}"
+        daq.acquire(fname, n_pulses=nBackground * repratefactor)
+        #move back to T0
+        delay.set(dsStart)
+        sleep(3)
+
+        ### measure:
+        
+        #timestamp = datetime.today().strftime("%d_%m_%H_%M")
+        fname = f"Measurement_{i}"
+#        daq.acquire(fname, n_pulses=nMeas * repratefactor)
+
+        n_pulses=nMeas * repratefactor
+
+        print(sStage.get())
+        scan.scan1D(sStage, start, stop, step, n_pulses, fname, return_to_initial_values=True, relative=True)
+
+
+
+from tqdm import trange
+
+def focus_test(daq):
+    daq.pgroup = "p19743"
+#    daq.pgroup = "p19509"
+    i = 1
     while True:
-        now = datetime.now()
-        if now > end_time:
-            break
-        print(now)
-        sleep(30)
-
-    print("close shutters", datetime.now())
-    shutter1.put(0)
-    shutter2.put(0)
-
-
+        i += 1
+        name = f"focus_test2_{i}"
+        daq.acquire(name, n_pulses=1000)
+        print("sleep")
+        for _ in trange(900):
+            sleep(1)