Merge pull request #17 from xmaptools/Lanari-4.3-beta2

Lanari 4.3 beta2

Author: lanari

Changelog.md

@@ -1,15 +1,20 @@
 # CHANGELOG for XMapTools developer
 
 
-## XMapTools 4.3 beta 1 (build 231007)
+## XMapTools 4.3 beta 2 (build 231215)
 
 - General
   - Add a functionality to reorder masks within a maskfile
-  - Solve issues in the classification function for the creation of submasks
   - Improve the correlation plots by implementing an option to select a submask
   - Improve the output format of the multi-map export function for all sampling methods
-  - Improve the live plot of the sampling method strip 
+  - Improve the live plot of the sampling method strip
+  - Improve the calibration module interface for EPMA data, including a description of the check calibration table 
   - Add a subroutine to check the map size before classification. Display an error message with the map size if there is any problem with the data (problem discovered by Alissa Madera)
+  
+- Classification:
+  - Add a classification test and calculate the classification metrics (Accuracy, Precision, Recall, F1 Score); they are displayed in the Information tab, if a mask file is selected. This feature is not available for mask files created with previous versions of XMapTools
+  - Improve significantly the performance of classification for sub-mask creation and fix several minor issues 
+  - Improve the overall appearance of the graphs generated by the Classification function
 
 - Data Visualisation Module:
   - Add a submask selection option for plotting 
@@ -35,13 +40,14 @@
   - Add a label showing the orientation of the stip when the shape is modified or rotated. 
   - Improve multi-map export function when a mask is selected from the secondary menu
   - Improve the file format for single-map sampling
-  - ROI is not deleted when mask selection is changed from the secondary menu
+  - Add an option to the Sampling menu to hold the ROI. The ROI will not be deleted if the mask selection is changed from the secondary menu and this mode is selected
 
 - Other: 
   - Fix an issue in the external function for rutile thermometry for the Kohn (2020) equations (pressure unit, discovered by Mona Lueder)
   - Fix several compatibility issues in the project loader for files created with previous versions of XMapTools
   - Fix an issue in the data visualisation module for binary plots after the mask option was disabled
   - Fix a display issue in the information window for map data containing NaN values
+  - Fix an error in the title of the sampling strip plot where colors where switched; the blue curve represents the median and the red curve represents the mean profiles (discovered by Nils Gies)
 
 
 - Tutorials:

Program/CleanDirectory.m

@@ -1,7 +1,7 @@
 function [] = CleanRepository()
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/Core/ReadXML_Method_LAICPMS.m

@@ -1,7 +1,7 @@
 function [EN,DT,MZ] = ReadXML_Method_LAICPMS(FileName)
 % 
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/External/Core_Call_ME.m

@@ -1,7 +1,7 @@
 function [OutputData,OutputVariables] = Core_Call_ME(Data,OxList,ExtFct,AddParameters,ElOxDataDef)
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/External/Core_Call_SF.m

@@ -1,7 +1,7 @@
 function [OutputData,OutputVariables] = Core_Call_SF(Data,OxList,ExtFct,ElOxDataDef)
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/External/Core_Call_TB.m

@@ -1,7 +1,7 @@
 function [OutputData,OutputVariables] = Core_Call_TB(Data,OxList,ExtFct,AddParameters,ElOxDataDef)
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/External/Core_Function_Indexing.m

@@ -1,7 +1,7 @@
 function [Functions] = Core_Function_Indexing()
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/External/SF_CatNorm.m

@@ -1,7 +1,7 @@
 function [MatrixSF,ElementsList] = SF_CatNorm(MatrixOxide,OxList,CatBasis,ElOxDataDef)
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/External/SF_OxNorm.m

@@ -1,7 +1,7 @@
 function [MatrixSF,ElementsList] = SF_OxNorm(MatrixOxide,OxList,OxBasis,ElOxDataDef)
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/Install_XMapTools_MATLAB.m

@@ -1,7 +1,7 @@
 function [] = Install_XMapTools_MATLAB()
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/Modules/About_XMapTools.mlapp

@@ -1,7 +1,7 @@
 % This script reset the configuration file config-xmaptools.mat
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by

Program/Modules/Calibration_EPMA.mlapp

@@ -1,7 +1,7 @@
 function [] = start(Input)
 %
 % XMapTools is a free software solution for the analysis of chemical maps
-% Copyright © 2022-2023 University of Bern, Institute of Geological Sciences, Pierre Lanari
+% Copyright © 2022-2024 University of Bern, Institute of Geological Sciences, Pierre Lanari
 %
 % XMapTools is free software: you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by