more changes

Author: StephenNneji

RATapi/examples/normal_reflectivity/DSPC_custom_layers.py

@@ -127,4 +127,4 @@ def DSPC_custom_layers():
 
 if __name__ == "__main__":
     problem, results = DSPC_custom_layers()
-    # RAT.plotting.plot_ref_sld(problem, results, True)
+    RAT.plotting.plot_ref_sld(problem, results, True)

RATapi/wrappers.py

@@ -1,4 +1,5 @@
 """Wrappers for the interface between RATapi and MATLAB custom files."""
+from contextlib import contextmanager
 import os
 import pathlib
 import platform
@@ -15,6 +16,16 @@
 MATLAB_PATH_FILE = os.path.join(os.path.dirname(os.path.realpath(__file__)), "matlab.txt")
 
 
+@contextmanager
+def cd(newdir):
+    prev_dir = os.getcwd()
+    os.chdir(os.path.expanduser(newdir))
+    try:
+        yield
+    finally:
+        os.chdir(prev_dir)
+
+
 def set_matlab_path(matlab_path):
     if not matlab_path:
         return 
@@ -39,7 +50,7 @@ def get_matlab_paths(exe_path):
     if platform.system() == "Windows": 
         arch  = "win64"
     elif  platform.system() == "Darwin":
-        arch = "maci64" if (bin_path / "maci64").exists() else "maca64"
+        arch = "maca64" if platform.mac_ver()[-1] == 'arm64' else "maci64"
     else: 
         arch = "glnxa64"
 
@@ -78,10 +89,13 @@ def start_matlab():
     if matlab_path:
         bin_path, dll_path = get_matlab_paths(matlab_path)
         os.environ["MATLAB_DLL_PATH"] = dll_path
-        os.environ["PATH"] = bin_path + os.pathsep + os.environ["PATH"]
-        os.environ["PATH"] = dll_path + os.pathsep + os.environ["PATH"]
-        engine = RATapi.rat_core.MatlabEngine()
-    
+        print(bin_path, dll_path)
+        if platform.system() == "Windows": 
+            os.environ["PATH"] = dll_path + os.pathsep + os.environ["PATH"]
+        
+        with cd(bin_path):
+            engine = RATapi.rat_core.MatlabEngine()
+        
         return engine
 
 

cpp/rat.cpp

@@ -22,9 +22,6 @@ setup_pybind11(cfg)
 #include "includes/defines.h"
 #include "includes/functions.h"
 
-#include <chrono>
-#include <thread>
-
 
 namespace py = pybind11;