From b3732f7a0d862cf79091b4c9b4be26afc546c475 Mon Sep 17 00:00:00 2001 From: Bob Myhill Date: Wed, 20 Sep 2023 19:14:28 +0100 Subject: [PATCH 1/2] formatted TAS data files --- pyrolite/data/models/TAS/config.json | 472 ++++++++++++++++- pyrolite/data/models/TAS/config_lemaitre.json | 476 +++++++++++++++++- .../models/TAS/config_lemaitre_combined.json | 442 +++++++++++++++- 3 files changed, 1377 insertions(+), 13 deletions(-) diff --git a/pyrolite/data/models/TAS/config.json b/pyrolite/data/models/TAS/config.json index ca51126e..fe425a53 100644 --- a/pyrolite/data/models/TAS/config.json +++ b/pyrolite/data/models/TAS/config.json @@ -1 +1,471 @@ -{"name":"TAS","axes":{"x":"SiO2","y":"Na2O + K2O"},"fields":{"Ba":{"name":["Basalt","Gabbro"],"poly":[[45,5],[52,5],[45,2]]},"Bs":{"name":["Basalt","Gabbro"],"poly":[[45,2],[52,5],[52,0],[45,0]]},"F":{"name":["Foidite","Foidolite"],"poly":[[35,9],[37,14],[52.5,18],[52.5,14],[48.4,11.5],[45,9.4],[41,7],[41,3],[37,3]]},"nan":{"name":"N/A","poly":[]},"none":{"name":["N/A"],"poly":[]},"O1":{"name":["Basaltic Andesite","Gabbroic Diorite"],"poly":[[52,0],[52,5],[57,5.9],[57,0]]},"O2":{"name":["Andesite","Diorite"],"poly":[[57,0],[57,5.9],[63,7],[63,0]]},"O3":{"name":["Dacite","Granodiorite"],"poly":[[63,0],[63,7],[69,8],[77.3,0]]},"Pc":{"name":["Picrite","Peridotitgabbro"],"poly":[[41,3],[45,3],[45,2],[45,0],[41,0]]},"Ph":{"name":["Phonolite","Foid Syenite"],"poly":[[52.5,14],[52.5,18],[57,18],[63,16.2],[61,13.5],[57.6,11.7]]},"R":{"name":["Rhyolite","Granite"],"poly":[[69,8],[71.8,13.5],[85.9,6.8],[87.5,4.7],[77.3,0]]},"S1":{"name":["Trachybasalt","Foidolite"],"poly":[[45,5],[49.4,7.3],[52,5]]},"S2":{"name":["Basaltic Trachyandesite","Foidolite"],"poly":[[49.4,7.3],[53,9.3],[57,5.9],[52,5]]},"S3":{"name":["Trachyandesite","Foidolite"],"poly":[[53,9.3],[57.6,11.7],[61,8.6],[63,7],[57,5.9]]},"T1":{"name":["Trachyte","Syenite"],"poly":[[57.6,11.7],[61,13.5],[63,16.2],[71.8,13.5],[61,8.6]]},"T2":{"name":["Trachydacite","Quartz-Monzonite"],"poly":[[61,8.6],[71.8,13.5],[69,8],[63,7]]},"U1":{"name":["Tephrite","Foid Gabbro"],"poly":[[41,3],[41,7],[45,9.4],[49.4,7.3],[45,5],[45,3]]},"U2":{"name":["Phonotephrite","Foid Monzodiorite"],"poly":[[45,9.4],[48.4,11.5],[53,9.3],[49.4,7.3]]},"U3":{"name":["Tephriphonolite","Foid Monzosyenite"],"poly":[[48.4,11.5],[52.5,14],[57.6,11.7],[53,9.3]]}}} +{ + "name": "TAS", + "axes": { + "x": "SiO2", + "y": "Na2O + K2O" + }, + "fields": { + "Ba": { + "name": [ + "Basalt", + "Gabbro" + ], + "poly": [ + [ + 45, + 5 + ], + [ + 52, + 5 + ], + [ + 45, + 2 + ] + ] + }, + "Bs": { + "name": [ + "Basalt", + "Gabbro" + ], + "poly": [ + [ + 45, + 2 + ], + [ + 52, + 5 + ], + [ + 52, + 0 + ], + [ + 45, + 0 + ] + ] + }, + "F": { + "name": [ + "Foidite", + "Foidolite" + ], + "poly": [ + [ + 35, + 9 + ], + [ + 37, + 14 + ], + [ + 52.5, + 18 + ], + [ + 52.5, + 14 + ], + [ + 48.4, + 11.5 + ], + [ + 45, + 9.4 + ], + [ + 41, + 7 + ], + [ + 41, + 3 + ], + [ + 37, + 3 + ] + ] + }, + "nan": { + "name": "N/A", + "poly": [] + }, + "none": { + "name": [ + "N/A" + ], + "poly": [] + }, + "O1": { + "name": [ + "Basaltic Andesite", + "Gabbroic Diorite" + ], + "poly": [ + [ + 52, + 0 + ], + [ + 52, + 5 + ], + [ + 57, + 5.9 + ], + [ + 57, + 0 + ] + ] + }, + "O2": { + "name": [ + "Andesite", + "Diorite" + ], + "poly": [ + [ + 57, + 0 + ], + [ + 57, + 5.9 + ], + [ + 63, + 7 + ], + [ + 63, + 0 + ] + ] + }, + "O3": { + "name": [ + "Dacite", + "Granodiorite" + ], + "poly": [ + [ + 63, + 0 + ], + [ + 63, + 7 + ], + [ + 69, + 8 + ], + [ + 77.3, + 0 + ] + ] + }, + "Pc": { + "name": [ + "Picrite", + "Peridotitgabbro" + ], + "poly": [ + [ + 41, + 3 + ], + [ + 45, + 3 + ], + [ + 45, + 2 + ], + [ + 45, + 0 + ], + [ + 41, + 0 + ] + ] + }, + "Ph": { + "name": [ + "Phonolite", + "Foid Syenite" + ], + "poly": [ + [ + 52.5, + 14 + ], + [ + 52.5, + 18 + ], + [ + 57, + 18 + ], + [ + 63, + 16.2 + ], + [ + 61, + 13.5 + ], + [ + 57.6, + 11.7 + ] + ] + }, + "R": { + "name": [ + "Rhyolite", + "Granite" + ], + "poly": [ + [ + 69, + 8 + ], + [ + 71.8, + 13.5 + ], + [ + 85.9, + 6.8 + ], + [ + 87.5, + 4.7 + ], + [ + 77.3, + 0 + ] + ] + }, + "S1": { + "name": [ + "Trachybasalt", + "Foidolite" + ], + "poly": [ + [ + 45, + 5 + ], + [ + 49.4, + 7.3 + ], + [ + 52, + 5 + ] + ] + }, + "S2": { + "name": [ + "Basaltic Trachyandesite", + "Foidolite" + ], + "poly": [ + [ + 49.4, + 7.3 + ], + [ + 53, + 9.3 + ], + [ + 57, + 5.9 + ], + [ + 52, + 5 + ] + ] + }, + "S3": { + "name": [ + "Trachyandesite", + "Foidolite" + ], + "poly": [ + [ + 53, + 9.3 + ], + [ + 57.6, + 11.7 + ], + [ + 61, + 8.6 + ], + [ + 63, + 7 + ], + [ + 57, + 5.9 + ] + ] + }, + "T1": { + "name": [ + "Trachyte", + "Syenite" + ], + "poly": [ + [ + 57.6, + 11.7 + ], + [ + 61, + 13.5 + ], + [ + 63, + 16.2 + ], + [ + 71.8, + 13.5 + ], + [ + 61, + 8.6 + ] + ] + }, + "T2": { + "name": [ + "Trachydacite", + "Quartz-Monzonite" + ], + "poly": [ + [ + 61, + 8.6 + ], + [ + 71.8, + 13.5 + ], + [ + 69, + 8 + ], + [ + 63, + 7 + ] + ] + }, + "U1": { + "name": [ + "Tephrite", + "Foid Gabbro" + ], + "poly": [ + [ + 41, + 3 + ], + [ + 41, + 7 + ], + [ + 45, + 9.4 + ], + [ + 49.4, + 7.3 + ], + [ + 45, + 5 + ], + [ + 45, + 3 + ] + ] + }, + "U2": { + "name": [ + "Phonotephrite", + "Foid Monzodiorite" + ], + "poly": [ + [ + 45, + 9.4 + ], + [ + 48.4, + 11.5 + ], + [ + 53, + 9.3 + ], + [ + 49.4, + 7.3 + ] + ] + }, + "U3": { + "name": [ + "Tephriphonolite", + "Foid Monzosyenite" + ], + "poly": [ + [ + 48.4, + 11.5 + ], + [ + 52.5, + 14 + ], + [ + 57.6, + 11.7 + ], + [ + 53, + 9.3 + ] + ] + } + } +} \ No newline at end of file diff --git a/pyrolite/data/models/TAS/config_lemaitre.json b/pyrolite/data/models/TAS/config_lemaitre.json index 3f3ce091..d1e918d5 100644 --- a/pyrolite/data/models/TAS/config_lemaitre.json +++ b/pyrolite/data/models/TAS/config_lemaitre.json @@ -1,5 +1,471 @@ -{"name":"TAS","axes":{"x":"SiO2","y":"Na2O + K2O"},"fields":{"Ba":{"name":["Basalt","Gabbro"],"poly":[[45,5],[52,5],[45,2]]},"Bs":{"name":["Basalt","Gabbro"],"poly":[[45,2],[52,5],[52,0],[45,0]]},"F":{"name":["Foidite","Foidolite"],"poly":[[35,9],[37,14],[52.5,18],[52.5,14],[48.4,11.5],[45,9.4],[41,7],[41,3],[37,3]]},"nan":{"name":"N/A","poly":[]},"none":{"name":["N/A"],"poly":[]},"O1":{"name":["Basaltic Andesite","Gabbroic Diorite"],"poly":[[52,0],[52,5],[57,5.9],[57,0]]},"O2":{"name":["Andesite","Diorite"],"poly":[[57,0],[57,5.9],[63,7],[63,0]]},"O3":{"name":["Dacite","Granodiorite"],"poly":[[63,0],[63,7],[69,8],[77.3,0]]},"Pc":{"name":["Picrite","Peridotitgabbro"],"poly":[[41,3],[45,3],[45,2],[45,0],[41,0]]},"Ph":{"name":["Phonolite","Foid Syenite"],"poly":[[52.5,14],[52.5,18],[57,18],[63,16.2],[61,13.5],[57.6,11.7]]}, -"R":{"name":["Rhyolite","Granite"],"poly":[[69,8],[69,13],[85.9,6.8],[87.5,4.7],[77.3,0]]},"S1":{"name":["Trachybasalt","Foidolite"],"poly":[[45,5],[49.4,7.3],[52,5]]},"S2":{"name":["Basaltic Trachyandesite","Foidolite"],"poly":[[49.4,7.3],[53,9.3],[57,5.9],[52,5]]},"S3":{"name":["Trachyandesite","Foidolite"],"poly":[[53,9.3],[57.6,11.7],[61,8.6],[63,7],[57,5.9]]}, -"T1":{"name":["Trachyte","Syenite"],"poly":[[57.6,11.7],[61,13.5],[63,16.2],[69,13],[61,8.6]]}, -"T2":{"name":["Trachydacite","Quartz-Monzonite"],"poly":[[61,8.6],[69,13],[69,8],[63,7]]},"U1":{"name":["Tephrite","Foid Gabbro"],"poly":[[41,3],[41,7],[45,9.4],[49.4,7.3],[45,5],[45,3]]},"U2":{"name":["Phonotephrite","Foid Monzodiorite"],"poly":[[45,9.4],[48.4,11.5],[53,9.3],[49.4,7.3]]},"U3":{"name":["Tephriphonolite","Foid Monzosyenite"],"poly":[[48.4,11.5],[52.5,14],[57.6,11.7],[53,9.3]]}}} - +{ + "name": "TAS", + "axes": { + "x": "SiO2", + "y": "Na2O + K2O" + }, + "fields": { + "Ba": { + "name": [ + "Basalt", + "Gabbro" + ], + "poly": [ + [ + 45, + 5 + ], + [ + 52, + 5 + ], + [ + 45, + 2 + ] + ] + }, + "Bs": { + "name": [ + "Basalt", + "Gabbro" + ], + "poly": [ + [ + 45, + 2 + ], + [ + 52, + 5 + ], + [ + 52, + 0 + ], + [ + 45, + 0 + ] + ] + }, + "F": { + "name": [ + "Foidite", + "Foidolite" + ], + "poly": [ + [ + 35, + 9 + ], + [ + 37, + 14 + ], + [ + 52.5, + 18 + ], + [ + 52.5, + 14 + ], + [ + 48.4, + 11.5 + ], + [ + 45, + 9.4 + ], + [ + 41, + 7 + ], + [ + 41, + 3 + ], + [ + 37, + 3 + ] + ] + }, + "nan": { + "name": "N/A", + "poly": [] + }, + "none": { + "name": [ + "N/A" + ], + "poly": [] + }, + "O1": { + "name": [ + "Basaltic Andesite", + "Gabbroic Diorite" + ], + "poly": [ + [ + 52, + 0 + ], + [ + 52, + 5 + ], + [ + 57, + 5.9 + ], + [ + 57, + 0 + ] + ] + }, + "O2": { + "name": [ + "Andesite", + "Diorite" + ], + "poly": [ + [ + 57, + 0 + ], + [ + 57, + 5.9 + ], + [ + 63, + 7 + ], + [ + 63, + 0 + ] + ] + }, + "O3": { + "name": [ + "Dacite", + "Granodiorite" + ], + "poly": [ + [ + 63, + 0 + ], + [ + 63, + 7 + ], + [ + 69, + 8 + ], + [ + 77.3, + 0 + ] + ] + }, + "Pc": { + "name": [ + "Picrite", + "Peridotitgabbro" + ], + "poly": [ + [ + 41, + 3 + ], + [ + 45, + 3 + ], + [ + 45, + 2 + ], + [ + 45, + 0 + ], + [ + 41, + 0 + ] + ] + }, + "Ph": { + "name": [ + "Phonolite", + "Foid Syenite" + ], + "poly": [ + [ + 52.5, + 14 + ], + [ + 52.5, + 18 + ], + [ + 57, + 18 + ], + [ + 63, + 16.2 + ], + [ + 61, + 13.5 + ], + [ + 57.6, + 11.7 + ] + ] + }, + "R": { + "name": [ + "Rhyolite", + "Granite" + ], + "poly": [ + [ + 69, + 8 + ], + [ + 69, + 13 + ], + [ + 85.9, + 6.8 + ], + [ + 87.5, + 4.7 + ], + [ + 77.3, + 0 + ] + ] + }, + "S1": { + "name": [ + "Trachybasalt", + "Foidolite" + ], + "poly": [ + [ + 45, + 5 + ], + [ + 49.4, + 7.3 + ], + [ + 52, + 5 + ] + ] + }, + "S2": { + "name": [ + "Basaltic Trachyandesite", + "Foidolite" + ], + "poly": [ + [ + 49.4, + 7.3 + ], + [ + 53, + 9.3 + ], + [ + 57, + 5.9 + ], + [ + 52, + 5 + ] + ] + }, + "S3": { + "name": [ + "Trachyandesite", + "Foidolite" + ], + "poly": [ + [ + 53, + 9.3 + ], + [ + 57.6, + 11.7 + ], + [ + 61, + 8.6 + ], + [ + 63, + 7 + ], + [ + 57, + 5.9 + ] + ] + }, + "T1": { + "name": [ + "Trachyte", + "Syenite" + ], + "poly": [ + [ + 57.6, + 11.7 + ], + [ + 61, + 13.5 + ], + [ + 63, + 16.2 + ], + [ + 69, + 13 + ], + [ + 61, + 8.6 + ] + ] + }, + "T2": { + "name": [ + "Trachydacite", + "Quartz-Monzonite" + ], + "poly": [ + [ + 61, + 8.6 + ], + [ + 69, + 13 + ], + [ + 69, + 8 + ], + [ + 63, + 7 + ] + ] + }, + "U1": { + "name": [ + "Tephrite", + "Foid Gabbro" + ], + "poly": [ + [ + 41, + 3 + ], + [ + 41, + 7 + ], + [ + 45, + 9.4 + ], + [ + 49.4, + 7.3 + ], + [ + 45, + 5 + ], + [ + 45, + 3 + ] + ] + }, + "U2": { + "name": [ + "Phonotephrite", + "Foid Monzodiorite" + ], + "poly": [ + [ + 45, + 9.4 + ], + [ + 48.4, + 11.5 + ], + [ + 53, + 9.3 + ], + [ + 49.4, + 7.3 + ] + ] + }, + "U3": { + "name": [ + "Tephriphonolite", + "Foid Monzosyenite" + ], + "poly": [ + [ + 48.4, + 11.5 + ], + [ + 52.5, + 14 + ], + [ + 57.6, + 11.7 + ], + [ + 53, + 9.3 + ] + ] + } + } +} \ No newline at end of file diff --git a/pyrolite/data/models/TAS/config_lemaitre_combined.json b/pyrolite/data/models/TAS/config_lemaitre_combined.json index e22ac07e..3ccc4f46 100644 --- a/pyrolite/data/models/TAS/config_lemaitre_combined.json +++ b/pyrolite/data/models/TAS/config_lemaitre_combined.json @@ -1,7 +1,435 @@ - -{"name":"TAS","axes":{"x":"SiO2","y":"Na2O + K2O"},"fields":{"Bs":{"name":["Basalt","Gabbro"],"poly":[[45,0],[45,5],[52,5],[52,0]]}, -"F":{"name":["Foidite","Foidolite"],"poly":[[35,9],[37,14],[52.5,18],[52.5,14],[48.4,11.5],[45,9.4],[41,7],[41,3],[37,3]]},"nan":{"name":"N/A","poly":[]},"none":{"name":["N/A"],"poly":[]},"O1":{"name":["Basaltic Andesite","Gabbroic Diorite"],"poly":[[52,0],[52,5],[57,5.9],[57,0]]},"O2":{"name":["Andesite","Diorite"],"poly":[[57,0],[57,5.9],[63,7],[63,0]]},"O3":{"name":["Dacite","Granodiorite"],"poly":[[63,0],[63,7],[69,8],[77.3,0]]},"Pc":{"name":["Picrite","Peridotitgabbro"],"poly":[[41,3],[45,3],[45,2],[45,0],[41,0]]},"Ph":{"name":["Phonolite","Foid Syenite"],"poly":[[52.5,14],[52.5,18],[57,18],[63,16.2],[61,13.5],[57.6,11.7]]}, -"R":{"name":["Rhyolite","Granite"],"poly":[[69,8],[69,13],[85.9,6.8],[87.5,4.7],[77.3,0]]},"S1":{"name":["Trachybasalt","Foidolite"],"poly":[[45,5],[49.4,7.3],[52,5]]},"S2":{"name":["Basaltic Trachyandesite","Foidolite"],"poly":[[49.4,7.3],[53,9.3],[57,5.9],[52,5]]},"S3":{"name":["Trachyandesite","Foidolite"],"poly":[[53,9.3],[57.6,11.7],[61,8.6],[63,7],[57,5.9]]}, -"T1T2":{"name":["Trachyte-Trachydacite","Syenite"],"poly":[[57.6,11.7],[61,13.5],[63,16.2],[69,13],[69,8],[63,7],[61,8.6]]}, -"U1":{"name":["Tephrite","Foid Gabbro"],"poly":[[41,3],[41,7],[45,9.4],[49.4,7.3],[45,5],[45,3]]},"U2":{"name":["Phonotephrite","Foid Monzodiorite"],"poly":[[45,9.4],[48.4,11.5],[53,9.3],[49.4,7.3]]},"U3":{"name":["Tephriphonolite","Foid Monzosyenite"],"poly":[[48.4,11.5],[52.5,14],[57.6,11.7],[53,9.3]]}}} - +{ + "name": "TAS", + "axes": { + "x": "SiO2", + "y": "Na2O + K2O" + }, + "fields": { + "Bs": { + "name": [ + "Basalt", + "Gabbro" + ], + "poly": [ + [ + 45, + 0 + ], + [ + 45, + 5 + ], + [ + 52, + 5 + ], + [ + 52, + 0 + ] + ] + }, + "F": { + "name": [ + "Foidite", + "Foidolite" + ], + "poly": [ + [ + 35, + 9 + ], + [ + 37, + 14 + ], + [ + 52.5, + 18 + ], + [ + 52.5, + 14 + ], + [ + 48.4, + 11.5 + ], + [ + 45, + 9.4 + ], + [ + 41, + 7 + ], + [ + 41, + 3 + ], + [ + 37, + 3 + ] + ] + }, + "nan": { + "name": "N/A", + "poly": [] + }, + "none": { + "name": [ + "N/A" + ], + "poly": [] + }, + "O1": { + "name": [ + "Basaltic Andesite", + "Gabbroic Diorite" + ], + "poly": [ + [ + 52, + 0 + ], + [ + 52, + 5 + ], + [ + 57, + 5.9 + ], + [ + 57, + 0 + ] + ] + }, + "O2": { + "name": [ + "Andesite", + "Diorite" + ], + "poly": [ + [ + 57, + 0 + ], + [ + 57, + 5.9 + ], + [ + 63, + 7 + ], + [ + 63, + 0 + ] + ] + }, + "O3": { + "name": [ + "Dacite", + "Granodiorite" + ], + "poly": [ + [ + 63, + 0 + ], + [ + 63, + 7 + ], + [ + 69, + 8 + ], + [ + 77.3, + 0 + ] + ] + }, + "Pc": { + "name": [ + "Picrite", + "Peridotitgabbro" + ], + "poly": [ + [ + 41, + 3 + ], + [ + 45, + 3 + ], + [ + 45, + 2 + ], + [ + 45, + 0 + ], + [ + 41, + 0 + ] + ] + }, + "Ph": { + "name": [ + "Phonolite", + "Foid Syenite" + ], + "poly": [ + [ + 52.5, + 14 + ], + [ + 52.5, + 18 + ], + [ + 57, + 18 + ], + [ + 63, + 16.2 + ], + [ + 61, + 13.5 + ], + [ + 57.6, + 11.7 + ] + ] + }, + "R": { + "name": [ + "Rhyolite", + "Granite" + ], + "poly": [ + [ + 69, + 8 + ], + [ + 69, + 13 + ], + [ + 85.9, + 6.8 + ], + [ + 87.5, + 4.7 + ], + [ + 77.3, + 0 + ] + ] + }, + "S1": { + "name": [ + "Trachybasalt", + "Foidolite" + ], + "poly": [ + [ + 45, + 5 + ], + [ + 49.4, + 7.3 + ], + [ + 52, + 5 + ] + ] + }, + "S2": { + "name": [ + "Basaltic Trachyandesite", + "Foidolite" + ], + "poly": [ + [ + 49.4, + 7.3 + ], + [ + 53, + 9.3 + ], + [ + 57, + 5.9 + ], + [ + 52, + 5 + ] + ] + }, + "S3": { + "name": [ + "Trachyandesite", + "Foidolite" + ], + "poly": [ + [ + 53, + 9.3 + ], + [ + 57.6, + 11.7 + ], + [ + 61, + 8.6 + ], + [ + 63, + 7 + ], + [ + 57, + 5.9 + ] + ] + }, + "T1T2": { + "name": [ + "Trachyte-Trachydacite", + "Syenite" + ], + "poly": [ + [ + 57.6, + 11.7 + ], + [ + 61, + 13.5 + ], + [ + 63, + 16.2 + ], + [ + 69, + 13 + ], + [ + 69, + 8 + ], + [ + 63, + 7 + ], + [ + 61, + 8.6 + ] + ] + }, + "U1": { + "name": [ + "Tephrite", + "Foid Gabbro" + ], + "poly": [ + [ + 41, + 3 + ], + [ + 41, + 7 + ], + [ + 45, + 9.4 + ], + [ + 49.4, + 7.3 + ], + [ + 45, + 5 + ], + [ + 45, + 3 + ] + ] + }, + "U2": { + "name": [ + "Phonotephrite", + "Foid Monzodiorite" + ], + "poly": [ + [ + 45, + 9.4 + ], + [ + 48.4, + 11.5 + ], + [ + 53, + 9.3 + ], + [ + 49.4, + 7.3 + ] + ] + }, + "U3": { + "name": [ + "Tephriphonolite", + "Foid Monzosyenite" + ], + "poly": [ + [ + 48.4, + 11.5 + ], + [ + 52.5, + 14 + ], + [ + 57.6, + 11.7 + ], + [ + 53, + 9.3 + ] + ] + } + } +} \ No newline at end of file From 4f3b1895d9a4ea15cdebd804c83355f023c85ef9 Mon Sep 17 00:00:00 2001 From: Bob Myhill Date: Wed, 20 Sep 2023 19:25:37 +0100 Subject: [PATCH 2/2] fixed intrusive TAS labels --- pyrolite/data/models/TAS/config.json | 26 +++++++++---------- pyrolite/data/models/TAS/config_lemaitre.json | 26 +++++++++---------- .../models/TAS/config_lemaitre_combined.json | 20 +++++++------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pyrolite/data/models/TAS/config.json b/pyrolite/data/models/TAS/config.json index fe425a53..b7483b8e 100644 --- a/pyrolite/data/models/TAS/config.json +++ b/pyrolite/data/models/TAS/config.json @@ -7,8 +7,8 @@ "fields": { "Ba": { "name": [ - "Basalt", - "Gabbro" + "Alkalic \nBasalt", + "Alkalic \nGabbro" ], "poly": [ [ @@ -27,8 +27,8 @@ }, "Bs": { "name": [ - "Basalt", - "Gabbro" + "Subalkalic \nBasalt", + "Subalkalic \nGabbro" ], "poly": [ [ @@ -178,7 +178,7 @@ "Pc": { "name": [ "Picrite", - "Peridotitgabbro" + "Peridot-\ngabbro" ], "poly": [ [ @@ -265,8 +265,8 @@ }, "S1": { "name": [ - "Trachybasalt", - "Foidolite" + "Trachy-\nbasalt", + "Monzo-\ngabbro" ], "poly": [ [ @@ -285,8 +285,8 @@ }, "S2": { "name": [ - "Basaltic Trachyandesite", - "Foidolite" + "Basaltic \nTrachy-\nandesite", + "Monzo-\ndiorite" ], "poly": [ [ @@ -309,8 +309,8 @@ }, "S3": { "name": [ - "Trachyandesite", - "Foidolite" + "Trachy-\nandesite", + "Monzonite" ], "poly": [ [ @@ -366,7 +366,7 @@ "T2": { "name": [ "Trachydacite", - "Quartz-Monzonite" + "Quartz \nMonzonite" ], "poly": [ [ @@ -468,4 +468,4 @@ ] } } -} \ No newline at end of file +} diff --git a/pyrolite/data/models/TAS/config_lemaitre.json b/pyrolite/data/models/TAS/config_lemaitre.json index d1e918d5..9071a800 100644 --- a/pyrolite/data/models/TAS/config_lemaitre.json +++ b/pyrolite/data/models/TAS/config_lemaitre.json @@ -7,8 +7,8 @@ "fields": { "Ba": { "name": [ - "Basalt", - "Gabbro" + "Alkalic \nBasalt", + "Alkalic \nGabbro" ], "poly": [ [ @@ -27,8 +27,8 @@ }, "Bs": { "name": [ - "Basalt", - "Gabbro" + "Subalkalic \nBasalt", + "Subalkalic \nGabbro" ], "poly": [ [ @@ -178,7 +178,7 @@ "Pc": { "name": [ "Picrite", - "Peridotitgabbro" + "Peridot-\ngabbro" ], "poly": [ [ @@ -265,8 +265,8 @@ }, "S1": { "name": [ - "Trachybasalt", - "Foidolite" + "Trachy-\nbasalt", + "Monzo-\ngabbro" ], "poly": [ [ @@ -285,8 +285,8 @@ }, "S2": { "name": [ - "Basaltic Trachyandesite", - "Foidolite" + "Basaltic \nTrachy-\nandesite", + "Monzo-\ndiorite" ], "poly": [ [ @@ -309,8 +309,8 @@ }, "S3": { "name": [ - "Trachyandesite", - "Foidolite" + "Trachy-\nandesite", + "Monzonite" ], "poly": [ [ @@ -366,7 +366,7 @@ "T2": { "name": [ "Trachydacite", - "Quartz-Monzonite" + "Quartz \nMonzonite" ], "poly": [ [ @@ -468,4 +468,4 @@ ] } } -} \ No newline at end of file +} diff --git a/pyrolite/data/models/TAS/config_lemaitre_combined.json b/pyrolite/data/models/TAS/config_lemaitre_combined.json index 3ccc4f46..9edad35f 100644 --- a/pyrolite/data/models/TAS/config_lemaitre_combined.json +++ b/pyrolite/data/models/TAS/config_lemaitre_combined.json @@ -5,7 +5,7 @@ "y": "Na2O + K2O" }, "fields": { - "Bs": { + "B": { "name": [ "Basalt", "Gabbro" @@ -158,7 +158,7 @@ "Pc": { "name": [ "Picrite", - "Peridotitgabbro" + "Peridot-\ngabbro" ], "poly": [ [ @@ -245,8 +245,8 @@ }, "S1": { "name": [ - "Trachybasalt", - "Foidolite" + "Trachy-\nbasalt", + "Monzo-\ngabbro" ], "poly": [ [ @@ -265,8 +265,8 @@ }, "S2": { "name": [ - "Basaltic Trachyandesite", - "Foidolite" + "Basaltic \nTrachy-\nandesite", + "Monzo-\ndiorite" ], "poly": [ [ @@ -289,8 +289,8 @@ }, "S3": { "name": [ - "Trachyandesite", - "Foidolite" + "Trachy-\nandesite", + "Monzonite" ], "poly": [ [ @@ -318,7 +318,7 @@ "T1T2": { "name": [ "Trachyte-Trachydacite", - "Syenite" + "Syenite-\nQuartz Monzonite" ], "poly": [ [ @@ -432,4 +432,4 @@ ] } } -} \ No newline at end of file +}