Merge branch 'dev' into dev_bioModelMerging

Author: wahln

matRad/doseCalc/+DoseEngines/matRad_ParticleHongPencilBeamEngine.m

@@ -74,7 +74,10 @@
                     matRad_cfg.dispError('Invalid Lateral Model');
             end
 
-            bixel.physicalDose = bixel.baseData.LatCutOff.CompFac * L .* kernels.Z;
+            if length(bixel.baseData.LatCutOff.CompFac) > 1
+                bixel.baseData.LatCutOff.CompFac = matRad_interp1(bixel.baseData.LatCutOff.depths', bixel.baseData.LatCutOff.CompFac', bixel.radDepths);
+            end
+            bixel.physicalDose = bixel.baseData.LatCutOff.CompFac .* L .* kernels.Z;
 
             % check if we have valid dose values
             if any(isnan(bixel.physicalDose)) || any(bixel.physicalDose<0)

matRad/doseCalc/+DoseEngines/matRad_ParticlePencilBeamEngineAbstract.m

@@ -673,14 +673,15 @@ function calcLateralParticleCutOff(this,cutOffLevel,stfElement)
 
                         % Find radius at which integrated dose becomes
                         % bigger than cutoff * IDD
+
                         switch this.cutOffMethod
                             case 'integral'
                                 IX = find(cumArea >= idd(j) * cutOffLevel,1, 'first');
                                 this.machine.data(energyIx).LatCutOff.CompFac = cutOffLevel^-1;
                             case 'relative'
                                 IX = find(dose_r <= (1-cutOffLevel) * max(dose_r), 1, 'first');
                                 relFac = cumArea(IX)./cumArea(end); % (or idd(j)) to find the appropriate integral of dose
-                                this.machine.data(energyIx).LatCutOff.CompFac = relFac^-1;
+                                this.machine.data(energyIx).LatCutOff.CompFac(j) = relFac^-1;
                             otherwise
                                 matRad_cfg.dispError('LateralParticleCutOff: Invalid Cutoff Method. Must be ''integral'' or ''relative''!');
                         end
@@ -831,14 +832,17 @@ function calcLateralParticleCutOff(this,cutOffLevel,stfElement)
                 else
                     idd = this.machine.data(energyIx).Z;
                 end
+                if length(TmpCompFac)>1
+                    TmpCompFac = matRad_interp1(depthValues, TmpCompFac', radDepths);
+                end
                 subplot(312),plot(this.machine.data(energyIx).depths,idd*conversionFactor,'k','LineWidth',2),grid on,hold on
                 plot(radDepths - this.machine.data(energyIx).offset,vDoseInt,'r--','LineWidth',2),hold on,
-                plot(radDepths - this.machine.data(energyIx).offset,vDoseInt * TmpCompFac,'bx','LineWidth',1),hold on,
+                plot(radDepths - this.machine.data(energyIx).offset,vDoseInt .* TmpCompFac,'bx','LineWidth',1),hold on,
                 legend({'original IDD',['cut off IDD at ' num2str(cutOffLevel) '%'],'cut off IDD with compensation'},'Location','northwest'),
                 xlabel('z [mm]'),ylabel('[MeV cm^2 /(g * primary)]'),set(gca,'FontSize',12)
 
                 totEnergy        = trapz(this.machine.data(energyIx).depths,idd*conversionFactor) ;
-                totEnergyCutOff  = trapz(radDepths,vDoseInt * TmpCompFac) ;
+                totEnergyCutOff  = trapz(radDepths,vDoseInt .* TmpCompFac) ;
                 relDiff          =  ((totEnergy/totEnergyCutOff)-1)*100;
                 title(['rel diff of integral dose ' num2str(relDiff) '%']);
                 baseData.LatCutOff.CompFac = TmpCompFac;