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

Timestamp:

Jun 5, 2008, 5:16:44 PM (18 years ago)

Author:

eugene

Message:

split fake and force photometry into separate functions and separate mosaicked images

File:

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

branches/eam_branch_20080511/ppSim/src/ppSimLoadSpots.c

@@ -9 +9 @@
     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
 
     bool forcedPhot = psMetadataLookupBool(&status, recipe, "FORCED.PHOT"); // Density of fakes
-    if (!forcedPhot) return true;
+    if (!forcedPhot) {
+        psArray *spots = psArrayAllocEmpty (1);
+        psMetadataAddArray (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
+        return true;
+    }
 
     // We read the catalogue stars using psastroLoadRefstars
@@ -30 +32 @@
 
     char *catdir = psMetadataLookupStr(NULL, recipe, "FORCED.CATDIR");
-    char *photcode = psMetadataLookupStr(NULL, recipe, "FORCED.PHOTCODE");
-    float MAGmax = 100.0;
 
     // Size of FPA
@@ -47 +47 @@
     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);
+    // tell psastroLoadRefstars to ignore photcode and maglim
+    psMetadataAddStr(astroRecipe, PS_LIST_TAIL, "DVO.GETSTAR.PHOTCODE",  PS_META_REPLACE, "", "NONE");
+    psMetadataAddF32(astroRecipe, PS_LIST_TAIL, "DVO.GETSTAR.MAG.MAX",  PS_META_REPLACE, "", NAN);
 
-    psArray *refStars = psastroLoadRefstars(config);
-    if (!refStars || refStars->n == 0) {
+    // load refstars from the catalog
+    psArray *spots = psastroLoadRefstars(config);
+    if (!spots || spots->n == 0) {
         psError(PS_ERR_UNKNOWN, false, "Unable to find reference stars.");
-        psFree(refStars);
+        psFree(spots);
         return false;
     }
-    psLogMsg("ppSim", PS_LOG_INFO, "Adding %ld reference stars", refStars->n);
+    psLogMsg("ppSim", PS_LOG_INFO, "Adding %ld reference stars", spots->n);
 
-    // convert the pmAstromObj sources to the storage format used by the CMF files
-    psArrayRealloc (spots, refStars->n);
-    for (long i = 0; i < refStars->n; i++) {
-        ppSimStar *spot = ppSimStarAlloc ();
-
-        pmAstromObj *ref = refStars->data[i]; // Reference star
-        spot->ra  = ref->sky->r; // RA of star
-        spot->dec = ref->sky->d; // Dec of star
-        spot->mag = ref->Mag;       // Magnitude of star
-
-        // Apply rotation, make FPA center of boresite
-        // convert the ra,dec to x,y using examples in psastro.
-        // spot->x = cos(pa) * xi - sin(pa) * eta + x0fpa;
-        // spot->y = sin(pa) * xi + cos(pa) * eta + y0fpa;
-
-        spots->data[i] = spot;
-
-        psTrace("ppSim", 10, "Adding catalogue star: %.1f,%.1f --> %.2f\n", spot->x, spot->y, ref->Mag);
-    }
+    psMetadataAddArray (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
 
     return true;