From be9dc26f3bfabf8293e37cbca03e8ad40b3598e4 Mon Sep 17 00:00:00 2001 From: samirdarouich Date: Tue, 5 Mar 2024 08:55:40 +0100 Subject: [PATCH] update generate_api --- .github/workflows/generate_api.yaml | 10 ++++------ Main.ipynb | 15 ++++++--------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/generate_api.yaml b/.github/workflows/generate_api.yaml index 5ee2175..13fda51 100644 --- a/.github/workflows/generate_api.yaml +++ b/.github/workflows/generate_api.yaml @@ -8,9 +8,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Generate sdRDM library - uses: JR-1991/generate-sdrdm-api@v3 - with: - library_name: "FAIRFlowChemistry" - schema_path: "./specifications/datamodel.md" - schema: "true" - branch: "main" + uses: JR-1991/generate-sdrdm-api@v3.1 + with: + library_name: "FAIRFlowChemistry" + schema_path: "./specifications/datamodel.md" diff --git a/Main.ipynb b/Main.ipynb index 8889c89..188eca4 100644 --- a/Main.ipynb +++ b/Main.ipynb @@ -205,7 +205,7 @@ " str(root)+'/data/Rohdaten/7.1_nm_OMC_washing/GC_Data/230706-3-CV-PEG20-068-GTA25-washing/JH-1H 2023-07-06 12-32-22/NV-F0104.D/report00.CSV',\n", " str(root)+'/data/Rohdaten/7.1_nm_OMC_washing/GC_Data/230706-3-CV-PEG20-068-GTA25-washing/JH-1H 2023-07-06 12-32-22/NV-F0104.D/REPORT01.CSV']\n", "\n", - "e_chem = str(root)+'/data/Rohdaten/9.2_nm/Gammry_Data/230705-1-CV-PEG35-052-GTA25/GSTATIC.DTA'\n", + "e_chem = [str(root)+'/data/Rohdaten/9.2_nm/Gammry_Data/230705-1-CV-PEG35-052-GTA25/GSTATIC.DTA']\n", "mfm = [str(root)+'/data/Rohdaten/9.2_nm/MFM_Data/1-CV-PEG35-052-GTA25/GSS_1-CV-PEG35-052-GTA25_200_20c_1h.csv',\n", " str(root)+'/data/Rohdaten/9.2_nm/MFM_Data/2-CV-PEG35-052-GTA25/GSS_2-CV-PEG35-052-GTA25_200_20c_1h.csv',]\n", "gc = [str(root)+'/data/Rohdaten/9.2_nm/GC_Data/230705-1-CV-PEG35-052-GTA25/JH-1H 2023-07-05 18-32-59/NV-F0102.D/report00.CSV',\n", @@ -222,7 +222,7 @@ " str(root)+'/data/Rohdaten/9.2_nm/GC_Data/230705-2-CV-PEG35-052-GTA25/JH-1H 2023-07-05 20-04-01/NV-F0104.D/report00.CSV',\n", " str(root)+'/data/Rohdaten/9.2_nm/GC_Data/230705-2-CV-PEG35-052-GTA25/JH-1H 2023-07-05 20-04-01/NV-F0104.D/REPORT01.CSV']\n", "\n", - "e_chem = str(root)+'/data/raw_data/01_EChem/CAD14-Cu@AB/GSTATIC.DTA'\n", + "e_chem = [str(root)+'/data/raw_data/01_EChem/CAD14-Cu@AB/GSTATIC.DTA']\n", "mfm = [str(root)+'/data/raw_data/03_MFM/CAD14-Cu@AB/Bench-2h-GSS_CAD14-Cu@AB_200_50c_24h_truncated.csv']\n", "gc = [str(root)+'/data/raw_data/02_GC/CAD14-Cu@AB/JH-1H 2023-02-06 10-00-18/NV-F0102.D/report00.CSV',\n", " str(root)+'/data/raw_data/02_GC/CAD14-Cu@AB/JH-1H 2023-02-06 10-00-18/NV-F0102.D/REPORT01.CSV',\n", @@ -230,16 +230,13 @@ " str(root)+'/data/raw_data/02_GC/CAD14-Cu@AB/JH-1H 2023-02-06 10-00-18/NV-F0103.D/REPORT01.CSV',\n", " str(root)+'/data/raw_data/02_GC/CAD14-Cu@AB/JH-1H 2023-02-06 10-00-18/NV-F0104.D/report00.CSV',\n", " str(root)+'/data/raw_data/02_GC/CAD14-Cu@AB/JH-1H 2023-02-06 10-00-18/NV-F0104.D/REPORT01.CSV']\n", - "calib = str(root)+'/data/additional_data/calibration.json'\n", - "correc = str(root)+'/data/additional_data/correction_factors.json'\n", - "farada = str(root)+'/data/additional_data/faraday_coefficients.json'\n", + "species = [str(root)+'/data/additional_data/species_data.yaml']\n", "\n", - "rrdw.galvano_files.value = [e_chem]\n", + "\n", + "rrdw.galvano_files.value = e_chem\n", "rrdw.MFM_files.value = mfm\n", "rrdw.GC_files.value = gc\n", - "rrdw.calib_files.value = [calib]\n", - "rrdw.correction_files.value = [correc]\n", - "rrdw.faraday_files.value = [farada]" + "rrdw.species_file.value = species" ] }, {