Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
LAMP
Commits
e320dbc8
Commit
e320dbc8
authored
Feb 15, 2019
by
Gonzalez, Miguel
Browse files
Test on dTheta calculation.
parent
e409b387
Changes
1
Hide whitespace changes
Inline
Side-by-side
lamp_mac/SANS/sans_settings.pro
View file @
e320dbc8
...
...
@@ -200,7 +200,10 @@ if siz[0] eq 2 then begin
if keyword_set(gravity) then Cxy=(Cxy+Cxyf)/2. else Cxy=Cxyf ;(Fit & Gravity) or Fit or gravity
endif
;if Dtheta then supl49=atan(sqrt(total((([Xpar(3),Ypar(3)]/2.)*sans_supl(8:9))^2))/sqrt(2)/(sans_supl(1)*100.)) ;beam width (radian)
;resultX = gaussfit(X, Xproj, paramX, nterms=4)
;resultY = gaussfit(Y, Yproj, paramY, nterms=4)
if Dtheta then supl49=atan( total( [Xpar[3],Ypar[3]]/2. *sans_supl[8:9]) /2./2.3548 /(sans_supl[1]*100.)) ;beam width (radian)
endif
...
...
@@ -263,6 +266,7 @@ if siz[0] eq 2 then begin
sans_supl[49] = supl49 ;Dtheta
endif
endif
return, Cxy
end
...
...
@@ -2368,6 +2372,7 @@ pro sans_merge_in_f, rpb, titW, fctb, fifib, Wb,Xb,Eb,dQb
if strpos(rpb.TIT,' [*') gt px then fifib = fifib+'by' +strmid(rpb.TIT,ps+3,bc-ps-3)
endif else $
if pb gt px then fifib = fifib+'bg'+strmid(rpb.TIT,pb+3,strpos(rpb.TIT,')',pb)-pb-3)
end
...
...
@@ -6644,6 +6649,7 @@ endif else case uv[0] of
if (uv[1] eq 7) and ((uv[2] eq 5) or (uv[2] eq 6)) then begin ;MERGE (sorted)
widget_control,baset.bases1[3],get_value=instru
widget_control,/hourglass
sans_merging, 'MERGE_file', cur_menu[2], idxll,idxmm,idxhh, gtlist=gtlist, background=farr[9], instrument=instru, WaveSuplement=WaveSuplement
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment