Changeset 35236 for branches/eam_branches/ipp-20130207/psphot

Timestamp:

Mar 5, 2013, 2:24:05 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotSourceSize.c (modified) (2 diffs)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)

branches/eam_branches/ipp-20130207/psphot/src/psphotSourceSize.c

@@ -423 +423 @@
     psLogMsg("psModules.objects", PS_LOG_INFO, "Source Size classifications: %4s %4s %4s %4s %4s", "Npsf", "Next", "Nsat", "Ncr", "Nskip");
     // Determine if this readout is above the threshold to ext fit all sources
+    options->extFitAllReadout = false;
     if (options->extFitAll) {
       float maskFrac = psMetadataLookupF32(&status,readout->analysis,"READOUT.MASK.FRAC");
@@ -584 +585 @@
         // the EXT_LIMIT flag
         if (options->extFitAllReadout) {
+          psTrace("psphotSourceClassRegion.EXTALT",10,"In extFitAll: %d %d\n",options->extFitAll,options->extFitAllReadout);
           source->mode |= PM_SOURCE_MODE_EXT_LIMIT;
         }