Fixed interpolation directory

interp_fwhm removed
thallor1 · Feb 4, 2025 · 9606e25 · 9606e25
1 parent c26f6c4
commit 9606e25
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 85 deletions.
diff --git a/docs/source/notebooks/MACS_User_notebook.ipynb b/docs/source/notebooks/MACS_User_notebook.ipynb
diff --git a/...ing/interp_fwhm/MACS_Ef_3p7_interp_dE.pck → pyMACS/scripting/MACS_Ef_3p7_interp_dE.pck b/...ing/interp_fwhm/MACS_Ef_3p7_interp_dE.pck → pyMACS/scripting/MACS_Ef_3p7_interp_dE.pck
diff --git a/...ng/interp_fwhm/MACS_Ef_3p7_interp_dQx.pck → pyMACS/scripting/MACS_Ef_3p7_interp_dQx.pck b/...ng/interp_fwhm/MACS_Ef_3p7_interp_dQx.pck → pyMACS/scripting/MACS_Ef_3p7_interp_dQx.pck
diff --git a/...ng/interp_fwhm/MACS_Ef_3p7_interp_dQz.pck → pyMACS/scripting/MACS_Ef_3p7_interp_dQz.pck b/...ng/interp_fwhm/MACS_Ef_3p7_interp_dQz.pck → pyMACS/scripting/MACS_Ef_3p7_interp_dQz.pck
diff --git a/...ing/interp_fwhm/MACS_Ef_5p0_interp_dE.pck → pyMACS/scripting/MACS_Ef_5p0_interp_dE.pck b/...ing/interp_fwhm/MACS_Ef_5p0_interp_dE.pck → pyMACS/scripting/MACS_Ef_5p0_interp_dE.pck
diff --git a/...ng/interp_fwhm/MACS_Ef_5p0_interp_dQx.pck → pyMACS/scripting/MACS_Ef_5p0_interp_dQx.pck b/...ng/interp_fwhm/MACS_Ef_5p0_interp_dQx.pck → pyMACS/scripting/MACS_Ef_5p0_interp_dQx.pck
diff --git a/...ng/interp_fwhm/MACS_Ef_5p0_interp_dQz.pck → pyMACS/scripting/MACS_Ef_5p0_interp_dQz.pck b/...ng/interp_fwhm/MACS_Ef_5p0_interp_dQz.pck → pyMACS/scripting/MACS_Ef_5p0_interp_dQz.pck
diff --git a/pyMACS/virtualMACS.py b/pyMACS/virtualMACS.py
@@ -1078,7 +1078,7 @@ def load_res_fwhm_interp_objects(self):
         :return: interp_dQx, interp_dQz, interp_dE, scipy.interpolate.RegularGridInterpolator obejcts that return the macs Bragg widhths in the respective directions for arbitrary h,k,l,E, for the Ef=3.7 or Ef=5.0 settings.
         :rtype: scipy.interpolate.RegularGridInterpolator, scipy.interpolate.RegularGridInterpolator, scipy.interpolate.RegularGridInterpolator 
         """ 
-        interp_dir = str(files("pyMACS")) + '/scripting/interp_fwhm/'
+        interp_dir = str(files("pyMACS")) + '/scripting/'
         if np.min(np.abs(np.array([5.0,3.7])-self.kidney.Ef))>0.1:
             #Check if the instrumental configruation is valid.
             print("Macs Ef hasn't been tabulated. Use Ef=3.7 or Ef=5.0")