Changeset 39981 for trunk/pswarp/src

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/pswarp/src

Files:

• pswarpLoadAstrometry.c (modified) (1 diff)
• pswarpOptions.c (modified) (2 diffs)

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");