Skip to content

Commit

Permalink
ISETAuto check and slight wvf value change with ISETBio merge
Browse files Browse the repository at this point in the history
  • Loading branch information
wandell committed Oct 25, 2023
1 parent 362c421 commit 28d4135
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
19 changes: 11 additions & 8 deletions isetcam/optics/v_icam_opticsFlare.m
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,16 @@

%% The same scene through Zhenyi's piFlareApply

% Close match.
[oiApply, pMask, psf] = piFlareApply(scene,'num sides aperture',nsides, ...
'focal length',wvfGet(wvf,'focal length','m'), ...
'fnumber',wvfGet(wvf,'fnumber'));

oiApply = oiSet(oiApply,'name','piFlare');
oiWindow(oiApply);
oiSet(oiApply,'gamma',0.5); drawnow;
% piFlareApply is in ISETAuto and thus we do not always check this.
if exist('piFlareApply','file')
% Close match.
[oiApply, pMask, psf] = piFlareApply(scene,'num sides aperture',nsides, ...
'focal length',wvfGet(wvf,'focal length','m'), ...
'fnumber',wvfGet(wvf,'fnumber'));

oiApply = oiSet(oiApply,'name','piFlare');
oiWindow(oiApply);
oiSet(oiApply,'gamma',0.5); drawnow;
end

%% END
6 changes: 4 additions & 2 deletions isetcam/optics/v_icam_opticsWVF.m
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,10 @@
identityLine;
title('OTF: oi converted to wvf')

% Checksum good to within 1 part in a thousand
assert(real(sum(oiOTFS(:))) / 1.0831e+03 - 1 < 1e-3)
% Checksum good to within 1 part in a thousand This changed slightly
% (1.0831 to 1.085) with the Merge of ISETCam/ISETBio. Keeping an eye
% on how this varies.
assert(real(sum(oiOTFS(:))) / 1.085e+03 - 1 < 1e-3)

%% Now, make a multispectral wvf and convert it to ISET OI format

Expand Down

0 comments on commit 28d4135

Please sign in to comment.