Changeset 36630 for trunk/Ohana/src/relastro/src/ImageOps.c

Timestamp:

Apr 1, 2014, 12:03:17 PM (12 years ago)

Author:

eugene

Message:

merge changes from EAM dev branches 20140206 (relastro, relphot extensions to parallel processing)

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana/src/relastro/src/ImageOps.c (modified) (2 diffs)

trunk/Ohana/src/relastro/src/ImageOps.c

@@ -226 +226 @@
     Measure *measureBig = &catalog[cat].measure[meas];
     int TESTPT = FALSE;
-    TESTPT |= (measureBig->imageID == CAT_ID_SRC) && (measureBig->detID == OBJ_ID_SRC);
-    TESTPT |= (measureBig->imageID == CAT_ID_DST) && (measureBig->detID == OBJ_ID_DST);
+    TESTPT |= CAT_ID_SRC && OBJ_ID_SRC && (measureBig->imageID == CAT_ID_SRC) && (measureBig->detID == OBJ_ID_SRC);
+    TESTPT |= CAT_ID_DST && OBJ_ID_DST && (measureBig->imageID == CAT_ID_DST) && (measureBig->detID == OBJ_ID_DST);
     if (TESTPT) {
       fprintf (stderr, "got test det\n");
@@ -462 +462 @@
     int TESTPT = FALSE;
 
-    TESTPT |= (measure->imageID == CAT_ID_SRC) && (measure->detID == OBJ_ID_SRC);
-    TESTPT |= (measure->imageID == CAT_ID_DST) && (measure->detID == OBJ_ID_DST);
+    TESTPT |= CAT_ID_SRC && OBJ_ID_SRC && (measure->imageID == CAT_ID_SRC) && (measure->detID == OBJ_ID_SRC);
+    TESTPT |= CAT_ID_DST && OBJ_ID_DST && (measure->imageID == CAT_ID_DST) && (measure->detID == OBJ_ID_DST);
     if (TESTPT) {
       fprintf (stderr, "got test det\n");