Changeset 41173 for trunk/ppSim/src/ppSimLoadStars.c

Timestamp:

Nov 27, 2019, 12:05:20 PM (6 years ago)

Author:

eugene

Message:

merge fixes from EAM dev branch ipp-20191011

File:

• trunk/ppSim/src/ppSimLoadStars.c (modified) (2 diffs)

trunk/ppSim/src/ppSimLoadStars.c

@@ -24 +24 @@
     float pa      = psMetadataLookupF32(NULL, recipe, "PA");        // Position angle (radians)
     float seeing  = psMetadataLookupF32(NULL, recipe, "SEEING");    // Seeing SIGMA (pixels)
-    float scale   = psMetadataLookupF32(NULL, recipe, "PIXEL.SCALE") * M_PI / 3600.0 / 180.0; // Plate scale (radians/pixel)
+    float scale   = psMetadataLookupF32(NULL, recipe, "PIXEL.SCALE"); // Plate scale (arcsec/pixel)
+    float scaleRad = scale * M_PI / 3600.0 / 180.0; // Plate scale in radians/pixel for WCS below
     float expTime = psMetadataLookupF32(NULL, recipe, "EXPTIME");   // Exposure time (sec)
 
     // Size of FPA
     psRegion *bounds = ppSimFPABounds (fpa);
-    float radius = 0.5 * PS_MAX(bounds->x1 - bounds->x0, bounds->y1 - bounds->y0) * scale;
+    float radius = 0.5 * PS_MAX(bounds->x1 - bounds->x0, bounds->y1 - bounds->y0) * scaleRad;
 
     float x0fpa = 0.5*(bounds->x0 + bounds->x1);
@@ -53 +54 @@
     stars = psArrayRealloc (stars, refStars->n);
 
-    psProjection *proj = psProjectionAlloc(ra0, dec0, scale, scale, PS_PROJ_TAN); // Projection
+    psProjection *proj = psProjectionAlloc(ra0, dec0, scaleRad, scaleRad, PS_PROJ_TAN); // Projection
 
     // Conversion loop