Changeset 20033 for branches/cnb_branch_20080830/psastro/src/psastroOneChipGrid.c

Timestamp:

Oct 9, 2008, 2:39:01 PM (18 years ago)

Author:

beaumont

Message:

merged mainline into branch. resolved conflicts. added plots.

Location:

branches/cnb_branch_20080830/psastro/src

Files:

• . (modified) (1 prop)
• psastroOneChipGrid.c (modified) (3 diffs)

branches/cnb_branch_20080830/psastro/src

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit

branches/cnb_branch_20080830/psastro/src/psastroOneChipGrid.c

@@ -21 +21 @@
     psArray *subset = psArrayAlloc (PS_MIN (maxNstar, rawstars->n));
     for (int i = 0; (i < maxNstar) && (i < rawstars->n); i++) {
-        subset->data[i] = psMemIncrRefCounter (rawstars->data[i]);
+        subset->data[i] = psMemIncrRefCounter (rawstars->data[i]);
     }
 
@@ -35 +35 @@
     pmAstromStats *gridStats = pmAstromGridMatch (gridStars, refSubset, recipe);
     if (gridStats == NULL) {
-        psLogMsg ("psastro", 3, "failed to find a grid match solution\n");
-        psFree (gridStars);
-        psFree (refSubset);
-        return false;
+        psLogMsg ("psastro", 3, "failed to find a grid match solution\n");
+        psFree (gridStars);
+        psFree (refSubset);
+        return false;
     }
     psLogMsg ("psastro", 3, "basic grid search result - offset: %f,%f pixels, rotation: %f deg\n", gridStats->offset.x, gridStats->offset.y, DEG_RAD*gridStats->angle);
@@ -45 +45 @@
     stats = pmAstromGridTweak (gridStars, refSubset, recipe, gridStats);
     if (stats == NULL) {
-        psLogMsg ("psastro", 3, "failed to measure tweaked grid solution\n");
-        psFree (gridStats);
-        psFree (gridStars);
-        psFree (refSubset);
-        return false;
+        psLogMsg ("psastro", 3, "failed to measure tweaked grid solution\n");
+        psFree (gridStats);
+        psFree (gridStars);
+        psFree (refSubset);
+        return false;
     }
     psLogMsg ("psastro", 3, "tweak grid search result - offset: %f,%f pixels, rotation: %f deg\n", stats->offset.x, stats->offset.y, DEG_RAD*stats->angle);

@@ -15 +15 @@
 psastroModel
 gpcModel
+psastroModelFit