Commit ab074c58 by Miguel Angel Gonzalez

### Added skip_regular to straight_2d.pro in order to solve Salsa issue #51

parent 352e2c5a
 FUNCTION straight_1d, win, interpol=inter, distance=e_d, datp=datp, dX=deltaX, \$ texture=txtr, integrate=integ, Weights=Iweight, \$ verbose=verbose verbose=verbose, skip_regular=skip_regular ;+ ;******* *********** ;** User callable ... ... @@ -20,8 +20,9 @@ FUNCTION straight_1d, win, interpol=inter, distance=e_d, datp=datp, dX=deltaX, \$ ;** r = physical radius of the multidetector --> in call ;** ;** Nov 2011: Call straight_2d adding the integrate keyword ;** Mar 2021: Added option to skip call to regular (needed for Salsa scans) ;- return, straight_2d(win, interpol=inter, distance=e_d, datp=datp, dX=deltaX, /integrate, Weights=Iweight, verbose=verbose) return, straight_2d(win, interpol=inter, distance=e_d, datp=datp, dX=deltaX, /integrate, Weights=Iweight, verbose=verbose, skip_regular=skip_regular) end
 FUNCTION straight_2d, win, interpol=inter, distance=e_d, datp=datp, dX=deltaX, \$ texture=txtr, integrate=integ, Weights=Iweight, \$ verbose=verbose verbose=verbose, skip_regular=skip_regular ;+ ;******* *********** ;** ... ... @@ -45,6 +45,11 @@ lamp_loop_so, SFdll ;We may have loops in C code if (!version.release lt '5.3') then inter=1 \$ ;***unknown VALUE_LOCATE function*** else if keyword_set(txtr) then inter=0 ; option to skip call to regular in Salsa scans, but keeping regularise as default ; to maintain the same behaviour as before if the keyword is not used, in order to ; avoid problems with non-regular workspaces in D2B or other instruments if keyword_set(skip_regular) then skip_regular=skip_regular else skip_regular=0 ; Get variables associated with win pasp = 1 if n_elements(datp) eq 0 then take_datp, datp else pasp = 0 ... ... @@ -85,7 +90,7 @@ if found then if typename(datp.z) eq 'STRING' then mod_datp, datp, 'z', fix(indg ; Function works only with regular 2thetha !!! regul = "" regu = 0 if not keyword_set(inter) then begin if not keyword_set(inter) and not skip_regular then begin Sxyz = regular(win, dY=0, dX=deltaX, datp=datp, /GetNewSize) regul = " regular" if Sxyz[0] ne (size(win))[1] then begin ... ...
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!