Changeset 41897 for trunk

Timestamp:

Nov 4, 2021, 6:11:39 PM (5 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-dev-20210817 (use new API to set extra orders from recipe))

Location:

trunk/pswarp/src

Files:

• pswarpLoadAstrometry.c (modified) (1 diff)
• pswarpLoop.c (modified) (1 diff)
• pswarpMapGrid.c (modified) (4 diffs)
• pswarpOptions.c (modified) (1 diff)

trunk/pswarp/src/pswarpLoadAstrometry.c

@@ -94 +94 @@
         }
     }
+
     // apply the bilevel astrometry elements to the target
     if (bilevelAstrometry) {
-      int additional_orders = 4;
-      bool status = false;
-      int config_additional_orders = psMetadataLookupS32(&status,config->arguments,"ADDITIONAL_WCS_ORDERS");
-      if (status) {
-        additional_orders = config_additional_orders;
-      }
-      psMetadataAddS32(astrom->fpa->analysis,PS_LIST_TAIL, "ADDITIONAL_WCS_ORDERS", PS_META_REPLACE,
-                       "Additional orders for bilevel fit.", additional_orders);
-      
-        
         if (!pmAstromReadBilevelMosaic(astrom->fpa, phu->header)) {
             psError(psErrorCodeLast(), false, "Unable to read bilevel mosaic astrometry for skycell.");

trunk/pswarp/src/pswarpLoop.c

@@ -240 +240 @@
 
     // use a map with only linear terms in x,y
-    psPlaneTransform *map = psPlaneTransformAlloc(1,1);
+    psPlaneTransform *map = psPlaneTransformAlloc(1, 1, PS_POLYNOMIAL_ORD);
     map->x->coeffMask[1][1] = PS_POLY_MASK_BOTH;
     map->y->coeffMask[1][1] = PS_POLY_MASK_BOTH;

trunk/pswarp/src/pswarpMapGrid.c

@@ -44 +44 @@
     for (ni = 0, i = xMin; ni < nXpts; i += nXpix, ni++) {
         for (nj = 0, j = yMin; nj < nYpts; j += nYpix, nj++) {
+//        pswarpMapSetLocalModel (grid->maps[ni][nj], dest, src, i, j, nXpix, nYpix);
             pswarpMapSetLocalModel (grid->maps[ni][nj], dest, src, i, j);
         }
@@ -196 +197 @@
  * astrometric transformations are supplied for the parent image coordinate frame.
  */
+// bool pswarpMapSetLocalModel (pswarpMap *map, pmReadout *dest, pmReadout *src, int ix, int iy, int dX, int dY) {
 bool pswarpMapSetLocalModel (pswarpMap *map, pmReadout *dest, pmReadout *src, int ix, int iy) {
 
@@ -234 +236 @@
 
     /** V(1,0) position */
+//  offset->x = ix + dX;
     offset->x = ix + 1;
     offset->y = iy;
@@ -246 +249 @@
     offset->x = ix;
     offset->y = iy + 1;
+//  offset->y = iy + dY;
     psPlaneTransformApply(FP, chipSrc->toFPA, offset);
     psPlaneTransformApply (TP, fpaSrc->toTPA, FP);

trunk/pswarp/src/pswarpOptions.c

@@ -104 +104 @@
       config_additional_orders = 0;
     }
-    
-
+    pmAstrometrySetExtraOrders(config_additional_orders);
+    // This is the number of orders that should be added to all non-linear inverse transformations
     
     // Set recipe values in the recipe (since we've possibly altered some)