Merge pull request #762 from SimonaFa/dev

Bug fixed in MonteCarloEngineAbstract for forward dose calculation

Author: wahln

AUTHORS.txt

@@ -13,6 +13,7 @@
 * Remo Cristoforetti
 * Marios Dallas
 * Edgardo Doerner
+* Simona Facchiano
 * Hubert Gabrys
 * Josefine Handrack
 * Jennifer Hardt

matRad/doseCalc/+DoseEngines/@matRad_DoseEngineBase/matRad_DoseEngineBase.m

@@ -64,6 +64,7 @@
     properties (Access = protected)
         lastProgressUpdate;
         calcDoseDirect = false; % switch for direct cube / dij calculation
+        directWeights  = [];
     end
 
     properties (Constant)
@@ -192,7 +193,7 @@ function assignPropertiesFromPln(this,pln,warnWhenPropertyChanged)
 
             % copy bixel weight vector into stf struct
             if nargin == 5
-                if sum([stf.totalNumOfBixels]) ~= numel(w)
+                if sum([stf.totalNumOfBixels]) ~= numel(w) && ~isfield([stf.ray],'shapes')
                     matRad_cfg.dispError('weighting does not match steering information');
                 end
                 counter = 0;
@@ -218,6 +219,7 @@ function assignPropertiesFromPln(this,pln,warnWhenPropertyChanged)
             end            
 
             %Set direct dose calculation and compute "dij"
+            this.directWeights = w;
             this.calcDoseDirect = true;
             dij = this.calcDose(ct,cst,stf);
 

matRad/doseCalc/+DoseEngines/matRad_MonteCarloEngineAbstract.m

@@ -51,56 +51,6 @@ function setDefaults(this)
 
             this.relativeDosimetricCutOff   = matRad_cfg.defaults.propDoseCalc.dosimetricLateralCutOff;
         end
-
-        function resultGUI = calcDoseForward(this,ct,cst,stf,w)
-            
-            matRad_cfg = MatRad_Config.instance();
-            if nargin < 5 && ~isfield([stf.ray],'weight')
-                matRad_cfg.dispError('No weight vector available. Please provide w or add info to stf')
-            end
-
-            % copy bixel weight vector into stf struct
-            if nargin == 5
-                if sum([stf.totalNumOfBixels]) ~= numel(w) && ~isfield([stf.ray],'shapes')
-                    matRad_cfg.dispError('weighting does not match steering information')
-                end
-                counter = 0;
-                for i = 1:size(stf,2)
-                    for j = 1:stf(i).numOfRays
-                        for k = 1:stf(i).numOfBixelsPerRay(j)
-                            counter = counter + 1;
-                            stf(i).ray(j).weight(k) = w(counter);
-                        end
-                    end
-                end
-            else % weights need to be in stf!
-                w = NaN*ones(sum([stf.totalNumOfBixels]),1);
-                counter = 0;
-                for i = 1:size(stf,2)
-                    for j = 1:stf(i).numOfRays
-                        for k = 1:stf(i).numOfBixelsPerRay(j)
-                            counter = counter + 1;
-                            w(counter) = stf(i).ray(j).weight(k);
-                        end
-                    end
-                end
-            end            
-            
-            %Set direct dose calculation and compute "dij"
-            this.calcDoseDirect = true;
-            dij = this.calcDose(ct,cst,stf);
-
-            % 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
     end