Changeset 29914

Timestamp:

Dec 5, 2010, 2:23:08 PM (15 years ago)

Author:

eugene

Message:

support for ppSub forced photometry

Location:

branches/eam_branches/ipp-20101103/psphot

Files:

• . (modified) (1 prop)
• src/Makefile.am (modified) (1 diff)
• src/psphot.h (modified) (3 diffs)
• src/psphotEfficiency.c (modified) (1 diff)
• src/psphotMergeSources.c (modified) (1 diff)
• src/psphotOutput.c (modified) (3 diffs)
• src/psphotParseCamera.c (modified) (1 diff)
• src/psphotRadiusChecks.c (modified) (1 diff)
• src/psphotReadout.c (modified) (1 diff)
• src/psphotReadoutForcedKnownSources.c (added)

branches/eam_branches/ipp-20101103/psphot/src/Makefile.am

@@ -125 +125 @@
         psphotReadoutFindPSF.c         \
         psphotReadoutKnownSources.c    \
+        psphotReadoutForcedKnownSources.c    \
         psphotReadoutMinimal.c         \
         psphotModelBackground.c        \

branches/eam_branches/ipp-20101103/psphot/src/psphot.h

@@ -27 +27 @@
 bool            psphotReadoutFindPSF(pmConfig *config, const pmFPAview *view, const char *filerule, psArray *inSources);
 bool            psphotReadoutKnownSources(pmConfig *config, const pmFPAview *view, const char *filerule, psArray *inSources);
+bool            psphotReadoutForcedKnownSources(pmConfig *config, const pmFPAview *view, const char *filerule, psArray *inSources);
 bool            psphotReadoutMinimal(pmConfig *config, const pmFPAview *view, const char *filerule);
 
@@ -312 +313 @@
 int psphotFileruleCount(const pmConfig *config, const char *filerule);
 
+bool psphotAddKnownSources (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *inSources);
+
+
 /**** psphotStack prototypes ****/
 
@@ -434 +438 @@
 pmModel *psphotFitPCM (pmReadout *readout, pmSource *source, pmSourceFitOptions *fitOptions, pmModelType modelType, psImageMaskType maskVal, psImageMaskType markVal, int psfSize);
 
+bool psphotCleanInputs (pmConfig *config, const pmFPAview *view, const char *filerule);
+
 #endif

branches/eam_branches/ipp-20101103/psphot/src/psphotEfficiency.c

@@ -511 +511 @@
     psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, PM_DETEFF_ANALYSIS, PS_META_REPLACE | PS_DATA_UNKNOWN,
                      "Detection efficiency", de);
+    psMetadataAddF32(readout->analysis, PS_LIST_TAIL, "DETEFF.MAGREF", 
+        PS_META_REPLACE, "Magnitude reference", magLim);
+
     psFree(de);
 

branches/eam_branches/ipp-20101103/psphot/src/psphotMergeSources.c

@@ -163 +163 @@
 }
 
+// copy the known sources (as external) to the detection list of the given filerule
+bool psphotAddKnownSources (pmConfig *config, const pmFPAview *view, const char *filerule, psArray *inSources) {
+
+    bool status = false;
+
+    // select the appropriate recipe information
+    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSPHOT_RECIPE);
+    psAssert (recipe, "missing recipe?");
+
+    // determine properties (sky, moments) of initial sources
+    float OUTER = psMetadataLookupF32 (&status, recipe, "SKY_OUTER_RADIUS");
+    psAssert (status, "missing SKY_OUTER_RADIUS in recipe?");
+
+    // XXX this seems like an arbitrary number...
+    OUTER = PS_MAX(OUTER, 20.0); // XXX Guarantee that we can encompass the max moments radius
+
+    // find the currently selected readout 
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, 0); // File of interest
+    psAssert (file, "missing file?");
+
+    pmReadout *readout = pmFPAviewThisReadout(view, file->fpa);
+    psAssert (readout, "missing readout?");
+
+    pmDetections *detections = psMetadataLookupPtr (&status, readout->analysis, "PSPHOT.DETECTIONS");
+    if (!detections) {
+        detections = pmDetectionsAlloc();
+        detections->newSources = psArrayAllocEmpty (100);
+        // save detections on the readout->analysis
+        if (!psMetadataAddPtr (readout->analysis, PS_LIST_TAIL, "PSPHOT.DETECTIONS", PS_META_REPLACE | PS_DATA_UNKNOWN, "psphot detections", detections)) {
+            psError (PSPHOT_ERR_CONFIG, false, "problem saving detections on readout");
+            return false;
+        }
+    } else {
+        psMemIncrRefCounter(detections); // so we can free the detections below
+    }
+
+    // copy the sources from inSources to the new detection structure
+    for (int i = 0; i < inSources->n; i++) {
+      pmSource *inSource = inSources->data[i];
+
+      pmSource *newSource = pmSourceCopy(inSource);
+      newSource->mode |= PM_SOURCE_MODE_EXTERNAL;
+      
+      // drop the loaded source modelPSF
+      psFree (newSource->modelPSF);
+      // source->modelPSF = NULL;  check this!
+
+      // drop the references to the original image pixels:
+      pmSourceFreePixels (newSource);
+
+      // allocate image, weight, mask for the new image for each peak (square of radius OUTER)
+      pmSourceDefinePixels (newSource, readout, newSource->peak->x, newSource->peak->y, OUTER);
+
+      newSource->imageID = 0;
+      // XXX reset the source ID? raised questions about the meaning of this ID...
+      // P_PM_SOURCE_SET_ID(source, i);
+
+      psArrayAdd (detections->newSources, 100, newSource);
+    }
+    psLogMsg ("psphot", 3, "%ld known sources supplied", detections->newSources->n);
+
+    psFree (detections);
+    return true;
+}
+
 // extract the input sources corresponding to this readout
 // XXX this function needs to be updated to work with the new context of psphot inputs

branches/eam_branches/ipp-20101103/psphot/src/psphotOutput.c

@@ -9 +9 @@
     psStringAppend(&name, "%s.NUM", filerule);
     int num = psMetadataLookupS32 (&status, config->arguments, name);
-    psAssert (status, "programming error: must define %s", name);
+    if (!status) {
+      // we only explicitly define (filerule.NUM) if we have more than 1
+      num = 1;
+    }
     psFree (name);
     return num;
@@ -125 +128 @@
     }
     fclose (f);
+    return true;
+}
+
+bool psphotCleanInputsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index);
+bool psphotCleanInputs (pmConfig *config, const pmFPAview *view, const char *filerule) {
+
+    int num = psphotFileruleCount(config, filerule);
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+        if (!psphotCleanInputsReadout (config, view, filerule, i)) {
+          psError (PSPHOT_ERR_CONFIG, false, "failed to clean inputs for %s entry %d", filerule, i);
+            return false;
+        }
+    }
+    return true;
+}
+
+bool psphotCleanInputsReadout (pmConfig *config, const pmFPAview *view, const char *filerule, int index) {
+
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, filerule, index); // File of interest
+    PS_ASSERT (file, false);
+
+    pmReadout  *readout = pmFPAviewThisReadout (view, file->fpa);
+
+    // XXX anything else to remove?
+    if (psMetadataLookup(readout->analysis, "PSPHOT.DETECTIONS")) {
+        psMetadataRemoveKey(readout->analysis, "PSPHOT.DETECTIONS");
+    }
+
     return true;
 }
@@ -282 +315 @@
     psMetadataItemSupplement (&status, header, analysis, "MSKY_NY");
 
+    psMetadataItemSupplement (&status, header, analysis, "DETEFF.MAGREF");
+
     psMetadataAddF32 (header, PS_LIST_TAIL, "DT_PHOT", PS_META_REPLACE, "elapsed psphot time", psTimerMark ("psphotReadout"));
 

branches/eam_branches/ipp-20101103/psphot/src/psphotParseCamera.c

@@ -39 +39 @@
         return NULL;
     }
-    // specify the number of psphot input images
-    psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", 1);
 
     // define the additional input/output files associated with psphot

branches/eam_branches/ipp-20101103/psphot/src/psphotRadiusChecks.c

@@ -135 +135 @@
     EXT_FIT_MAX_RADIUS = psMetadataLookupF32 (&status, recipe, "EXT_FIT_MAX_RADIUS");
 
-    float skyMean  = psMetadataLookupF32 (&status, readout->analysis, "SKY_MEAN");
     float skyStdev = psMetadataLookupF32 (&status, readout->analysis, "SKY_STDEV");
-
-    fprintf (stderr, "sky: %f +/- %f\n", skyMean, skyStdev);
 
     EXT_FIT_SKY_SIG = skyStdev;

branches/eam_branches/ipp-20101103/psphot/src/psphotReadout.c

@@ -27 +27 @@
     psAssert (breakPt, "configuration error: set BREAK_POINT");
 
+    // remove cruft from the input analysis structure
+    if (!psphotCleanInputs (config, view, filerule)) {
+        psError (PSPHOT_ERR_PROG, false, "trouble setting up the inputs");
+        return false;
+    }
+
     // set the photcode for this image
     if (!psphotAddPhotcode (config, view, filerule)) {