diff --git a/config/AbsortionSpectrum/Co_L3_FINE.abs b/config/AbsortionSpectrum/Co_L3_FINE.abs new file mode 100644 index 0000000..4c0755b Binary files /dev/null and b/config/AbsortionSpectrum/Co_L3_FINE.abs differ diff --git a/config/AbsortionSpectrum/Co_L3_MEDIUM.abs b/config/AbsortionSpectrum/Co_L3_MEDIUM.abs new file mode 100644 index 0000000..7b1c317 Binary files /dev/null and b/config/AbsortionSpectrum/Co_L3_MEDIUM.abs differ diff --git a/config/AbsortionSpectrum/Co_L3_coarse.abs b/config/AbsortionSpectrum/Co_L3_coarse.abs new file mode 100644 index 0000000..c6a3e7b Binary files /dev/null and b/config/AbsortionSpectrum/Co_L3_coarse.abs differ diff --git a/config/AbsortionSpectrum/Co_L3_savetime.abs b/config/AbsortionSpectrum/Co_L3_savetime.abs new file mode 100644 index 0000000..ab5f997 Binary files /dev/null and b/config/AbsortionSpectrum/Co_L3_savetime.abs differ diff --git a/config/ROIs/test.roi b/config/ROIs/test.roi index 019265d..ad826d3 100644 Binary files a/config/ROIs/test.roi and b/config/ROIs/test.roi differ 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)