Changeset 27657 for trunk/psModules

Timestamp:

Apr 11, 2010, 5:08:29 PM (16 years ago)

Author:

eugene

Message:

updates to support psphotStack

Location:

trunk/psModules

Files:

• . (modified) (1 prop)
• src/camera/pmFPAfile.c (modified) (3 diffs)
• src/camera/pmFPAfile.h (modified) (1 diff)
• src/camera/pmFPAfileDefine.c (modified) (2 diffs)
• src/camera/pmFPAfileDefine.h (modified) (1 diff)
• src/objects/Makefile.am (modified) (2 diffs)
• src/objects/pmPeaks.h (modified) (1 diff)
• src/objects/pmPhotObj.c (modified) (2 diffs)
• src/objects/pmPhotObj.h (modified) (1 diff)
• src/objects/pmSource.c (modified) (2 diffs)
• src/objects/pmSource.h (modified) (3 diffs)
• src/psmodules.h (modified) (1 diff)

trunk/psModules/src/camera/pmFPAfile.c

@@ -111 +111 @@
     file->save = false;
 
-    file->index = fileNum++;
+    file->fileIndex = fileNum++;
+    file->fileID = 0;
 
     file->imageId = 0;
@@ -372 +373 @@
         // Number of the file in list
         psString num = NULL;            // Number to use
-        psStringAppend(&num, "%d", file->index);
+        psStringAppend(&num, "%d", file->fileIndex);
         psStringSubstitute(&newRule, num, "{FILE.INDEX}");
+        psFree(num);
+    }
+
+    if (strstr(newRule, "{FILE.ID}")) {
+        // Number of the file in list
+        psString num = NULL;            // Number to use
+        psStringAppend(&num, "%03d", file->fileID);
+        psStringSubstitute(&newRule, num, "{FILE.ID}");
         psFree(num);
     }
@@ -638 +647 @@
     psFree(iter);
 
-    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to find instance %d of file %s", num, name);
+    psLogMsg("psModules.camera", PS_LOG_MINUTIA, "Unable to find instance %d of file %s", num, name);
     return NULL;
 }

trunk/psModules/src/camera/pmFPAfile.h

@@ -111 +111 @@
     psString formatName;                // name of the camera format
 
-    int index;                          // Index of file
+    int fileIndex;                      // Index of file
+    int fileID;                         // internal sequence number
 
     psS64 imageId, sourceId;            // Image and source identifiers

trunk/psModules/src/camera/pmFPAfileDefine.c

@@ -1271 +1271 @@
     file->name = psStringCopy (name);
 
+    // free a previously existing readout
+    psFree(file->readout);
     file->readout = readout;
-    psMetadataAddPtr(files, PS_LIST_TAIL, name, PS_DATA_UNKNOWN, "", file);
+
+    // allow for multiple entries
+    // XXX handle replace vs multiple?
+    psMetadataAddPtr(files, PS_LIST_TAIL, name, PS_DATA_UNKNOWN | PS_META_DUPLICATE_OK, "", file);
     psFree(file);
     // we free this copy of file, but 'files' still has a copy
@@ -1313 +1318 @@
                                 const char *name, // name of internal/external file
                                 const pmFPA *fpa, // use this fpa to generate
-                                const psImageBinning *binning) {
+                                const psImageBinning *binning,
+                                int index) {
   pmReadout *readout = NULL;
 
-  bool status = true;
-  pmFPAfile *file = psMetadataLookupPtr(&status, config->files, name);
+  pmFPAfile *file = pmFPAfileSelectSingle(config->files, name, index);
 
   // if the file does not exist, it is not being used as an I/O file: define an internal version
   if (file == NULL) {
-    readout = pmFPAfileDefineInternal (config->files, name, binning->nXruff, binning->nYruff, PS_TYPE_F32);
-    return readout;
+      // XXX currently, we do not guarantee that the defined file lands on entry 'index'
+      psAssert (binning, "internal files must be supplied a psImageBinning for the output images size"); 
+      readout = pmFPAfileDefineInternal (config->files, name, binning->nXruff, binning->nYruff, PS_TYPE_F32);
+      return readout;
   }
 

trunk/psModules/src/camera/pmFPAfileDefine.h

@@ -172 +172 @@
                                 const char *name, // name of internal/external file
                                 const pmFPA *fpa, // use this fpa to generate
-                                const psImageBinning *binning);
+                                const psImageBinning *binning,
+                                int index
+    );
 
 /// @}

trunk/psModules/src/objects/Makefile.am

@@ -20 +20 @@
         pmModelUtils.c \
         pmSource.c \
+        pmPhotObj.c \
         pmSourceMasks.c \
         pmSourceMoments.c \
@@ -80 +81 @@
         pmModelUtils.h \
         pmSource.h \
+        pmPhotObj.h \
         pmSourceMasks.h \
         pmSourceDiffStats.h \

trunk/psModules/src/objects/pmPeaks.h

@@ -63 +63 @@
     bool assigned;                      ///< is peak assigned to a source?
     pmPeakType type;                    ///< Description of peak.
-    pmFootprint *footprint;     ///< reference to containing footprint
+    pmFootprint *footprint;             ///< reference to containing footprint
 }
 pmPeak;

trunk/psModules/src/objects/pmPhotObj.c

@@ -17 +17 @@
 #include <pslib.h>
 #include "pmPhotObj.h"
+#include "pmSource.h"
 
 static void pmPhotObjFree (pmPhotObj *tmp)
@@ -38 +39 @@
 }
 
+bool pmPhotObjAddSource(pmPhotObj *object, pmSource *source) {
+
+    psAssert (source, "programming error: NULL source");
+    if (!source->peak) {
+        psError(PS_ERR_UNKNOWN, true, "source missing peak");
+        return false; 
+    }
+    if (!finite(source->peak->xf)) {
+        psError(PS_ERR_UNKNOWN, true, "NAN peak coordinate");
+        return false; 
+    }
+    if (!finite(source->peak->yf)) {
+        psError(PS_ERR_UNKNOWN, true, "NAN peak coordinate");
+        return false; 
+    }
+
+    // XXX we should probably use the fitted position if it exists
+    if (!object->sources) {
+        object->sources = psArrayAllocEmpty(1);
+        object->x = source->peak->xf;
+        object->y = source->peak->yf;
+    }
+    psArrayAdd (object->sources, 1, source);
+    return true;
+}

trunk/psModules/src/objects/pmPhotObj.h

@@ -34 +34 @@
  */
 typedef struct {
-  int seq;                            ///< ID for output (generated on write OR set on read)
-  psArray *sources;
+    int id;                            ///< ID for output (generated on write OR set on read)
+    psArray *sources;
+    int flags;
+    float x;
+    float y;
 } pmPhotObj;
+
+bool pmPhotObjAddSource(pmPhotObj *object, pmSource *source);
+pmPhotObj *pmPhotObjAlloc(void);
 
 /// @}
 # endif /* PM_PHOT_OBJ_H */
+

trunk/psModules/src/objects/pmSource.c

@@ -180 +180 @@
     source->type = in->type;
     source->mode = in->mode;
+    source->imageID = in->imageID;
 
     return(source);
@@ -1058 +1059 @@
     psF32 fA = (A->peak == NULL) ? 0 : A->peak->y;
     psF32 fB = (B->peak == NULL) ? 0 : B->peak->y;
+
+    psF32 diff = fA - fB;
+    if (diff > FLT_EPSILON) return (+1);
+    if (diff < FLT_EPSILON) return (-1);
+    return (0);
+}
+
+// sort by X (ascending)
+int pmSourceSortByX (const void **a, const void **b)
+{
+    pmSource *A = *(pmSource **)a;
+    pmSource *B = *(pmSource **)b;
+
+    psF32 fA = (A->peak == NULL) ? 0 : A->peak->x;
+    psF32 fB = (B->peak == NULL) ? 0 : B->peak->x;
 
     psF32 diff = fA - fB;

trunk/psModules/src/objects/pmSource.h

@@ -43 +43 @@
     PM_SOURCE_TMPF_SIZE_MEASURED     = 0x0004,
     PM_SOURCE_TMPF_SIZE_CR_CANDIDATE = 0x0008,
+    PM_SOURCE_TMPF_MOMENTS_MEASURED  = 0x0010,
 } pmSourceTmpF;
 
@@ -90 +91 @@
     pmSourceExtendedPars *extpars;      ///< extended source parameters
     pmSourceDiffStats *diffStats;       ///< extra parameters for difference detections
+    int imageID;
 };
 
@@ -245 +247 @@
 int  pmSourceSortBySN (const void **a, const void **b);
 int  pmSourceSortByY (const void **a, const void **b);
+int  pmSourceSortByX (const void **a, const void **b);
 int  pmSourceSortBySeq (const void **a, const void **b);
 

trunk/psModules/src/psmodules.h

@@ -124 +124 @@
 #include <pmSourceMasks.h>
 #include <pmSource.h>
+#include <pmPhotObj.h>
 #include <pmSourceUtils.h>
 #include <pmSourceIO.h>