make mex file compilation a static function

HomolkaN · Nov 22, 2022 · d81012d · d81012d
1 parent 20626d1
commit d81012d
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 58 deletions.
diff --git a/matRad_calcPhotonDoseOmpMC.m b/matRad_calcPhotonDoseOmpMC.m
@@ -53,7 +53,7 @@
 if ~matRad_checkMexFileExists('omc_matrad') %exist('matRad_ompInterface','file') ~= 3
     matRad_cfg.dispWarning('Compiled mex interface not found. Trying to compile the ompMC interface on the fly!');
     try
-        pln.propMC.compileOmpMCInterface();
+        matRad_OmpConfig.compileOmpMCInterface();
     catch MException
         matRad_cfg.dispError('Could not find/generate mex interface for MC dose calculation.\nCause of error:\n%s\n Please compile it yourself (preferably with OpenMP support).',MException.message);
     end

diff --git a/ompMC/matRad_OmpConfig.m b/ompMC/matRad_OmpConfig.m
@@ -235,36 +235,70 @@
 
             end
         end
+
+
+    end
+
+    methods (Access = private)
+        function material = setupMaterials(~)
+            material = cell(4,5);
+            material{1,1} = 'AIR700ICRU';
+            material{1,2} = -1024;
+            material{1,3} = -974;
+            material{1,4} = 0.001;
+            material{1,5} = 0.044;
+            material{2,1} = 'LUNG700ICRU';
+            material{2,2} = -974;
+            material{2,3} = -724;
+            material{2,4} = 0.044;
+            material{2,5} = 0.302;
+            material{3,1} = 'ICRUTISSUE700ICRU';
+            material{3,2} = -724;
+            material{3,3} = 101;
+            material{3,4} = 0.302;
+            material{3,5} = 1.101;
+            material{4,1} = 'ICRPBONE700ICRU';
+            material{4,2} = 101;
+            material{4,3} = 1976;
+            material{4,4} = 1.101;
+            material{4,5} = 2.088;
+
+        end
 
+    end
+
+    methods (Static)
         function compileOmpMCInterface(dest,omcFolder)
-            % Compiles the ompMC interface (integrated as submodule)
-            %
-            % call
-            %   obj.compileOmpMCInterface()
-            %   obj.compileOmpMCInterface(dest)
-            %   obj.compileOmpMCInterface(dest,sourceFolder)
-            %
-            % input:
-            %   dest:           (optional) destination for mex file. Default: location
-            %                   of this file
-            %   sourceFolder:   (optional) path to ompMC . Default assumes its checked
-            %                   out in the submodules folder of matRad
-            %
-            % References
-            %
-            %
-            % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-            %
-            % Copyright 2020 the matRad development team.
-            %
-            % This file is part of the matRad project. It is subject to the license
-            % terms in the LICENSE file found in the top-level directory of this
-            % distribution and at https://github.com/e0404/matRad/LICENSES.txt. No part
-            % of the matRad project, including this file, may be copied, modified,
-            % propagated, or distributed except according to the terms contained in the
-            % LICENSE file.
-            %
-            % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+        % Compiles the ompMC interface (integrated as submodule)
+        %
+        % call
+        %   matRad_OmpConfig.compileOmpMCInterface()
+        %   matRad_OmpConfig.compileOmpMCInterface(dest)
+        %   matRad_OmpConfig.compileOmpMCInterface(dest,sourceFolder)
+        % if an object is instantiated, matRad_OmpConfig can be replaced by the 
+        % object handle
+        %
+        % input:
+        %   dest:           (optional) destination for mex file. Default: location
+        %                   of this file
+        %   sourceFolder:   (optional) path to ompMC . Default assumes its checked
+        %                   out in the submodules folder of matRad
+        %
+        % References
+        %
+        %
+        % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+        %
+        % Copyright 2020 the matRad development team.
+        %
+        % This file is part of the matRad project. It is subject to the license
+        % terms in the LICENSE file found in the top-level directory of this
+        % distribution and at https://github.com/e0404/matRad/LICENSES.txt. No part
+        % of the matRad project, including this file, may be copied, modified,
+        % propagated, or distributed except according to the terms contained in the
+        % LICENSE file.
+        %
+        % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 
             matRad_cfg = MatRad_Config.instance();
@@ -338,35 +372,6 @@ function compileOmpMCInterface(dest,omcFolder)
             eval(mexCall);
             cd(currDir);
         end
-
-    end
-
-    methods (Access = private)
-        function material = setupMaterials(~)
-            material = cell(4,5);
-            material{1,1} = 'AIR700ICRU';
-            material{1,2} = -1024;
-            material{1,3} = -974;
-            material{1,4} = 0.001;
-            material{1,5} = 0.044;
-            material{2,1} = 'LUNG700ICRU';
-            material{2,2} = -974;
-            material{2,3} = -724;
-            material{2,4} = 0.044;
-            material{2,5} = 0.302;
-            material{3,1} = 'ICRUTISSUE700ICRU';
-            material{3,2} = -724;
-            material{3,3} = 101;
-            material{3,4} = 0.302;
-            material{3,5} = 1.101;
-            material{4,1} = 'ICRPBONE700ICRU';
-            material{4,2} = 101;
-            material{4,3} = 1976;
-            material{4,4} = 1.101;
-            material{4,5} = 2.088;
-
-        end
-
     end
 end