Changeset 12492 for trunk/psastro/src/psastroOneChip.c

Timestamp:

Mar 18, 2007, 12:28:16 PM (19 years ago)

Author:

eugene

Message:

a variety of fixes to get psastro working in chip and mosaic mode

• various memory leaks
• when loading mosaic data, the modification of the WCS for the common focal-plane scale was getting the offset wrong (fixed in psModules)
• added some debugging dump; more plots still needed
• error handling in psastroMosaicAstrom
• loading chip and fpa dimensions from concepts
• now reading chip concepts when reading objects (in psModules)
• now supplying region and subdivisions for gradient measurements
• grid search is now optional

-

File:

• trunk/psastro/src/psastroOneChip.c (modified) (4 diffs)

trunk/psastro/src/psastroOneChip.c

@@ -10 +10 @@
 
     bool status;
+    pmAstromStats *gridStats = NULL;
+    pmAstromStats *stats = NULL;
 
     // supplied radius is in pixels
@@ -25 +27 @@
     REQUIRED_RECIPE_VALUE (int minNstar, "PSASTRO.MIN.NSTAR", S32, "failed to find single-chip min allowed stars\n");
 
-    // find initial offset / rotation
-    pmAstromStats *gridStats = pmAstromGridMatch (rawstars, refstars, recipe);
-    if (gridStats == NULL) {
-        psLogMsg ("psastro", 3, "failed to find a grid match solution\n");
-        return false;
+    // do we need to get a rough initial match?
+    REQUIRED_RECIPE_VALUE (bool gridSearch, "PSASTRO.GRID.SEARCH", Bool, "failed to find chip grid-search option\n");
+
+    if (gridSearch) {
+        // find initial offset / rotation
+        gridStats = pmAstromGridMatch (rawstars, refstars, recipe);
+        if (gridStats == NULL) {
+            psLogMsg ("psastro", 3, "failed to find a grid match solution\n");
+            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);
+
+        // tweak the position by finding peak of matches stars
+        stats = pmAstromGridTweak (rawstars, refstars, recipe, gridStats);
+        if (stats == NULL) {
+            psLogMsg ("psastro", 3, "failed to measure tweaked grid solution\n");
+            psFree (gridStats);
+            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);
+
+        // adjust the chip.toFPA terms only
+        pmAstromGridApply (chip->toFPA, stats);
+        psastroUpdateChipToFPA (fpa, chip, rawstars, refstars);
     }
-    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);
-
-    // tweak the position by finding peak of matches stars
-    pmAstromStats *stats = pmAstromGridTweak (rawstars, refstars, recipe, gridStats);
-    if (stats == NULL) {
-        psLogMsg ("psastro", 3, "failed to measure tweaked grid solution\n");
-        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);
-
-    // adjust the chip.toFPA terms only
-    pmAstromGridApply (chip->toFPA, stats);
-    psastroUpdateChipToFPA (fpa, chip, rawstars, refstars);
 
     // use small radius to match stars
@@ -49 +57 @@
     if (match == NULL) {
         psLogMsg ("psastro", 3, "failed to find radius-matched sources\n");
+        psFree (stats);
+        psFree (gridStats);
         return false;
     }
@@ -85 +95 @@
     if (!results) {
         psLogMsg ("psastro", 3, "failed to perform the matched fit\n");
+        psFree (match);
+        psFree (stats);
+        psFree (fitStats);
+        psFree (gridStats);
         return false;
     }