Changeset 39313 for trunk

Timestamp:

Jan 13, 2016, 4:36:11 PM (11 years ago)

Author:

eugene

Message:

fix error in image naming; abort on duplicate images

File:

• trunk/Ohana/src/delstar/src/delete_duplicate_images.c (modified) (3 diffs)

trunk/Ohana/src/delstar/src/delete_duplicate_images.c

@@ -37 +37 @@
 
   fprintf (stderr, "deleting measures for "OFF_T_FMT" duplicate images in this database\n", Nduplicates);
+  myAbort ("do not attempt to delete detections");
 
   if (!IMAGE_ONLY) {
@@ -513 +514 @@
       int length2 = strlen(image[pair2[i]].name);
 
-      // names should be of the form: foo.cmf, foo.inv.cmf
+      // names should be of the form: foo.cmf[SkyChip.hdr], foo.inv.cmf[SkyChip.hdr]
       valid = (length1 == length2 + 4) || (length1 == length2 - 4);
       if (!valid) continue;
 
-      int baselength = MIN(length1, length2) - 4;
+      int baselength = MIN(length1, length2) - 17;
       valid = !strncmp (image[pair1[i]].name, image[pair2[i]].name, baselength);
       if (!valid) continue;
@@ -523 +524 @@
       valid = TRUE;
       if (length1 > length2) {
-        valid = valid && !strcmp (&image[pair1[i]].name[baselength], ".inv.cmf");
-        valid = valid && !strcmp (&image[pair2[i]].name[baselength], ".cmf");
+        valid = valid && !strcmp (&image[pair1[i]].name[baselength], ".inv.cmf[SkyChip.hdr]");
+        valid = valid && !strcmp (&image[pair2[i]].name[baselength], ".cmf[SkyChip.hdr]");
       } else {
-        valid = valid && !strcmp (&image[pair1[i]].name[baselength], ".cmf");
-        valid = valid && !strcmp (&image[pair2[i]].name[baselength], ".inv.cmf");
+        valid = valid && !strcmp (&image[pair1[i]].name[baselength], ".cmf[SkyChip.hdr]");
+        valid = valid && !strcmp (&image[pair2[i]].name[baselength], ".inv.cmf[SkyChip.hdr]");
       }
       if (!valid) continue;