Merge branch 'master' of https://github.com/abuts/Fe

# Conflicts: # Data/DFT/read_add_sim_Kun.m
abuts · Feb 26, 2020 · c2a1d80 · c2a1d80
2 parents f9ee7f2 + 8027dfd
commit c2a1d80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Data/DFT/build_ScattInt.m b/Data/DFT/build_ScattInt.m
@@ -17,7 +17,7 @@
     qx_bin = qx(in_bin);
     qy_bin = qy(in_bin);
     qz_bin = qz(in_bin);
-    Interp_array{i}= scatteredInterpolant(qx_bin,qy_bin,qz_bin,s_bin,'linear');
+    Interp_array{i}= scatteredInterpolant(qx_bin,qy_bin,qz_bin,s_bin,'natural');
 end
 if isempty(Interp_array{end})
     Interp_array{end} = Interp_array{end-1};

diff --git a/Data/DFT/disp_dft_kun4D_lint.m b/Data/DFT/disp_dft_kun4D_lint.m
@@ -37,6 +37,7 @@
     magFF = mi.getFF_calculator(bm);
 end
 %
+
 if isempty(ses) || isempty(Interp_array)
     [ses,~,en_pts,qxs,qys,qzs,ens]=read_add_sim_Kun(true);
     Interp_array = build_ScattInt(en_pts,qxs,qys,qzs,ens,ses);
@@ -58,6 +59,7 @@
 brav = brav+sign(brav);
 brav = (brav-rem(brav,2));
 %
+%
 qr   = double(abs(qr-brav));
 enr  = double(en);
 wdisp = interpLintKun(qr,enr,Interp_array,en_pts,en_bin_size);