Changeset 32853 for branches/eam_branches/ipp-20111122/psModules

Timestamp:

Dec 2, 2011, 11:46:07 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111122/psModules/src

Files:

• astrom/pmAstrometryWCS.c (modified) (1 diff)
• objects (modified) (1 prop)
• objects/pmSourceMasks.h (modified) (1 diff)
• objects/pmSourcePhotometry.c (modified) (3 diffs)

branches/eam_branches/ipp-20111122/psModules/src/astrom/pmAstrometryWCS.c

@@ -487 +487 @@
 
     if (fpa->toSky == NULL) {
+        psFree(fpa->toTPA);
+        psFree(fpa->fromTPA);
         fpa->toTPA = psPlaneTransformIdentity (1);
         fpa->fromTPA = psPlaneTransformIdentity (1);

branches/eam_branches/ipp-20111122/psModules/src/objects

@@ -9 +9 @@
 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
+

@@ -9 +9 @@
 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/eam_branches/ipp-20111122/psModules/src/objects/pmSourceMasks.h

@@ -46 +46 @@
     PM_SOURCE_MODE2_DIFF_WITH_DOUBLE = 0x00000002, ///< diff source matched to positive detections in both images
     PM_SOURCE_MODE2_MATCHED          = 0x00000004, ///< diff source matched to positive detections in both images
+    PM_SOURCE_MODE2_DIFF_SELF_MATCH  = 0x00000800, ///< positive detection match is probably this source 
 
     PM_SOURCE_MODE2_ON_SPIKE         = 0x00000008, ///< > 25% of (PSF-weighted) pixels land on diffraction spike

branches/eam_branches/ipp-20111122/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;
     }
@@ -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;
+
+    bool onChip = true;
+    onChip &= (xChip >= 0);
+    onChip &= (xChip < mask->numCols);
+    onChip &= (yChip >= 0);
+    onChip &= (yChip < mask->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 {
+        psImageMaskType maskValue = mask->data.PS_TYPE_IMAGE_MASK_DATA[yChip][xChip];
+        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);
 }

@@ -9 +9 @@
 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
+