Changeset 14531

Timestamp:

Aug 16, 2007, 8:52:31 AM (19 years ago)

Author:

eugene

Message:

adding input psf

Location:

trunk/ppSim/src

Files:

• ppSimArguments.c (modified) (4 diffs)
• ppSimCreate.c (modified) (1 diff)
• ppSimInsertSource.c (added)
• ppSimInsertSources.c (added)
• ppSimLoadStars.c (modified) (2 diffs)
• ppSimLoop.c (modified) (2 diffs)
• ppSimMakeStars.c (modified) (1 diff)
• ppSimUtils.c (modified) (4 diffs)

trunk/ppSim/src/ppSimArguments.c

@@ -8 +8 @@
 {
     fprintf(stderr, "\nPan-STARRS data simulator\n\n");
-    fprintf(stderr, "Usage: %s -camera CAMERA_NAME\n", program);
+    fprintf(stderr, "Usage: %s -camera CAMERA_NAME (output)\n", program);
     fprintf(stderr, "\n");
     psArgumentHelp(arguments);
@@ -68 +68 @@
     psMetadataAddS32(arguments, PS_LIST_TAIL, "-bin", 0, "Binning in x and y", 1);
 
+    pmConfigFileSetsMD (config->arguments, &argc, argv, "PSPHOT.PSF", "-psf", "-psflist");
+
     if (!config->camera) {
         psErrorStackPrint(stderr, "A camera name must be specified using the -camera option.");
         usage(argv[0], arguments, config);
     }
-
-    if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 2) {
-        usage(argv[0], arguments, config);
-    }
+ 
+    if (!psArgumentParse(arguments, &argc, argv)) { usage (argv[0], arguments, config); }
+
+    if (argc != 2) { usage(argv[0], arguments, config); }
 
     psString formatName = psMetadataLookupStr(NULL, arguments, "-format"); // Name of format
@@ -113 +115 @@
         type = PPSIM_TYPE_OBJECT;
     } else {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised exposure type: %s", typeStr);
+        psErrorStackPrint(stderr, "Unrecognised exposure type: %s", typeStr);
         usage(argv[0], arguments, config);
     }
@@ -179 +181 @@
 
         if (isnan(ra0) || isnan(dec0) || isnan(pa) || isnan(scale) || isnan(zp) || isnan(seeing)) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                    "-ra, -dec, -pa, -scale, -zp, -seeing must be specified for OBJECT type");
+            psErrorStackPrint(stderr, "-ra, -dec, -pa, -scale, -zp, -seeing must be specified for OBJECT type");
             usage(argv[0], arguments, config);
         }

trunk/ppSim/src/ppSimCreate.c

@@ -24 +24 @@
     }
     file->save = true;
+
+    // have we supplied a psf model?
+    if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
+        bool status = false;
+        pmFPAfileBindFromArgs(&status, file, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "Failed to find/build PSPHOT.PSF.LOAD");
+            return status;
+        }
+    }
 
     pmFPALevel phuLevel = pmFPAPHULevel(file->format); // Level at which PHU goes

trunk/ppSim/src/ppSimLoadStars.c

@@ -22 +22 @@
     float radius = 0.5 * PS_MAX(bounds->x1 - bounds->x0, bounds->y1 - bounds->y0) * scale;
     psFree(bounds);
+
+    float x0fpa = 0.5*(bounds->x0 + bounds->x1);
+    float y0fpa = 0.5*(bounds->y0 + bounds->y1);
 
     psMetadataAdd(astroRecipe, PS_LIST_TAIL, "RA_MIN",  PS_DATA_F32 | PS_META_REPLACE, "", ra0 - radius);
@@ -47 +50 @@
 
         // Convert to x,y position on tangent plane, in pixels
-        float div = sin(star->ra) * sin(dec0) + cos(star->dec) * cos(dec0) * cos(star->ra - ra0) / scale;
+        float div = (sin(star->ra) * sin(dec0) + cos(star->dec) * cos(dec0) * cos(star->ra - ra0)) * scale;
         float xi = cos(star->dec) * sin(star->ra - ra0) / div;
         float eta = (sin(star->dec) * cos(dec0) - cos(star->dec) * sin(dec0) * cos(star->ra - ra0)) / div;
 
-        // Apply rotation
-        star->x = cos(pa) * xi - sin(pa) * eta;
-        star->y = sin(pa) * xi + cos(pa) * eta;
+        // Apply rotation, make FPA center of boresite
+        star->x = cos(pa) * xi - sin(pa) * eta + x0fpa;
+        star->y = sin(pa) * xi + cos(pa) * eta + y0fpa;
 
         // Convert magnitude to peak flux

trunk/ppSim/src/ppSimLoop.c

@@ -23 +23 @@
 
     // Add random stars
-    // XXX put this in a wrapper (add to array of stars)
     if (type == PPSIM_TYPE_OBJECT) {
         ppSimMakeStars (stars, fpa, config, rng);
@@ -30 +29 @@
     pmFPAview *view = pmFPAviewAlloc(0);// View for iterating over FPA
 
+    // load any needed files (eg, input image, PSF)
+    if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
+        psError(PSPHOT_ERR_DATA, false, "failed IO for fpa in ppSim\n");
+        psFree(view);
+        return false;
+    }
+
     ppSimUpdateConceptsFPA (fpa, config);
 
     pmChip *chip;                       // Chip from FPA
     while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
+
+        // load any needed files (eg, input image, PSF)
+        if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) {
+            psError(PSPHOT_ERR_DATA, false, "failed IO for chip %d in ppSim\n", view->chip);
+            psFree (view);
+            return false;
+        }
+
+        pmPSF *psf = NULL;
+        if (type == PPSIM_TYPE_OBJECT) {
+            psf = ppSimSetPSF (config);
+        }
 
         pmCell *cell;                   // Cell from chip

trunk/ppSim/src/ppSimMakeStars.c

@@ -63 +63 @@
             ppSimStar *star = ppSimStarAlloc ();
 
-            star->x    = (psRandomUniform(rng) - 0.5) * xSize ; // x position
-            star->y    = (psRandomUniform(rng) - 0.5) * ySize; // y position
+            // make fpa center of distribution
+            star->x    = psRandomUniform(rng) * xSize; // x position
+            star->y    = psRandomUniform(rng) * ySize; // y position
             star->peak = expf((logf(i + 1) - logf(norm)) / starsLum); // Peak flux
+            star->flux = star->peak * sqrt(2.0*M_PI)*seeing;
             stars->data[oldSize + i] = star;
         }
+        stars->n = stars->nalloc;
     }
     return true;

trunk/ppSim/src/ppSimUtils.c

@@ -2 +2 @@
 
 // Generate a header containing WCS keywords
+// this function is called with only one of fpa, chip, cell not NULL
 bool ppSimInitHeader(pmConfig *config,
                      pmFPA *fpa,
@@ -11 +12 @@
     float dec0 = psMetadataLookupF32(NULL, config->arguments, "DEC"); // Boresight Dec (radians)
     float pa = psMetadataLookupF32(NULL, config->arguments, "PA"); // Position angle (radians)
-    float scale = psMetadataLookupF32(NULL, config->arguments, "SCALE") *
-        M_PI / 3600.0 / 180.0; // Plate scale (radians/pixel)
-
-    int x0Chip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.X0");
-    int y0Chip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.Y0");
-    int xParityChip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.XPARITY");
-    int yParityChip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.YPARITY");
-
-    int x0Cell = psMetadataLookupS32(NULL, cell->concepts, "CELL.X0");
-    int y0Cell = psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0");
-    int xParityCell = psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY");
-    int yParityCell = psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY");
+    float scale = psMetadataLookupF32(NULL, config->arguments, "SCALE"); // plate scale in arcsec / pixel
+    scale *= M_PI / 3600.0 / 180.0; // convert plate scale to radians/pixel
 
     int binning = psMetadataLookupS32(NULL, config->arguments, "BINNING"); // Binning in x and y
@@ -29 +20 @@
     int xParity, yParity;
     if (cell) {
+        int x0Chip = psMetadataLookupS32(NULL, cell->parent->concepts, "CHIP.X0");
+        int y0Chip = psMetadataLookupS32(NULL, cell->parent->concepts, "CHIP.Y0");
+        int xParityChip = psMetadataLookupS32(NULL, cell->parent->concepts, "CHIP.XPARITY");
+        int yParityChip = psMetadataLookupS32(NULL, cell->parent->concepts, "CHIP.YPARITY");
+
+        int x0Cell = psMetadataLookupS32(NULL, cell->concepts, "CELL.X0");
+        int y0Cell = psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0");
+        int xParityCell = psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY");
+        int yParityCell = psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY");
+
         x0 = PPSIM_FPA_TO_CELL(0.0, x0Cell, xParityCell, binning, x0Chip, xParityChip);
         y0 = PPSIM_FPA_TO_CELL(0.0, y0Cell, yParityCell, binning, y0Chip, yParityChip);
@@ -35 +36 @@
     }
     if (chip) {
+        int x0Chip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.X0");
+        int y0Chip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.Y0");
+        int xParityChip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.XPARITY");
+        int yParityChip = psMetadataLookupS32(NULL, chip->concepts, "CHIP.YPARITY");
+
         x0 = PPSIM_FPA_TO_CELL(0.0, 0, 1, binning, x0Chip, xParityChip);
         y0 = PPSIM_FPA_TO_CELL(0.0, 0, 1, binning, y0Chip, yParityChip);