Changeset 35535 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpTransformReadout.c

Timestamp:

May 8, 2013, 4:41:42 PM (13 years ago)

Author:

eugene

Message:

warping of background model appears to work

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpTransformReadout.c (modified) (4 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpTransformReadout.c

@@ -48 +48 @@
     psAssert(mdok, "MASK.INPUT was not defined");
 
+    bool backgroundWarp = psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING");
+
     if (!input->covariance) {
         input->covariance = psImageCovarianceNone();
     }
 
-    // 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 +59 @@
     // 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
@@ -118 +115 @@
     psAssert (yGridMax < grid->nYpts, "yGridMax too big\n");
 
-    fprintf (stderr, "warp %d,%d - %d,%d\n", xGridMin, yGridMin, xGridMax, yGridMax);
+    // fprintf (stderr, "warp %d,%d - %d,%d\n", xGridMin, yGridMin, xGridMax, yGridMax);
 
     // create jobs and supply them to the threads
@@ -134 +131 @@
             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