Changeset 39981 for trunk

Timestamp:

Feb 23, 2017, 4:22:35 PM (9 years ago)

Author:

watersc1

Message:

Add code to allow the number of additional polynomial terms in the WCS solution to be modified. This should allow updates to look like the original run.

Location:

trunk

Files:

• ippconfig/gpc1/pswarp.config (modified) (1 diff)
• ippconfig/recipes/pswarp.config (modified) (1 diff)
• psModules/src/astrom/pmAstrometryWCS.c (modified) (1 diff)
• pswarp/src/pswarpLoadAstrometry.c (modified) (1 diff)
• pswarp/src/pswarpOptions.c (modified) (2 diffs)

trunk/ippconfig/gpc1/pswarp.config

@@ -3 +3 @@
 BKG.XGRID               S32     50
 BKG.YGRID               S32     50
+ADDITIONAL_WCS_ORDERS   S32     4               # By default, use a bilevel astrometric model with 4 additional orders.

trunk/ippconfig/recipes/pswarp.config

@@ -25 +25 @@
 BKG.YGRID              S32    4
 
+ADDITIONAL_WCS_ORDERS S32     4              # By default, use a bilevel astrometric model with 4 additional orders.
+
 # Default recipe for warping
 WARP    METADATA

trunk/psModules/src/astrom/pmAstrometryWCS.c

@@ -695 +695 @@
     // the region defines the FPA pixels covered by the tranformation
     psFree (fpa->fromTPA);
-    psPlaneTransform *myPT = psPlaneTransformAlloc(fpa->toTPA->x->nX+4, fpa->toTPA->x->nY+4);
+
+    int additional_orders = 4;  // This is the number of orders that should be added.
+    bool status = false;
+    int config_additional_orders = psMetadataLookupS32(&status,fpa->analysis, "ADDITIONAL_WCS_ORDERS");
+    if (status) { // If this keyword is found, then use that number of orders instead
+      additional_orders = config_additional_orders; 
+    }
+    
+    psPlaneTransform *myPT = psPlaneTransformAlloc(fpa->toTPA->x->nX+additional_orders, fpa->toTPA->x->nY+additional_orders);
     fpa->fromTPA = psPlaneTransformInvert(myPT, fpa->toTPA, region, 50);
     psFree (myPT);

trunk/pswarp/src/pswarpLoadAstrometry.c

@@ -96 +96 @@
     // 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/pswarpOptions.c

@@ -92 +92 @@
     }
 
+    // See if we should use a more accurate WCS model.
+    int config_additional_orders = psMetadataLookupS32(&status,recipe, "ADDITIONAL_WCS_ORDERS");
+    if (!status) {
+      // We did not find this recipe option.  We are likely updating an old config.
+      config_additional_orders = 0;
+    }
+    
+
     
     // Set recipe values in the recipe (since we've possibly altered some)
@@ -114 +122 @@
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "BKG.XGRID", PS_META_REPLACE, "Xsize of background model", bkgXgrid);
     psMetadataAddS32(config->arguments, PS_LIST_TAIL, "BKG.YGRID", PS_META_REPLACE, "Ysize of background model", bkgYgrid);
+    psMetadataAddS32(config->arguments, PS_LIST_TAIL, "ADDITIONAL_WCS_ORDERS", PS_META_REPLACE, "Additional orders for bilevel fit.", config_additional_orders);
 
     psTrace("pswarp", 1, "Done with pswarpOptions...\n");