Changeset 27838 for branches/tap_branches/psastro/src/psastroConvert.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• psastro/src/psastroConvert.c (modified) (7 diffs)

branches/tap_branches/psastro/src/psastroConvert.c

@@ -1 +1 @@
 /** @file psastroConvert.c
  *
- *  @brief 
+ *  @brief
  *
  *  @ingroup libpsastro
@@ -47 +47 @@
 
     // PSPHOT.SOURCES carries the pmSource objects (from psphot analysis or loaded externally)
-    psArray *sources = psMetadataLookupPtr (NULL, readout->analysis, "PSPHOT.SOURCES");
-    if (sources == NULL)
-        return false;
+    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+    psAssert (detections, "missing detections?");
+
+    psArray *sources = detections->allSources;
+    psAssert (sources, "missing sources?");
 
     // convert the pmSource objects into pmAstromObj objects (drop !STAR and SATSTAR?)
@@ -61 +63 @@
     // XXX need to exit gracefully is inStars->n is 0 (or 1?)
 
-    // we are going to select the brighter Nmax subset for astrometry 
+    // we are going to select the brighter Nmax subset for astrometry
     int nMax = psMetadataLookupS32 (&status, recipe, "PSASTRO.MAX.NRAW");
     if (!status || !nMax) nMax = inStars->n;
 
-    // we are going to select the brighter Nmax subset for astrometry 
+    // we are going to select the brighter Nmax subset for astrometry
     float iMagMax = psMetadataLookupF32 (&status, recipe, "PSASTRO.MAX.INST.MAG.RAW");
     float iMagMin = psMetadataLookupF32 (&status, recipe, "PSASTRO.MIN.INST.MAG.RAW");
 
-    // we are going to select the brighter Nmax subset for astrometry 
+    // we are going to select the brighter Nmax subset for astrometry
     pmSourceMode skip = PM_SOURCE_MODE_DEFAULT;
     char *ignoreList = psMetadataLookupStr (&status, recipe, "PSASTRO.IGNORE");
@@ -75 +77 @@
       psArray *list = psStringSplitArray (ignoreList, ",", false);
       for (int i = 0; i < list->n; i++) {
-        pmSourceMode mode = pmSourceModeFromString (list->data[i]);
-        if (mode == PM_SOURCE_MODE_DEFAULT) {
-          psWarning ("unknown source mode in PSASTRO.IGNORE, skipping");
-          continue;
-        }
-        skip |= mode;
+        pmSourceMode mode = pmSourceModeFromString (list->data[i]);
+        if (mode == PM_SOURCE_MODE_DEFAULT) {
+          psWarning ("unknown source mode in PSASTRO.IGNORE, skipping");
+          continue;
+        }
+        skip |= mode;
       }
       psFree (list);
@@ -97 +99 @@
 
     for (int i = 0; (i < inStars->n) && (j < rawStars->n); i++) {
-        int n = index->data.S32[i];
-        pmSource *source = sources->data[n];
+        int n = index->data.S32[i];
+        pmSource *source = sources->data[n];
 
         psTrace ("psastro", 6, "mag: %f +/- %f, mode: %x, skip: %x\n", source->psfMag, source->errMag, source->mode, skip);
 
-        if (source->mode & skip) { 
-          nModeSkip ++;
-          continue;
-        }
+        if (source->mode & skip) {
+          nModeSkip ++;
+          continue;
+        }
 
-        if ((iMagMax != 0.0) && (source->psfMag > iMagMax)) {
-          nFaintSkip ++;
-          continue;
-        }
-        if ((iMagMin != 0.0) && (source->psfMag < iMagMin)) {
-          nBrightSkip ++;
-          continue;
-        }
-        if (!isfinite(source->psfMag)) {
-          nInfSkip ++;
-          continue;
-        }
-        mMin = PS_MIN (mMin, source->psfMag);
-        mMax = PS_MAX (mMax, source->psfMag);
-        rawStars->data[j] = psMemIncrRefCounter (inStars->data[n]);
-        j++;
+        if ((iMagMax != 0.0) && (source->psfMag > iMagMax)) {
+          nFaintSkip ++;
+          continue;
+        }
+        if ((iMagMin != 0.0) && (source->psfMag < iMagMin)) {
+          nBrightSkip ++;
+          continue;
+        }
+        if (!isfinite(source->psfMag)) {
+          nInfSkip ++;
+          continue;
+        }
+        mMin = PS_MIN (mMin, source->psfMag);
+        mMax = PS_MAX (mMax, source->psfMag);
+        rawStars->data[j] = psMemIncrRefCounter (inStars->data[n]);
+        j++;
     }
     rawStars->n = j;
 
     psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSASTRO.RAWSTARS", PS_DATA_ARRAY, "astrometry objects", rawStars);
+
     psLogMsg ("psastro", 4, "loaded %ld sources, using %ld of %ld good sources (inst mag: %f to %f)\n", sources->n, rawStars->n, inStars->n, mMin, mMax);
     psLogMsg ("psastro", 4, "skip reasons: mode: %d, faint: %d, bright: %d, inf: %d\n", nModeSkip, nFaintSkip, nBrightSkip, nInfSkip);
@@ -146 +149 @@
 
         // only accept the PSF sources?
-        // XXX drop SATSTAR?
+        // XXX drop SATSTAR?
         // if (source->type != PM_SOURCE_TYPE_STAR) continue;
 
@@ -153 +156 @@
 
         psF32 *PAR = model->params->data.F32;
+        psF32 *dPAR = model->dparams->data.F32;
 
         pmAstromObj *obj = pmAstromObjAlloc ();
 
         // is the source magnitude calibrated in any sense?
-        obj->pix->x = PAR[PM_PAR_XPOS];
-        obj->pix->y = PAR[PM_PAR_YPOS];
+        obj->pix->x    = PAR[PM_PAR_XPOS];
+        obj->pix->y    = PAR[PM_PAR_YPOS];
+        obj->pix->xErr = dPAR[PM_PAR_XPOS];
+        obj->pix->yErr = dPAR[PM_PAR_YPOS];
         obj->Mag = source->psfMag;
+        obj->dMag = source->errMag;
 
         // XXX do we have the information giving the readout and cell offset?