Skip to content

Commit

Permalink
Updated mDiffFit to ignore images not overlapping - this is needed fo…
Browse files Browse the repository at this point in the history
…r Pegasus workflows as overlaps can not be fully determined at workflow planning time
  • Loading branch information
rynge committed Nov 29, 2017
1 parent 1fa9ffa commit 8e1c823
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion grid/Pegasus/mDiffFit.c
Expand Up @@ -2,6 +2,9 @@
Version Developer Date Change
------- --------------- ------- -----------------------
1.3 Mats Rynge 28Nov17 Ignore some expected failure
conditions from mDiff, such as
images not overlapping
1.2 Mei-Hui Su 16Mar05 Add the check for MONTAGE_HOME to
access mFitplane and mDiff with 'path'
1.1 Mei-Hui Su 11Oct04 Changed one OK return to a WARNING
Expand Down Expand Up @@ -192,7 +195,16 @@ int main(int argc, char **argv)
fprintf(fstatus, "[struct stat=\"%s\", msg=\"%s\"]\n", status, msg);
fflush(stdout);

exit(1);
/* some errors from mDiff are ignored, such as images not overlapping */
if (strcmp(msg, "Images don't overlap") == 0
|| strcmp(msg, "All pixels are blank.") == 0) {
/* ensure the output file exists, even if it is 0 bytes */
fopen(output_file, "w+");
exit(0);
}
else {
exit(1);
}
}

if(strcmp( status, "WARNING") == 0)
Expand Down

0 comments on commit 8e1c823

Please sign in to comment.