Changeset 26454 for trunk/ppStack/src/ppStackSources.c

Timestamp:

Dec 17, 2009, 9:43:45 AM (16 years ago)

Author:

eugene

Message:

The new code which generates unconvolved and convolved stacks broke
the ability to run PR-style images without convolutions AND without
input psf models from pswarp. The zero point matching code also
requires input sources, and it had become mandatory. To fix this, I
have made the following modifications:

1) add an option to avoid matching zero points (MATCH.ZERO.POINTS)

2) do not activate the pmFPAfile PPSTACK.CONv.KERNEL unless
CONVOLVE is true

3) do not attempt to load the sources unless CONVOLVE, PHOT, or
MATCH.ZERO.POINTS is true.

4) the call of pmStackCombine ppStackReadout needs to test for the
existence of the rejected sources.

This check-in also includes again the pmReadoutFake threading which
had caused errors (problem was in pmSourceGroups.c)

File:

• trunk/ppStack/src/ppStackSources.c (modified) (1 diff)

trunk/ppStack/src/ppStackSources.c

@@ -61 +61 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
+    if (!options->matchZPs) {
+        int num = psMetadataLookupS32(NULL, config->arguments, "INPUTS.NUM"); // Number of inputs
+        options->norm = psVectorAlloc(num, PS_TYPE_F32);
+        psVectorInit (options->norm, 0.0);
+
+        // XXX do I need to set this?
+        // options->sumExposure = sumExpTime;
+
+        return true;
+    }
+
     psArray *sourceLists = options->sourceLists; // Source lists for each input
     psVector *inputMask = options->inputMask; // Mask for inputs