Changeset 11171

Timestamp:

Jan 18, 2007, 6:53:35 PM (19 years ago)

Author:

eugene

Message:

added FITTED_MEAN_V3 option; allow existing internal background model

File:

• trunk/psphot/src/psphotImageMedian.c (modified) (5 diffs)

trunk/psphot/src/psphotImageMedian.c

@@ -40 +40 @@
     }
     psStatsOptions statsOption = psStatsOptionFromString (statsName);
-    if (!(statsOption & (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_MEDIAN | PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_QUARTILE | PS_STAT_CLIPPED_MEAN | PS_STAT_FITTED_MEAN | PS_STAT_FITTED_MEAN_V2))) {
+    if (!(statsOption & (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_MEDIAN | PS_STAT_ROBUST_MEDIAN | PS_STAT_ROBUST_QUARTILE | PS_STAT_CLIPPED_MEAN | PS_STAT_FITTED_MEAN | PS_STAT_FITTED_MEAN_V2 | PS_STAT_FITTED_MEAN_V3))) {
         statsOption = PS_STAT_FITTED_MEAN;
     }
@@ -104 +104 @@
     }
     psF32 **modelData = model->image->data.F32;
+
     assert(model->analysis != NULL);
     psMetadataAdd(model->analysis, PS_LIST_TAIL, "XBIN", PS_DATA_S32 | PS_META_REPLACE,
@@ -164 +165 @@
 
     // patch over bad regions (use average of 8 possible neighbor pixels)
+    // XXX consider testing pixels against the 8 neighbors and replacing outliers...
     float Count = 0;
     float Value = 0;
@@ -199 +201 @@
         }
     }
+
     psLogMsg ("psphot", PS_LOG_MINUTIA, "build median image: %f sec\n", psTimerMark ("psphot"));
 
@@ -218 +221 @@
     if (file) {
         // we are using PSPHOT.BACKGND as an I/O file: select readout or create
-        background = pmFPAviewThisReadout (view, file->fpa);
+        if (file->mode == PM_FPA_MODE_INTERNAL) {
+            background = file->readout;
+        } else {
+            background = pmFPAviewThisReadout (view, file->fpa);
+        }
         if (background == NULL) {
             // readout does not yet exist: create from input