Commit 08317a01 authored by Yoann Sallaz Damaz's avatar Yoann Sallaz Damaz
Browse files

Merge branch 'master' of https://gitlab.esrf.fr/BM07/bm07

parents c4c98111 fa0ac87b
Pipeline #33989 failed with stages
......@@ -246,8 +246,8 @@ def geofip(LAMBDA=0.97974,VERBOSE=2):
z_be = (X_BE - X_M1)*math.tan(2.*equiv_angle) + z_m1
z_filw = (X_FILW - X_M1)*math.tan(2.*equiv_angle) + z_m1
z_c1 = (X_C1 - X_M1)*math.tan(2.*equiv_angle) + z_m1
l = (X_M2 - X_M1)/2.
d = 2.*l*math.sin(2.*equiv_angle) + (z_m1 - z_m2)/math.cos(2.*equiv_angle)
l = (X_M2 - X_M1)/2. #half-distance X between M1 et M2
d = 2.*l*math.sin(2.*equiv_angle) + (z_m1 - z_m2)/math.cos(2.*equiv_angle) # Normal distance between mono entering and exiting beams
dist_m1c1 = (X_C1 - X_M1)/math.cos(2.*equiv_angle)
dist_c2m2 = (2.*l - (X_C1 - X_M1) - d/math.sin(2.*bragg_angle)*math.cos(2.*bragg_angle-2.*equiv_angle))/math.cos(2.*equiv_angle)
f1 = X_M1 + dist_m1c1 + d/math.sin(2.*bragg_angle)
......@@ -255,8 +255,8 @@ def geofip(LAMBDA=0.97974,VERBOSE=2):
radius_c2 = 2.*f1*f2*math.sin(bragg_angle)/(f1+f2)
x_c2 = X_C1 + l*math.sin(2.*equiv_angle)*math.cos(2.*bragg_angle - 2.*equiv_angle)/(math.sin(bragg_angle)*math.cos(bragg_angle))
z_c2 = (x_c2 - X_M2)*math.tan(2.*angle_m2) + z_m2
dx = d/(2.*math.sin(bragg_angle))
dz = d/(2.*math.cos(bragg_angle))
dx = d/(2.*math.sin(bragg_angle)) # X dist in cristals geometric ref. (Ref rotated by mono_angle)
dz = d/(2.*math.cos(bragg_angle)) # Z dist in cristals geometric ref. (Ref rotated by mono_angle)
z_fluo1= (X_FLUO1 - X_M2)*math.tan(2.*angle_m2) + z_m2
depth_M1= 1200.*1200./(8.*radius_m1)
depth_M2= 1200.*1200./(8.*radius_m2)
......
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment