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

trunk/psastro/src/psastroUtils.c

@@ -79 +79 @@
 bool psastroUpdateChipToFPA (pmFPA *fpa, pmChip *chip, psArray *rawstars, psArray *refstars) {
 
-    // XXX this region needs to be defined more intelligently
-    // psRegion *region = pmChipExtent (chip);
-    psRegion *region = psRegionAlloc (0, 2000, 0, 2000);
-
+    psRegion *region = pmChipExtent (chip);
+    region->x1 -= region->x0;
+    region->y1 -= region->y0;
+    region->x0 = 0;
+    region->y0 = 0;
     psFree (chip->fromFPA);
     chip->fromFPA = psPlaneTransformInvert (NULL, chip->toFPA, *region, 20);
-
-//    PS_POLY_PRINT_2D(chip->toFPA->x);
-//    PS_POLY_PRINT_2D(chip->toFPA->y);
-
-//    PS_POLY_PRINT_2D(chip->fromFPA->x);
-//    PS_POLY_PRINT_2D(chip->fromFPA->y);
+    psFree (region);
 
     for (int i = 0; i < rawstars->n; i++) {
@@ -105 +101 @@
     }
 
-    psFree (region);
     return true;
 }