Changeset 23351 for branches/cnb_branches/cnb_branch_20090301/psModules/src/objects/pmSourceMatch.h

Timestamp:

Mar 17, 2009, 12:07:42 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301/psModules

Files:

• . (modified) (1 prop)
• src/objects/pmSourceMatch.h (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/psModules/src/objects/pmSourceMatch.h

@@ -33 +33 @@
 
 /// Allocator for pmSourceMatch
-pmSourceMatch *pmSourceMatchAlloc(int num // Maximum number of images
-                                  );
+pmSourceMatch *pmSourceMatchAlloc(void);
 
 /// Add a source to a match
@@ -48 +47 @@
 ///
 /// Returns an array of psSourceMatch
-psArray *pmSourceMatchSources(const psArray *sourceArrays, // Array of arrays of sources on each image
-                              float radius // Correlation radius
+psArray *pmSourceMatchSources(const psArray *sourceArrays, ///< Array of arrays of sources on each image
+                              float radius, ///< Matching radius
+                              bool cullSingles ///< Cull "matches" with only a single source?
                               );
+
+/// Merge two source lists
+///
+/// Sources are pulled from the lists into a new list, with no effort made to adjust them.
+psArray *pmSourceMatchMerge(psArray *sourceArrays, ///< Array of arrays of sources on each image
+                            float radius ///< Matching radius
+    );
 
 /// Perform relative photometry to calibrate images
 psVector *pmSourceMatchRelphot(const psArray *matches, // Array of matches
                                const psVector *zp, // Zero points for each image (including airmass term)
-                               int maxIter, // Maximum number of iterations
                                float tol, // Relative tolerance for convergence
+                               int iter1, // Number of iterations for pass 1
+                               float rej1, // Limit on rejection between iterations for pass 1
+                               float sys1, // Systematic error in measurements for pass 1
+                               int iter2, // Number of iterations for pass 2
+                               float rej2, // Limit on rejection between iterations for pass 2
+                               float sys2, // Systematic error in measurements for pass 2
                                float rejLimit, // Limit on rejection between iterations
                                int transIter, // Clipping iterations for transparency
                                float transClip, // Clipping level for transparency
-                               float photoLevel, // Level at which we declare image is photometric
-                               float starClip, // Clipping for stars
-                               float sysErr // Systematic error in measurements
+                               float photoLevel // Level at which we declare image is photometric
     );