Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/objects/pmSourcePhotometry.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psModules/src/objects/pmSourcePhotometry.c (modified) (4 diffs)

branches/meh_branches/ppstack_test/psModules/src/objects

@@ -5 +5 @@
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c
+

@@ -5 +5 @@
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c
+

branches/meh_branches/ppstack_test/psModules/src/objects/pmSourcePhotometry.c

@@ -56 +56 @@
 static psImageMaskType maskBurntool = 0;
 static psImageMaskType maskConvPoor = 0;
+static psImageMaskType maskGhost    = 0;
+static psImageMaskType maskGlint    = 0;
 
 bool pmSourceMagnitudesInit (pmConfig *config, psMetadata *recipe)
@@ -68 +70 @@
         maskBurntool = pmConfigMaskGet("BURNTOOL", config);
         maskConvPoor = pmConfigMaskGet("CONV.POOR", config);
+        maskGhost    = pmConfigMaskGet("GHOST", config);
+        maskGlint    = pmConfigMaskGet("GHOST", config);
         maskSuspect  = maskSpike | maskStarCore | maskBurntool | maskConvPoor;
     }
@@ -94 +98 @@
 {
     PS_ASSERT_PTR_NON_NULL(source, false);
-    PS_ASSERT_PTR_NON_NULL(psf, false);
+    // PS_ASSERT_PTR_NON_NULL(psf, false);
 
     int status = false;
@@ -533 +537 @@
     }
 
+    // Check that if the peak is on/off a ghost, glint, or diffraction spike.  In regular IPP
+    // processing, these values are only set in the image mask after the 'camera' stage
+
+    int xChip = source->peak->x;
+    int yChip = source->peak->y;
+
+    // need to access the parent if we are looking at a subimage (likely)
+    psImage *chipImage = (source->pixels == NULL) ? source->pixels : (psImage *) source->pixels->parent;
+
+    bool onChip = true;
+    onChip &= (xChip >= 0);
+    onChip &= (xChip < chipImage->numCols);
+    onChip &= (yChip >= 0);
+    onChip &= (yChip < chipImage->numRows);
+    if (!onChip) {
+        // if the source is off the edge of the chip, raise a different bit?
+        source->mode |= PM_SOURCE_MODE_OFF_CHIP;
+    } else {
+        int xMask = xChip - mask->col0;
+        int yMask = yChip - mask->row0;
+        psImageMaskType maskValue = mask->data.PS_TYPE_IMAGE_MASK_DATA[yMask][xMask];
+        if (maskValue & maskGhost) {
+            source->mode |= PM_SOURCE_MODE_ON_GHOST;
+        }
+        pmSourceMode PM_SOURCE_MODE_ON_GLINT = PM_SOURCE_MODE_ON_GHOST;
+        if (maskValue & maskGlint) {
+            source->mode |= PM_SOURCE_MODE_ON_GLINT;
+        }
+        if (maskValue & maskSpike) {
+            source->mode |= PM_SOURCE_MODE_ON_SPIKE;
+        }
+    }
     return (true);
 }

@@ -5 +5 @@
 *.la
 *.lo
+pmSourceIO_CMF_PS1_V1.c
+pmSourceIO_CMF_PS1_V2.c
+pmSourceIO_CMF_PS1_V3.c
+pmSourceIO_CMF_PS1_V4.c
+pmSourceIO_CMF_PS1_V3.v1.c
+pmSourceIO_CMF_PS1_V1.v1.c
+pmSourceIO_CMF_PS1_V2.v1.c
+