new focus spot spacing Lookup name

Author: wahln

examples/matRad_example13_fitAnalyticalParticleBaseData.m

@@ -109,18 +109,18 @@
 pln.radiationMode   = 'protons'; 
 
 % create meta machine data
-machine.meta.machine = 'example'; %name of the machine
+machine.meta.name = 'example'; %name of the machine
 machine.meta.radiationMode = 'protons'; %modality
 machine.meta.dataType = 'singleGauss'; %singleGauss or doubleGauss
 machine.meta.created_on = date;
 machine.meta.created_by = 'matRad_example';
 machine.meta.SAD = (2218 + 1839) / 2; %This is the (virtual) source to axis distance
 machine.meta.BAMStoIsoDist = 420.0; %distance from beam nozzle ot isocenter
-machine.meta.LUT_bxWidthminFWHM = [0, Inf; 5 ,5]; %Specifies which minimum FWHM to use as spot sice for which ranges of lateral spot distance (here, each spot distance of 0 to to Inf gets at least 5mm wide spots
+machine.meta.LUTspotSize = [0, Inf; 5 ,5]; %Specifies which minimum FWHM to use as spot sice for which ranges of lateral spot distance (here, each spot distance of 0 to to Inf gets at least 5mm wide spots
 machine.meta.fitAirOffset = 420.0; %Tells matRad how much "air" was considered during fitting. Set this to 0 if the fit is obtained in vacuum and no air transport is simulated up to the phantom. matRad assumes that the phantom starts at the isocenter.
 
 % Now add the example machine to the pln and then save it
-pln.machine = machine.meta.machine;
+pln.machine = machine.meta.name;
 pln.radiationMode = machine.meta.radiationMode;
 fileName = [pln.radiationMode '_' pln.machine];
 filePath = fullfile(matRad_cfg.userfolders{1},'machines',[fileName '.mat']);

matRad/basedata/protons_Generic.mat

@@ -365,7 +365,10 @@ function calcLateralParticleCutOff(this,cutOffLevel,~)
                 return;
             end
 
-            checkMeta = all(isfield(machine.meta,{'SAD','BAMStoIsoDist','LUT_bxWidthminFWHM','dataType'}));
+            checkMeta = all(isfield(machine.meta,{'SAD','BAMStoIsoDist','dataType'}));
+            
+            %Superseded names from older machine file versions
+            checkMeta = checkMeta && any(isfield(machine.meta,{'LUTspotSize','LUT_bxWidthminFWHM'}));
 
             dataType = machine.meta.dataType;
             if strcmp(dataType,'singleGauss')

matRad/doseCalc/+DoseEngines/matRad_ParticleAnalyticalBortfeldEngine.m

@@ -424,7 +424,10 @@ function setDefaults(this)
                 return;
             end
 
-            checkMeta = all(isfield(machine.meta,{'SAD','BAMStoIsoDist','LUT_bxWidthminFWHM','dataType'}));
+            checkMeta = all(isfield(machine.meta,{'SAD','BAMStoIsoDist','dataType'}));
+            
+            %Superseded names from older machine file versions
+            checkMeta = checkMeta && any(isfield(machine.meta,{'LUTspotSize','LUT_bxWidthminFWHM'}));
 
             dataType = machine.meta.dataType;
             if strcmp(dataType,'singleGauss')

matRad/doseCalc/+DoseEngines/matRad_ParticleFineSamplingPencilBeamEngine.m

@@ -124,7 +124,10 @@
                 return;
             end
 
-            checkMeta = all(isfield(machine.meta,{'SAD','BAMStoIsoDist','LUT_bxWidthminFWHM','dataType'}));
+            checkMeta = all(isfield(machine.meta,{'SAD','BAMStoIsoDist','dataType'}));
+            
+            %Superseded names from older machine file versions
+            checkMeta = checkMeta && any(isfield(machine.meta,{'LUTspotSize','LUT_bxWidthminFWHM'}));
 
             dataType = machine.meta.dataType;
             if strcmp(dataType,'singleGauss')

matRad/doseCalc/+DoseEngines/matRad_ParticleHongPencilBeamEngine.m

@@ -472,7 +472,7 @@ function initialize(this)
             %checkBasic
             available = isfield(machine,'meta') && isfield(machine,'data');
 
-            available = available && isfield(machine.meta,'machine');
+            available = available && any(isfield(machine.meta,{'machine','name'}));
 
             available = available && isfield(machine.meta,'SAD') && isscalar(machine.meta.SAD);
 

matRad/steering/matRad_StfGeneratorExternalRayBixelAbstract.m

@@ -47,6 +47,13 @@
 
             isoCenterInCubeCoords = matRad_world2cubeCoords(beam.isoCenter,this.ct);
 
+            if isfield(this.machine.meta,'LUT_bxWidthminFWHM')
+                LUTspotSize = this.machine.meta.LUT_bxWidthminFWHM;
+            else
+                LUTspotSize = this.machine.meta.LUTspotSize;
+            end
+            
+
             beam.numOfBixelsPerRay = zeros(1,beam.numOfRays);
 
             for j = beam.numOfRays:-1:1
@@ -172,10 +179,10 @@
 
                     % book keeping & calculate focus index
                     beam.numOfBixelsPerRay(j) = numel([beam.ray(j).energy]);
-                    currentMinimumFWHM = matRad_interp1(this.machine.meta.LUT_bxWidthminFWHM(1,:)',...
-                        this.machine.meta.LUT_bxWidthminFWHM(2,:)',...
+                    currentMinimumFWHM = matRad_interp1(LUTspotSize(1,:)',...
+                        LUTspotSize(2,:)',...
                         this.bixelWidth, ...
-                        this.machine.meta.LUT_bxWidthminFWHM(2,end));
+                        LUTspotSize(2,end));
                     focusIx  =  ones(beam.numOfBixelsPerRay(j),1);
                     [~, vEnergyIx] = min(abs(bsxfun(@minus,[this.machine.data.energy]',...
                         repmat(beam.ray(j).energy,length([this.machine.data]),1))));

matRad/steering/matRad_StfGeneratorParticleIMPT.m

@@ -170,10 +170,18 @@ function createPatientGeometry(this)
 
             % get the focus index
             if isfield(this.machine.meta,'LUT_bxWidthminFWHM')
-                currentMinimumFWHM = matRad_interp1(this.machine.meta.LUT_bxWidthminFWHM(1,:)',...
-                    this.machine.meta.LUT_bxWidthminFWHM(2,:)',...
+                LUTspotSize = this.machine.meta.LUT_bxWidthminFWHM;
+            elseif isfield(this.machine.meta,'LUTspotSize')
+                LUTspotSize = this.machine.meta.LUTspotSize;
+            else
+                LUTspotSize = [];
+            end
+                    
+            if ~isempty(LUTspotSize)
+                currentMinimumFWHM = matRad_interp1(LUTspotSize(1,:)',...
+                    LUTspotSize(2,:)',...
                     beam.bixelWidth, ...
-                    this.machine.meta.LUT_bxWidthminFWHM(2,end));
+                    LUTspotSize(2,end));
 
                 beam.ray.focusIx = find(this.machine.data(vEnergyIx).initFocus.SisFWHMAtIso > currentMinimumFWHM,1,'first');
             else