Skip to content

Commit 3f55109

Browse files
committed
fix the coherent partial envelop function for TEM
1 parent be8903f commit 3f55109

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+48
-48
lines changed

matlab_functions/ilm_read_ap_cif.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
% Read atomic positions from cif file
2-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
2+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
33
function [atoms, lx, ly, lz] = ilm_read_ap_cif(path, rmsd_3d_0, pbc, na, nb, nc)
44
if(nargin<6)
55
nc = 1;

matlab_functions/ilm_read_lat_parm_cif.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
% Read lattice parameter from cif file
2-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
2+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
33
function [a, b, c] = ilm_read_lat_parm_cif(path)
44
str_file = fileread(path);
55
str_file = strtrim(strsplit(str_file, '\n'));

mex_examples_multem/example_MULTEM_CBED.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Convergent beam electron diffraction (CBED) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_CBEI.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Convergent beam electron Imaging (CBEI) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_ED.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Electron diffraction (ED) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_EELS.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% STEM electron energy loss spectroscopy (EELS) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_EFTEM.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Energy filtered transmission electron microscopy (EFTEM) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_EWFS.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Exit wave real space (EWRS) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_EWFS_till_illumination.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Exit wave real space (EWRS) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_EWRS.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Exit wave real space (EWRS) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_EWRS_till_illumination.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Exit wave real space (EWRS) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_HCTEM.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Hollow cone transmission electron microscopy (HCTEM) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_HRTEM.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% High resolution transmission electron microscopy (HRTEM) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_ISTEM.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Imaging scanning transmission electron microscopy (ISTEM) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_PED.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%
55
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
66
%
7-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
7+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
88

99
clear; clc;
1010
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_STEM.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Scanning transmission electron microscopy (STEM) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_STEM_EELS.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% STEM electron energy loss spectroscopy (EELS) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_MULTEM_STEM_matrix_detector.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Scanning transmission electron microscopy (STEM) simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_add_amorphous_layer.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_amorphous_specimen.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_apply_ctf.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% inclusion of TEM aberrerations into a exitwve simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_beam_self_interaction.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
3-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
3+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
44

55
clear; clc;
66
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_crystal_by_layers.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_feg.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_fxg.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_incident_wave_1.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Incident wave simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_incident_wave_2.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Incident wave simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_incident_wave_3.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Incident wave simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_incident_wave_4.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% Incident wave simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) '/mex_bin'])

mex_examples_multem/example_microscope_aberrations.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% inclusion of TEM aberrerations into a exitwve simulation
33
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
4-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
4+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
55

66
clear; clc;
77
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_pr.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_projected_potential.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_propagate.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_specimen_creation_from_cif_file.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
% Specimen creation
2-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
2+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
33

44
clear all;clc;
55

mex_examples_multem/example_specimen_planes.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_specimen_rotation.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
%
55
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
66
%
7-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
7+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
88

99
clear; clc;
1010
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_specimen_slicing_rotation.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_specimen_slicing_show.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_specimen_slicing_with_amorphous_layer.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_specimen_slicing_zone_axis.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_specimen_subslicing.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_transmission_function.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_vp.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_vr.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_vz.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>
1+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>
22

33
clear; clc;
44
addpath([fileparts(pwd) filesep 'mex_bin'])

mex_examples_multem/example_wave_function.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% output_multislice = input_multem.ilc_multem perform TEM simulation
22
% All parameters of the input_multem structure are explained in ilm_dflt_input_multem()
3-
% Copyright 2021 Ivan Lobato <Ivanlh20@gmail.com>clear; clc;
3+
% Copyright 2023 Ivan Lobato <Ivanlh20@gmail.com>clear; clc;
44

55
addpath([fileparts(pwd) filesep 'mex_bin'])
66
addpath([fileparts(pwd) filesep 'crystalline_materials'])

src/cgpu_fcns.cuh

+2-2
Original file line numberDiff line numberDiff line change
@@ -2019,10 +2019,10 @@ namespace mt
20192019
{
20202020
T_r chi = g2*(lens.c_c_30*g2+lens.c_c_10);
20212021
T_r c = c_Pi*lens.si_theta_c*lens.ti_iehwgd;
2022-
T_r u = 1.0 + 2*c*c*g2;
2022+
T_r u = 1.0 + c*c*g2;
20232023

20242024
c = c_Pi*lens.ti_iehwgd*lens.lambda*g2;
2025-
T_r temp_inc = 0.5*c*c;
2025+
T_r temp_inc = 0.25*c*c;
20262026

20272027
c = c_Pi*lens.si_theta_c*(lens.c_30*lens.lambda2*g2-lens.c_10);
20282028
T_r spa_inc = c*c*g2;

0 commit comments

Comments
 (0)