diff --git a/RIXS_time_points.py b/RIXS_time_points.py
new file mode 100644
index 0000000..1f8f39f
--- /dev/null
+++ b/RIXS_time_points.py
@@ -0,0 +1,11 @@
+#%run -i ./script.py 
+
+import time
+
+
+
+mono_new.set_target_value(528.0).wait()
+time.sleep(10)
+
+scan.scan1D("DummyAdjustable", 1, 3, 1, 1000, "test") ## doesn't work
+ ## 
diff --git a/Tdep_YBCO_long.py b/Tdep_YBCO_long.py
new file mode 100644
index 0000000..e12fd4a
--- /dev/null
+++ b/Tdep_YBCO_long.py
@@ -0,0 +1,26 @@
+#%run -i ./script.py 
+
+import time
+
+
+#############################
+## change to 150 K
+caput("SATES30-BRKHF:FLMTR-SET-SETPOINT",10)
+caput("SATES30-LS336:LOOP1_SP",135)
+time.sleep(600)
+print('10min')
+time.sleep(600)
+print('20min')
+time.sleep(600)
+print('30min')
+time.sleep(600)
+print('40min')
+time.sleep(600)
+print('50min')
+time.sleep(600)
+print('60min')
+
+
+### RIXS at 4 energies
+daq.acquire("YBCFO_150K_529p5V", n_pulses=30000)
+
diff --git a/channels.py b/channels.py
index a94c99e..3bb3dc8 100644
--- a/channels.py
+++ b/channels.py
@@ -1,6 +1,7 @@
 #Channels
 channels = [
     "SATES30-LSCP10:CH0:1",
+    "SATES30-LSCP10:CH1:1",
     "SATES30-LSCP10:CH2:1",
     "SATES30-LSCP10:CH3:1",
     "SLAAT31-LTIM01-EVR0:CALCV",
@@ -53,12 +54,21 @@ channels = [
     "SLAAT31-LSCP1-FNS:CH0:VAL_GET",     #2um beam intensity (out of vacuum)
     "SLAAT31-LSCP1-FNS:CH1:VAL_GET",
     "SLAAT31-LSCP1-FNS:CH2:VAL_GET",
+    "SLAAT31-LSCP1-FNS:CH3:VAL_GET",
+    "SLAAT31-LSCP1-FNS:CH4:VAL_GET",
     "SLAAT31-LTIM01-EVR0:CALCI",
     "SLAAT31-LTIM01-EVR0:CALCS",
+    "SLAAT31-LTIM01-EVR0:CALCU",
+    "SLAAT01-LCAM-C603:FPICTURE",
+    "SLAAT01-LCAM-C604:FPICTURE",
+ #   "SATOP11-PSAS079:FPICTURE",
     "SAT-CVME-TIFALL5:EvtSet",
     "SAT-CVME-TIFALL6:EvtSet",
     "SATOP31-PMOS132-2D:SPECTRUM_X",
-    "SATOP31-PMOS132-2D:SPECTRUM_Y"
+    "SATOP31-PMOS132-2D:SPECTRUM_Y", 
+    "SATOP11-PSAS079:SPECTRUM_X",
+    "SATOP11-PSAS079:SPECTRUM_Y", 
+    "SATOP11-PSAS079:SPECTRUM_Y_SUM"
 ]
 
 pvs = [
@@ -94,6 +104,7 @@ pvs = [
     #"SLAAT31-LMOT-M803:MOT.RBV",
     #"SLAAT31-LMOT-M804:MOT.RBV",
     "SLAAT31-LDIO-LAS6411:SET_BO02", ## new
+    "SLAAT31-LDIO-LAS6411:SET_BO03",
     "SLAAT31-LMOT-M805:MOT.RBV",
     "SLAAT31-LMOT-M806:MOT.RBV",
     "SLAAT31-LMOT-M807:MOT.RBV",
@@ -110,8 +121,10 @@ pvs = [
     "SLAAT01-LTIM-PDLY:DELAY",
     "SLAAT-LGEN:DLY_OFFS1",
     "SLAAT01-LTIM-PDLY:DELAY_Z_OFFS"
-    #"SATOP21-PMOS127-2D:SPECTRUM_X",
+   # "SATOP21-PMOS127-2D:SPECTRUM_X",
     #"SATOP21-PMOS127-2D:SPECTRUM_Y",
+    #"SATOP11-PSAS079:SPECTRUM_X",
+    #"SATOP11-PSAS079:SPECTRUM_Y",
     #"SATES30-CAMS182-GIGE1_sp1:x_center_of_mass",
     #"SATES30-CAMS182-GIGE1_sp1:y_center_of_mass",
     #"SLAAT31-LCAM-C801:FIT-XPOS_EGU",
@@ -144,7 +157,17 @@ pvs = [
     "SATES30-RIXS:MOT_GRX.RBV",
     "SATES30-RIXS:MOT_DTY1.RBV",
     "SATES30-RIXS:MOT_DTZ.RBV",
-    "SATES30-RIXS:MOT_DRX.RBV",
+    "SATES30-RIXS:MOT_DRX.RBV", 
+    "SATOP11-PSAS079:MOT_UG_X.RBV", 
+    "SATOP11-PSAS079:MOT_UG_Y.RBV", 
+    "SATOP11-PSAS079:MOT_UG_Z.RBV", 
+    "SATOP11-PSAS079:MOT_DDC_Y.RBV",
+    "SATOP11-PSAS079:MOT_DDCAM_Y.RBV", 
+    "SATOP11-PSAS079:MOT_DDF_X.RBV", 
+    "SATOP11-PSAS079:MOT_DDC_RX.RBV", 
+    "SATOP11-PSAS079:MOT_DDC_X.RBV", 
+    "SATOP11-PSAS079:MOT_DDS_Y1.RBV", 
+    "SATOP11-PSAS079:MOT_DDS_Y2.RBV",
     "SLAAT01-TLSY-EPL:JITTERMON",
     "SATOP11-OSGM087:ENCA_GR1", #Encoder on mono grating pitch 
     "SATOP11-OSGM087:ENCA_GR2", #Encoder on mono grating pitch 
diff --git a/furka.py b/furka.py
index 2abc1e1..145411d 100644
--- a/furka.py
+++ b/furka.py
@@ -60,7 +60,6 @@ parab_RY = Motor("SATES30-MCS001:MOT_4", name="Parab RY")
 parab_RX = Motor("SATES30-MCS001:MOT_7", name="Parab RX")
 taget_along_beam = SmarActAxis("SATES30-XSMA184:MOT6", name="Target along beam")
 
-
 #Retro Chamber Motors
 #mot_x = Motor("SATES30-RETRO:MOT_X", name="Retro X")
 #mot_y = Motor("SATES30-RETRO:MOT_Y", name="Retro Y")
@@ -157,7 +156,7 @@ tth_scan = Coupled_tth(delta=0,  name="theta 2theta")
 tth_scan_RIXS = Coupled_tth_RIXSside(delta=0, name='theta 2theta RIXS side')
 tth_scan_outer = Coupled_tth_outer(delta=0,  name="theta 2theta outer")
 Thz_Gate_scan = Coupled_THzGate( name = "THz Gate coupled ")
-Thz_Gate_scan_fixedD =  Coupled_THzGate_fixedDelta(delta=60.65, name = "Thz Gate fix Delta")
+Thz_Gate_scan_fixedD =  Coupled_THzGate_fixedDelta(delta=73.11, name = "Thz Gate fix Delta")
 
 GRX = Motor("SATES30-RIXS:MOT_GRX", name = "Pitch grating")
 DTZ = Motor("SATES30-RIXS:MOT_DTZ", name = "DTZ (r2)")
@@ -185,6 +184,7 @@ Thz_delay  = Motor("SLAAT31-LMOT-M806:MOT", name="Thz Delay")
 WL_delay   = Motor("SLAAT31-LMOT-M807:MOT", name="WL Delay")
 gate_delay = Motor("SLAAT31-LMOT-M808:MOT", name="Gate Delay")
 twomicron_delay = Motor("SLAAT31-LMOT-M813:MOT", name="2um Delay")
+ss_EO_gate = PVAdjustable("SLAAT31-LMTS-SMAR13:DRIVE", pvname_readback="SLAAT31-LMTS-SMAR13:MOTRBV", name="ss EO Gate Delay")
 
 #laser_WP = Motor("SLAAT31-LMOT-M801:MOT", name="Laser WavePlate")
 laser_WP = Motor("SLAAT31-LMOT-M809:MOT", name="Laser WavePlate")
@@ -206,7 +206,7 @@ spreadsheet = Spreadsheet(spreadsheet_info, placeholders=["comment", "sample"],
 
 
 instrument = "furka"
-pgroup = "p21613"  #User p group
+pgroup = "p21645"  #User p group
 
 #check_intensity = PVCondition("SATFE10-PEPG046:FCUP-INTENSITY-CAL", vmin=5, vmax=None, wait_time=3, required_fraction=0.8)
 check_intensity = PVCondition("SATBD01-DBPM060:Q2", vmin=5, vmax=None, wait_time=1, required_fraction=0.8)
@@ -306,9 +306,11 @@ def KBh_Pointing(KBh_RYv):
     print("KBh pointing change done")
 
 
-def GoToXAS_RIXS(TRYv, Del_or_Norm, ESv, GAv, MonoNewv, HWPv, KBv_B1v, KBv_B2v, KBh_B1v, KBh_B2v, KBv_RXv, KBh_RYv ):
+def GoToXAS_RIXS(TRYv, Del_or_Norm, ESv, GAv, MonoNewv, HWPv, KBv_B1v, KBv_B2v, KBh_B1v, KBh_B2v, KBv_RXv, KBh_RYv, DC_updownv ):
     #close shutter
     caput('SATOP31-OPSH138:REQUEST', 'close')
+    caput('SATES30-MCS003:MOT_5.VAL', DC_updownv)
+    print("DC target moved")
     KBv_Focusing(KBv_B1v, KBv_B2v)
     KBv_Pointing(KBv_RXv)
     KBh_Focusing(KBh_B1v, KBh_B2v)
@@ -320,8 +322,7 @@ def GoToXAS_RIXS(TRYv, Del_or_Norm, ESv, GAv, MonoNewv, HWPv, KBv_B1v, KBv_B2v,
     else:
         caput('SLAAT01-LTIM-PDLY:NORMAL.PROC', 1 )
     print("delay mode done")
-    Mon_ES.set_target_value(ESv).wait()
-    print("Mono done")
+    #Mon_ES.set_target_value(ESv).wait()
     gas_attenuator_trans.set_target_value(GAv).wait()
     print("GA done")
     mono_new.set_target_value( MonoNewv).wait()
@@ -334,15 +335,15 @@ def GoToXAS_RIXS(TRYv, Del_or_Norm, ESv, GAv, MonoNewv, HWPv, KBv_B1v, KBv_B2v,
    
 @as_shortcut
 def TrXAS_pos(name = "TrXAS Positions"):
-     GoToXAS_RIXS(85, "Del", 400, 1.0, 529, 42, 3.221, 3.444, 3.723, 3.917, 13.218, 13.215) 
+     GoToXAS_RIXS(85, "Del", 400, 1.0, 528.6, 44, 3.221, 3.444, 3.723, 3.917, 13.218, 13.215, -11.8) 
 
 @as_shortcut
 def RIXS_pos(name = "RIXS Positions"):
-     GoToXAS_RIXS(85, "Norm", 200, 0.8, 529, 42, 3.0209, 3.2439, 3.023, 3.217, 13.233, 13.245)
+     GoToXAS_RIXS(85, "Norm", 100, 0.8, 528.6, 44, 3.0678, 3.3279, 3.023, 3.217, 13.233, 13.245, 4)
 
 @as_shortcut
 def EOS_pos(name = "EOS Positions"):
-    Diffr_pos(148.335, 74.5, 0, 3.0, -6.5, 0, -90, -3.0)
+    Diffr_pos(148.26, 80.5, 1.3, 5.12, -3.0, 0, -90, -4.0)
 
 @as_shortcut
 def CTape_pos(name = "X-ray knife edge"):
@@ -362,7 +363,7 @@ def xray_knife(name = "X-ray knife edge"):
 
 @as_shortcut
 def Transfer_pos(name = "Transfer Positions"):
-      Diffr_pos(148.40, 80.5, 4.21, -3.5, -10.93, 0, 50, -1.95)
+      Diffr_pos(148.40, 80.5, 4.21, -2.0, -0.5, 0, 60, 0)
 
 print("To start the GUI, run: gui()")
 
diff --git a/rixs_test_2.py b/rixs_test_2.py
new file mode 100644
index 0000000..55fb78c
--- /dev/null
+++ b/rixs_test_2.py
@@ -0,0 +1,136 @@
+#%run -i ./script.py 
+
+import time
+
+### start from 100 K
+### RIXS at 4 energies
+mono_new.set_target_value(528.0).wait()
+time.sleep(10)
+
+mono_new.set_target_value(529.5).wait()
+daq.acquire("YBCFO_100K_529p5V", n_pulses=30000)
+
+mono_new.set_target_value(530.2).wait()
+
+
+daq.acquire("YBCFO_100K_530p2eV", n_pulses=30000, n_repeat = 2)
+scan.acquire(3, 10000, 'Name')
+
+
+
+
+
+mono_new.set_target_value(530.9).wait()
+daq.acquire("YBCFO_100K_530p9eV", n_pulses=30000)
+
+mono_new.set_target_value(531.7).wait()
+daq.acquire("YBCFO_100K_531p7eV", n_pulses=30000)
+
+mono_new.set_target_value(533.3).wait()
+daq.acquire("YBCFO_100K_533p3eV", n_pulses=30000)
+
+mono_new.set_target_value(528.0).wait()
+
+#############################
+## change to 150 K
+caput("SATES30-BRKHF:FLMTR-SET-SETPOINT",10)
+caput("SATES30-LS336:LOOP1_SP",135)
+time.sleep(600)
+print('10min')
+time.sleep(600)
+print('20min')
+time.sleep(600)
+print('30min')
+time.sleep(600)
+print('40min')
+time.sleep(600)
+print('50min')
+time.sleep(600)
+print('60min')
+
+
+### RIXS at 4 energies
+mono_new.set_target_value(529.5).wait()
+daq.acquire("YBCFO_150K_529p5V", n_pulses=30000)
+
+mono_new.set_target_value(530.2).wait()
+daq.acquire("YBCFO_150K_530p2eV", n_pulses=30000)
+
+mono_new.set_target_value(530.9).wait()
+daq.acquire("YBCFO_150K_530p9eV", n_pulses=30000)
+
+mono_new.set_target_value(531.7).wait()
+daq.acquire("YBCFO_150K_531p7eV", n_pulses=30000)
+
+mono_new.set_target_value(533.3).wait()
+daq.acquire("YBCFO_150K_533p3eV", n_pulses=30000)
+
+mono_new.set_target_value(528.0).wait()
+
+#############################
+## change to 200 K
+caput("SATES30-BRKHF:FLMTR-SET-SETPOINT",5)
+caput("SATES30-LS336:LOOP1_SP",185)
+time.sleep(600)
+print('10min')
+time.sleep(600)
+print('20min')
+time.sleep(600)
+print('30min')
+time.sleep(600)
+print('40min')
+time.sleep(600)
+print('50min')
+time.sleep(600)
+print('60min')
+
+### RIXS at 4 energies
+mono_new.set_target_value(529.5).wait()
+daq.acquire("YBCFO_200K_529p5V", n_pulses=30000)
+
+mono_new.set_target_value(530.2).wait()
+daq.acquire("YBCFO_200K_530p2eV", n_pulses=30000)
+
+mono_new.set_target_value(530.9).wait()
+daq.acquire("YBCFO_200K_530p9eV", n_pulses=30000)
+
+mono_new.set_target_value(531.7).wait()
+daq.acquire("YBCFO_200K_531p7eV", n_pulses=30000)
+
+mono_new.set_target_value(533.3).wait()
+daq.acquire("YBCFO_200K_533p3eV", n_pulses=30000)
+
+mono_new.set_target_value(528.0).wait()
+#############################
+## change to 250 K
+caput("SATES30-LS336:LOOP1_SP",235)
+time.sleep(600)
+print('10min')
+time.sleep(600)
+print('20min')
+time.sleep(600)
+print('30min')
+time.sleep(600)
+print('40min')
+time.sleep(600)
+print('50min')
+time.sleep(600)
+print('60min')
+
+### RIXS at 4 energies
+
+mono_new.set_target_value(529.5).wait()
+daq.acquire("YBCFO_250K_529p5V", n_pulses=30000)
+
+mono_new.set_target_value(530.2).wait()
+daq.acquire("YBCFO_250K_530p2eV", n_pulses=30000)
+
+mono_new.set_target_value(530.9).wait()
+daq.acquire("YBCFO_250K_530p9eV", n_pulses=30000)
+
+mono_new.set_target_value(531.7).wait()
+daq.acquire("YBCFO_250K_531p7eV", n_pulses=30000)
+
+mono_new.set_target_value(533.3).wait()
+daq.acquire("YBCFO_250K_533p3eV", n_pulses=30000)
+