Changeset 35383 for trunk/psModules

Timestamp:

Apr 9, 2013, 1:33:36 PM (13 years ago)

Author:

watersc1

Message:

ppStack changes to fix source matching bug.

Location:

trunk/psModules/src/objects

Files:

• pmSourceMatch.c (modified) (3 diffs)
• pmSourceMatch.h (modified) (1 diff)

trunk/psModules/src/objects/pmSourceMatch.c

@@ -630 +630 @@
 
 psVector *pmSourceMatchRelphot(const psArray *matches, // Array of matches
+                               psArray *matchedSources, // Array of averaged sources
                                const psVector *zp, // Zero points for each image (including airmass term)
                                float tol, // Relative tolerance for convergence
@@ -648 +649 @@
     PS_ASSERT_VECTOR_TYPE(zp, PS_TYPE_F32, NULL);
     PS_ASSERT_FLOAT_LARGER_THAN(transClip, 0.0, NULL);
-
+    PS_ASSERT_ARRAY_NON_NULL(matchedSources, NULL);
+    
     sys1 *= sys1;
     sys2 *= sys2;
@@ -742 +744 @@
     }
 
+    for (int i = 0; i < matches->n; i++) {
+      pmSource *source = pmSourceAlloc();
+      source->psfMag = stars->data.F32[i];
+      psArrayAdd(matchedSources,matchedSources->n,source);
+    }
+    
     psFree(photo);
     psFree(badImage);

trunk/psModules/src/objects/pmSourceMatch.h

@@ -74 +74 @@
 /// Perform relative photometry to calibrate images
 psVector *pmSourceMatchRelphot(const psArray *matches, // Array of matches
+                               psArray *matchedSources, // Array of average sources
                                const psVector *zp, // Zero points for each image (including airmass term)
                                float tol, // Relative tolerance for convergence