Changeset 12492 for trunk/psastro/src/psastroMosaicGradients.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/psastroMosaicGradients.c (modified) (3 diffs)

trunk/psastro/src/psastroMosaicGradients.c

@@ -16 +16 @@
         if (!chip->process || !chip->file_exists) { continue; }
         
+        psRegion *region = pmChipExtent (chip);
+
         while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
             psTrace ("psastro", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process);
@@ -37 +39 @@
 
                 // measure the local gradients for this set of stars
-                gradients = pmAstromMeasureGradients (gradients, rawstars, refstars, match, recipe);
+                // XXX 2,2 are the number of test boxes on the chip.  put this in the recipe
+                gradients = pmAstromMeasureGradients (gradients, rawstars, refstars, match, region, 2, 2);
             }
         }
+        psFree (region);
     }
 
@@ -59 +63 @@
     }
 
+    // physical pixel scale in microns per pixel (FP is in physical units, chip is in pixels)
+    double pixelScale = psMetadataLookupF32 (&status, recipe, "PSASTRO.PIXEL.SCALE");
+    if (!status) {
+        psError(PS_ERR_IO, false, "Failed to lookup pixel scale"); 
+        return false; 
+    } 
+
     // fit the measured gradients with the telescope distortion model (polynomial order based on toTPA)
-    pmAstromFitDistortion (fpa, gradients, recipe);
-    psastroMosaicSetAstrom (fpa);
+    if (!pmAstromFitDistortion (fpa, gradients, pixelScale)) {
+        psError(PSASTRO_ERR_UNKNOWN, false, "failed to fit the distortion terms\n");
+        psFree (gradients);
+        psFree (view);
+        return false;
+    }
+        
+    if (!psastroMosaicSetAstrom (fpa)) {
+        psError(PSASTRO_ERR_UNKNOWN, false, "failed to apply mosaic distortion terms\n");
+        psFree (gradients);
+        psFree (view);
+        return false;
+    }
 
     psFree (gradients);