test Availability functions and fix corresponding issues

Author: wahln

matRad/steering/matRad_ParticleStfGeneratorIMPT.m

@@ -279,7 +279,7 @@
             end
 
             % Check superclass availability
-            [available,msg] = matRad_ParticleStfGeneratorRayBixelAbstract.IsAvailable(pln,machine);
+            [available,msg] = matRad_ParticleStfGeneratorRayBixelAbstract.isAvailable(pln,machine);
 
             if ~available
                 return;
@@ -298,7 +298,7 @@
                     checkModality = strcmp(machine.meta.radiationMode,pln.radiationMode);
                 end
 
-                preCheck = checkBasic && checkModality;
+                preCheck = checkModality;
 
                 if ~preCheck
                     return;

matRad/steering/matRad_ParticleStfGeneratorRayBixelAbstract.m

@@ -86,15 +86,15 @@ function initialize(this)
             end
 
             % Check superclass availability
-            [available,msg] = matRad_ExternalStfGeneratorRayBixelAbstract.IsAvailable(pln,machine);
+            [available,msg] = matRad_ExternalStfGeneratorRayBixelAbstract.isAvailable(pln,machine);
 
             if ~available
                 return;
             end
 
             available = available && isstruct(machine.data);
 
-            available = available && all(isfield(machine.data),{'energy','peakPos','initFocus','offset'});
+            available = available && all(isfield(machine.data,{'energy','peakPos','initFocus','offset'}));
 
 
             if ~available

matRad/steering/matRad_ParticleStfGeneratorSingleBeamlet.m

@@ -208,7 +208,7 @@ function createPatientGeometry(this)
             end
 
             % Check superclass availability
-            [available,msg] = matRad_ParticleStfGeneratorRayBixelAbstract.IsAvailable(pln,machine);
+            [available,msg] = matRad_ParticleStfGeneratorRayBixelAbstract.isAvailable(pln,machine);
 
             if ~available
                 return;

matRad/steering/matRad_PhotonStfGeneratorIMRT.m

@@ -36,7 +36,7 @@
             end
 
             % Check superclass availability
-            [available,msg] = matRad_PhotonStfGeneratorRayBixelAbstract.IsAvailable(pln,machine);
+            [available,msg] = matRad_PhotonStfGeneratorRayBixelAbstract.isAvailable(pln,machine);
 
             if ~available
                 return;

matRad/steering/matRad_PhotonStfGeneratorRayBixelAbstract.m

@@ -79,7 +79,7 @@ function setDefaults(this)
             end
 
             % Check superclass availability
-            [available,msg] = matRad_ExternalStfGeneratorRayBixelAbstract.IsAvailable(pln,machine);
+            [available,msg] = matRad_ExternalStfGeneratorRayBixelAbstract.isAvailable(pln,machine);
 
             if ~available
                 return;

matRad/steering/matRad_PhotonStfGeneratorSingleBeamlet.m

@@ -54,7 +54,7 @@
             end
 
             % Check superclass availability
-            [available,msg] = matRad_PhotonStfGeneratorRayBixelAbstract.IsAvailable(pln,machine);
+            [available,msg] = matRad_PhotonStfGeneratorRayBixelAbstract.isAvailable(pln,machine);
 
             if ~available
                 return;

test/steering/test_stfGeneratorParticleBeamlet.m

@@ -7,11 +7,12 @@
     function test_basic_construct()
         stfGen = matRad_ParticleStfGeneratorSingleBeamlet();    
         assertTrue(isa(stfGen, 'matRad_ParticleStfGeneratorSingleBeamlet'));
-        assertEqual(stfGen.radiationMode,'protons')
+        assertEqual(stfGen.radiationMode,'protons');
 
     function test_pln_construct()
         load protons_testData.mat
         stfGen = matRad_ParticleStfGeneratorSingleBeamlet(pln);
+        assertTrue(stfGen.isAvailable(pln));
         assertTrue(isa(stfGen, 'matRad_ParticleStfGeneratorSingleBeamlet'));
         assertEqual(stfGen.gantryAngles, pln.propStf.gantryAngles);
         assertEqual(stfGen.couchAngles, pln.propStf.couchAngles);
@@ -23,11 +24,13 @@ function test_pln_construct()
 
         pln.radiationMode = 'helium';
         stfGen = matRad_ParticleStfGeneratorSingleBeamlet(pln);
+        assertTrue(stfGen.isAvailable(pln));
         assertTrue(isa(stfGen, 'matRad_ParticleStfGeneratorSingleBeamlet'));
         assertEqual(stfGen.radiationMode, pln.radiationMode);
 
         pln.radiationMode = 'carbon';
         stfGen = matRad_ParticleStfGeneratorSingleBeamlet(pln);
+        assertTrue(stfGen.isAvailable(pln));
         assertTrue(isa(stfGen, 'matRad_ParticleStfGeneratorSingleBeamlet'));
         assertEqual(stfGen.radiationMode, pln.radiationMode);        
 

test/steering/test_stfGeneratorPhotonBixel.m

@@ -11,6 +11,7 @@ function test_basic_construct()
 function test_pln_construct()
     load photons_testData.mat
     stfGen = matRad_PhotonStfGeneratorSingleBeamlet(pln);
+    stfGen.isAvailable(pln);
     assertTrue(isa(stfGen, 'matRad_PhotonStfGeneratorSingleBeamlet'));
     assertEqual(stfGen.gantryAngles, pln.propStf.gantryAngles);
     assertEqual(stfGen.couchAngles, pln.propStf.couchAngles);
@@ -26,7 +27,6 @@ function test_generate_multibeams()
     stfGen = matRad_PhotonStfGeneratorSingleBeamlet(pln);
     stf = stfGen.generate(ct,cst);
 
-
     assertTrue(isfield(stf, 'radiationMode'));
     assertTrue(isfield(stf, 'machine'));
     assertTrue(isfield(stf, 'gantryAngle'));