Changeset 24181 for trunk/psModules

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).

File:

• trunk/psModules/src/imcombine/pmSubtractionMatch.c (modified) (1 diff)

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);
             }