Changeset 12600

Timestamp:

Mar 27, 2007, 9:04:23 AM (19 years ago)

Author:

eugene

Message:

more PS_ASSERTs; PS_META_REPLACE for binning addition

File:

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

trunk/psphot/src/psphotImageMedian.c

@@ -94 +94 @@
     psImageBinningSetRuffSize(binning, PS_IMAGE_BINNING_CENTER);
     psImageBinningSetSkip(binning, image);
-    status = psMetadataAddPtr(recipe, PS_LIST_TAIL, "PSPHOT.BACKGROUND.BINNING", PS_DATA_UNKNOWN, "Background binning", binning);
-    if (!status) {
-        psError (PSPHOT_ERR_PROG, false, "failed to save bininnng");
-        return false;
-    }
+    status = psMetadataAddPtr(recipe, PS_LIST_TAIL, "PSPHOT.BACKGROUND.BINNING", PS_DATA_UNKNOWN | PS_META_REPLACE, "Background binning", binning);
+    PS_ASSERT (status, false);
 
     // we save the binning structure for use in psphotMagnitudes
@@ -121 +118 @@
                 pmFPAfileCopyStructureView (file->fpa, inFPA, binning->nXbin, binning->nYbin, view);
                 model = pmFPAviewThisReadout (view, file->fpa);
-                assert (binning->nXruff == model->image->numCols);
-                assert (binning->nYruff == model->image->numRows);
+                PS_ASSERT (binning->nXruff == model->image->numCols, false);
+                PS_ASSERT (binning->nYruff == model->image->numRows, false);
             }
         }
@@ -227 +224 @@
     psStats *statsBck = psStatsAlloc (PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV | PS_STAT_MIN | PS_STAT_MAX);
     psImageStats (statsBck, model->image, NULL, 0);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_MEAN", PS_DATA_F32 | PS_META_REPLACE, "sky model mean",          statsBck->sampleMean);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "SKYSTDEV", PS_DATA_F32 | PS_META_REPLACE, "sky model stdev",         statsBck->sampleStdev);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_MAX",  PS_DATA_F32 | PS_META_REPLACE, "sky model maximum value", statsBck->max);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_MIN",  PS_DATA_F32 | PS_META_REPLACE, "sky model minimum value", statsBck->min);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_NX",   PS_DATA_S32 | PS_META_REPLACE, "sky model size (x)",      model->image->numCols);
-    psMetadataAdd (recipe, PS_LIST_TAIL, "SKY_NY",   PS_DATA_S32 | PS_META_REPLACE, "sky model size (y)",      model->image->numRows);
+    psMetadataAddF32 (recipe, PS_LIST_TAIL, "SKY_MEAN", PS_META_REPLACE, "sky model mean",          statsBck->sampleMean);
+    psMetadataAddF32 (recipe, PS_LIST_TAIL, "SKYSTDEV", PS_META_REPLACE, "sky model stdev",         statsBck->sampleStdev);
+    psMetadataAddF32 (recipe, PS_LIST_TAIL, "SKY_MAX",  PS_META_REPLACE, "sky model maximum value", statsBck->max);
+    psMetadataAddF32 (recipe, PS_LIST_TAIL, "SKY_MIN",  PS_META_REPLACE, "sky model minimum value", statsBck->min);
+    psMetadataAddS32 (recipe, PS_LIST_TAIL, "SKY_NX",   PS_META_REPLACE, "sky model size (x)",      model->image->numCols);
+    psMetadataAddS32 (recipe, PS_LIST_TAIL, "SKY_NY",   PS_META_REPLACE, "sky model size (y)",      model->image->numRows);
     psLogMsg ("psphot", PS_LOG_INFO, "background sky : min %f mean %f max %f stdev %f", 
               statsBck->min, statsBck->sampleMean, statsBck->max, statsBck->sampleStdev);