Changeset 35563 for trunk/pswarp/src/pswarpTransformReadout.c

Timestamp:

May 9, 2013, 12:26:48 PM (13 years ago)

Author:

eugene

Message:

major upgrades to pswarp to enable skycell warp -> chip

File:

• trunk/pswarp/src/pswarpTransformReadout.c (modified) (6 diffs)

trunk/pswarp/src/pswarpTransformReadout.c

@@ -16 +16 @@
  * NOTE: in this function, the coordinates are transformed from the OUTPUT to the INPUT
  */
-bool pswarpTransformReadout(pmReadout *output, pmReadout *input, pmConfig *config)
+bool pswarpTransformReadout(pmReadout *output, pmReadout *input, pmConfig *config, bool backgroundWarp)
 {
     // XXX this implementation currently ignores the use of the region
@@ -52 +52 @@
     }
 
-    // XXX unused int nThreads = psMetadataLookupS32(&mdok, config->arguments, "NTHREADS"); // Number of threads
-    // XXX unused if (!mdok) {
-    // XXX unused     nThreads = 0;
-    // XXX unused }
     float poorFrac = psMetadataLookupF32(NULL, config->arguments, "POOR.FRAC"); ///< Flux fraction for "poor"
 
@@ -61 +57 @@
     // output coordinates to input coordinates
     pswarpMapGrid *grid = pswarpMapGridFromImage(input, output, nGridX, nGridY);
-    //    if (psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING")) {
     
     // XXX optionally modify the grid based on this result and force the maxError < XXX
@@ -117 +112 @@
     psAssert (xGridMax < grid->nXpts, "xGridMax too big\n");
     psAssert (yGridMax < grid->nYpts, "yGridMax too big\n");
+
+    // fprintf (stderr, "warp %d,%d - %d,%d\n", xGridMin, yGridMin, xGridMax, yGridMax);
 
     // create jobs and supply them to the threads
@@ -132 +129 @@
             args->goodPixels = 0;
 
-            if (psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING")) {
+            if (backgroundWarp) {
               args->background_warping = true;
               args->offset_x = psMetadataLookupF32(NULL,config->arguments,"BKG_WARP_XOFFSET");
               args->offset_y = psMetadataLookupF32(NULL,config->arguments,"BKG_WARP_YOFFSET");
             }
-
             
             // allocate a job
@@ -210 +206 @@
     psFree(interp);
 
-    if (goodPixels > 0 && psMetadataLookupBool(&mdok, recipe, "SOURCES")) {
-      if (!psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING")) {
-        if (!pswarpTransformSources(output, input, config)) {
-          psError(psErrorCodeLast(), false, "Unable to interpolate image.");
-          return false;
+    if (goodPixels > 0 && !backgroundWarp && psMetadataLookupBool(&mdok, recipe, "SOURCES")) {
+        if (!pswarpTransformSources(output, input, config)) {
+            psError(psErrorCodeLast(), false, "Unable to transform sources.");
+            return false;
         }
-      }
     }