Changeset 28164 for branches/czw_branch/20100519/ppStack/src/ppStackSources.c

Timestamp:

May 28, 2010, 3:09:59 PM (16 years ago)

Author:

watersc1

Message:

JPEG work should be done. Transitioning to try to pick up stackAssociation concept in this branch as well.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackSources.c (modified) (2 diffs)

branches/czw_branch/20100519/ppStack/src/ppStackSources.c

@@ -77 +77 @@
     PS_ASSERT_VECTOR_SIZE(inputMask, sourceLists->n, false);
 
-#if defined(TESTING) && 0
+#if defined(TESTING) && 1
     {
         // Deliberately induce a major transparency difference
-        psArray *sources = sourceLists->data[1]; // Sources to correct
+        psArray *sources = sourceLists->data[0]; // Sources to correct
         for (int i = 0; i < sources->n; i++) {
             pmSource *source = sources->data[i]; // Source of interest
@@ -283 +283 @@
                 }
                 psArray *sources = sourceLists->data[i]; // Sources of interest
-                float magCorr = zp->data.F32[i] + trans->data.F32[i] - 2.5*log10(options->sumExposure);
+                float magCorr = zp->data.F32[i] - trans->data.F32[i] - 2.5*log10(options->sumExposure);
                 if (zpExpNum == numGoodImages) {
                     // Using measured zero points, so attempt to set target zero point
                     magCorr -= zpTarget;
                 }
-                options->norm->data.F32[i] = -magCorr;
+                options->norm->data.F32[i] = magCorr;
                 psLogMsg("ppStack", PS_LOG_INFO,
                          "Applying scale correction to image %d: %f mag (%f)\n",