diff --git a/eu_basynthec/dist/etc/growth-profiles/data-set-handler.py b/eu_basynthec/dist/etc/growth-profiles/data-set-handler.py index e8462a5d0c87efb745763dcc6e02736a992d2c7e..412e67333d2aa62afdaee080edbee0bb920135f8 100644 --- a/eu_basynthec/dist/etc/growth-profiles/data-set-handler.py +++ b/eu_basynthec/dist/etc/growth-profiles/data-set-handler.py @@ -65,10 +65,18 @@ metadata = timeSeriesData.getMetadataMap() # Strains are not in the metadata, but in the data, so extract them metadata["STRAIN_NAMES"] = extract_strains() assign_properties(dataset, metadata) - -# Convert the data into a tsv file, and put that and the original data into the data set -convert_data_to_tsv(tr, dataset, "data/tsv") -store_original_data(tr, dataset, "data/xls") + +# Store the original and tsv data in data sets +original_dataset = tr.createNewDataSet("EXCEL_ORIGINAL") +store_original_data(tr, original_dataset, "xls") + +tsv_dataset = tr.createNewDataSet("TSV_MULTISTRAIN_EXPORT") +convert_data_to_tsv(tr, tsv_dataset, "tsv-multi") + +# Make the original contain these +contained_codes = [original_dataset.getDataSetCode(), tsv_dataset.getDataSetCode()] +dataset.setContainedDataSetCodes(contained_codes) + # If no experiment has been set, then get the experiment from the excel file if dataset.getExperiment() is None: diff --git a/eu_basynthec/dist/etc/metabolomics/data-set-handler.py b/eu_basynthec/dist/etc/metabolomics/data-set-handler.py index dc9a36aa072486dc5aea1ad6bc10ad034d9a5581..c4ac2a23f3f6d4bac218f6f91fc82895e36d7ff1 100644 --- a/eu_basynthec/dist/etc/metabolomics/data-set-handler.py +++ b/eu_basynthec/dist/etc/metabolomics/data-set-handler.py @@ -53,9 +53,17 @@ dataset = tr.createNewDataSet("METABOLITE_INTENSITIES") metadata = timeSeriesData.getMetadataMap() assign_properties(dataset, metadata) -# Convert the data into a tsv file, and put that and the original data into the data set -convert_data_to_tsv(tr, dataset, "data/tsv") -store_original_data(tr, dataset, "data/xls") +# Store the original and tsv data in data sets +original_dataset = tr.createNewDataSet("EXCEL_ORIGINAL") +store_original_data(tr, original_dataset, "xls") + +tsv_dataset = tr.createNewDataSet("TSV_EXPORT") +convert_data_to_tsv(tr, tsv_dataset, "tsv") + +# Make the original contain these +contained_codes = [original_dataset.getDataSetCode(), tsv_dataset.getDataSetCode()] +dataset.setContainedDataSetCodes(contained_codes) + # If no experiment has been set, then get the experiment from the excel file if dataset.getExperiment() is None: diff --git a/eu_basynthec/dist/etc/proteomics/data-set-handler.py b/eu_basynthec/dist/etc/proteomics/data-set-handler.py index 725b1dc61a644a5d0d6fe2d0e0a0436eb65a968b..c6ac2b22ff496be2d621d6360a47456c43f8f3d6 100644 --- a/eu_basynthec/dist/etc/proteomics/data-set-handler.py +++ b/eu_basynthec/dist/etc/proteomics/data-set-handler.py @@ -53,10 +53,18 @@ timeSeriesData = TimeSeriesDataExcel.createTimeSeriesDataExcel(incoming.getAbsol dataset = tr.createNewDataSet("PROTEIN_QUANTIFICATIONS") metadata = timeSeriesData.getMetadataMap() assign_properties(dataset, metadata) - -# Convert the data into a tsv file, and put that and the original data into the data set -convert_data_to_tsv(tr, dataset, "data/tsv") -store_original_data(tr, dataset, "data/xls") + +# Store the original and tsv data in data sets +original_dataset = tr.createNewDataSet("EXCEL_ORIGINAL") +store_original_data(tr, original_dataset, "xls") + +tsv_dataset = tr.createNewDataSet("TSV_EXPORT") +convert_data_to_tsv(tr, tsv_dataset, "tsv") + +# Make the original contain these +contained_codes = [original_dataset.getDataSetCode(), tsv_dataset.getDataSetCode()] +dataset.setContainedDataSetCodes(contained_codes) + # If no experiment has been set, then get the experiment from the excel file if dataset.getExperiment() is None: diff --git a/eu_basynthec/dist/etc/transcriptomics/data-set-handler.py b/eu_basynthec/dist/etc/transcriptomics/data-set-handler.py index 01507137934935c502de1d0b841f84337bb591dd..bcd7a8617c5bd3754a33333e35c8fca1c1893926 100644 --- a/eu_basynthec/dist/etc/transcriptomics/data-set-handler.py +++ b/eu_basynthec/dist/etc/transcriptomics/data-set-handler.py @@ -94,10 +94,18 @@ dataset = tr.createNewDataSet("TRANSCRIPTOMICS") metadata = timeSeriesData.getMetadataMap() metadata["STRAIN_NAMES"] = extract_strains(dataStart[0], dataStart[1]) assign_properties(dataset, metadata) - -# Convert the data into a tsv file, and put that and the original data into the data set -convert_data_to_tsv(tr, dataStart[0], dataStart[1], dataset, "data/tsv") -store_original_data(tr, dataset, "data/xls") + +# Store the original and tsv data in data sets +original_dataset = tr.createNewDataSet("EXCEL_ORIGINAL") +store_original_data(tr, original_dataset, "xls") + +tsv_dataset = tr.createNewDataSet("TSV_MULTISTRAIN_EXPORT") +convert_data_to_tsv(tr, dataStart[0], dataStart[1], tsv_dataset, "tsv-multi") + +# Make the original contain these +contained_codes = [original_dataset.getDataSetCode(), tsv_dataset.getDataSetCode()] +dataset.setContainedDataSetCodes(contained_codes) + # If no experiment has been set, then get the experiment from the excel file if dataset.getExperiment() is None: