Changeset 37807 for trunk/Ohana/src/relastro/src/markObjects.c

Timestamp:

Jan 11, 2015, 2:14:39 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140904

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/relastro/src/markObjects.c (modified) (1 diff)

trunk/Ohana/src/relastro/src/markObjects.c

@@ -14 +14 @@
       int m = catalog[i].average[j].measureOffset;
       for (n = 0; n < catalog[i].average[j].Nmeasure; n++) {
-        if (!catalog[i].measureT[m+n].myDet) continue;
-        nOwn ++;
+        // this is a detection I own (it is on one of my images)
+        if (catalog[i].measureT[m+n].myDet) {
+          nOwn ++;
+          continue;
+        }
+        // 2MASS detections are counted as 'owned' (I completely control this object is nOwn_t == Nmeasure; no sharing needed)
+        if ((catalog[i].measureT[m+n].photcode == 2011) || 
+            (catalog[i].measureT[m+n].photcode == 2012) || 
+            (catalog[i].measureT[m+n].photcode == 2013)) {
+          nOwn ++;
+          continue;
+        }
       }
       catalog[i].nOwn_t[j] = nOwn;