Changeset 24181

Timestamp:

May 13, 2009, 5:12:53 PM (17 years ago)

Author:

Paul Price

Message:

Fixing ticket 1246: inverting preference order for stamps source (specified sources by user first, general sources from photometry second). ppSub wasn't using the correct source for the name of the stamps file from the user (artifact of recent reorganisation).

Location:

trunk

Files:

• ppSub/src/ppSubMatchPSFs.c (modified) (2 diffs)
• psModules/src/imcombine/pmSubtractionMatch.c (modified) (1 diff)

trunk/ppSub/src/ppSubMatchPSFs.c

@@ -94 +94 @@
     float spacing = psMetadataLookupF32(NULL, recipe, "STAMP.SPACING"); // Typical stamp spacing
     float threshold = psMetadataLookupF32(NULL, recipe, "STAMP.THRESHOLD"); // Threshold for stmps
-    const char *stampsName = psMetadataLookupStr(&mdok, config->arguments, "STAMPS"); // Filename for stamps
 
     const char *typeStr = psMetadataLookupStr(NULL, recipe, "KERNEL.TYPE"); // Kernel type
@@ -151 +150 @@
     } else {
         success = pmSubtractionMatch(inConv, refConv, inRO, refRO, footprint, stride, regionSize,
-                                     spacing, threshold, sources, stampsName, type, size, order,
+                                     spacing, threshold, sources, data->stamps, type, size, order,
                                      widths, orders, inner, ringsOrder, binning, penalty, optimum,
                                      optWidths, optOrder, optThresh, iter, rej, sys, maskVal,

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -432 +432 @@
             }
 
-            if (sources) {
+            if (stampsName && strlen(stampsName) > 0) {
+                stamps = pmSubtractionStampsSetFromFile(stampsName, ro1->image, subMask, region, size,
+                                                        footprint, stampSpacing, subMode);
+            } else if (sources) {
                 stamps = pmSubtractionStampsSetFromSources(sources, ro1->image, subMask, region, size,
                                                            footprint, stampSpacing, subMode);
-            } else if (stampsName && strlen(stampsName) > 0) {
-                stamps = pmSubtractionStampsSetFromFile(stampsName, ro1->image, subMask, region, size,
-                                                        footprint, stampSpacing, subMode);
             }