Changeset 34838 for branches/eam_branches/ipp-20121130/psphot/src/psphotOutput.c

Timestamp:

Dec 18, 2012, 5:56:48 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121130/psphot

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/psphotOutput.c (modified) (4 diffs)

branches/eam_branches/ipp-20121130/psphot/src/psphotOutput.c

@@ -201 +201 @@
     int nCR  = 0;
     int nEXT = 0;
+    int nForced = 0;
+    int nDetections = sources != NULL ? sources->n : 0;
 
     // count the number of sources which will be written and other sub-types
     for (int i = 0; (sources != NULL) && (i < sources->n); i++) {
         pmSource *source = (pmSource *) sources->data[i];
+        if (source->mode2 & PM_SOURCE_MODE2_MATCHED) {
+            nForced ++;
+        }
         pmModel *model = pmSourceGetModel (NULL, source);
         if (model == NULL)
@@ -217 +222 @@
     }
 
+    // XXX: This loop cauess nSrc to be twice as large as it should be. This is kept
+    // for compatability
     for (int i = 0; (sources != NULL) && (i < sources->n); i++) {
         pmSource *source = (pmSource *) sources->data[i];
@@ -226 +233 @@
 
     psMetadataAddS32 (header, PS_LIST_TAIL, "NSTARS",   PS_META_REPLACE, "Number of sources", nSrc);
+    psMetadataAddS32 (header, PS_LIST_TAIL, "NDET",     PS_META_REPLACE, "Number of detections", nDetections);
     psMetadataAddS32 (header, PS_LIST_TAIL, "NDET_EXT", PS_META_REPLACE, "Number of extended sources", nEXT);
     psMetadataAddS32 (header, PS_LIST_TAIL, "NDET_CR",  PS_META_REPLACE, "Number of cosmic rays", nCR);
+    psMetadataAddS32 (header, PS_LIST_TAIL, "NDET_FRC", PS_META_REPLACE, "Number of Forced detections", nForced);
     return true;
 }
@@ -306 +315 @@
     psMetadataItemSupplement (&status, header, analysis, "NSTARS");
 
+    psMetadataItemSupplement (&status, header, analysis, "NDET");
     psMetadataItemSupplement (&status, header, analysis, "NDET_EXT");
     psMetadataItemSupplement (&status, header, analysis, "NDET_CR");
+    psMetadataItemSupplement (&status, header, analysis, "NDET_FRC");
 
     psMetadataItemSupplement (&status, header, analysis, "PSPHOT.PSF.APRESID");