diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_MAT/ibrain2_dataset_id_58/Batch_handles.mat b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CC_MAT/ibrain2_dataset_id_58/Batch_handles.mat similarity index 100% rename from integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_MAT/ibrain2_dataset_id_58/Batch_handles.mat rename to integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CC_MAT/ibrain2_dataset_id_58/Batch_handles.mat diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_MAT/ibrain2_dataset_id_58/metadata.properties b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CC_MAT/ibrain2_dataset_id_58/metadata.properties similarity index 100% rename from integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_MAT/ibrain2_dataset_id_58/metadata.properties rename to integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CC_MAT/ibrain2_dataset_id_58/metadata.properties diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CSV/ibrain2_dataset_id_67/workflow_analysisWorkflowX_jsmith.xml b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CC_MAT/ibrain2_dataset_id_58/workflow_analysisWorkflowX_jsmith.xml similarity index 100% rename from integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CSV/ibrain2_dataset_id_67/workflow_analysisWorkflowX_jsmith.xml rename to integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CC_MAT/ibrain2_dataset_id_58/workflow_analysisWorkflowX_jsmith.xml diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CSV/ibrain2_dataset_id_67/data1.csv b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CSV/ibrain2_dataset_id_67/data1.csv deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CSV/ibrain2_dataset_id_67/data2.csv b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CSV/ibrain2_dataset_id_67/data2.csv deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CSV/ibrain2_dataset_id_67/metadata.properties b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CSV/ibrain2_dataset_id_67/metadata.properties deleted file mode 100644 index cab7affc5f9506b8d95b8b6cd647f0f508d3a262..0000000000000000000000000000000000000000 --- a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_CSV/ibrain2_dataset_id_67/metadata.properties +++ /dev/null @@ -1,7 +0,0 @@ -storage_provider.parent.dataset.id = 20110315102448498-198 -ibrain2.parent.dataset.id = 32 -ibrain2.dataset.id = 67 -dataset.type = HCS_ANALYSIS_CELL_FEATURES_CSV -ibrain2.workflow.id = 23 -ibrain2.module.order = 12 -ibrain2.process.id = 42 \ No newline at end of file diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY/ibrain2_dataset_id_47/workflow_analysisWorkflowX_jsmith.xml b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY/ibrain2_dataset_id_47/workflow_analysisWorkflowX_jsmith.xml deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY/ibrain2_dataset_id_47/ImageQuality_imy-assay_mBS-IX2_bKB03-2B-1297191313_u0410491D.csv b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY_SUMMARY/ibrain2_dataset_id_47/ImageQuality_imy-assay_mBS-IX2_bKB03-2B-1297191313_u0410491D.csv similarity index 100% rename from integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY/ibrain2_dataset_id_47/ImageQuality_imy-assay_mBS-IX2_bKB03-2B-1297191313_u0410491D.csv rename to integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY_SUMMARY/ibrain2_dataset_id_47/ImageQuality_imy-assay_mBS-IX2_bKB03-2B-1297191313_u0410491D.csv diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY/ibrain2_dataset_id_47/metadata.properties b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY_SUMMARY/ibrain2_dataset_id_47/metadata.properties similarity index 100% rename from integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY/ibrain2_dataset_id_47/metadata.properties rename to integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY_SUMMARY/ibrain2_dataset_id_47/metadata.properties diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_MAT/ibrain2_dataset_id_58/workflow_analysisWorkflowX_jsmith.xml b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY_SUMMARY/ibrain2_dataset_id_47/workflow_analysisWorkflowX_jsmith.xml similarity index 100% rename from integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_CELL_FEATURES_MAT/ibrain2_dataset_id_58/workflow_analysisWorkflowX_jsmith.xml rename to integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_QUALITY_SUMMARY/ibrain2_dataset_id_47/workflow_analysisWorkflowX_jsmith.xml diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_FEATURES/ibrain2_dataset_id_77/PlateSummary.csv b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_RESULTS_SUMMARIES/ibrain2_dataset_id_77/PlateSummary.csv similarity index 100% rename from integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_FEATURES/ibrain2_dataset_id_77/PlateSummary.csv rename to integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_RESULTS_SUMMARIES/ibrain2_dataset_id_77/PlateSummary.csv diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_FEATURES/ibrain2_dataset_id_77/metadata.properties b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_RESULTS_SUMMARIES/ibrain2_dataset_id_77/metadata.properties similarity index 100% rename from integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_FEATURES/ibrain2_dataset_id_77/metadata.properties rename to integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_RESULTS_SUMMARIES/ibrain2_dataset_id_77/metadata.properties diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_FEATURES/ibrain2_dataset_id_77/workflow_analysisWorkflowX_jsmith.xml b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_RESULTS_SUMMARIES/ibrain2_dataset_id_77/workflow_analysisWorkflowX_jsmith.xml similarity index 100% rename from integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_FEATURES/ibrain2_dataset_id_77/workflow_analysisWorkflowX_jsmith.xml rename to integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_ANALYSIS_WELL_RESULTS_SUMMARIES/ibrain2_dataset_id_77/workflow_analysisWorkflowX_jsmith.xml diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_32/metadata.properties b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_32/metadata.properties index 88049632413638ba2256f4f55950c53ef35645dd..3a33c155bafca5ee3f891f136baf82f3f108d9ab 100644 --- a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_32/metadata.properties +++ b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_32/metadata.properties @@ -3,4 +3,4 @@ ibrain2.dataset.id = 32 dataset.type = HCS_IMAGE_RAW instrument.id = BS-IX2 barcode = DZ01-1A -timestamp = 13DBF3 \ No newline at end of file +acquisition.timestamp = 13DBF3 \ No newline at end of file diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/assay_my-assay.txt b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/assay_my-assay.txt deleted file mode 100644 index 46fa504288c6fbf1cd70be51332324d300ccc17b..0000000000000000000000000000000000000000 --- a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/assay_my-assay.txt +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# IBRAIN2 Configuration File for Assays -# -################################################################################ - -################################################################################ -# Assay Info -################################################################################ -# Assay ID (unique) -assay.id = my-assay-abc - -# Assay type -assay.type = TestPlate CK002 - -# Assay description -assay.description = CKBZE151-3 plate1 - -# Number of acquired wave lengths (mandatory) -assay.acquisition.wavelengths = 4 - -# Lab's primary investigator name (mandatory) -labinfo.pi = group_researchIT - -# Experimenter login name (mandatory) -experimenter.login = ibrain2 - -# Name of the workflow as defined in the workflow description file -workflow.name = workflow1 - -# Author of the workflow as defined in the workflow description file -workflow.author = author1 diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/b48hplate1_wA01_s1_z1_t1_cCy3_u001.tif b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/b48hplate1_wA01_s1_z1_t1_cCy3_u001.tif deleted file mode 100644 index af2097e8e01bcd773324581277ff6dfc6335450b..0000000000000000000000000000000000000000 Binary files a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/b48hplate1_wA01_s1_z1_t1_cCy3_u001.tif and /dev/null differ diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/b48hplate1_wA01_s1_z1_t1_cCy5_u001.tif b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/b48hplate1_wA01_s1_z1_t1_cCy5_u001.tif deleted file mode 100644 index d3d27b4f6b520ef581199a5f307038dc3b0ab7f0..0000000000000000000000000000000000000000 Binary files a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/b48hplate1_wA01_s1_z1_t1_cCy5_u001.tif and /dev/null differ diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/b48hplate1_wA01_s1_z1_t1_cDAPI_u001.tif b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/b48hplate1_wA01_s1_z1_t1_cDAPI_u001.tif deleted file mode 100644 index 286bf14a942f07ae24356629b45580cc43a253a9..0000000000000000000000000000000000000000 Binary files a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/b48hplate1_wA01_s1_z1_t1_cDAPI_u001.tif and /dev/null differ diff --git a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/metadata.properties b/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/metadata.properties deleted file mode 100644 index 92eca90d875fc84992c5d9632e55d3cf964052f9..0000000000000000000000000000000000000000 --- a/integration-tests/templates/data-ibrain2/examples/ibrain2-dropboxes-test/HCS_IMAGE_RAW/ibrain2_dataset_id_33/metadata.properties +++ /dev/null @@ -1,6 +0,0 @@ -ibrain2.assay.id = my-assay-abc -ibrain2.dataset.id = 33 -dataset.type = HCS_IMAGE_RAW -instrument.id = BS-IX2 -barcode = ABC -timestamp = 13DBF3 \ No newline at end of file