Changeset 17297 for trunk/psModules/src/imcombine/pmSubtractionStamps.c

Timestamp:

Apr 2, 2008, 3:57:59 PM (18 years ago)

Author:

Paul Price

Message:

Removing MODE_TARGET mode --- this is now done by generating a fake image (with pmReadoutFakeFromSources) and matching to that with MODE_1 or MODE_2 as appropriate. Changed pmSubtractionMatch and pmSubtractionConvolve so that two output 'convolved' images are always produced. This makes it easier to determine what to subtract from what.

File:

• trunk/psModules/src/imcombine/pmSubtractionStamps.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmSubtractionStamps.c

@@ -86 +86 @@
     switch (mode) {
       case PM_SUBTRACTION_MODE_1:
-      case PM_SUBTRACTION_MODE_TARGET:
         maskVal |= PM_SUBTRACTION_MASK_FOOTPRINT_1;
         break;
@@ -585 +584 @@
     // Let pmSubtractionStampsSet take care of the rest of the assertions
 
-    const char *format = (mode == PM_SUBTRACTION_MODE_TARGET ? "%f %f %f" : "%f %f"); // Format of file
-    psArray *data = psVectorsReadFromFile(filename, format);
+    psArray *data = psVectorsReadFromFile(filename, "%f %f");
     if (!data) {
         psError(PS_ERR_IO, false, "Unable to read stamps file %s", filename);
@@ -592 +590 @@
     }
     psVector *x = data->data[0], *y = data->data[1]; // Stamp positions
-    psVector *flux = (mode == PM_SUBTRACTION_MODE_TARGET ? data->data[2] : NULL); // Stamp fluxes
 
     // Correct for IRAF/FITS (unit-offset) positions to C (zero-offset) positions
@@ -598 +595 @@
     psBinaryOp(y, y, "-", psScalarAlloc(1.0, PS_TYPE_F32));
 
-    pmSubtractionStampList *stamps = pmSubtractionStampsSet(x, y, flux, image, subMask, region, footprint,
+    pmSubtractionStampList *stamps = pmSubtractionStampsSet(x, y, NULL, image, subMask, region, footprint,
                                                             spacing, mode);
     psFree(data);