Index: trunk/psastro/src/psastro.h =================================================================== --- trunk/psastro/src/psastro.h (revision 41348) +++ trunk/psastro/src/psastro.h (revision 41367) @@ -156,5 +156,5 @@ psVector *psastroZeroPointReadoutAccum(psVector *dMag, pmReadout *readout, float exptime, float refminMag, float refmaxMag); bool psastroZeroPointAnalysis (psMetadata *header, psVector *dMag, float zeropt, psMetadata *recipe); -bool psastroZeroPointFromRecipe (float *zeropt, float *exptime, float *ghostMaxMag, pmFPA *fpa, psMetadata *recipe); +bool psastroZeroPointFromRecipe (float *zeropt, float *exptime, float *ghostMaxMag, double *glintMaxMag, pmFPA *fpa, psMetadata *recipe); bool psastroZeroPointRefMagLimitFromRecipe (float *refminMag, float *refmaxMag, pmFPA *fpa, psMetadata *recipe); Index: trunk/psastro/src/psastroChooseGlintStars.c =================================================================== --- trunk/psastro/src/psastroChooseGlintStars.c (revision 41348) +++ trunk/psastro/src/psastroChooseGlintStars.c (revision 41367) @@ -37,5 +37,5 @@ // really error-out here? or just skip? - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, NULL, fpa, recipe)) { psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe"); return false; Index: trunk/psastro/src/psastroConvert.c =================================================================== --- trunk/psastro/src/psastroConvert.c (revision 41348) +++ trunk/psastro/src/psastroConvert.c (revision 41367) @@ -65,5 +65,5 @@ // really error-out here? or just skip? - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, NULL, fpa, recipe)) { psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe"); zeropt = 0.0; Index: trunk/psastro/src/psastroExtractGhosts.c =================================================================== --- trunk/psastro/src/psastroExtractGhosts.c (revision 41348) +++ trunk/psastro/src/psastroExtractGhosts.c (revision 41367) @@ -53,5 +53,5 @@ // really error-out here? or just skip? - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, NULL, fpa, recipe)) { psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe"); return false; Index: trunk/psastro/src/psastroExtractStars.c =================================================================== --- trunk/psastro/src/psastroExtractStars.c (revision 41348) +++ trunk/psastro/src/psastroExtractStars.c (revision 41367) @@ -65,5 +65,5 @@ // really error-out here? or just skip? - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, NULL, fpa, recipe)) { psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe"); return false; Index: trunk/psastro/src/psastroLoadCrosstalk.c =================================================================== --- trunk/psastro/src/psastroLoadCrosstalk.c (revision 41348) +++ trunk/psastro/src/psastroLoadCrosstalk.c (revision 41367) @@ -94,5 +94,5 @@ // really error-out here? or just skip? - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, &MAX_MAG, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, &MAX_MAG, NULL, fpa, recipe)) { psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe"); goto escape; Index: trunk/psastro/src/psastroLoadGhosts.c =================================================================== --- trunk/psastro/src/psastroLoadGhosts.c (revision 41348) +++ trunk/psastro/src/psastroLoadGhosts.c (revision 41367) @@ -113,5 +113,13 @@ pmFPAview *view = pmFPAviewAlloc (0); - GET_1D_POLY ("GHOST.MIRROR.RAD", mirrorRad); + //We need to check whether we are dealing with an old style ghost_model, or a new style model. Check if the mirror_rad polynomial exists + float mirCheck = 0; + md = psMetadataLookupMetadata (&status, ghostModel, "GHOST.MIRROR.RAD"); + if (!md) { psLogMsg ("psastro", PS_LOG_INFO, "No ghost mirror_rad polynomial found. Assuming old-style ghost masking"); } + if (md) { + GET_1D_POLY ("GHOST.MIRROR.RAD", mirrorRad); + mirCheck = 1; + } + GET_2D_POLY ("GHOST.CENTER.X", centerX); GET_2D_POLY ("GHOST.CENTER.Y", centerY); @@ -131,5 +139,5 @@ // raise an error if the config is broken - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, &MAX_MAG, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, &MAX_MAG, NULL, fpa, recipe)) { psError(PSASTRO_ERR_CONFIG, true, "failed to load zeropt data from recipe"); goto escape; @@ -179,15 +187,22 @@ ghost->srcFP->y = ref->FP->y; - //TdB: first mirror the reference star positions (around the 0,0 pixel) using the radial offset coefficients and the ghost/star angle double rSrc = hypot (ref->FP->x, ref->FP->y); double theta0 = atan2(ref->FP->y,ref->FP->x); - double ghost_offset_rad = psPolynomial1DEval (mirrorRad, rSrc); - double ghost_x_fpa_mirror = ref->FP->x + ((ref->FP->x*-1.)/abs(ref->FP->x)*abs(cos(theta0)*ghost_offset_rad)); - double ghost_y_fpa_mirror = ref->FP->y + ((ref->FP->y*-1.)/abs(ref->FP->y)*abs(sin(theta0)*ghost_offset_rad)); - - // Now use the mirrored position together with the 2D ghost center fitting to get the actual ghost position in FPA coords - ghost->FP->x = ghost_x_fpa_mirror + psPolynomial2DEval(centerX, ghost_x_fpa_mirror, ghost_y_fpa_mirror); - ghost->FP->y = ghost_y_fpa_mirror + psPolynomial2DEval(centerY, ghost_x_fpa_mirror, ghost_y_fpa_mirror); + if(mirCheck) { + //TdB: first mirror the reference star positions (around the 0,0 pixel) using the radial offset coefficients and the ghost/star angle + double ghost_offset_rad = psPolynomial1DEval (mirrorRad, rSrc); + double ghost_x_fpa_mirror = ref->FP->x + ((ref->FP->x*-1.)/abs(ref->FP->x)*abs(cos(theta0)*ghost_offset_rad)); + double ghost_y_fpa_mirror = ref->FP->y + ((ref->FP->y*-1.)/abs(ref->FP->y)*abs(sin(theta0)*ghost_offset_rad)); + + // Now use the mirrored position together with the 2D ghost center fitting to get the actual ghost position in FPA coords + ghost->FP->x = ghost_x_fpa_mirror + psPolynomial2DEval(centerX, ghost_x_fpa_mirror, ghost_y_fpa_mirror); + ghost->FP->y = ghost_y_fpa_mirror + psPolynomial2DEval(centerY, ghost_x_fpa_mirror, ghost_y_fpa_mirror); + } + if(!mirCheck) { + //Use the old-style ghost position determination + ghost->FP->x = -ref->FP->x + psPolynomial2DEval(centerX, -ref->FP->x, -ref->FP->y); + ghost->FP->y = -ref->FP->y + psPolynomial2DEval(centerY, -ref->FP->x, -ref->FP->y); + } ghost->inner.major = psPolynomial1DEval (innerMajor, rSrc); @@ -210,4 +225,5 @@ ghostChip = psastroFindChip (&ghost->chip->x, &ghost->chip->y, fpa, ghost->FP->x, ghost->FP->y); // fprintf (stderr, "-> model chip position: %f, %f\n", ghost->chip->x, ghost->chip->y); + if (ghostChip) { @@ -356,5 +372,5 @@ // if a filter is defined, but the recipe elements are missing, the config is broken. - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, &MAX_MAG, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, &MAX_MAG, NULL, fpa, recipe)) { psError(PSASTRO_ERR_CONFIG, true, "failed to load zeropt data from recipe"); goto escape; Index: trunk/psastro/src/psastroLoadGlints.c =================================================================== --- trunk/psastro/src/psastroLoadGlints.c (revision 41348) +++ trunk/psastro/src/psastroLoadGlints.c (revision 41367) @@ -26,4 +26,6 @@ bool status; float zeropt, exptime; + psVector *x_glint = psVectorAlloc(2,PS_TYPE_F32); + psVector *y_glint = psVectorAlloc(2,PS_TYPE_F32); psLogMsg ("psastro", PS_LOG_INFO, "determine glint positions"); @@ -39,14 +41,25 @@ if (!REFSTAR_MASK_GLINTS) return true; - // select the limiting magnitude + // select relevant keywords double GLINT_MAX_MAG = psMetadataLookupF32 (&status, recipe, "GLINT_MAX_MAG"); double GLINT_LENGTH_MAG_SLOPE = psMetadataLookupF32 (&status, recipe, "GLINT_LENGTH_MAG_SLOPE"); double GLINT_LENGTH_MAG_ZERO = psMetadataLookupF32 (&status, recipe, "GLINT_LENGTH_MAG_ZERO"); + double glintWidth = psMetadataLookupF32 (&status, recipe, "GLINT_WIDTH"); + double pixelScale = psMetadataLookupF32 (&status, recipe, "PSASTRO.PIXEL.SCALE"); + + //we will use one of the new keywords to differentiate between an old and new style glint treatment + float glintCheck = 0; double GLINT_LENGTH_POS_SLOPE = psMetadataLookupF32 (&status, recipe, "GLINT_LENGTH_POS_SLOPE"); + if (!status) { + psLogMsg ("psastro", PS_LOG_INFO, "Assuming old-style glint masking, given the recipe keywords"); + glintCheck = 1; + } double GLINT_LENGTH_POS_REF = psMetadataLookupF32 (&status, recipe, "GLINT_LENGTH_POS_REF"); + double GLINT_LENGTH_POS_CUT = psMetadataLookupF32 (&status, recipe, "GLINT_LENGTH_POS_CUT"); + double GLINT_LENGTH_MIN_FPA = psMetadataLookupF32 (&status, recipe, "GLINT_LENGTH_MIN_FPA"); + if (!status) GLINT_LENGTH_MIN_FPA=1000.; double GLINT_ANGLE_POS_SLOPE = psMetadataLookupF32 (&status, recipe, "GLINT_ANGLE_POS_SLOPE"); double GLINT_ANGLE_POS_REF = psMetadataLookupF32 (&status, recipe, "GLINT_ANGLE_POS_REF"); - double glintWidth = psMetadataLookupF32 (&status, recipe, "GLINT_WIDTH"); - double pixelScale = psMetadataLookupF32 (&status, recipe, "PSASTRO.PIXEL.SCALE"); + // select the set of glint regions (GLINT.REGION is a MULTI of METADATA items) @@ -70,5 +83,5 @@ // really error-out here? or just skip? - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, &GLINT_MAX_MAG, fpa, recipe)) { psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe"); return false; @@ -79,5 +92,5 @@ float MagOffset = zeropt + 2.5*log10(exptime); GLINT_MAX_MAG += MagOffset; - GLINT_LENGTH_MAG_ZERO += MagOffset; + //GLINT_LENGTH_MAG_ZERO += MagOffset; // select the raw objects for this readout (loaded in psastroExtract.c) @@ -91,5 +104,4 @@ psastroChipBounds (fpa); - // find the possible glint stars, and convert the position to FPA coordinates. // search for stars within the glint regions @@ -97,10 +109,10 @@ pmAstromObj *star = glintStars->data[i]; - if (star->Mag > GLINT_MAX_MAG) continue; // XXX should not be needed... + if (star->Mag > GLINT_MAX_MAG) continue; // project glint star to the focal-plane psProject (star->TP, star->sky, fpa->toSky); psPlaneTransformApply (star->FP, fpa->fromTPA, star->TP); - fprintf (stderr, "glint: %7.2f @ %8.1f, %8.1f (%f %f) %8.1f %8.1f\n", star->Mag, star->FP->x, star->FP->y, star->sky->r * PS_DEG_RAD, star->sky->d * PS_DEG_RAD, star->TP->x,star->TP->y); + //fprintf (stderr, "glint: %7.2f @ %8.1f, %8.1f (%f %f) %8.1f %8.1f\n", star->Mag, star->FP->x, star->FP->y, star->sky->r * PS_DEG_RAD, star->sky->d * PS_DEG_RAD, star->TP->x,star->TP->y); // find the GLINT.REGION this star lands in (if any) @@ -132,22 +144,24 @@ } - double glintLength = GLINT_LENGTH_MAG_SLOPE*(GLINT_LENGTH_MAG_ZERO - star->Mag); + //double glintLength = GLINT_LENGTH_MAG_SLOPE*(GLINT_LENGTH_MAG_ZERO - star->Mag); + //glint length should depend on the brightness on image, i.e. in instrumental mag. The same instrumental mag in different filters should likely give the same glint length. + double glintLength = GLINT_LENGTH_MAG_SLOPE*(GLINT_LENGTH_MAG_ZERO - (star->Mag-MagOffset)); double glintAngle = 0; - //Besides brightness, the length of the glints also depends on the position of the star compared to the focal plane. But, seemingly only for stars closer than 30k pixels - if ((!strcasecmp(glintType, "TOP") || !strcasecmp(glintType, "BOTTOM")) && abs(star->FP->y) < 30000 ){ - glintLength /= GLINT_LENGTH_POS_SLOPE*(GLINT_LENGTH_POS_REF - abs(star->FP->y)); - - } - if ((!strcasecmp(glintType, "LEFT") || !strcasecmp(glintType, "RIGHT")) && abs(star->FP->x) < 30000 ) { - glintLength /= GLINT_LENGTH_POS_SLOPE*(GLINT_LENGTH_POS_REF - abs(star->FP->x)); - } - //also compute the angle of the glint, which depends on position parallel to the FPX - if (!strcasecmp(glintType, "TOP") || !strcasecmp(glintType, "BOTTOM") ){ - glintAngle = PM_RAD_DEG * (GLINT_ANGLE_POS_SLOPE*((GLINT_ANGLE_POS_REF - star->FP->x)/1000.)); - - } - if (!strcasecmp(glintType, "LEFT") || !strcasecmp(glintType, "RIGHT") ) { - glintAngle = PM_RAD_DEG * (GLINT_ANGLE_POS_SLOPE*((GLINT_ANGLE_POS_REF - star->FP->y)/1000.)); + //Besides brightness, the length of the glints also depends on the position of the star compared to the focal plane. But, seemingly only for stars closer than about 30k pixels + if(glintCheck) { + if ((!strcasecmp(glintType, "TOP") || !strcasecmp(glintType, "BOTTOM")) && abs(star->FP->y) < GLINT_LENGTH_POS_CUT ){ + glintLength /= GLINT_LENGTH_POS_SLOPE*(GLINT_LENGTH_POS_REF - abs(star->FP->y)); + } + if ((!strcasecmp(glintType, "LEFT") || !strcasecmp(glintType, "RIGHT")) && abs(star->FP->x) < GLINT_LENGTH_POS_CUT ) { + glintLength /= GLINT_LENGTH_POS_SLOPE*(GLINT_LENGTH_POS_REF - abs(star->FP->x)); + } + //also compute the angle of the glint, which depends on position parallel to the FPX + if (!strcasecmp(glintType, "TOP") || !strcasecmp(glintType, "BOTTOM") ){ + glintAngle = PM_RAD_DEG * (GLINT_ANGLE_POS_SLOPE*((GLINT_ANGLE_POS_REF - star->FP->x)/1000.)); + } + if (!strcasecmp(glintType, "LEFT") || !strcasecmp(glintType, "RIGHT") ) { + glintAngle = PM_RAD_DEG * (GLINT_ANGLE_POS_SLOPE*((GLINT_ANGLE_POS_REF - star->FP->y)/1000.)); + } } @@ -157,7 +171,4 @@ if (!strcasecmp(glintType, "LEFT") && ((star->FP->x + glintLength) < -20000.)) continue; if (!strcasecmp(glintType, "RIGHT") && ((star->FP->x - glintLength) > 20000.)) continue; - - psVector *x_glint = psVectorAlloc(2,PS_TYPE_F32); - psVector *y_glint = psVectorAlloc(2,PS_TYPE_F32); if (!strcasecmp(glintType, "TOP") || !strcasecmp(glintType, "BOTTOM")) { @@ -220,4 +231,6 @@ yFPA1 = yFPA0 + glintLength*cos(glintAngle); } + + if(glintLength < GLINT_LENGTH_MIN_FPA) continue; x_glint->data.F32[0] = xFPA0; @@ -294,7 +307,5 @@ psFree (glints); } - - fprintf (stderr, "glint %s : %d %f,%f to %f,%f (%f %f %f)\n", glintType, nChip, xChip0, yChip0, xChip1, yChip1, glint_length, glintWidth, chip_angle); - psVector *glint = psVectorAlloc(5,PS_TYPE_F32); + psVector *glint = psVectorAlloc(5,PS_TYPE_F32); glint->data.F32[0] = xChip0; glint->data.F32[1] = yChip0; @@ -369,4 +380,6 @@ yFPA1 = yFPA0 + glintLength*sin(glintAngle*-1.); } + + if(glintLength < GLINT_LENGTH_MIN_FPA) continue; x_glint->data.F32[0] = xFPA0; @@ -441,6 +454,4 @@ } - fprintf (stderr, "glint %s : %d %f,%f to %f,%f (%f %f %f)\n", glintType, nChip, xChip0, yChip0, xChip1, yChip1, glint_length, glintWidth, chip_angle); - psVector *glint = psVectorAlloc(5,PS_TYPE_F32); glint->data.F32[0] = xChip0; Index: trunk/psastro/src/psastroMaskUpdates.Mosaic.c =================================================================== --- trunk/psastro/src/psastroMaskUpdates.Mosaic.c (revision 41348) +++ trunk/psastro/src/psastroMaskUpdates.Mosaic.c (revision 41367) @@ -56,5 +56,5 @@ // really error-out here? or just skip? - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, NULL, fpa, recipe)) { psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe"); return false; Index: trunk/psastro/src/psastroMaskUpdates.c =================================================================== --- trunk/psastro/src/psastroMaskUpdates.c (revision 41348) +++ trunk/psastro/src/psastroMaskUpdates.c (revision 41367) @@ -184,5 +184,5 @@ // really error-out here? or just skip? - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, &GHOST_MAX_MAG, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, &GHOST_MAX_MAG, NULL, fpa, recipe)) { psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe"); return false; @@ -443,6 +443,4 @@ //psLogMsg ("psastro", 3, "glint: %f %f %f %f\n", glint->x0, glint->y0, glint->x1, glint->y1); //psastroMaskRectangle (readoutMask->mask, glintMaskValue, glint->x0, glint->y0, glint->x1, glint->y1); - - psLogMsg ("psastro", 3, "glint: %d %f %f %f %f %f\n",i, glint->data.F32[0], glint->data.F32[1],glint->data.F32[2], glint->data.F32[3], glint->data.F32[4]); psastroMaskBox (readoutMask->mask, glintMaskValue, glint->data.F32[0], glint->data.F32[1], glint->data.F32[2], glint->data.F32[3], glint->data.F32[4]); Index: trunk/psastro/src/psastroZeroPoint.c =================================================================== --- trunk/psastro/src/psastroZeroPoint.c (revision 41348) +++ trunk/psastro/src/psastroZeroPoint.c (revision 41367) @@ -55,5 +55,5 @@ // really error-out here? or just skip? - if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, fpa, recipe)) { + if (!psastroZeroPointFromRecipe (&zeropt, &exptime, NULL, NULL, fpa, recipe)) { psLogMsg ("psastro", PS_LOG_INFO, "failed to load zeropt data from recipe"); return false; @@ -480,5 +480,5 @@ return false; } -bool psastroZeroPointFromRecipe (float *zeropt, float *exptime, float *ghostMaxMag, pmFPA *fpa, psMetadata *recipe) { +bool psastroZeroPointFromRecipe (float *zeropt, float *exptime, float *ghostMaxMag, double *glintMaxMag, pmFPA *fpa, psMetadata *recipe) { bool status; @@ -527,4 +527,12 @@ //MEH null is a pain.. so only log if set psLogMsg ("psastro", PS_LOG_INFO, "found GHOST_MAX_MAG %f",*ghostMaxMag); + } + if (glintMaxMag) { + float MaxMag = psMetadataLookupF32 (&status, refItem->data.md, "GLINT_MAX_MAG"); + if (status) { + *glintMaxMag = MaxMag ; + //MEH null is a pain.. so only log if set + psLogMsg ("psastro", PS_LOG_INFO, "found GLINT_MAX_MAG %f",*glintMaxMag); + } } //MEH what zpt is set to