Changeset 30806 for branches/eam_branches/ipp-20110213/ppStack/src/ppStackConvolve.c

Timestamp:

Mar 4, 2011, 3:47:03 PM (15 years ago)

Author:

eugene

Message:

fix adjustments to SAT

File:

• branches/eam_branches/ipp-20110213/ppStack/src/ppStackConvolve.c (modified) (4 diffs)

branches/eam_branches/ipp-20110213/ppStack/src/ppStackConvolve.c

@@ -238 +238 @@
             // M_app = m_inst + ZP + 2.5*log(exptime), where exptime in the output is sumExposure
             psMetadataItem *zpItem = psMetadataLookup(inCell->parent->parent->concepts, "FPA.ZP");
+            float inZP = zpItem->data.F32;
             zpItem->data.F32 += options->norm->data.F32[i] + 2.5*log10(options->sumExposure);
 
@@ -244 +245 @@
 
             expItem = psMetadataLookup(inCell->concepts, "CELL.EXPOSURE");
+            float inExptime = expItem->data.F32;
             expItem->data.F32 = options->sumExposure;
 
             // flux_out = flux_in * ten(-0.4*norm) -- save the individual saturation values
-            psMetadataItem *satItem = psMetadataLookup(inCell->concepts, "CELL.EXPOSURE");
+            psMetadataItem *satItem = psMetadataLookup(inCell->concepts, "CELL.SATURATION");
+            float inSat = satItem->data.F32;
             satItem->data.F32 *= pow(10.0, -0.4*options->norm->data.F32[i]);
             psVectorAppend (satValues, satItem->data.F32);
+
+            psLogMsg("ppStack", PS_LOG_INFO, "image %d mods : zp %f -> %f, exptime %f -> %f, sat %f -> %f", 
+                     i, inZP, zpItem->data.F32, inExptime, expItem->data.F32, inSat, satItem->data.F32);
         }
 
@@ -311 +317 @@
         // this case, the best value for CELL.SATURATION is the 2nd highest value in the list.
         // If not, it should be the higest value in the list
+        bool mdok = false;
         bool safe = psMetadataLookupBool(&mdok, recipe, "SAFE"); // Be safe when combining small numbers of pixels
         psVectorSortInPlace(satValues);
@@ -327 +334 @@
         UPDATE_CONCEPT(unconvCell, "CELL.SATURATION", satBest);
         UPDATE_CONCEPT(unconvFPA,  "FPA.ZP",        options->zp);
+
+        psLogMsg("ppStack", PS_LOG_INFO, "stack adjust metadata values : zp %f, exptime %f, sat %f", options->zp, options->sumExposure, satBest);
 
         if (options->stats) {