Changeset 35516

Timestamp:

May 6, 2013, 9:14:00 AM (13 years ago)

Author:

eugene

Message:

when reading a cmf files, if we have already read sources into this pmFPAfile, we will replace the old sources with the new ones

Location:

branches/eam_branches/ipp-20130419/psModules/src

Files:

• camera/pmFPAfileIO.c (modified) (1 diff)
• objects/pmSourceIO.c (modified) (1 diff)

branches/eam_branches/ipp-20130419/psModules/src/camera/pmFPAfileIO.c

@@ -382 +382 @@
     // (existing) fpa
     if (file->type == PM_FPA_FILE_CMF) {
-        if (!pmFPAviewCheckDataStatusForSources (view, file)) {
-        psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
-        return true;
-      }
+        if (!pmFPAviewCheckDataStatusForSources (view, file)) {
+            psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name);
+            return true;
+        }
     }
     if (file->type == PM_FPA_FILE_PSF) {

branches/eam_branches/ipp-20130419/psModules/src/objects/pmSourceIO.c

@@ -1138 +1138 @@
     readout->data_exists = true;
 
+    // if we have a prior set of detections on this readout, we will replace them here
     pmDetections *detections = pmDetectionsAlloc();
     detections->allSources = sources;
-    status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_DATA_ARRAY, "input sources", detections);
+    status = psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_DATA_ARRAY | PS_META_REPLACE, "input sources", detections);
     psFree (detections);
     return true;