remove automatic clearing of matRad_cfg in matRad_rc and better handl…

…e calling matRad_rc from wrong folder

MatRad_Config.m

@@ -60,12 +60,11 @@
             %  For instantiation, use the static MatRad_Config.instance();
 
             obj.matRadRoot = fileparts(mfilename('fullpath'));
+            addpath(genpath(obj.matRadRoot));
 
             %Set Version
             obj.getEnvironment();
-            obj.matRad_version = matRad_version();
-
-            obj.matRadRoot = fileparts(mfilename('fullpath'));
+            obj.matRad_version = matRad_version();            
 
             %Just to catch people messing with the properties in the file
             if ~isempty(obj.writeLog) && obj.writeLog
@@ -76,6 +75,11 @@
             %Call the reset function for remaining inatialization
             obj.reset();
         end
+
+        function delete(~)
+            %might not be desired by users
+            %rmpath(genpath(matRad_cfg.matRadRoot));
+        end
 
         function displayToConsole(obj,type,formatSpec,varargin)
             %displayToConsole lowest-level logging function for matRad.

matRad_rc.m

@@ -13,10 +13,14 @@
 %
 % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-% set search path and clear other instances of matRad
-clear matRad_cfg MatRad_Config persistent global;
+% Initialize matRad
 matRad_cfg = MatRad_Config.instance();
-addpath(genpath(matRad_cfg.matRadRoot));
+if ~strcmp(matRad_cfg.matRadRoot,fileparts(mfilename("fullpath")))
+    matRad_cfg.dispWarning('Called matRad_rc in folder %s but matRad initialized in folder %s!\n Removing old matRad from path and using new installation!',fileparts(mfilename("fullpath")),matRad_cfg.matRadRoot); 
+    rmpath(genpath(matRad_cfg.matRadRoot));
+    clear matRad_cfg MatRad_Config;
+    matRad_cfg = MatRad_Config.instance();
+end
 
 %clear command window and close all figures
 clc;