RascalSoftware · StephenNneji · Feb 17, 2023 · Feb 16, 2023 · Feb 17, 2023
diff --git a/API/domainsClass/domainsClass.m b/API/domainsClass/domainsClass.m
@@ -220,17 +220,7 @@
             generalStruct.TF = 'domainsTF';
 
             % Add the 'general' fields
-            thisType = obj.modelType;
-
-            switch lower(thisType)
-                case 'standard layers'
-                    generalStruct.modelType = 'layers';
-                case 'custom layers'
-                    generalStruct.modelType = 'custom layers';
-                case 'custom xy'
-                    generalStruct.modelType = 'custom xy';
-            end
-
+            generalStruct.modelType = lower(obj.modelType);        
             generalStruct.geometry = obj.geometry;
 
             % Parameters
@@ -274,7 +264,7 @@
             paramNames = string(paramStruct.paramNames);
 
             switch generalStruct.modelType
-                case 'layers'
+                case 'standard layers'
                     numberOfLayers = layersStruct.numberOfLayers;
 
                     if numberOfLayers > 0

diff --git a/API/domainsClass/reflContrastsClass.m b/API/domainsClass/reflContrastsClass.m
@@ -247,7 +247,7 @@
 
 
                 switch modelType
-                    case 'layers'
+                    case 'standard layers'
                         thisModel = thisContrast.model;
                         thisLayerArray = [];
                         for n = 1:length(thisModel)

diff --git a/API/domainsClass/simContrastsClass.m b/API/domainsClass/simContrastsClass.m
@@ -153,7 +153,7 @@
                 contrastRepeatSLDs{i} = [0 1]; 
 
                 switch modelType
-                    case 'layers'
+                    case 'standard layers'
                         thisModel = thisContrast.model;
                         thisLayerArray = [];
                         for n = 1:length(thisModel)

diff --git a/API/projectClass/contrastsClass.m b/API/projectClass/contrastsClass.m
@@ -285,7 +285,7 @@
 
 
                 switch modelType
-                    case 'layers'
+                    case 'standard layers'
                         thisModel = thisContrast.model;
                         thisLayerArray = [];
                         for n = 1:length(thisModel)

diff --git a/API/projectClass/projectClass.m b/API/projectClass/projectClass.m
@@ -801,17 +801,7 @@
             generalStruct.TF = 'standardTF';
 
             % Add the 'general' fields
-            thisType = obj.modelType;
-
-            switch lower(thisType)
-                case 'standard layers'
-                    generalStruct.modelType = 'layers';
-                case 'custom layers'
-                    generalStruct.modelType = 'custom layers';
-                case 'custom xy'
-                    generalStruct.modelType = 'custom xy';
-            end
-
+            generalStruct.modelType = lower(obj.modelType);  
             generalStruct.geometry = obj.geometry;
 
             % Parameters
@@ -855,7 +845,7 @@
             paramNames = string(paramStruct.paramNames);
 
             switch generalStruct.modelType
-                case 'layers'
+                case 'standard layers'
                     numberOfLayers = layersStruct.numberOfLayers;
 
                     if numberOfLayers > 0

diff --git a/targetFunctions/domains_TF/domainsTF_reflectivityCalculation.m b/targetFunctions/domains_TF/domainsTF_reflectivityCalculation.m
@@ -63,7 +63,7 @@
 end
 
 switch lower(type)
-    case 'layers'
+    case 'standard layers'
         % Standard layers calculation
 %         [problem,reflectivity,Simulation,...
 %          shifted_data,layerSlds,sldProfiles,...

diff --git a/targetFunctions/standard_TF/standardTF_custXY/reflectivity_calculation_mex.mexw64 b/targetFunctions/standard_TF/standardTF_custXY/reflectivity_calculation_mex.mexw64
diff --git a/targetFunctions/standard_TF/standardTF_reflectivityCalculation.m b/targetFunctions/standard_TF/standardTF_reflectivityCalculation.m
@@ -63,7 +63,7 @@
 end
 
 switch lower(type)
-    case 'layers'
+    case 'standard layers'
         % Standard layers calculation
         [problem,reflectivity,Simulation,...
          shifted_data,layerSlds,sldProfiles,...

diff --git a/testRatScript.m b/testRatScript.m
@@ -23,8 +23,6 @@
 disp('Adding paths Initiated')
 addRatPaths;
 disp('Adding paths Completed')
-disp('Compiling RAT to mex Initiated')
-disp('Compiling RAT to mex Completed')
 
 allTests = TestSuite.fromFolder('tests','IncludingSubfolders', true);
 disp('Running unit tests')

diff --git a/tests/standardTFReflectivityCalculation/customLayersInputs.mat b/tests/standardTFReflectivityCalculation/customLayersInputs.mat
diff --git a/tests/standardTFReflectivityCalculation/customLayersOutputs.mat b/tests/standardTFReflectivityCalculation/customLayersOutputs.mat
diff --git a/tests/standardTFReflectivityCalculation/customLayersTFParams.mat b/tests/standardTFReflectivityCalculation/customLayersTFParams.mat
diff --git a/tests/standardTFReflectivityCalculation/customXYInputs.mat b/tests/standardTFReflectivityCalculation/customXYInputs.mat
diff --git a/tests/standardTFReflectivityCalculation/customXYOutputs.mat b/tests/standardTFReflectivityCalculation/customXYOutputs.mat
diff --git a/tests/standardTFReflectivityCalculation/customXYTFParams.mat b/tests/standardTFReflectivityCalculation/customXYTFParams.mat
diff --git a/tests/standardTFReflectivityCalculation/standardLayersInputs.mat b/tests/standardTFReflectivityCalculation/standardLayersInputs.mat
diff --git a/tests/standardTFReflectivityCalculation/standardLayersOutputs.mat b/tests/standardTFReflectivityCalculation/standardLayersOutputs.mat
diff --git a/tests/standardTFReflectivityCalculation/standardLayersTFParams.mat b/tests/standardTFReflectivityCalculation/standardLayersTFParams.mat