Update to externalCalculation

Changed output of TopasMCEngine to be empty not a 0 struct, this way, we dont need the check for externalCalculation in the MonteCarlo DoseEngine, and the resultGUI is still returned as empty in the calc cubes
e0404 · Mar 27, 2024 · 2934e29 · 2934e29
1 parent 43af419
commit 2934e29
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/doseCalc/+DoseEngines/matRad_MonteCarloEngineAbstract.m b/doseCalc/+DoseEngines/matRad_MonteCarloEngineAbstract.m
@@ -90,15 +90,14 @@ function setDefaults(this)
             this.calcDoseDirect = true;
             dij = this.calcDose(ct,cst,stf);
 
-            if ~this.externalCalculation
-                % hack dij struct
-                dij.numOfBeams = 1;
-                dij.beamNum = 1;
-
-                % calculate cubes; use uniform weights here, weighting with actual fluence
-                % already performed in dij construction
-                resultGUI    = matRad_calcCubes(sum(w),dij);
-            end
+            % hack dij struct
+            dij.numOfBeams = 1;
+            dij.beamNum = 1;
+
+            % calculate cubes; use uniform weights here, weighting with actual fluence
+            % already performed in dij construction
+            resultGUI    = matRad_calcCubes(sum(w),dij);
+
             % remember original fluence weights
             resultGUI.w  = w;
         end

diff --git a/doseCalc/+DoseEngines/matRad_TopasMCEngine.m b/doseCalc/+DoseEngines/matRad_TopasMCEngine.m
@@ -582,7 +582,7 @@ function writeAllFiles(obj,ct,cst,stf,machine,w)
                 % Order fields for easier comparison between different dijs
                 dij = orderfields(dij);
             else
-                dij = struct([]);
+                dij = [];
             end
 
         end

diff --git a/matRad_calcCubes.m b/matRad_calcCubes.m
@@ -165,7 +165,7 @@
 resultGUI = orderfields(resultGUI);
 
 % interpolation if dose grid does not match ct grid
-if any(dij.ctGrid.dimensions~=dij.doseGrid.dimensions)
+if isfield(dij,'ctGrid') && any(dij.ctGrid.dimensions~=dij.doseGrid.dimensions)
     myFields = fieldnames(resultGUI);
     for i = 1:numel(myFields)
         if numel(resultGUI.(myFields{i})) == dij.doseGrid.numOfVoxels