From 26abb23c100a9e04daf7f7a3b60dbc16f39c7c2a Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-02.psi.ch>
Date: Wed, 27 Jan 2021 16:05:28 +0100
Subject: [PATCH]

---
 config/AbsortionSpectrum/Co_L3_FINE.abs     | Bin 0 -> 515 bytes
 config/AbsortionSpectrum/Co_L3_MEDIUM.abs   | Bin 0 -> 307 bytes
 config/AbsortionSpectrum/Co_L3_coarse.abs   | Bin 0 -> 203 bytes
 config/AbsortionSpectrum/Co_L3_savetime.abs | Bin 0 -> 203 bytes
 config/ROIs/test.roi                        | Bin 266 -> 209 bytes
 config/settings.properties                  |  20 ++++++++++----------
 config/variables.properties                 |   8 ++++----
 script/templates/Eiger2Img.py               |   6 ++++--
 8 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 config/AbsortionSpectrum/Co_L3_FINE.abs
 create mode 100644 config/AbsortionSpectrum/Co_L3_MEDIUM.abs
 create mode 100644 config/AbsortionSpectrum/Co_L3_coarse.abs
 create mode 100644 config/AbsortionSpectrum/Co_L3_savetime.abs

diff --git a/config/AbsortionSpectrum/Co_L3_FINE.abs b/config/AbsortionSpectrum/Co_L3_FINE.abs
new file mode 100644
index 0000000000000000000000000000000000000000..4c0755b5f3bf0837b1230275cd0f40cb379c0c3a
GIT binary patch
literal 515
zcmZ4UmVvdjh(S2oCo8cmQ7<PkFI~?+DJwO(#CpQHi1`A=nmJ4i3>5_o3=E7wbt2JN
z6iV#>9sDHw_9>V`_R>OzI-mvy2Ik@-1_6Y@F8QTNIjIes4|!>3|7KxgV02+%ElbQP
zO|3vt=2x1Vlv>obW~warln32lQyto0fDJ4Lnat|Yp@GD+e*oq%AlZsVl|zREvYrdL
z^dPHp=m7bffdOKx{mz*nFbmTjWK|9w2axsPv<F$0L&p<jJvi+_R^`y~2U!nJdyrK*
NbS^;F^8n0Y006p!eAfT~

literal 0
HcmV?d00001

diff --git a/config/AbsortionSpectrum/Co_L3_MEDIUM.abs b/config/AbsortionSpectrum/Co_L3_MEDIUM.abs
new file mode 100644
index 0000000000000000000000000000000000000000..7b1c3175b0e26f48821b385db196ab86477af26a
GIT binary patch
literal 307
zcmZ4UmVvdjh(S2oCo8cmQ7<PkFI~?+DJwO(#CpQHi1`A=nmJ4i3>5_o3=E7wbt2JN
z6iV#>9sDHw_9>V`=F&ojI-mvy2Ik@-1_6Y@F8QTNIjIes4|!>3|7KxgV02+%ElbQP
zO|3vt=2x1Vlv>obW~warln32lQyto0fDJ4Lnat|Yp@GD+e*oq%AlZsVl|#oLWIY#f
Q=|NWI(76Cv&jW}a0Jj-XKL7v#

literal 0
HcmV?d00001

diff --git a/config/AbsortionSpectrum/Co_L3_coarse.abs b/config/AbsortionSpectrum/Co_L3_coarse.abs
new file mode 100644
index 0000000000000000000000000000000000000000..c6a3e7ba1afb1c2ab6867123954e624448c83623
GIT binary patch
literal 203
zcmZ4UmVvdjh(S2oCo8cmQ7<PkFI~?+DJwO(#CpQHi1`A=nmJ4i3>5_o3=E7wbt2JN
z6iV#>9sDHw_9=wILWVk^1_lP^;vxnCguyQPrAaxd4Vw>nX=eXsVPar(VPGvw%qdN+
qKvCvbnwykb)V5}-EccWL-C$E4It0K57K2P?b?E3o;@Mv|1_J=vnmwcd

literal 0
HcmV?d00001

diff --git a/config/AbsortionSpectrum/Co_L3_savetime.abs b/config/AbsortionSpectrum/Co_L3_savetime.abs
new file mode 100644
index 0000000000000000000000000000000000000000..ab5f997da9603e7a0ddf036fba60e8a759f024e5
GIT binary patch
literal 203
zcmZ4UmVvdjh(S2oCo8cmQ7<PkFI~?+DJwO(#CpQHi1`A=nmJ4i3>5_o3=E7wbt2JN
z6iV#>9sDHw_9=wILWVk^1_lP^;vxnCguyQPrAaxd4Vw>nX=eXsVPar(VPGvw%qdN+
rKvCvbnwykb)V5}-EccWL-C$E4+FyVTEC!j(>d?6WiD&-+%wYfk^+-K$

literal 0
HcmV?d00001

diff --git a/config/ROIs/test.roi b/config/ROIs/test.roi
index 019265d57fafbe5f3adb344bc4c5e5f350f39f64..ad826d35cbdc0bf093cc0d3d8a4e682e5671d081 100644
GIT binary patch
delta 43
lcmeBTy2v;ogpqM#XsrCi;zEWx1~vu;21gi+F$&Jw0s!>F3BdpW

delta 100
zcmcb}*u^v<gpp}tXlz7UaUnw;0~-SaLqD9A183Qmf@DE}wS<8s$luclCdGIh&a!~9
J7z*L6d;nrj6g2<<

diff --git a/config/settings.properties b/config/settings.properties
index 1ac0232..c621eec 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,21 +1,21 @@
-#Fri Dec 18 13:35:02 CET 2020
+#Wed Jan 27 14:57:59 CET 2021
 HARMONIC_ID_1=1
-RSYNC_USER=
+RSYNC_USER=e18904
 OUTLIERS_THRESHOLD=1000000000
-NORM_FILE=/sls/X11MA/data/X11MA/Data1/public/PEEM/2020_09/i1904_1_0.tif
+NORM_FILE=/sls/X11MA/data/X11MA/Data1/2021/Yona250121/s250121
 AUTO_SWITCH_VALVE=true
-DRY_RUN=true
-POL_ID_2=Circ_Plus
-OFFSET_ID_1=-1.5
+DRY_RUN=false
+POL_ID_2=Circ_Minus
+OFFSET_ID_1=-0.4
 ID=ID1_ID2
-OFFSET_ID_2=-1.3
+OFFSET_ID_2=-1.1
 proposal=proposal
-ENERGY=707.3
+ENERGY=778.0
 proposer=proposer
-POL_ID_1=Circ_Minus
+POL_ID_1=Circ_Plus
 RSYNC_HOST=
 sample=sample
-RSYNC_PATH=Kagome_Triangular_b100
+RSYNC_PATH=
 pgroup=pgroup
 ALPHA_ID_2=45.0
 ALPHA_ID_1=15.0
diff --git a/config/variables.properties b/config/variables.properties
index 7a7d2fc..d3b8416 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Tue Dec 15 15:18:30 CET 2020
-LastRunDate=201215
-FileSequentialNumber=4965
-DaySequentialNumber=117
+#Wed Jan 27 16:03:59 CET 2021
+LastRunDate=210127
+FileSequentialNumber=5019
+DaySequentialNumber=67
diff --git a/script/templates/Eiger2Img.py b/script/templates/Eiger2Img.py
index 4a8e179..16d1dbd 100644
--- a/script/templates/Eiger2Img.py
+++ b/script/templates/Eiger2Img.py
@@ -45,6 +45,8 @@ max_index=0
 
 def get_image_file_name(cycle=-1, frame_index=0, short_name=False):
     global max_index
+    if  (METHOD == "Two_Pol") and (SEQUENCE == "A") and (frame_index<2) and ((cycle%2)==0): #Swapped
+        frame_index = 0 if frame_index else 1
     root =  "" if short_name else (data_path + "/")
     #prefix = get_context().setup.expandPath("i{seq}%03d" + "_" + ("%d" % frame_index))
     abs_index=run_index + frame_index    
@@ -127,11 +129,11 @@ try:
     
         if (METHOD == "Two_Pol") or (METHOD == "Two_Energies"):     
             if (METHOD == "Two_Energies") or (SEQUENCE == "B") or ((cycle%2)==1):
-                #print "Divide first frame by second"
+                print "Divide first frame by second"
                 frames.append(frames[0].copy())
                 frames[2].div(frames[1])
             else:
-                #print "Divide second frame by first"
+                print "Divide second frame by first"
                 frames.append(frames[1].copy())
                 frames[2].div(frames[0])   
             save_image_file(frames[2],cycle, 2)