diff --git a/matlab_functions/ilm_read_ap_cif.m b/matlab_functions/ilm_read_ap_cif.m index 4ddef97f..c569bf5a 100644 --- a/matlab_functions/ilm_read_ap_cif.m +++ b/matlab_functions/ilm_read_ap_cif.m @@ -1,5 +1,5 @@ % Read atomic positions from cif file -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato function [atoms, lx, ly, lz] = ilm_read_ap_cif(path, rmsd_3d_0, pbc, na, nb, nc) if(nargin<6) nc = 1; diff --git a/matlab_functions/ilm_read_lat_parm_cif.m b/matlab_functions/ilm_read_lat_parm_cif.m index 903677f6..147a839d 100644 --- a/matlab_functions/ilm_read_lat_parm_cif.m +++ b/matlab_functions/ilm_read_lat_parm_cif.m @@ -1,5 +1,5 @@ % Read lattice parameter from cif file -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato function [a, b, c] = ilm_read_lat_parm_cif(path) str_file = fileread(path); str_file = strtrim(strsplit(str_file, '\n')); diff --git a/mex_examples_multem/example_MULTEM_CBED.m b/mex_examples_multem/example_MULTEM_CBED.m index 89d80bc7..cf4e8c15 100644 --- a/mex_examples_multem/example_MULTEM_CBED.m +++ b/mex_examples_multem/example_MULTEM_CBED.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Convergent beam electron diffraction (CBED) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_CBEI.m b/mex_examples_multem/example_MULTEM_CBEI.m index f51cb183..1b828fae 100644 --- a/mex_examples_multem/example_MULTEM_CBEI.m +++ b/mex_examples_multem/example_MULTEM_CBEI.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Convergent beam electron Imaging (CBEI) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_ED.m b/mex_examples_multem/example_MULTEM_ED.m index f066ea55..2168eb1d 100644 --- a/mex_examples_multem/example_MULTEM_ED.m +++ b/mex_examples_multem/example_MULTEM_ED.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Electron diffraction (ED) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_EELS.m b/mex_examples_multem/example_MULTEM_EELS.m index 7d99c39c..a602e52a 100644 --- a/mex_examples_multem/example_MULTEM_EELS.m +++ b/mex_examples_multem/example_MULTEM_EELS.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % STEM electron energy loss spectroscopy (EELS) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_EFTEM.m b/mex_examples_multem/example_MULTEM_EFTEM.m index 11a85eba..4ea01057 100644 --- a/mex_examples_multem/example_MULTEM_EFTEM.m +++ b/mex_examples_multem/example_MULTEM_EFTEM.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Energy filtered transmission electron microscopy (EFTEM) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_EWFS.m b/mex_examples_multem/example_MULTEM_EWFS.m index 0c2f1cf9..9aead610 100644 --- a/mex_examples_multem/example_MULTEM_EWFS.m +++ b/mex_examples_multem/example_MULTEM_EWFS.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Exit wave real space (EWRS) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_EWFS_till_illumination.m b/mex_examples_multem/example_MULTEM_EWFS_till_illumination.m index 48792e53..b2bc795f 100644 --- a/mex_examples_multem/example_MULTEM_EWFS_till_illumination.m +++ b/mex_examples_multem/example_MULTEM_EWFS_till_illumination.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Exit wave real space (EWRS) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_EWRS.m b/mex_examples_multem/example_MULTEM_EWRS.m index 09140d66..b181ef1a 100644 --- a/mex_examples_multem/example_MULTEM_EWRS.m +++ b/mex_examples_multem/example_MULTEM_EWRS.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Exit wave real space (EWRS) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_EWRS_till_illumination.m b/mex_examples_multem/example_MULTEM_EWRS_till_illumination.m index 7d64cf28..75c69624 100644 --- a/mex_examples_multem/example_MULTEM_EWRS_till_illumination.m +++ b/mex_examples_multem/example_MULTEM_EWRS_till_illumination.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Exit wave real space (EWRS) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_HCTEM.m b/mex_examples_multem/example_MULTEM_HCTEM.m index 9887c194..042085fc 100644 --- a/mex_examples_multem/example_MULTEM_HCTEM.m +++ b/mex_examples_multem/example_MULTEM_HCTEM.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Hollow cone transmission electron microscopy (HCTEM) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_HRTEM.m b/mex_examples_multem/example_MULTEM_HRTEM.m index 6857d713..4bd7a5c5 100644 --- a/mex_examples_multem/example_MULTEM_HRTEM.m +++ b/mex_examples_multem/example_MULTEM_HRTEM.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % High resolution transmission electron microscopy (HRTEM) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_ISTEM.m b/mex_examples_multem/example_MULTEM_ISTEM.m index 97ca4a9b..e2ea7b57 100644 --- a/mex_examples_multem/example_MULTEM_ISTEM.m +++ b/mex_examples_multem/example_MULTEM_ISTEM.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Imaging scanning transmission electron microscopy (ISTEM) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_PED.m b/mex_examples_multem/example_MULTEM_PED.m index 3437939a..b7e84968 100644 --- a/mex_examples_multem/example_MULTEM_PED.m +++ b/mex_examples_multem/example_MULTEM_PED.m @@ -4,7 +4,7 @@ % % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() % -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_STEM.m b/mex_examples_multem/example_MULTEM_STEM.m index c2e67512..e335cf1e 100644 --- a/mex_examples_multem/example_MULTEM_STEM.m +++ b/mex_examples_multem/example_MULTEM_STEM.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Scanning transmission electron microscopy (STEM) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_STEM_EELS.m b/mex_examples_multem/example_MULTEM_STEM_EELS.m index 800ef45c..5f042c2b 100644 --- a/mex_examples_multem/example_MULTEM_STEM_EELS.m +++ b/mex_examples_multem/example_MULTEM_STEM_EELS.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % STEM electron energy loss spectroscopy (EELS) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_MULTEM_STEM_matrix_detector.m b/mex_examples_multem/example_MULTEM_STEM_matrix_detector.m index a4af4329..b8346378 100644 --- a/mex_examples_multem/example_MULTEM_STEM_matrix_detector.m +++ b/mex_examples_multem/example_MULTEM_STEM_matrix_detector.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Scanning transmission electron microscopy (STEM) simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_add_amorphous_layer.m b/mex_examples_multem/example_add_amorphous_layer.m index 19632d69..51a65565 100644 --- a/mex_examples_multem/example_add_amorphous_layer.m +++ b/mex_examples_multem/example_add_amorphous_layer.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_amorphous_specimen.m b/mex_examples_multem/example_amorphous_specimen.m index 0e852554..8c8c1962 100644 --- a/mex_examples_multem/example_amorphous_specimen.m +++ b/mex_examples_multem/example_amorphous_specimen.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_apply_ctf.m b/mex_examples_multem/example_apply_ctf.m index 0b72e7f3..9fb33712 100644 --- a/mex_examples_multem/example_apply_ctf.m +++ b/mex_examples_multem/example_apply_ctf.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % inclusion of TEM aberrerations into a exitwve simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_beam_self_interaction.m b/mex_examples_multem/example_beam_self_interaction.m index 26367fba..e7f81853 100644 --- a/mex_examples_multem/example_beam_self_interaction.m +++ b/mex_examples_multem/example_beam_self_interaction.m @@ -1,6 +1,6 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_crystal_by_layers.m b/mex_examples_multem/example_crystal_by_layers.m index 49a116f9..94fe76c1 100644 --- a/mex_examples_multem/example_crystal_by_layers.m +++ b/mex_examples_multem/example_crystal_by_layers.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_feg.m b/mex_examples_multem/example_feg.m index da36ea33..8d263ebe 100644 --- a/mex_examples_multem/example_feg.m +++ b/mex_examples_multem/example_feg.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_fxg.m b/mex_examples_multem/example_fxg.m index 7e9d4b1f..4baaf8d5 100644 --- a/mex_examples_multem/example_fxg.m +++ b/mex_examples_multem/example_fxg.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_incident_wave_1.m b/mex_examples_multem/example_incident_wave_1.m index c1ae4a79..dcd9bc4f 100644 --- a/mex_examples_multem/example_incident_wave_1.m +++ b/mex_examples_multem/example_incident_wave_1.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Incident wave simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_incident_wave_2.m b/mex_examples_multem/example_incident_wave_2.m index 9dac5f97..a49272eb 100644 --- a/mex_examples_multem/example_incident_wave_2.m +++ b/mex_examples_multem/example_incident_wave_2.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Incident wave simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_incident_wave_3.m b/mex_examples_multem/example_incident_wave_3.m index 8fbc9c81..0f7bfdc9 100644 --- a/mex_examples_multem/example_incident_wave_3.m +++ b/mex_examples_multem/example_incident_wave_3.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Incident wave simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_incident_wave_4.m b/mex_examples_multem/example_incident_wave_4.m index d6379ff5..694f8e3a 100644 --- a/mex_examples_multem/example_incident_wave_4.m +++ b/mex_examples_multem/example_incident_wave_4.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % Incident wave simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) '/mex_bin']) diff --git a/mex_examples_multem/example_microscope_aberrations.m b/mex_examples_multem/example_microscope_aberrations.m index fdef5941..d682b92e 100644 --- a/mex_examples_multem/example_microscope_aberrations.m +++ b/mex_examples_multem/example_microscope_aberrations.m @@ -1,7 +1,7 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % inclusion of TEM aberrerations into a exitwve simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_pr.m b/mex_examples_multem/example_pr.m index 0c1982fa..f3bc2f78 100644 --- a/mex_examples_multem/example_pr.m +++ b/mex_examples_multem/example_pr.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_projected_potential.m b/mex_examples_multem/example_projected_potential.m index e863a65a..f2ec68a2 100644 --- a/mex_examples_multem/example_projected_potential.m +++ b/mex_examples_multem/example_projected_potential.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_propagate.m b/mex_examples_multem/example_propagate.m index 9c11294a..09ec82ab 100644 --- a/mex_examples_multem/example_propagate.m +++ b/mex_examples_multem/example_propagate.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_specimen_creation_from_cif_file.m b/mex_examples_multem/example_specimen_creation_from_cif_file.m index 255009a8..94712be3 100644 --- a/mex_examples_multem/example_specimen_creation_from_cif_file.m +++ b/mex_examples_multem/example_specimen_creation_from_cif_file.m @@ -1,5 +1,5 @@ % Specimen creation -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear all;clc; diff --git a/mex_examples_multem/example_specimen_planes.m b/mex_examples_multem/example_specimen_planes.m index b9d95aa8..214ecbe4 100644 --- a/mex_examples_multem/example_specimen_planes.m +++ b/mex_examples_multem/example_specimen_planes.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_specimen_rotation.m b/mex_examples_multem/example_specimen_rotation.m index eab06351..637f5179 100644 --- a/mex_examples_multem/example_specimen_rotation.m +++ b/mex_examples_multem/example_specimen_rotation.m @@ -4,7 +4,7 @@ % % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() % -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_specimen_slicing_rotation.m b/mex_examples_multem/example_specimen_slicing_rotation.m index 9d0bc170..7af1e87d 100644 --- a/mex_examples_multem/example_specimen_slicing_rotation.m +++ b/mex_examples_multem/example_specimen_slicing_rotation.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_specimen_slicing_show.m b/mex_examples_multem/example_specimen_slicing_show.m index 8386d5d8..950dd6f8 100644 --- a/mex_examples_multem/example_specimen_slicing_show.m +++ b/mex_examples_multem/example_specimen_slicing_show.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_specimen_slicing_with_amorphous_layer.m b/mex_examples_multem/example_specimen_slicing_with_amorphous_layer.m index e6a4368c..d693ee24 100644 --- a/mex_examples_multem/example_specimen_slicing_with_amorphous_layer.m +++ b/mex_examples_multem/example_specimen_slicing_with_amorphous_layer.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_specimen_slicing_zone_axis.m b/mex_examples_multem/example_specimen_slicing_zone_axis.m index 21a25464..e5c6b3f1 100644 --- a/mex_examples_multem/example_specimen_slicing_zone_axis.m +++ b/mex_examples_multem/example_specimen_slicing_zone_axis.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_specimen_subslicing.m b/mex_examples_multem/example_specimen_subslicing.m index 6e0baf70..57256e2c 100644 --- a/mex_examples_multem/example_specimen_subslicing.m +++ b/mex_examples_multem/example_specimen_subslicing.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_transmission_function.m b/mex_examples_multem/example_transmission_function.m index 6fcf0013..f6065a05 100644 --- a/mex_examples_multem/example_transmission_function.m +++ b/mex_examples_multem/example_transmission_function.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_vp.m b/mex_examples_multem/example_vp.m index 89eed28e..1568aeb6 100644 --- a/mex_examples_multem/example_vp.m +++ b/mex_examples_multem/example_vp.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_vr.m b/mex_examples_multem/example_vr.m index ce01f344..61ea89e5 100644 --- a/mex_examples_multem/example_vr.m +++ b/mex_examples_multem/example_vr.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_vz.m b/mex_examples_multem/example_vz.m index ed354d60..8f466bf1 100644 --- a/mex_examples_multem/example_vz.m +++ b/mex_examples_multem/example_vz.m @@ -1,4 +1,4 @@ -% Copyright 2021 Ivan Lobato +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) diff --git a/mex_examples_multem/example_wave_function.m b/mex_examples_multem/example_wave_function.m index 6845f6f9..3354031e 100644 --- a/mex_examples_multem/example_wave_function.m +++ b/mex_examples_multem/example_wave_function.m @@ -1,6 +1,6 @@ % output_multislice = input_multem.ilc_multem perform TEM simulation % All parameters of the input_multem structure are explained in ilm_dflt_input_multem() -% Copyright 2021 Ivan Lobato clear; clc; +% Copyright 2023 Ivan Lobato clear; clc; addpath([fileparts(pwd) filesep 'mex_bin']) addpath([fileparts(pwd) filesep 'crystalline_materials']) diff --git a/src/cgpu_fcns.cuh b/src/cgpu_fcns.cuh index 1229594e..8f9280ca 100644 --- a/src/cgpu_fcns.cuh +++ b/src/cgpu_fcns.cuh @@ -2019,10 +2019,10 @@ namespace mt { T_r chi = g2*(lens.c_c_30*g2+lens.c_c_10); T_r c = c_Pi*lens.si_theta_c*lens.ti_iehwgd; - T_r u = 1.0 + 2*c*c*g2; + T_r u = 1.0 + c*c*g2; c = c_Pi*lens.ti_iehwgd*lens.lambda*g2; - T_r temp_inc = 0.5*c*c; + T_r temp_inc = 0.25*c*c; c = c_Pi*lens.si_theta_c*(lens.c_30*lens.lambda2*g2-lens.c_10); T_r spa_inc = c*c*g2;