Skip to content

Commit f9a9713

Browse files
author
Pierre Lanari
committed
merge with XMapTools_Lanari
- Fix several minor issues in the LA-ICPMS modules - Update the help files - Improve Bingo-Antidote including the possibility to change the database
1 parent 298bed4 commit f9a9713

21 files changed

+390
-78
lines changed

‎.DS_Store

6 KB
Binary file not shown.

‎Program/Addons/BingoAntidote/BingoAntidote.mlapp

6.28 KB
Binary file not shown.

‎Program/Addons/BingoAntidote/Bridge2BA.mlapp

-46 Bytes
Binary file not shown.

‎Program/Addons/BingoAntidote/Core/BinButtonCalcPhaseFASTlocal.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
% (1) Get the shape of the selected pixels
1111
h = BinBulk(1).DomainXrefYref;
1212
[LinS,ColS] = size(app.MaskFile.MaskMap);
13-
MaskSel = Xpoly2maskX(h(:,1),h(:,2),LinS,ColS);
13+
MaskSel = poly2mask(h(:,1),h(:,2),LinS,ColS);
1414

1515
% define the selected phases (checkbox =1)
1616
BinPhaseDef = app.BinPhaseDef;

‎Program/Addons/BingoAntidote/Databases/.DS_Store

6 KB
Binary file not shown.

‎Program/Addons/BingoAntidote/Databases/Database_Definitions.txt

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -49,29 +49,29 @@ Definition_File: DEF_TC55.txt
4949
Last_Change: 18.10.2019
5050
Comment: Original TC55 database distributed by Capi with Theriak-Domino
5151

52-
! ###
53-
! File_Name: tc55_3.20
54-
! Definition_File: DEF_TC55.txt
55-
! Last_Change: 23.10.2019
56-
! Comment: Original TC55 version 3.20 (1998)
52+
###
53+
File_Name: tc55_3.20
54+
Definition_File: DEF_TC55.txt
55+
Last_Change: 23.10.2019
56+
Comment: Original TC55 version 3.20 (1998)
5757

58-
! ###
59-
! File_Name: tc55_3.25
60-
! Definition_File: DEF_TC55.txt
61-
! Last_Change: 18.10.2019
62-
! Comment: Original TC55 version 3.25 (2005)
58+
###
59+
File_Name: tc55_3.25
60+
Definition_File: DEF_TC55.txt
61+
Last_Change: 18.10.2019
62+
Comment: Original TC55 version 3.25 (2005)
6363

64-
! ###
65-
! File_Name: tc55_3.30
66-
! Definition_File: DEF_TC55.txt
67-
! Last_Change: 18.10.2019
68-
! Comment: Original TC55 version 3.30 (2007)
64+
###
65+
File_Name: tc55_3.30
66+
Definition_File: DEF_TC55.txt
67+
Last_Change: 18.10.2019
68+
Comment: Original TC55 version 3.30 (2007)
6969

70-
! ###
71-
! File_Name: tc55_subsolidus
72-
! Definition_File: DEF_TC55.txt
73-
! Last_Change: 05.07.2019
74-
! Comment: TC55 database with no melt model (works faster for subsolidus conditions)
70+
###
71+
File_Name: tc55_subsolidus
72+
Definition_File: DEF_TC55.txt
73+
Last_Change: 05.07.2019
74+
Comment: TC55 database with no melt model (works faster for subsolidus conditions)
7575

7676
###
7777
File_Name: tc55_Bt
@@ -82,26 +82,26 @@ Comment: TC55 database (mostly 3.30) with biotite model of Tajcmanova et al. (
8282

8383
! HOPO (2011)
8484

85-
! ###
86-
! File_Name: tcds62_DT
87-
! Definition_File: DEF_TCDS62_DT.txt
88-
! Last_Change: 05.07.2019
89-
! Comment: Original TCDS62 database for metapelite distributed by Doug Tinkham
85+
###
86+
File_Name: tcds62_DT
87+
Definition_File: DEF_TCDS62_DT.txt
88+
Last_Change: 23.12.2022
89+
Comment: Original TCDS62 database for metapelite distributed by Doug Tinkham (no MRG)
9090

91-
! ###
92-
! File_Name: tcds62_DT_noF3
93-
! Definition_File: DEF_TCDS62_DT.txt
94-
! Last_Change: 05.07.2019
95-
! Comment: TCDS62 database (metapelite) no F3 end-members (faster if Fe is FeO)
91+
###
92+
File_Name: tcds62_DT_noF3
93+
Definition_File: DEF_TCDS62_DT.txt
94+
Last_Change: 23.12.2022
95+
Comment: TCDS62 database (metapelite) no F3 end-members (faster if Fe is FeO; no MRG)
9696

9797
! ###
98-
! File_Name: tcds62c
98+
! File_Name: tcds62c
9999
! Definition_File: DEF_TCDS62C.txt
100100
! Last_Change: 05.07.2019
101101
! Comment: Original TCDS62c database for mafic rocks distributed by Capi
102102

103103
! ###
104-
! File_Name: tcds62c_noF3
104+
! File_Name: tcds62c_noF3
105105
! Definition_File: DEF_TCDS62C.txt
106106
! Last_Change: 05.07.2019
107107
! Comment: TCDS62c database (mafic) no F3 end-members (faster if Fe is FeO)

‎Program/Addons/BingoAntidote/Databases/tcds62_DT

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -457,20 +457,20 @@ H2O_liq H(2)O(1) H2O_liq code
457457
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
458458
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
459459
**** SOLUTION DATA ****
460-
LIQtc6 (EXT,MARGULES)
460+
LIQtc6 (EXT,MARGULES)
461461

462462
Quartz8_liq
463-
Albite_liq
463+
Albite_liq
464464

465-
K-feldspar_liq
465+
K-feldspar_liq
466466

467-
Anorthite_liq
467+
Anorthite_liq
468468

469-
Sillimanite8_liq
469+
Sillimanite8_liq
470470

471471
Forsterite8_liq
472-
473-
Fayalite8_liq
472+
473+
Fayalite8_liq
474474

475475
H2O_liq
476476
**** MARGULES PARAMETERS ****
@@ -722,7 +722,7 @@ WM (-SITE,MARGULES) A(1):K,Na,Ca - M2A(1):Al,Mg,Fe - M2B(1):Al,F3 - T1(2):S
722722
fcel K - Fe - Al - Si,Si 0.63 0.0 0.0 0
723723
pa Na - Al - Al - Si,Al 0.37 0.0 0.0 0
724724
! ma2 Ca - Al - Al - Al,Al 0.63 0.0 0.0 0
725-
! fmu2 K - Al - F3 - Si,Al 0.63 0.0 0.0 0
725+
fmu2 K - Al - F3 - Si,Al 0.63 0.0 0.0 0
726726
**** MARGULES PARAMETERS ****
727727
mu - cel
728728
12 0.0 0.0 0.2
@@ -1160,12 +1160,12 @@ mnchl2 MN(5)AL(2)SI(3)H(8)O(18) mnchl2 code
11601160
ST 0.0 -5670.0 0 0
11611161
COM mnchl+[1]
11621162
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
1163-
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
1163+
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
11641164

11651165
!
1166-
! Note that the F3clin1 is really bad and was commented by PL. This breaks the consistency
1166+
! Note that the F3clin1 is really bad and was commented by PL. This breaks the consistency
11671167
...
1168-
! ... which is in this case better than using F3clin1
1168+
! ... which is in this case better than using F3clin1
11691169
!
11701170
!
11711171
**** SOLUTION DATA ****
@@ -1547,7 +1547,7 @@ pnt MN(1)TI(1)O(3) pnt code
15471547
**** SOLUTION DATA ****
15481548
ILM1 (-SITE,MARGULES)1/2 A(2):Fe,Ti,F3,Mg,Mn - B(2):Ti,Fe,F3
15491549
oilm Fe,Fe - Ti,Ti
1550-
dilm Fe,Ti - Fe,Ti
1550+
dilm Fe,Ti - Fe,Ti
15511551
hem1 F3,F3 - F3,F3
15521552
geik Mg,Mg - Ti,Ti
15531553
pnt Mn,Mn - Ti,Ti
@@ -1585,7 +1585,7 @@ geik - pnt
15851585
! note: ds6.
15861586
! entry: D.K. Tinkham. Fri 21 Aug 2015 18:56:12 (via axcnvrt.wl)
15871587
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
1588-
**** MINERAL DATA ****
1588+
**** MuNERAL DATA ****
15891589
! Required dataset phase components for COM's: {mu+, cel+, fcel+, pa+, gr+, andr+}
15901590
mu2 K(1)AL(3)SI(3)H(2)O(12) mu2 code
15911591
ST 0.0 1000.0 0 0
@@ -1608,15 +1608,15 @@ fmu3 K(1)FE(1)AL(2)SI(3)H(2)O(12) fmu3 code
16081608
COM mu+[1]gr+[-1/2]andr+[1/2]
16091609
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
16101610
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
1611-
**** SOLUTION DATA ****
1611+
**** SuLUTION DATA ****
16121612
MRG (-SITE,MARGULES) A(1):K,Na,Ca - M2A(1):Al,Mg,Fe - M2B(1):Al,F3 - T1(2):Si,Al
16131613
mu2 K - Al - Al - Si,Al 0.63 0.0 0.0 0
16141614
cel2 K - Mg - Al - Si,Si 0.63 0.0 0.0 0
16151615
fcel2 K - Fe - Al - Si,Si 0.63 0.0 0.0 0
16161616
pa2 Na - Al - Al - Si,Al 0.37 0.0 0.0 0
16171617
ma Ca - Al - Al - Al,Al 0.63 0.0 0.0 0
16181618
! fmu3 K - Al - F3 - Si,Al 0.63 0.0 0.0 0
1619-
**** MARGULES PARAMETERS ****
1619+
**** MuRGULES PARAMETERS ****
16201620
mu2 - cel2
16211621
12 0.0 0.0 0.2
16221622
mu2 - fcel2

‎Program/Addons/BingoAntidote/Databases/tcds62_DT_noF3

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -485,14 +485,14 @@ H2O_liq H(2)O(1) H2O_liq code
485485
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
486486
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
487487
**** SOLUTION DATA ****
488-
LIQtc6 (EXT,MARGULES)
489-
Quartz8_liq
490-
Albite_liq
491-
K-feldspar_liq
492-
Anorthite_liq
493-
Sillimanite8_liq
494-
Forsterite8_liq
495-
Fayalite8_liq
488+
LIQtc6 (EXT,MARGULES)
489+
Quartz8_liq
490+
Albite_liq
491+
K-feldspar_liq
492+
Anorthite_liq
493+
Sillimanite8_liq
494+
Forsterite8_liq
495+
Fayalite8_liq
496496
H2O_liq
497497
**** MARGULES PARAMETERS ****
498498
Quartz8_liq - Albite_liq
@@ -1599,7 +1599,7 @@ geik - pnt
15991599
! note: ds6.
16001600
! entry: D.K. Tinkham. Fri 21 Aug 2015 18:56:12 (via axcnvrt.wl)
16011601
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
1602-
**** MINERAL DATA ****
1602+
**** MuNERAL DATA ****
16031603
! Required dataset phase components for COM's: {mu+, cel+, fcel+, pa+, gr+, andr+}
16041604
mu2 K(1)AL(3)SI(3)H(2)O(12) mu2 code
16051605
ST 0.0 1000.0 0 0
@@ -1622,15 +1622,15 @@ fmu3 K(1)FE(1)AL(2)SI(3)H(2)O(12) fmu3 code
16221622
COM mu+[1]gr+[-1/2]andr+[1/2]
16231623
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
16241624
!. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
1625-
**** SOLUTION DATA ****
1625+
**** SuLUTION DATA ****
16261626
MRG (-SITE,MARGULES) A(1):K,Na,Ca - M2A(1):Al,Mg,Fe - M2B(1):Al,F3 - T1(2):Si,Al
16271627
mu2 K - Al - Al - Si,Al 0.63 0.0 0.0 0
16281628
cel2 K - Mg - Al - Si,Si 0.63 0.0 0.0 0
16291629
fcel2 K - Fe - Al - Si,Si 0.63 0.0 0.0 0
16301630
pa2 Na - Al - Al - Si,Al 0.37 0.0 0.0 0
16311631
ma Ca - Al - Al - Al,Al 0.63 0.0 0.0 0
16321632
! fmu3 K - Al - F3 - Si,Al 0.63 0.0 0.0 0
1633-
**** MARGULES PARAMETERS ****
1633+
**** MuRGULES PARAMETERS ****
16341634
mu2 - cel2
16351635
12 0.0 0.0 0.2
16361636
mu2 - fcel2

0 commit comments

Comments
 (0)