Skip to content

Commit

Permalink
Release XMapTools 4.3 Public
Browse files Browse the repository at this point in the history
See Change Log for a list of changes
  • Loading branch information
lanari committed Jan 14, 2024
1 parent fc3be61 commit 34f7133
Show file tree
Hide file tree
Showing 102 changed files with 17,285 additions and 540 deletions.
624 changes: 624 additions & 0 deletions Program/Addons/BingoAntidote/Databases/Archives/Rob_March2020.dta

Large diffs are not rendered by default.

995 changes: 995 additions & 0 deletions Program/Addons/BingoAntidote/Databases/Archives/rob_March5.dta

Large diffs are not rendered by default.

1,006 changes: 1,006 additions & 0 deletions Program/Addons/BingoAntidote/Databases/Archives/rob_March5_original.dta

Large diffs are not rendered by default.

2,771 changes: 2,771 additions & 0 deletions Program/Addons/BingoAntidote/Databases/Archives/tcds62_DT

Large diffs are not rendered by default.

2,785 changes: 2,785 additions & 0 deletions Program/Addons/BingoAntidote/Databases/Archives/tcds62_DT_noF3

Large diffs are not rendered by default.

3,904 changes: 3,904 additions & 0 deletions Program/Addons/BingoAntidote/Databases/Archives/tcds62c

Large diffs are not rendered by default.

3,902 changes: 3,902 additions & 0 deletions Program/Addons/BingoAntidote/Databases/Archives/tcds62c_noF3

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Program/Addons/BingoAntidote/Databases/DEF_ds62-mb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ CLINOPYROXENE 6 AUG [AL,MG,FE,CA,NA]
COESITE 2 coe [SI]
CORDIERITE 18 CD14 [FE,MG]
DOLOMITE 6 dol [CA,MG]
EPIDOTE 13 EP11 [AL]
EPIDOTE 13 EPI [AL]
GARNET 12 GRT [CA,MG,FE,MN]
GLAUCOPHANE 23 gl [MG,NA,FE]
HEMATITE 3 hem [FE]
Expand Down
10 changes: 5 additions & 5 deletions Program/Addons/BingoAntidote/Databases/Database_Definitions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,11 @@ Last_Change: 17.06.2023
Comment: Database td-ds62-mb50 for metabasite by D. Tinkham (no ma in WM; requires extra O)


###
File_Name: td-ds62-mb50-v07.txt
Definition_File: DEF_ds62-mb.txt
Last_Change: 17.06.2023
Comment: Database td-ds62-mb50 for metabasite by D. Tinkham (no ma in WM; requires extra O)
! ###
! File_Name: td-ds62-mb50-v07.txt
! Definition_File: DEF_ds62-mb.txt
! Last_Change: 17.06.2023
! Comment: Database td-ds62-mb50 for metabasite by D. Tinkham (no ma in WM; requires extra O)


! ###
Expand Down
32 changes: 32 additions & 0 deletions Program/CleanDirectory.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
function [] = CleanRepository()
%
% XMapTools is a free software solution for the analysis of chemical maps
% 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
% the Free Software Foundation, either version 3 of the License, or any
% later version.
%
% XMapTools is distributed in the hope that it will be useful,
% but WITHOUT ANY WARRANTY; without even the implied warranty of
% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
% GNU General Public License for more details.
%
% You should have received a copy of the GNU General Public License
% along with XMapTools. If not, see https://www.gnu.org/licenses.


clear all, clc, close all

if exist('XMapTools.prj')
delete('XMapTools.prj');
end
if exist(fullfile(cd,'XMapTools'),'dir')
rmdir(fullfile(cd,'XMapTools'), 's');
end
if exist(fullfile(cd,'XMapTools_resources'),'dir')
rmdir(fullfile(cd,'XMapTools_resources'), 's');
end

disp('Completed – you are ready to compile')
2 changes: 1 addition & 1 deletion Program/Core/ReadXML_Method_LAICPMS.m
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Program/Dev/Data_Std_LAICPMS/BCR2G.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
! Standard Name G_BCR2G ! Data source GeoRem database as of Dec09 ! Matrix Glass ! Brief description "Natural glass, basaltic composition"! Notes "GEOREM preferred values. Uncertainties for some major elements have not been included, otherwise 2 sd"! URL ! Parameter Units Value Uncertainty Ag ppm 0.5 0.8 Al ppm 70913 - Ba ppm 683 14 Be ppm 2.3 0.8 Bi ppm 0.05 0.02 Ca ppm 50429 -Cd ppm 0.2 - Ce ppm 53.3 1 Co ppm 38 4 Cr ppm 17 4 Cs ppm 1.16 0.14Cu ppm 21 10Dy ppm 6.44 0.12Er ppm 3.7 0.08Eu ppm 1.97 0.04Fe ppm 96385 -Ga ppm 23 2Gd ppm 6.71 0.14Ge ppm 1.5 0.2Hf ppm 4.84 0.56Ho ppm 1.27 0.16In ppm 0.11 0.04K ppm 14900 -La ppm 24.7 .6Li ppm 9 2Lu ppm 0.503 0.01Mg ppm 21467 - Mn ppm 1550 140 Mo ppm 270 60 Na ppm 23962 - Nb ppm 12.5 2 Nd ppm 28.9 - Ni ppm 13 4 P ppm 1615 - Pb ppm 11 2 Pr ppm 6.7 0.8 Pt ppm 0.78 1.2 Rb ppm 47 1 Re ppm 0.0062 0.0014 Sb ppm 0.35 0.16 Sc ppm 33 4 Si ppm 254270 - Sm ppm 6.59 0.14 Sn ppm 2.6 0.8 Sr ppm 342 8 Ta ppm 0.78 0.12 Tb ppm 1.02 0.16 Th ppm 5.9 0.6 Ti ppm 14100 - Tl ppm 0.3 0.2 Tm ppm 0.51 0.08 U ppm 1.69 0.24 V ppm 425 36 W ppm 0.5 0.14 Y ppm 35 6 Yb ppm 3.39 0.06 Zn ppm 125 10 Zr ppm 184 30 ^
! Standard Name G_BCR2G ! Data source GeoRem database as of Dec09 ! Matrix Glass ! Brief description "Natural glass, basaltic composition"! Notes "GEOREM preferred values. Uncertainties for some major elements have not been included, otherwise 2 sd"! URL ! Parameter Units Value Uncertainty Ag ppm 0.5 0.8 Al ppm 70913 - Ba ppm 683 14 Be ppm 2.3 0.8 Bi ppm 0.05 0.02 Ca ppm 50429 -Cd ppm 0.2 - Ce ppm 53.3 1 Co ppm 38 4 Cr ppm 17 4 Cs ppm 1.16 0.14Cu ppm 21 10Dy ppm 6.44 0.12Er ppm 3.7 0.08Eu ppm 1.97 0.04Fe ppm 96385 -Ga ppm 23 2Gd ppm 6.71 0.14Ge ppm 1.5 0.2Hf ppm 4.84 0.56Ho ppm 1.27 0.16In ppm 0.11 0.04K ppm 14900 -La ppm 24.7 .6Li ppm 9 2Lu ppm 0.503 0.01Mg ppm 21467 - Mn ppm 1550 140 Mo ppm 270 60 Na ppm 23962 - Nb ppm 12.5 2 Nd ppm 28.9 - Ni ppm 13 4 P ppm 1615 - Pb ppm 11 2 Pr ppm 6.7 0.8 Pt ppm 0.78 1.2 Rb ppm 47 1 Re ppm 0.0062 0.0014 Sb ppm 0.35 0.16 Sc ppm 33 4 Si ppm 254270 - Sm ppm 6.59 0.14Sn ppm 2.6 0.8Sr ppm 342 8Ta ppm 0.78 0.12Tb ppm 1.02 0.16Th ppm 5.9 0.6Ti ppm 14100 -Tl ppm 0.3 0.2Tm ppm 0.51 0.08U ppm 1.69 0.24V ppm 425 36W ppm 0.5 0.14Y ppm 35 6Yb ppm 3.39 0.06Zn ppm 125 10Zr ppm 184 30^
Expand Down
2 changes: 1 addition & 1 deletion Program/Dev/Data_Std_LAICPMS/BHVO2G.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
! Standard Name G_BHVO2G ! Data source GeoRem database as of Dec09 ! Matrix Glass ! Brief description "Natural glass, basaltic composition"! Notes "GEOREM preferred values. Uncertainties for some major elements have not been included, otherwise 2 sd"! URL ! Parameter Units Value Uncertainty Al ppm 71971 - Ba ppm 131 4 Be ppm 1.3 0.4 Bi ppm 0.01 0.004 Ca ppm 81430 -Cd ppm 0.1 0.04 Ce ppm 37.6 0.4 Co ppm 44 4 Cr ppm 293 24 Cs ppm 0.1 0.04Cu ppm 127 22Dy ppm 5.28 0.1Er ppm 2.56 0.04Eu ppm 2.07 0.02Fe ppm 87835 -Ga ppm 22 6Gd ppm 6.16 0.1Ge ppm 1.6 0.2Hf ppm 4.32 0.36Ho ppm 0.98 0.08In ppm 0.1 0.04K ppm 4270 -La ppm 15.2 0.4Li ppm 4.4 1.6Lu ppm 0.279 0.006Mg ppm 42994 - Mn ppm 1317 - Mo ppm 3.8 0.4 Na ppm 17806 - Nb ppm 18.3 1.6 Nd ppm 24.5 0.4 Ni ppm 116 14 P ppm 1266 - Pb ppm 1.7 0.4 Pr ppm 5.35 0.44 Pt ppm 0.46 0.18 Rb ppm 9.2 0.08 Re ppm 0.00047 0.00026 Sb ppm 0.3 0.26 Sc ppm 33 4 Si ppm 230428 - Sm ppm 6.1 0.06 Sn ppm 2.6 1.2 Sr ppm 396 2 Ta ppm 1.15 0.2 Tb ppm 0.92 0.08 Th ppm 1.22 0.1 Ti ppm 16726 - Tm ppm 0.34 0.04 U ppm 0.403 0.006 V ppm 308 36 W ppm 0.23 0.08 Y ppm 26 4 Yb ppm 2.01 0.04 Zn ppm 102 12 Zr ppm 170 14
! Standard Name G_BHVO2G ! Data source GeoRem database as of Dec09 ! Matrix Glass ! Brief description "Natural glass, basaltic composition"! Notes "GEOREM preferred values. Uncertainties for some major elements have not been included, otherwise 2 sd"! URL ! Parameter Units Value Uncertainty Al ppm 71971 - Ba ppm 131 4 Be ppm 1.3 0.4 Bi ppm 0.01 0.004 Ca ppm 81430 -Cd ppm 0.1 0.04 Ce ppm 37.6 0.4 Co ppm 44 4 Cr ppm 293 24 Cs ppm 0.1 0.04Cu ppm 127 22Dy ppm 5.28 0.1Er ppm 2.56 0.04Eu ppm 2.07 0.02Fe ppm 87835 -Ga ppm 22 6Gd ppm 6.16 0.1Ge ppm 1.6 0.2Hf ppm 4.32 0.36Ho ppm 0.98 0.08In ppm 0.1 0.04K ppm 4270 -La ppm 15.2 0.4Li ppm 4.4 1.6Lu ppm 0.279 0.006Mg ppm 42994 - Mn ppm 1317 - Mo ppm 3.8 0.4 Na ppm 17806 - Nb ppm 18.3 1.6 Nd ppm 24.5 0.4 Ni ppm 116 14 P ppm 1266 - Pb ppm 1.7 0.4 Pr ppm 5.35 0.44 Pt ppm 0.46 0.18 Rb ppm 9.2 0.08 Re ppm 0.00047 0.00026 Sb ppm 0.3 0.26 Sc ppm 33 4 Si ppm 230428 - Sm ppm 6.1 0.06Sn ppm 2.6 1.2Sr ppm 396 2Ta ppm 1.15 0.2Tb ppm 0.92 0.08Th ppm 1.22 0.1Ti ppm 16726 -Tm ppm 0.34 0.04U ppm 0.403 0.006V ppm 308 36W ppm 0.23 0.08Y ppm 26 4Yb ppm 2.01 0.04Zn ppm 102 12Zr ppm 170 14
Expand Down
31 changes: 31 additions & 0 deletions Program/Dev/Data_Std_LAICPMS/FGS1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
! Standard Name G_FGS1
! Data source "Forensic Science Institute, germany"
! Matrix Float glass
! Brief description
! Notes
! URL
! Parameter Units Value Uncertainty
Na ppm 102800 2100
Mg ppm 23900 3200
Si ppm 341900 1300
Ca ppm 60600 4200
Li ppm 6 1
Al ppm 1500 150
K ppm 920 20
Ti ppm 69 7
Mn ppm 43 6
Fe ppm 580 60
Rb ppm 8.6 0.5
Sr ppm 57 4
Zr ppm 49 3
Sn ppm 19 3
Ba ppm 40 3
La ppm 4.3 0.5
Ce ppm 5.2 0.5
Nd ppm 5.1 0.5
Hf ppm 3.2 0.3
Pb ppm 5.8 1




27 changes: 27 additions & 0 deletions Program/Dev/Data_Std_LAICPMS/FGS2.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
! Standard Name G_FGS2
! Data source "Forensic Science Institute, germany"
! Matrix Float glass
! Brief description
! Notes
! URL
! Parameter Units Value Uncertainty
Na ppm 100500 2500
Mg ppm 23400 3600
Si ppm 335200 1800
Ca ppm 59300 4100
Li ppm 29 2
Al ppm 7400 100
K ppm 4600 200
Ti ppm 326 20
Mn ppm 221 20
Fe ppm 2600 100
Rb ppm 35 3
Sr ppm 253 13
Zr ppm 223 15
Sn ppm 94 12
Ba ppm 199 15
La ppm 18 1
Ce ppm 23 2
Nd ppm 25 2
Hf ppm 15 1
Pb ppm 24 2
65 changes: 65 additions & 0 deletions Program/Dev/Data_Std_LAICPMS/MACS3.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
! Standard Name C_MACS3
! Data source USGS
! Matrix Pellet
! Brief description
! Notes
! URL
! Parameter Units Value Uncertainty
Ag ppm 53.3 1.8
As ppm 44.2 1.4
Au ppm 7.12 -
Ba ppm 58.7 2
Be ppm 56.4 1.7
Bi ppm 19.9 1.6
Br ppm 0.44 -
C ppm 115000 600
Ca ppm 376900 5200
Cd ppm 54.6 2.2
Ce ppm 11.2 0.33
Cl ppm 61 2
Co ppm 57.1 2
Cr ppm 117 5
Cu ppm 120 5
Dy ppm 10.7 0.5
Er ppm 11.2 0.22
Eu ppm 11.8 0.13
Fe ppm 11200 300
Ga ppm 16.1 1.1
Gd ppm 10.8 0.3
Ge ppm 56.9 4
Hf ppm 4.73 0.21
Hg ppm 10.2 0.4
Ho ppm 11.3 0.14
I ppm 20.3 -
La ppm 10.4 0.5
Li ppm 62.2 4.2
Lu ppm 10.8 0.3
Mg ppm 1756 136
Mn ppm 536 28
Mo ppm 1.21 0.14
Na ppm 5900 400
Nb ppm 35.2 3.1
Nd ppm 11 0.41
Ni ppm 57.4 4.9
Pb ppm 56.5 1.8
Pd ppm 3.4 -
Pr ppm 12.1 0.23
Pt ppm 17.8 -
Ru ppm 20.1 -
Sb ppm 20.6 1.1
Sc ppm 21 0.8
Sm ppm 11 0.27
Sn ppm 58.1 8.8
Sr ppm 6760 350
Ta ppm 20.5 5.3
Th ppm 55.4 1.1
Ti ppm 54.9 0.18
Tl ppm 14.2 1.7
U ppm 1.52 0.04
V ppm 46.3 1.13
W ppm 2.16 0.19
Zn ppm 111 5.7
Zr ppm 8.67 0.63



65 changes: 65 additions & 0 deletions Program/Dev/Data_Std_LAICPMS/MAPS4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
! Standard Name P_MAPS4
! Data source USGS & GeoREM (red)
! Matrix Pellet
! Brief description
! Notes
! URL
! Parameter Units Value Uncertainty
Al ppm 2000 700
Ag ppm 7.3 0.6
As ppm 190 16
Au ppm 9 -
B ppm 53 4
Ba ppm 2900 250
Be ppm 12 -
Bi ppm 19 0.6
Ca ppm 338300 12900
Cd ppm 23 2
Ce ppm 2600 260
Co ppm 51 3
Cr ppm 110 20
Cu ppm 340 50
Dy ppm 194 33
Er ppm 110 22
Eu ppm 27 3
Fe ppm 1600 90
Ga ppm 25 -
Gd ppm 270 22
Ge ppm 10 0.8
Hf ppm 21 2
Hg ppm 3 0.2
Ho ppm 30 5
La ppm 926 78
Li ppm 9.6 1
Lu ppm 9 0.7
P ppm 167000 16400
Mg ppm 680 68
Mn ppm 910 37
Mo ppm 1.8 0.4
Na ppm 10000 600
Nb ppm 10.3 1.9
Nd ppm 1860 150
Ni ppm 120 21
Pb ppm 220 22
Pr ppm 280 18
Sb ppm 3 -
Sc ppm 18 2
Se ppm 23 -
Sm ppm 360 20
Sn ppm 100 -
Sr ppm 3100 270
Ta ppm 12 1.5
Tb ppm 39 4.5
Th ppm 91 8
Tl ppm 17 2
Tm ppm 10 0.8
U ppm 17 1
V ppm 14 2
W ppm 2 -
Y ppm 990 130
Yb ppm 57 12
Zn ppm 470 70
Zr ppm 44 9



35 changes: 35 additions & 0 deletions Program/Dev/Data_Std_LAICPMS/MASS1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
! Standard Name S_MASS1
! Data source USGS
! Matrix Polymetallic Sulfide
! Brief description
! Notes
! URL
! Parameter Units Value Uncertainty
Cu ppm 134000 500
Fe ppm 156000 1000
Na2O ppm 3300 200
S ppm 276000 1000
Zn ppm 210000 5000
Ag ppm 50 5
As ppm 65 3
Ba ppm 14 5
Cd ppm 60 7
Co ppm 60 10
Cr ppm 65 11
Ga ppm 64 11
Hg ppm 57 3
Mn ppm 280 80
Mo ppm 59 9
Ni ppm 97 15
Pb ppm 68 7
Sb ppm 60 9
Se ppm 51 4
Sn ppm 59 6
V ppm 63 10
W ppm 20 2
Bi ppm 60 -
In ppm 50 -
Au ppm 57 -
Ir ppm 42 -
Te ppm 15 -
Tl ppm 50 -
79 changes: 79 additions & 0 deletions Program/Dev/Data_Std_LAICPMS/NIST614.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
! Standard Name G_NIST614
! Data source GeoREM
! Matrix GLASS
! Brief description
! Notes
! URL
! Parameter Units Value Uncertainty
Ag ppm 0.41 -
Al ppm 10797 -
As ppm 0.74 -
Au ppm 0.48 -
B ppm 1.49 -
Ba ppm 3.2 -
Be ppm 0.753 -
Bi ppm 0.581 -
Ca ppm 85049 -
Cd ppm 0.56 -
Ce ppm 0.813 -
Cl ppm 102 -
Co ppm 0.79 -
Cr ppm 1.19 -
Cs ppm 0.664 -
Cu ppm 1.37 -
Dy ppm 0.746 -
Er ppm 0.74 -
Eu ppm 0.77 -
F ppm 6.2 -
Fe ppm 18.8 -
Ga ppm 1.31 -
Gd ppm 0.763 -
Ge ppm 0.942 -
Hf ppm 0.711 -
Ho ppm 0.749 -
In ppm 0.79 -
Ir ppm 0.002 -
K ppm 30 -
La ppm 0.72 -
Li ppm 1.69 -
Lu ppm 0.732 -
Mg ppm 33.8 -
Mn ppm 1.42 -
Mo ppm 0.8 -
Na ppm 101635 -
Nb ppm 0.824 -
Nd ppm 0.752 -
Ni ppm 1.1 -
P ppm 11.4 -
Pb ppm 2.32 -
Pd ppm 2.05 -
Pr ppm 0.768 -
Pt ppm 2.36 -
Rb ppm 0.855 -
Re ppm 0.17 -
Rh ppm 1.54 -
S ppm 291 -
Sb ppm 0.79 -
Sc ppm 0.74 -
Se ppm 0.4 -
Si ppm 337024 -
Sm ppm 0.754 -
Sn ppm 1.68 -
Sr ppm 45.8 -
Ta ppm 0.808 -
Tb ppm 0.739 -
Th ppm 0.748 -
Ti ppm 3.61 -
Tl ppm 0.273 -
Tm ppm 0.732 -
U ppm 0.823 -
V ppm 1.01 -
W ppm 0.806 -
Y ppm 0.79 -
Yb ppm 0.777 -
Zn ppm 2.79 -
Zr ppm 0.848 -




Loading

0 comments on commit 34f7133

Please sign in to comment.