Changeset 32840

Timestamp:

Nov 30, 2011, 11:41:54 AM (15 years ago)

Author:

eugene

Message:

merged from trunk: fixes to the neighbor flagging

Location:

tags/ipp-20111110/psModules

Files:

• . (modified) (1 prop)
• src/astrom/pmAstrometryWCS.c (modified) (1 diff)
• src/objects (modified) (2 props)
• src/objects/pmSourceMasks.h (modified) (1 diff)

tags/ipp-20111110/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);

tags/ipp-20111110/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
+

tags/ipp-20111110/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

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