Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroMosaicOneChip.c

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• psastro (modified) (1 prop)
• psastro/src (modified) (1 prop)
• psastro/src/psastroMosaicOneChip.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/psastro/src

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h

branches/cnb_branches/cnb_branch_20090301/psastro/src/psastroMosaicOneChip.c

@@ -58 +58 @@
 
     // modify the order to correspond to the actual number of matched stars:
-    if ((match->n < 17) && (order >= 3)) order = 2;
-    if ((match->n < 13) && (order >= 2)) order = 1;
-    if ((match->n <  9) && (order >= 1)) order = 0;
-    if ((match->n <  3) || (order < 0) || (order > 3)) {
+    int Ndof_min = 3;
+    int order_max = 0.5*(sqrt(4*match->n - 4*Ndof_min + 1) - 3);
+    order = PS_MIN (order, order_max);
+
+    // if ((match->n < 17) && (order >= 3)) order = 2;
+    // if ((match->n < 13) && (order >= 2)) order = 1;
+    // if ((match->n <  9) && (order >= 1)) order = 0;
+
+    if (order < 0) {
         psLogMsg ("psastro", 3, "insufficient stars (%ld) or invalid order (%d)", match->n, order);
         return false;

@@ -17 +17 @@
 psastroModelFit
 psastroExtract
+psastroVersionDefinitions.h