Changeset 17935 for branches/eam_branch_20080511/ppSim/src/ppSimLoadSpots.c

Timestamp:

Jun 5, 2008, 3:29:09 AM (18 years ago)

Author:

eugene

Message:

added forced photometry code; compiles, not tested

File:

• branches/eam_branch_20080511/ppSim/src/ppSimLoadSpots.c (modified) (5 diffs)

branches/eam_branch_20080511/ppSim/src/ppSimLoadSpots.c

@@ -1 +1 @@
 # include "ppSim.h"
 
-// need to specify an alternative CATDIR for the force positions
-bool ppSimLoadSpots (psArray *spots, pmFPA *fpa, pmConfig *config) {
+// Load the relevant forced-photometry positions for this field.  This function does not determine
+// the pixel coordinates, merely the celestial coordinates for sources in the general vicinity.  The
+// sources are saved on the fpa->analysis metadata as FORCED.SPOTS.  We always create an entry; it
+// will be empty if no sources were selected or forced photometry is not desired.
+bool ppSimLoadSpots (pmFPA *fpa, pmConfig *config) {
 
     bool status;
+
+    psArray *spots = psArrayAllocEmpty (1);
+    psMetadataAddPtr (fpa->analysis, PS_LIST_TAIL, "FORCED.SPOTS", PS_META_REPLACE, "forced photometry positions", spots);
+    psFree (spots); // free the extra (local) reference; a copy remains on fpa->analysis
 
     psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, PPSIM_RECIPE); // Recipe
@@ -15 +22 @@
     if (!astroRecipe) {
         psError(PSASTRO_ERR_CONFIG, false, "Can't find recipe %s", PSASTRO_RECIPE);
-        return NULL;
+        return false;
     }
 
@@ -22 +29 @@
     float scale   = psMetadataLookupF32(NULL, recipe, "PIXEL.SCALE") * M_PI / 3600.0 / 180.0; // Plate scale (radians/pixel)
 
+    char *catdir = psMetadataLookupStr(NULL, recipe, "FORCED.CATDIR");
+    char *photcode = psMetadataLookupStr(NULL, recipe, "FORCED.PHOTCODE");
+    float MAGmax = 100.0;
+
     // Size of FPA
     psRegion *bounds = ppSimFPABounds (fpa);
@@ -27 +38 @@
     psFree(bounds);
 
-    float x0fpa = 0.5*(bounds->x0 + bounds->x1);
-    float y0fpa = 0.5*(bounds->y0 + bounds->y1);
+    // modify the PSASTRO recipe to use the values desired for FORCED.PHOT.  we can use a view on
+    // the PSASTRO recipe because we are not calling psastro elsewhere in this program.  XXX need to
+    // use the WCS to define the overlap region
+    psMetadataAddStr(astroRecipe, PS_LIST_TAIL, "DVO.CATDIR",  PS_META_REPLACE, "", catdir);
+    psMetadataAddF32(astroRecipe, PS_LIST_TAIL, "RA_MIN",  PS_META_REPLACE, "", ra0 - radius);
+    psMetadataAddF32(astroRecipe, PS_LIST_TAIL, "RA_MAX",  PS_META_REPLACE, "", ra0 + radius);
+    psMetadataAddF32(astroRecipe, PS_LIST_TAIL, "DEC_MIN", PS_META_REPLACE, "", dec0 - radius);
+    psMetadataAddF32(astroRecipe, PS_LIST_TAIL, "DEC_MAX", PS_META_REPLACE, "", dec0 + radius);
+    
+    // XXX these two values are somewhat bogus: can we have psastroLoadRefstars optionally ignore photcode and MAGmax?
+    psMetadataAddStr(astroRecipe, PS_LIST_TAIL, "DVO.GETSTAR.PHOTCODE",  PS_META_REPLACE, "", photcode);
+    psMetadataAddF32(astroRecipe, PS_LIST_TAIL, "DVO.GETSTAR.MAG.MAX",  PS_META_REPLACE, "", MAGmax);
 
-    // XXX need to use the WCS to define the overlap region
-    psMetadataAdd(astroRecipe, PS_LIST_TAIL, "RA_MIN",  PS_DATA_F32 | PS_META_REPLACE, "", ra0 - radius);
-    psMetadataAdd(astroRecipe, PS_LIST_TAIL, "RA_MAX",  PS_DATA_F32 | PS_META_REPLACE, "", ra0 + radius);
-    psMetadataAdd(astroRecipe, PS_LIST_TAIL, "DEC_MIN", PS_DATA_F32 | PS_META_REPLACE, "", dec0 - radius);
-    psMetadataAdd(astroRecipe, PS_LIST_TAIL, "DEC_MAX", PS_DATA_F32 | PS_META_REPLACE, "", dec0 + radius);
     psArray *refStars = psastroLoadRefstars(config);
     if (!refStars || refStars->n == 0) {
         psError(PS_ERR_UNKNOWN, false, "Unable to find reference stars.");
         psFree(refStars);
-        return NULL;
+        return false;
     }
     psLogMsg("ppSim", PS_LOG_INFO, "Adding %ld reference stars", refStars->n);
 
     // convert the pmAstromObj sources to the storage format used by the CMF files
-
-    long oldSize = spots->n;
-    spots = psArrayRealloc (spots, oldSize + refStars->n);
-
-    // Conversion loop
+    psArrayRealloc (spots, refStars->n);
     for (long i = 0; i < refStars->n; i++) {
         ppSimStar *spot = ppSimStarAlloc ();
@@ -62 +74 @@
         // spot->y = sin(pa) * xi + cos(pa) * eta + y0fpa;
 
-        spots->data[oldSize + i] = star;
+        spots->data[i] = spot;
 
         psTrace("ppSim", 10, "Adding catalogue star: %.1f,%.1f --> %.2f\n", spot->x, spot->y, ref->Mag);
     }
 
-    // XXX these need to be saved on PSPHOT.INPUT.CMF
     return true;
 }