use objective too when matching published images

JaneliaSciComp · Sep 3, 2024 · 3d7da9c · 3d7da9c
1 parent 2f7b5f5
commit 3d7da9c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/...rmipsearch-api/src/main/java/org/janelia/colormipsearch/model/PublishedLMImageFields.java b/...rmipsearch-api/src/main/java/org/janelia/colormipsearch/model/PublishedLMImageFields.java
@@ -87,6 +87,10 @@ public void setObjective(String objective) {
         this.objective = objective;
     }
 
+    public boolean hasObjective() {
+        return StringUtils.isNotBlank(objective);
+    }
+
     public String getAlignmentSpace() {
         return alignmentSpace;
     }

diff --git a/...rmipsearch-tools/src/main/java/org/janelia/colormipsearch/cmd/jacsdata/ColorDepthMIP.java b/...rmipsearch-tools/src/main/java/org/janelia/colormipsearch/cmd/jacsdata/ColorDepthMIP.java
@@ -104,6 +104,10 @@ public String lmObjective() {
         return objective;
     }
 
+    public boolean hasLmObjective() {
+        return StringUtils.isNotBlank(objective);
+    }
+
     public boolean lmIsNotStaged() {
         if (sample == null) {
             // really cannot tell if the sample has been published to staging

diff --git a/...arch-tools/src/main/java/org/janelia/colormipsearch/cmd/jacsdata/PublishedDataGetter.java b/...arch-tools/src/main/java/org/janelia/colormipsearch/cmd/jacsdata/PublishedDataGetter.java
@@ -81,6 +81,7 @@ private PublishedLMImage findPublishedImage(ColorDepthMIP colorDepthMIP, List<Pu
             return publishedLMImages.stream()
                     .filter(pi -> pi.getAlignmentSpace().equals(colorDepthMIP.alignmentSpace) ||
                             (CollectionUtils.isNotEmpty(aliasesForAlignmentSpace) && aliasesForAlignmentSpace.contains(pi.getAlignmentSpace())))
+                    .filter(pi -> !pi.hasObjective() || !colorDepthMIP.hasLmObjective() || pi.getObjective().equals(colorDepthMIP.objective))
                     .findFirst()
                     .orElseGet(() -> {
                         LOG.warn("No published image found for {}:sample={}:as={}",