Changeset 21079 for branches/eam_branch_20081230/psModules/src/objects/pmSourceMatch.c

Timestamp:

Jan 1, 2009, 7:13:00 PM (18 years ago)

Author:

eugene

Message:

convert mask references to abstract psImageMaskType and psVectorMaskType as needed

File:

• branches/eam_branch_20081230/psModules/src/objects/pmSourceMatch.c (modified) (7 diffs)

branches/eam_branch_20081230/psModules/src/objects/pmSourceMatch.c

@@ -122 +122 @@
     match->image = psVectorAllocEmpty(num, PS_TYPE_U32);
     match->index = psVectorAllocEmpty(num, PS_TYPE_U32);
-    match->mask = psVectorAllocEmpty(num, PS_TYPE_MASK);
+    match->mask = psVectorAllocEmpty(num, PS_TYPE_VECTOR_MASK);
 
     return match;
@@ -143 +143 @@
     match->image->data.S32[num] = image;
     match->index->data.S32[num] = index;
-    match->index->data.PS_TYPE_MASK_DATA[num] = 0;
+    match->index->data.PS_TYPE_VECTOR_MASK_DATA[num] = 0; // XXXX EAM : I think this should be match->mask not match->index
     match->num++;
 
@@ -316 +316 @@
         double star = 0.0, starErr = 0.0; // Accumulators for star
         for (int j = 0; j < match->num; j++) {
-            if (match->mask->data.PS_TYPE_MASK_DATA[j]) {
+            if (match->mask->data.PS_TYPE_VECTOR_MASK_DATA[j]) {
                 continue;
             }
@@ -347 +347 @@
         pmSourceMatch *match = matches->data[i]; // Matched stars
         for (int j = 0; j < match->num; j++) {
-            if (match->mask->data.PS_TYPE_MASK_DATA[j]) {
+            if (match->mask->data.PS_TYPE_VECTOR_MASK_DATA[j]) {
                 continue;
             }
@@ -373 +373 @@
         pmSourceMatch *match = matches->data[i]; // Matched stars
         for (int j = 0; j < match->num; j++) {
-            if (match->mask->data.PS_TYPE_MASK_DATA[j]) {
+            if (match->mask->data.PS_TYPE_VECTOR_MASK_DATA[j]) {
                 continue;
             }
@@ -474 +474 @@
         pmSourceMatch *match = matches->data[i]; // Matched stars
         for (int j = 0; j < match->num; j++) {
-            if (match->mask->data.PS_TYPE_MASK_DATA[j]) {
+            if (match->mask->data.PS_TYPE_VECTOR_MASK_DATA[j]) {
                 continue;
             }
@@ -488 +488 @@
             if (PS_SQR(dev) > starClip * (PS_SQR(magErr) + sysErr2)) {
                 numRejected++;
-                match->mask->data.PS_TYPE_MASK_DATA[j] = 0xFF;
+                match->mask->data.PS_TYPE_VECTOR_MASK_DATA[j] = 0xFF;
             }
         }