From a62bad550837d178516b8fb922334c86e9ac5dbe Mon Sep 17 00:00:00 2001 From: Steffengreiner Date: Fri, 17 Feb 2023 15:39:58 +0100 Subject: [PATCH 1/3] Streamline Nanopore models in Readme --- README.md | 7 ------- doc/figures/Nanopore_Data_Structure_Model.svg | 2 +- doc/figures/Nanopore_Data_Structure_Model_v2.svg | 4 ---- doc/figures/Nanopore_Data_Structure_Model_v4.svg | 4 ---- 4 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 doc/figures/Nanopore_Data_Structure_Model_v2.svg delete mode 100644 doc/figures/Nanopore_Data_Structure_Model_v4.svg diff --git a/README.md b/README.md index 752a60c58..6248a6522 100644 --- a/README.md +++ b/README.md @@ -103,13 +103,6 @@ A Nanopore NGS measurement output is delivered to us as a nested folder structur ![Nanopore Data Structure Model](./doc/figures/Nanopore_Data_Structure_Model.svg) -A more recent model, which places two of the configuration files into a subfolder and adds the barcode alignment file, is also supported: - -![Nanopore Data Structure Model v2](./doc/figures/Nanopore_Data_Structure_Model_v2.svg) - -V4 outlines a model in which a second higher-accuracy basecalling was performed after the initial basecalling - -![Nanopore Data Structure Model v4](./doc/figures/Nanopore_Data_Structure_Model_v4.svg) #### Nanopore usage example diff --git a/doc/figures/Nanopore_Data_Structure_Model.svg b/doc/figures/Nanopore_Data_Structure_Model.svg index d3ffbbd6f..b62c81d5a 100644 --- a/doc/figures/Nanopore_Data_Structure_Model.svg +++ b/doc/figures/Nanopore_Data_Structure_Model.svg @@ -1,4 +1,4 @@ -
Root Folder
(OxfordNanoporeExperiment)
Root Folder...
Measurement Folder
(OxfordNanoporeMeasurement)
Measurement Folder...
1
1
1..n
1..n
FastQ Fail Folder
FastQ Fail Folder
FastQ Pass Folder
FastQ Pass Folder
Fast5 Pass Folder
Fast5 Pass Folder
Fast5 Fail Folder
Fast5 Fail Folder
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
Sequencing Summary Log
Sequencing Summary Log
Duty Time Log
Duty Time Log
Final Summary Log
Final Summary Log
Throughput Log
Throughput Log
Report MD Log
Report MD Log
Report PDF Log
Report PDF Log
Drift Correction Log
Drift Correction Log
Mux Scan Data Log
Mux Scan Data Log
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
FastQ Folder
FastQ Folder
FastQ File
FastQ File
1
1
0..n
0..n
DataFile
DataFile
BarcodedFolder
BarcodedFolder
Extends
Extends
Extends
Extends
Data File
Data File
Extends
Extends
DataFolder
DataFolder
Extends
Extends
DataFolder
DataFolder
Extends
Extends
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
1
1
0..n
0..n
FastQ File
FastQ File
1
1
0..n
0..n
1
1
0..n
0..n
FastQ Folder
FastQ Folder
FastQ File
FastQ File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
FastQ File
FastQ File
1
1
0..n
0..n
Fast5 Folder
Fast5 Folder
Fast5 File
Fast5 File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
Fast5 File
Fast5 File
1
1
0..n
0..n
Fast5 Folder
Fast5 Folder
Fast5 File
Fast5 File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
Fast5 File
Fast5 File
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
FastQ Folder
FastQ Folder
Fast5 Folder
Fast5 Folder
DataFolder
DataFolderText is not SVG - cannot display \ No newline at end of file +
Root Folder
(OxfordNanoporeExperiment)
Root Folder...
Measurement Folder
(OxfordNanoporeMeasurement)
Measurement Folder...
1
1
1..n
1..n
FastQ Fail Folder
FastQ Fail Folder
FastQ Pass Folder
FastQ Pass Folder
Fast5 Pass Folder
Fast5 Pass Folder
Fast5 Fail Folder
Fast5 Fail Folder
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
Sequencing Summary Log
Sequencing Summary Log
Final Summary Log
Final Summary Log
Report MD Log
Report MD Log
1
1
1
1
1
1
1
1
1
1
1
1
FastQ Folder
FastQ Folder
FastQ File
FastQ File
1
1
0..n
0..n
BarcodedFolder
BarcodedFolder
Extends
Extends
Data File
Data File
Extends
Extends
DataFolder
DataFolder
Extends
Extends
DataFolder
DataFolder
Extends
Extends
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
1
1
0..n
0..n
FastQ File
FastQ File
1
1
0..n
0..n
1
1
0..n
0..n
FastQ Folder
FastQ Folder
FastQ File
FastQ File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
FastQ File
FastQ File
1
1
0..n
0..n
Fast5 Folder
Fast5 Folder
Fast5 File
Fast5 File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
Fast5 File
Fast5 File
1
1
0..n
0..n
Fast5 Folder
Fast5 Folder
Fast5 File
Fast5 File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
Fast5 File
Fast5 File
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
Optional File
Optional File
1
1
0..n
0..n
Data File
Data File
Extends
Extends
Data File
Data File
Extends
Extends
Data File
Data File
Extends
Extends
Other Reports
Other Reports
DataFolder
DataFolder
Extends
Extends
1
1
0..1
0..1
DataFolder
DataFolder
Extends
Extends
DataFolder
DataFolder
Extends
Extends
DataFolder
DataFolder
Extends
Extends
Duty Time Log
Duty Time Log
Throughput Log
Throughput Log
Report PDF Log
Report PDF Log
Drift Correction Log
Drift Correction Log
Mux Scan Data Log
Mux Scan Data Log
Sequencing Summary Log
Sequencing Summary Log
Sequencing Telemetry Log
Sequencing Telemetry Log
Guppy Basecalling
Client Log
Guppy Basecalling...
Fastq Fail Folder
Fastq Fail Folder
1
1
1
1
1
1
1
1
Data File
Data File
Extends
Extends
FastQ Folder
FastQ Folder
Unclassified Folder
Unclassified Folder
FastQ File
FastQ File
FastQ File
FastQ File
1
1
0..n
0..n
1
1
0..n
0..n
0..n
0..n
0..n
0..n
1
1
0..n
0..n
Fastq Pass Folder
Fastq Pass Folder
FastQ Folder
FastQ Folder
Unclassified Folder
Unclassified Folder
FastQ File
FastQ File
FastQ File
FastQ File
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
0..n
0..n
1
1
0..n
0..n
Basecalling
Basecalling
DataFolder
DataFolder
Extends
Extends
1
1
1
1
0..1
0..1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
DataFolder
DataFolder
Extends
Extends
DataFolder
DataFolder
Extends
Extends
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
Data File
Data File
Extends
Extends
Data File
Data File
Extends
Extends
Data File
Data File
Extends
Extends
Data File
Data File
Extends
Extends
Data File
Data File
Extends
Extends
Data File
Data File
Extends
Extends
Data File
Data File
Extends
Extends
FastQ Folder
FastQ Folder
Fast5 Folder
Fast5 Folder
DataFolder
DataFolder
FastQ File
FastQ File
Fast5 File
Fast5 File
DataFile
DataFile
Optional File
Optional File
Data File
Data File
Extends
Extends
Optional Folder
Optional Folder
DataFolder
DataFolder
1
1
0..n
0..n
Extends
Extends
1
1
0..n
0..n
Optional Folder
Optional Folder
DataFolder
DataFolder
Extends
Extends
0..n
0..n
1
1
0..n
0..n
Drift Correction Log
Drift Correction Log
Mux Scan Data Log
Mux Scan Data Log
1
1
1
1
1
1
1
1Text is not SVG - cannot display \ No newline at end of file diff --git a/doc/figures/Nanopore_Data_Structure_Model_v2.svg b/doc/figures/Nanopore_Data_Structure_Model_v2.svg deleted file mode 100644 index 330e266c8..000000000 --- a/doc/figures/Nanopore_Data_Structure_Model_v2.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -
Root Folder
(OxfordNanoporeExperiment)
Root Folder...
Measurement Folder
(OxfordNanoporeMeasurement)
Measurement Folder...
1
1
1..n
1..n
FastQ Fail Folder
FastQ Fail Folder
FastQ Pass Folder
FastQ Pass Folder
Fast5 Pass Folder
Fast5 Pass Folder
Fast5 Fail Folder
Fast5 Fail Folder
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
Barcode Alignment Log
Barcode Alignment Log
Duty Time Log
Duty Time Log
Final Summary Log
Final Summary Log
Throughput Log
Throughput Log
Report MD Log
Report MD Log
Report PDF Log
Report PDF Log
Sequencing Summary Log
Sequencing Summary Log
Mux Scan Data Log
Mux Scan Data Log
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
FastQ Folder
FastQ Folder
FastQ File
FastQ File
1
1
0..n
0..n
DataFile
DataFile
BarcodedFolder
BarcodedFolder
Extends
Extends
Extends
Extends
Data File
Data File
Extends
Extends
DataFolder
DataFolder
Extends
Extends
DataFolder
DataFolder
Extends
Extends
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
1
1
0..n
0..n
FastQ File
FastQ File
1
1
0..n
0..n
1
1
0..n
0..n
FastQ Folder
FastQ Folder
FastQ File
FastQ File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
FastQ File
FastQ File
1
1
0..n
0..n
Fast5 Folder
Fast5 Folder
Fast5 File
Fast5 File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
Fast5 File
Fast5 File
1
1
0..n
0..n
Fast5 Folder
Fast5 Folder
Fast5 File
Fast5 File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
Fast5 File
Fast5 File
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
FastQ Folder
FastQ Folder
Fast5 Folder
Fast5 Folder
DataFolder
DataFolder
Drift Correction Log
Drift Correction Log
Extends
Extends
1:1
1:1
1:1
1:1
Other Reports Subfolder
Other Reports SubfolderText is not SVG - cannot display \ No newline at end of file diff --git a/doc/figures/Nanopore_Data_Structure_Model_v4.svg b/doc/figures/Nanopore_Data_Structure_Model_v4.svg deleted file mode 100644 index 4c1602816..000000000 --- a/doc/figures/Nanopore_Data_Structure_Model_v4.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -
Root Folder
(OxfordNanoporeExperiment)
Root Folder...
Measurement Folder
(OxfordNanoporeMeasurement)
Measurement Folder...
1
1
1..n
1..n
FastQ Fail Folder
FastQ Fail Folder
FastQ Pass Folder
FastQ Pass Folder
Fast5 Pass Folder
Fast5 Pass Folder
Fast5 Fail Folder
Fast5 Fail Folder
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
Sequencing Summary Log
Sequencing Summary Log
Duty Time Log
Duty Time Log
Final Summary Log
Final Summary Log
Throughput Log
Throughput Log
Report MD Log
Report MD Log
Report PDF Log
Report PDF Log
Drift Correction Log
Drift Correction Log
Mux Scan Data Log
Mux Scan Data Log
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
1
FastQ Folder
FastQ Folder
FastQ File
FastQ File
0..n
0..n
DataFile
DataFile
BarcodedFolder
BarcodedFolder
Extends
Extends
Extends
Extends
Data File
Data File
Extends
Extends
DataFolder
DataFolder
Extends
Extends
DataFolder
DataFolder
Extends
Extends
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
0..n
0..n
FastQ File
FastQ File
1
1
0..n
0..n
1
1
0..n
0..n
FastQ Folder
FastQ Folder
FastQ File
FastQ File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
FastQ File
FastQ File
1
1
0..n
0..n
Fast5 Folder
Fast5 Folder
Fast5 File
Fast5 File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
Fast5 File
Fast5 File
1
1
0..n
0..n
Fast5 Folder
Fast5 Folder
Fast5 File
Fast5 File
Unclassified Folder
Unclassified Folder
1
1
0..n
0..n
Fast5 File
Fast5 File
1
1
0..n
0..n
0..n
0..n
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
0..n
0..n
1
1
0..n
0..n
0..n
0..n
0..n
0..n
FastQ Folder
FastQ Folder
Fast5 Folder
Fast5 Folder
DataFolder
DataFolder
Sequencing Summary Log
Sequencing Summary Log
Sequencing Telemetry Log
Sequencing Telemetry Log
Guppy Basecalling
Client Log
Guppy Basecalling...
Fastq Fail Folder
Fastq Fail Folder
1
1
1
1
1
1
1
1
1
1
Data File
Data File
Extends
Extends
FastQ Folder
FastQ Folder
Unclassified Folder
Unclassified Folder
FastQ File
FastQ File
FastQ File
FastQ File
1
1
0..n
0..n
1
1
0..n
0..n
0..n
0..n
0..n
0..n
1
1
0..n
0..n
Fastq Pass Folder
Fastq Pass Folder
FastQ Folder
FastQ Folder
Unclassified Folder
Unclassified Folder
FastQ File
FastQ File
FastQ File
FastQ File
1
1
0..n
0..n
1
1
0..n
0..n
1
1
0..n
0..n
0..n
0..n
1
1
0..n
0..n
Basecalling
Basecalling
DataFolder
DataFolder
Extends
Extends
1
1Text is not SVG - cannot display \ No newline at end of file From 25650fa653efadc943ce606b026d013d2828670f Mon Sep 17 00:00:00 2001 From: Sven F <9976560+sven1103@users.noreply.github.com> Date: Thu, 23 Feb 2023 09:16:26 +0100 Subject: [PATCH 2/3] Add metabolomics facility for products (#358) --- .../qbic/datamodel/dtos/business/facilities/Facility.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/life/qbic/datamodel/dtos/business/facilities/Facility.groovy b/src/main/groovy/life/qbic/datamodel/dtos/business/facilities/Facility.groovy index 1b192cae1..6ef3f5207 100644 --- a/src/main/groovy/life/qbic/datamodel/dtos/business/facilities/Facility.groovy +++ b/src/main/groovy/life/qbic/datamodel/dtos/business/facilities/Facility.groovy @@ -25,7 +25,8 @@ enum Facility { QBIC("Quantitative Biology Center", "QBIC"), CFMB_PCT("Proteomics Facility Tübingen", "Proteomics Facility"), PCT("Proteome Center Tübingen", "PCT"), - CEGAT("CeGaT GmbH", "CeGaT GmbH") + CEGAT("CeGaT GmbH", "CeGaT GmbH"), + METABOLOMICS("Metabolomics Facility Tübingen", "Metabolomics Facility") private final String fullName private final String label From 92cce8fe7077dfb8745ef5cd5566f834d42b270e Mon Sep 17 00:00:00 2001 From: Johnny Q5 <50356506+JohnnyQ5@users.noreply.github.com> Date: Thu, 4 May 2023 09:19:48 +0200 Subject: [PATCH 3/3] Set version to 2.25.1 (#359) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ccf42f532..19fe41804 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ life.qbic data-model-lib - 2.25.0 + 2.25.1 data-model-lib http://github.com/qbicsoftware/data-model-lib Data models. A collection of QBiC's central data models and DTOs.