Changeset 35038 for trunk/psModules

Timestamp:

Jan 23, 2013, 3:08:32 PM (13 years ago)

Author:

watersc1

Message:

Add READOUT.MASK.FRAC analysis metadata element calculation to pmReadoutMaskApply. Fix typo in pmSourceIO_CMF that doubly defined NPARAMS for DV3. Add configuration/psphotSourceSize parameters to force extended object fits to all sources.

Location:

trunk/psModules/src

Files:

• camera/pmFPAMaskWeight.c (modified) (2 diffs)
• objects/pmSourceIO_CMF.c.in (modified) (1 diff)

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -538 +538 @@
     psF32 **imageData = readout->image->data.F32;// Dereference image
     psF32 **varianceData = readout->variance ? readout->variance->data.F32 : NULL; // Dereference variance map
-
+    float maskFrac = 0.0;
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
             if (maskData[y][x] & maskVal) {
+                maskFrac += 1;
                 imageData[y][x] = NAN;
                 if (varianceData) {
@@ -549 +550 @@
         }
     }
-
+    maskFrac = maskFrac / (1.0 * numRows * numCols);
+    psMetadataAddF32(readout->analysis, PS_LIST_TAIL, "READOUT.MASK.FRAC", PS_META_REPLACE,
+                     "fraction of pixels masked by pmReadoutMaskApply",maskFrac);
     return true;
 }

trunk/psModules/src/objects/pmSourceIO_CMF.c.in

@@ -830 +830 @@
             psMetadataAddF32 (row, PS_LIST_TAIL, "KRON_MAG",         0, "Kron Mag",                                   kronMag);
 
-            @PS1_DV1,PS1_DV2@ psMetadataAddF32 (row, PS_LIST_TAIL, "NPARAMS",          0, "number of model parameters",                 model->params->n);
+            @PS1_DV0,PS1_DV1@ psMetadataAddF32 (row, PS_LIST_TAIL, "NPARAMS",          0, "number of model parameters",                 model->params->n);
             @ALL,!PS1_DV0,!PS1_DV1@ psMetadataAddS32 (row, PS_LIST_TAIL, "NPARAMS",          0, "number of model parameters",                 model->params->n);
             psMetadataAddStr (row, PS_LIST_TAIL, "MODEL_TYPE",       0, "name of model",                              pmModelClassGetName (model->type));