Commit fe494146 authored by Isabelle Kieffer's avatar Isabelle Kieffer

Bug corrections to v0.9 adaptations

parent 326dea31
......@@ -15,12 +15,14 @@
},
{
"cell_type": "code",
"execution_count": 2,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"my_directory = \"/home/letard/DataSshade/Bissardon_Se2015\"\n",
"#my_directory = \"/home/letard/DataSshade/Testemale_Cu2005\""
"#my_directory = \"/home/letard/Sshade/Data/Carriere_Co2014\"\n",
"my_directory = \"/home/letard/Sshade/Data/Maurin_Co2012\"\n",
"#my_directory = \"/home/letard/Sshade/Data/Thomas_Hg2016\"\n",
"#my_directory = \"/home/letard/Sshade/Data/Bissardon_Se2015\""
]
},
{
......@@ -29,32 +31,19 @@
"metadata": {},
"outputs": [],
"source": [
"csv2xml.ods_converter(my_directory,\"Bissardon_Se_2019_v7.ods\")\n",
"#csv2xml.ods_converter(my_directory,\"20190417_Cu_v7.ods\")"
"#csv2xml.ods_converter(my_directory,\"manip_Carriere_Co2014.ods\")\n",
"csv2xml.ods_converter(my_directory,\"manip_Maurin_Co2012.ods\")\n",
"#csv2xml.ods_converter(my_directory,\"manip_Thomas_Hg2016.ods\")\n",
"#csv2xml.ods_converter(my_directory,\"manip_Bissardon_Se2015.ods\")"
]
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"FILE experimentalist_Bohic.xml ALREADY EXISTS\n",
"Do you want to overwrite it? y\n",
"\n",
"=== The file experimentalist_Bohic.xml has been written in /home/letard/DataSshade/Bissardon_Se2015. ===\n",
"FILE experimentalist_Bissardon.xml ALREADY EXISTS\n",
"Do you want to overwrite it? y\n",
"\n",
"=== The file experimentalist_Bissardon.xml has been written in /home/letard/DataSshade/Bissardon_Se2015. ===\n"
]
}
],
"outputs": [],
"source": [
"csv2xml.multiple_file_writer(my_directory,\"experimentalist\")"
"csv2xml.multiple_file_writer(my_directory,\"pellet\")"
]
},
{
......@@ -63,7 +52,7 @@
"metadata": {},
"outputs": [],
"source": [
"csv2xml.experimentalist_file_writer(my_directory,\"experimentalist.csv\")"
"csv2xml.experimentalist_file_writer(my_directory,\"experimentalist_PC.csv\")"
]
},
{
......@@ -72,7 +61,7 @@
"metadata": {},
"outputs": [],
"source": [
"csv2xml.laboratory_file_writer(my_directory,\"laboratory_GIN.csv\")"
"csv2xml.laboratory_file_writer(my_directory,\"laboratory.csv\")"
]
},
{
......@@ -81,7 +70,7 @@
"metadata": {},
"outputs": [],
"source": [
"csv2xml.sample_pellet_file_writer(my_directory,\"pellet_001.csv\")"
"csv2xml.sample_pellet_file_writer(my_directory,\"pellet_8.csv\")"
]
},
{
......@@ -90,7 +79,7 @@
"metadata": {},
"outputs": [],
"source": [
"csv2xml.sample_frozen_solution_file_writer(my_directory,\"frozen_solution_001.csv\")"
"csv2xml.sample_frozen_solution_file_writer(my_directory,\"frozen_solution_007.csv\")"
]
},
{
......@@ -117,7 +106,7 @@
"metadata": {},
"outputs": [],
"source": [
"csv2xml.experiments_structure_file_writer(my_directory,\"experiments_spectra_with_strucure.csv\")"
"csv2xml.experiments_structure_file_writer(my_directory,\"experiments_spectra_with_structure.csv\")"
]
},
{
......@@ -144,7 +133,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.7.1"
"version": "3.7.3"
}
},
"nbformat": 4,
......
<import type="experiment_spectra" ssdm_version="0.9.0">
<experiment>
<import_mode>first import</import_mode> <!-- experiment import_mode -->
<import_mode>$$$</import_mode> <!-- experiment import_mode -->
<uid>EXPERIMENT_$$$</uid> <!-- experiment uid - Ex: EXPERIMENT_OP_20180115_005 -->
<owner_databases>
......@@ -56,6 +56,13 @@
<position_error>NULL</position_error>
</range>
</ranges>
<filters>
<filter>
<type>NULL</type>
<center>NULL</center>
<width>NULL</width>
</filter>
</filters>
<comments><![CDATA[The resolution in the above table is the resolution given by the monochromator. The energy was calibrated by measuring the $$$ spectrum of a reference $$$ metallic foil (first maximum of the derivative set at $$$ eV).]]></comments>
</spectral>
<angle>
......@@ -81,7 +88,7 @@
<!-- SPECTRA -->
<spectra>
<spectrum>
<import_mode>first import</import_mode> <!-- spectrum import_mode. Enum: {first import, inherited, ignore, draft, no change, correction, new version, invalidate} -->
<import_mode>$$$</import_mode> <!-- spectrum import_mode. Enum: {first import, inherited, ignore, draft, no change, correction, new version, invalidate} -->
<uid>SPECTRUM_$$$</uid> <!-- Ex: SPECTRUM_OP_20180115_005T -->
<experiment_type>laboratory measurement</experiment_type>
<chronologically_ordered>no</chronologically_ordered>
......
<import type="experiment_spectra" ssdm_version="0.9.0">
<experiment>
<import_mode>first import</import_mode> <!-- experiment import_mode -->
<import_mode>$$$</import_mode> <!-- experiment import_mode -->
<uid>$$$</uid> <!-- experiment uid - Ex: EXPERIMENT_OP_20180115_005 -->
<owner_databases>
......@@ -54,7 +54,14 @@
N1, N2, N3, N4, N5, N6, N7, O, O1, O2, O3, O4, O5, O6, O7} -->
<resolution>$$$</resolution> <!-- monochromator resolution -->
</range>
</ranges>
</ranges>
<filters>
<filter>
<type>NULL</type>
<center>NULL</center>
<width>NULL</width>
</filter>
</filters>
<comments><![CDATA[The resolution in the above table is the resolution given by the monochromator. The energy was calibrated by regularly measuring the spectrum of a reference metallic foil (first maximum of the derivative set at 7112 eV).]]></comments>
</spectral>
<angle>
......@@ -90,7 +97,7 @@
<spectra>
<spectrum> <!-- A multiplier -->
<import_mode>first import</import_mode> <!-- spectrum import_mode. Enum: {first import, inherited, ignore, draft, no change, correction, new version, invalidate} -->
<import_mode>$$$</import_mode> <!-- spectrum import_mode. Enum: {first import, inherited, ignore, draft, no change, correction, new version, invalidate} -->
<uid>$$$</uid> <!-- Ex: SPECTRUM_OP_20180115_005T -->
<experiment_type>laboratory measurement</experiment_type>
<chronologically_ordered>no</chronologically_ordered>
......
......@@ -65,7 +65,7 @@
<materials>
<material>
<import_mode>first import</import_mode> <!-- material import_mode -->
<import_mode>$$$</import_mode> <!-- material import_mode -->
<uid>$$$</uid> <!-- material uid - Ex: MATERIAL_OP_20180717_001 -->
<relevance>main - major</relevance>
<mass_fraction>1</mass_fraction>
......@@ -78,7 +78,7 @@
<constituents>
<constituent>
<import_mode>first import</import_mode> <!-- constituent import_mode -->
<import_mode>$$$</import_mode> <!-- constituent import_mode -->
<uid>$$$</uid> <!-- constituent uid - Ex: CONST_OP_20180717_001 -->
<relevance>main - major</relevance>
<arrangement>single phase</arrangement>
......@@ -92,6 +92,7 @@
<phase_type>liquid</phase_type>
<texture>liquid</texture>
<species_mole_fraction_unit>$$$</species_mole_fraction_unit>
<species>
<specie>
<family>$$$</family>
......@@ -99,9 +100,11 @@
<state>$$$</state>
<relevance>$$$</relevance>
<mass>$$$</mass>
<mass_error>$$$</mass_error>
<mass_error>NULL</mass_error>
<mole>$$$</mole>
<mole_error>$$$</mole_error>
<mole_error>NULL</mole_error>
<mole_fraction>$$$</mole_fraction>
<mole_fraction_error>NULL</mole_fraction_error>
<comments><![CDATA[$$$]]></comments>
</specie>
</species>
......
......@@ -27,6 +27,8 @@
<temperature>
<unit>K</unit>
<value>77</value>
<error>NULL</error>
<max>NULL</max>
</temperature>
<fluid>
<type>molecular liquid</type>
......@@ -46,7 +48,7 @@
<layers>
<layer>
<import_mode>first import</import_mode> <!-- layer import_mode -->
<import_mode>$$$</import_mode> <!-- layer import_mode -->
<name>Frozen solution of @@@</name> <!-- layer name -->
<order>1</order>
<type>compact</type>
......@@ -64,7 +66,7 @@
<materials>
<material>
<import_mode>first import</import_mode> <!-- material import_mode -->
<import_mode>$$$</import_mode> <!-- material import_mode -->
<uid>MATERIAL_$$$</uid> <!-- material uid - Ex: MATERIAL_OP_20180717_001 -->
<relevance>main - major</relevance>
<mass_fraction>1</mass_fraction> <!-- material mass fraction -->
......@@ -72,7 +74,6 @@
<name>Frozen solution of @@@</name> <!-- material name -->
<origin>$$$</origin> <!-- Enum: {natural terrestrial, extraterrestrial, laboratory, commercial, simulated} -->
<family>solid</family> <!-- Enum: {solid, mineral, carbonaceous, extraterrestrial, fluid, mixed, other, unknown} -->
<bulk_density>1</bulk_density>
<comments><![CDATA[$$$]]></comments> <!-- material comments - Ex: prepared in glove box -->
<publications>
......@@ -82,7 +83,7 @@
<constituents_mixing>single phase</constituents_mixing>
<constituents>
<constituent>
<import_mode>first import</import_mode> <!-- constituent import_mode -->
<import_mode>$$$</import_mode> <!-- constituent import_mode -->
<uid>CONST_$$$</uid> <!-- constituent uid - Ex: CONST_OP_20180717_001 -->
<name>Frozen solution of @@@</name> <!-- constituent name -->
<relevance>main - major</relevance>
......@@ -96,19 +97,21 @@
<phase_type>amorphous</phase_type>
<texture>amorphous</texture>
<!-- SPECIES -->
<species_mole_fraction_unit>$$$</species_mole_fraction_unit>
<species>
<specie>
<family>$$$</family>
<uid>$$$</uid>
<state>$$$</state>
<relevance>$$$</relevance>
<mass>$$$</mass>
<mass_error>$$$</mass_error>
<mole>$$$</mole>
<mole_error>$$$</mole_error>
<comments><![CDATA[$$$]]></comments>
</specie>
<family>$$$</family>
<uid>$$$</uid>
<state>$$$</state>
<relevance>$$$</relevance>
<mass>$$$</mass>
<mass_error>NULL</mass_error>
<mole>$$$</mole>
<mole_error>NULL</mole_error>
<mole_fraction>$$$</mole_fraction>
<mole_fraction_error>NULL</mole_fraction_error>
<comments><![CDATA[$$$]]></comments>
</specie>
</species>
</constituent>
</constituents>
......
......@@ -28,6 +28,7 @@
<unit>K</unit>
<value>293</value>
<error>5</error>
<max>293</max>
</temperature>
<fluid>
<type>ambient air</type>
......@@ -39,7 +40,7 @@
<layers>
<layer>
<import_mode>first import</import_mode> <!-- layer import_mode -->
<import_mode>$$$</import_mode> <!-- layer import_mode -->
<name>@@@</name> <!-- layer name -->
<order>1</order>
......@@ -64,7 +65,7 @@
<materials>
<material>
<import_mode>first import</import_mode> <!-- material import_mode -->
<import_mode>$$$</import_mode> <!-- material import_mode -->
<uid>MATERIAL_$$$</uid> <!-- material uid - Ex: MATERIAL_OP_20180717_001 -->
<relevance>main - major</relevance>
<mass>$$$</mass> <!-- material mass in g -->
......@@ -92,7 +93,7 @@
<constituents_mixing>single phase</constituents_mixing>
<basic_constituents>
<basic_constituent>
<import_mode>first import</import_mode> <!-- constituent import_mode -->
<import_mode>$$$</import_mode> <!-- constituent import_mode -->
<uid>CONST_$$$</uid> <!-- constituent uid - Ex: CONST_OP_20180717_001 -->
<name>@@@</name> <!-- constituent name -->
<fundamental_phase_uid>$$$</fundamental_phase_uid> <!-- To be found in the database (or via Alex!) -->
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment