Changeset 36299 for branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c

Timestamp:

Nov 22, 2013, 2:38:49 PM (13 years ago)

Author:

bills

Message:

when saving flux in cff file divide by the exposure time so that the value is counts per second.
psphotLoadExtSources multiples the flux value by CELL.EXPOSURE for cff sources
added some sanity checking to cff files

File:

• branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c (modified) (2 diffs)

branches/eam_branches/ipp-20130904/psphot/src/psphotMergeSources.c

@@ -129 +129 @@
         extCFF = psMetadataLookupPtr (NULL, readoutCFF->analysis, "PSPHOT.DETECTIONS");
         if (extCFF) {
+            psF32 exptime = psMetadataLookupF32(NULL, readout->parent->concepts, "CELL.EXPOSURE");
             for (int i = 0; i < extCFF->allSources->n; i++) {
                 pmSource *source = extCFF->allSources->data[i];
@@ -136 +137 @@
                 source->mode |= PM_SOURCE_MODE_EXTERNAL;
 
-                // source->peak->detValue,rawFlux,smoothFlux all set to input flux value
+                // source->peak->detValue,rawFlux,smoothFlux all set to input flux value which is scaled
+                // to 1 second exposure time. Scale to this image's exposure.
+                source->peak->rawFlux    *= exptime;
+                source->peak->smoothFlux *= exptime;
+                source->peak->detValue   *= exptime;
                 // source->peak->xf,yf, moments->Mx,My all set to input position