diff --git a/tools/max_projections_stack_and_upload_omero/CHANGELOG.md b/tools/max_projections_stack_and_upload_omero/CHANGELOG.md index 603811a..508d9de 100644 --- a/tools/max_projections_stack_and_upload_omero/CHANGELOG.md +++ b/tools/max_projections_stack_and_upload_omero/CHANGELOG.md @@ -1,5 +1,10 @@ # CHANGELOG +## 20241213.2 + +- Fixed a variable definition in the groovy +- Do not ask for the Project ID when the Dataset exists + ## 20241213.1 - Fixed a forgotten nT diff --git a/tools/max_projections_stack_and_upload_omero/max_projections_stack_and_upload_omero.xml b/tools/max_projections_stack_and_upload_omero/max_projections_stack_and_upload_omero.xml index af685d9..81b7f23 100644 --- a/tools/max_projections_stack_and_upload_omero/max_projections_stack_and_upload_omero.xml +++ b/tools/max_projections_stack_and_upload_omero/max_projections_stack_and_upload_omero.xml @@ -1,7 +1,7 @@ And upload to omero - 20241213.1 + 20241213.2 0 @@ -79,7 +79,7 @@ $password - + diff --git a/tools/max_projections_stack_and_upload_omero/stack_max_projs.groovy b/tools/max_projections_stack_and_upload_omero/stack_max_projs.groovy index 703ae5b..dd79262 100644 --- a/tools/max_projections_stack_and_upload_omero/stack_max_projs.groovy +++ b/tools/max_projections_stack_and_upload_omero/stack_max_projs.groovy @@ -29,7 +29,7 @@ */ // Version number = date of last modif -VERSION = "20241213.1" +VERSION = "20241213.2" /** * ***************************************************************************************************************** @@ -116,6 +116,7 @@ try { // Explore the HashMap and save to tiff for(String unique_identifier : samplesMap.keySet()){ + println "Merging " + unique_identifier // get the channel map Map channelsMap = samplesMap.get(unique_identifier) ArrayList channels = [] @@ -135,11 +136,11 @@ try { } } + ImagePlus final_imp if (all_compatibles) { // Merge all ImagePlus merged_imps = Concatenator.run(current_images as ImagePlus[]) // Re-order to make a multi-channel, time-lapse image - ImagePlus final_imp if (channels.size() == 1 && ref_nT == 1) { final_imp = merged_imps } else {