Changeset 20070

Timestamp:

Oct 11, 2008, 11:55:22 AM (18 years ago)

Author:

eugene

Message:

adding psphotReadoutFindPSF

Location:

trunk/psphot/src

Files:

• Makefile.am (modified) (1 diff)
• psphot.h (modified) (2 diffs)
• psphotMergeSources.c (modified) (1 diff)
• psphotReadoutFindPSF.c (added)

trunk/psphot/src/Makefile.am

@@ -27 +27 @@
         psphotDefineFiles.c            \
         psphotReadout.c                \
+        psphotReadoutFindPSF.c         \
         psphotModelBackground.c        \
         psphotSubtractBackground.c     \

trunk/psphot/src/psphot.h

@@ -21 +21 @@
 bool            psphotModelTest (pmConfig *config, const pmFPAview *view, psMetadata *recipe);
 bool            psphotReadout (pmConfig *config, const pmFPAview *view);
+bool            psphotReadoutFindPSF(pmConfig *config, const pmFPAview *view);
 bool            psphotReadoutCleanup (pmConfig *config, pmReadout *readout, psMetadata *recipe, pmDetections *detections, pmPSF *psf, psArray *sources);
 bool            psphotDefineFiles (pmConfig *config, pmFPAfile *input);
@@ -107 +108 @@
 bool            psphotMergeSources (psArray *oldSources, psArray *newSources);
 bool            psphotLoadExtSources (pmConfig *config, const pmFPAview *view, psArray *sources);
+
+pmDetections   *psphotLoadPSFSources (pmConfig *config, const pmFPAview *view);
+
 pmPSF          *psphotLoadPSF (pmConfig *config, const pmFPAview *view, psMetadata *recipe);
 bool            psphotSetHeaderNstars (psMetadata *recipe, psArray *sources);

trunk/psphot/src/psphotMergeSources.c

@@ -51 +51 @@
     return true;
 }
+
+pmDetections *detections = psphotLoadPSFSources (pmConfig *config, const pmFPAview *view) {
+
+    // find the currently selected readout
+    pmReadout  *readout = pmFPAfileThisReadout (config->files, view, "PSPHOT.INPUT.CMF");
+    if (!readout) {
+        psLogMsg ("psphot", 3, "readout not found");
+        return NULL;
+    }
+
+    pmDetections *detections = pmDetectionsAlloc();
+  
+    psArray *sources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
+    if (!sources) {
+        psLogMsg ("psphot", 3, "no psf sources for this readout");
+        return detections;
+    }
+
+    detections->peaks = psArrayAllocEmpty(100);
+
+    for (int i = 0; i < sources->n; i++) {
+        pmSource *source = sources->data[i];
+        pmModel *model = source->modelPSF;
+
+        float xpos = model->params->data.F32[PM_PAR_XPOS];
+        float ypos = model->params->data.F32[PM_PAR_YPOS];
+
+        pmPeak *peak = pmPeakAlloc(xpos, ypos, 1.0, PM_PEAK_LONE);
+        peak->xf = xpos;
+        peak->yf = ypos;
+        peak->flux = 1.0;
+
+        psArrayAdd (detections->peaks, 100, peak);
+        psFree (peak);
+    }
+
+    psLogMsg ("psphot", 3, "%ld PSF sources loaded", detections->peaks->nn);
+
+    return detections;
+}