fixes to differences in how machine names are requested

Author: wahln

matRad/doseCalc/+DoseEngines/matRad_ParticleMCsquareEngine.m

@@ -150,8 +150,14 @@ function setDefaults(this)
                 bdFile = this.forceBDL;
 
             else
+                % Newer machine files have "name" instead of "machine"
+                if ~isfield(this.machine.meta,'machine')
+                    machineName = this.machine.meta.name;                    
+                else
+                    machineName = this.machine.meta.machine;
+                end
                 % fit and create BDL file using selected machine file
-                bdFile = [this.machine.meta.machine '.txt'];
+                bdFile = [machineName '.txt'];
 
                 % Calculate MCsquare base data
                 % Argument stf is optional, if given, calculation only for energies given in stf

matRad/doseCalc/+DoseEngines/matRad_ParticlePencilBeamEngineAbstract.m

@@ -605,7 +605,7 @@ function calcLateralParticleCutOff(this,cutOffLevel,stfElement)
                 sigmaIni_sq = sigmaIni^2;
 
                 % consider range shifter for protons if applicable
-                if  strcmp(this.machine.meta.radiationMode,'protons') && rangeShifterLUT(i).eqThickness > 0  && ~strcmp(this.machine.meta.machine,'Generic')
+                if  strcmp(this.machine.meta.radiationMode,'protons') && rangeShifterLUT(i).eqThickness > 0 
 
                     %get max range shift
                     sigmaRashi = matRad_calcSigmaRashi(this.machine.data(energyIx).energy, ...

matRad/doseCalc/MCsquare/matRad_MCsquareBaseData.m

@@ -47,7 +47,6 @@
                 fileID = fopen(filepath,'w');
 
                 %Header
-                %fprintf(fileID,'--matRad: Beam Model for machine %s (%s)--\n',machine.meta.machine,machine.meta.dataType);
                 fprintf(fileID,'--UPenn beam model (double gaussian)--\n');
                 fprintf(fileID,'# %s\n', obj.machine.meta.description);
                 fprintf(fileID,'# created by %s on %s\n\n', obj.machine.meta.created_by, obj.machine.meta.created_on);

matRad/steering/matRad_StfGeneratorExternalRayBixelAbstract.m

@@ -202,8 +202,16 @@ function initialize(this)
             beam.isoCenter       = this.isoCenter(beamIndex,:);
             beam.bixelWidth      = this.bixelWidth;
             beam.radiationMode   = this.radiationMode;
-            beam.machine         = this.machine.meta.machine;
-            beam.SAD             = this.machine.meta.SAD;
+
+            % Newer machine files have "name" instead of "machine"
+            if ~isfield(this.machine.meta,'machine')
+                machineName = this.machine.meta.name;                    
+            else
+                machineName = this.machine.meta.machine;
+            end
+            beam.machine = machineName;
+
+            beam.SAD = this.machine.meta.SAD;
         end