Changeset 36083

Timestamp:

Aug 31, 2013, 5:24:27 AM (13 years ago)

Author:

eugene

Message:

merge changes from EAM branch (additional handling for chip to chip warping and to ignore sources if desired)

Location:

trunk/pswarp/src

Files:

• pswarpLoop.c (modified) (1 diff)
• pswarpOverlaps.c (modified) (2 diffs)

trunk/pswarp/src/pswarpLoop.c

@@ -54 +54 @@
     // We re-activate the CMF load so we can transform the sources as well as the pixels.
     // We only need to read in these if the astrometry source is CMF.
-    pmFPAfileActivate(config->files, true, "PSWARP.ASTROM");
+    if (psMetadataLookupBool(&status, recipe, "SOURCES")) {
+        pmFPAfileActivate(config->files, true, "PSWARP.ASTROM");
+    }
 
     // loop over this section once per input group

trunk/pswarp/src/pswarpOverlaps.c

@@ -117 +117 @@
         psTrace ("pswarp", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
         // if (!chip->file_exists) { continue; } // this fpa refers to the output file, so no chip exist
+        if (!chip->toFPA) { continue; } // this fpa refers to the output file, so no chip exist
         assert (chip->toFPA);
         chip->process = true; // start with process true, we will de-activate later (pswarpFindOverlaps)
@@ -179 +180 @@
     for (int j = 0; j < output->chips->n; j++) {
         pmChip *chip = output->chips->data[j];
+
+        if (!isfinite(tgt->Pmin->data.F32[j])) continue;
+        if (!isfinite(tgt->Pmax->data.F32[j])) continue;
+        if (!isfinite(tgt->Qmin->data.F32[j])) continue;
+        if (!isfinite(tgt->Qmax->data.F32[j])) continue;
 
         // we have src bounds