Changeset 35560 for trunk/psModules/src/objects/pmSourceIO.c

Timestamp:

May 9, 2013, 12:19:21 PM (13 years ago)

Author:

eugene

Message:

do not crash psphot if variance is not supplied; include mask and mark in modelGuess functions (needed for trail angle guess); fix Reff sx,sy,sxx relationships; define new function to measure guess at the trail angle; tell pmSourceIO if MATCHED_REFS have been read (& skip); do not read sources for WCS type

File:

• trunk/psModules/src/objects/pmSourceIO.c (modified) (3 diffs)

trunk/psModules/src/objects/pmSourceIO.c

@@ -980 +980 @@
             return false;
         }
+
         // if this is not TRUE, the output files only contain the psf measurements.
         bool XSRC_OUTPUT = psMetadataLookupBool(&status, recipe, "EXTENDED_SOURCE_ANALYSIS");
@@ -1005 +1006 @@
             hdu->header = psFitsReadHeader (NULL, file->fits);
         }
+
+        // "WCS" is CMF without detected objects
+        if (file->type == PM_FPA_FILE_WCS) {
+          psTrace("psModules.objects", 6, "read CMF table from %s : %s : %s", file->filename, headname, dataname);
+          psFree (headname);
+          psFree (dataname);
+          psFree (deteffname);
+          break;
+        }
+
+        // EXTDATA is the PSF data associated with this image header
 
         // we need to find the corresponding table EXTNAME.
@@ -1126 +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;