Changeset 41348 for trunk/psastro/src/psastroLoadGlints.c

Timestamp:

Apr 28, 2020, 1:26:07 PM (6 years ago)

Author:

tdeboer

Message:

gpc2 dynamic masking set up

File:

• trunk/psastro/src/psastroLoadGlints.c (modified) (8 diffs)

trunk/psastro/src/psastroLoadGlints.c

@@ -152 +152 @@
             }
 
+            //do a rudimentary check of whether the glint enters the pixel FPA
+            if (!strcasecmp(glintType, "TOP")    && ((star->FP->y - glintLength) > 20000.))  continue;
+            if (!strcasecmp(glintType, "BOTTOM") && ((star->FP->y + glintLength) < -20000.))  continue;
+            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);
@@ -179 +184 @@
                         double yFPAs, yFPAe;
                         psastroFindChipYedges (&yFPAs, &yFPAe, fpa, nChip);
+                        if (yFPAs > yFPAe) PS_SWAP (yFPAs, yFPAe);
 
                         xFPA0 = star->FP->x;
@@ -204 +210 @@
                         double yFPAs, yFPAe;
                         psastroFindChipYedges (&yFPAs, &yFPAe, fpa, nChip);
+                        if (yFPAs > yFPAe) PS_SWAP (yFPAs, yFPAe);
 
                         xFPA0 = star->FP->x;
@@ -218 +225 @@
                 x_glint->data.F32[1] = xFPA1;
                 y_glint->data.F32[1] = yFPA1;
+
 
                 //we need to loop over each corner to select the chips that can have the glint on it
@@ -243 +251 @@
                         if (yFPA0 > yFPAe) continue;
                         if (yFPA1 < yFPAs) continue;
+
 
                         //find the y-coord positions for this chip
@@ -322 +331 @@
 
                         // FPA coordinates of intersections with chip edges 
-                        double yFPAs, yFPAe;
-                        psastroFindChipYedges (&yFPAs, &yFPAe, fpa, nChip);
-
-                        xFPA0 = yFPAe;
+                        double xFPAs, xFPAe;
+                        psastroFindChipXedges (&xFPAs, &xFPAe, fpa, nChip);
+                        if (xFPAs > xFPAe) PS_SWAP (xFPAs, xFPAe);
+
+                        xFPA0 = xFPAe;
                         yFPA0 = star->FP->y;
-                        glintLength-= (star->FP->x-yFPAe);
+                        glintLength-= (star->FP->x-xFPAe);
                     }
 
@@ -347 +357 @@
 
                         // FPA coordinates of intersections with chip edges 
-                        double yFPAs, yFPAe;
-                        psastroFindChipYedges (&yFPAs, &yFPAe, fpa, nChip);
-
-                        xFPA0 = yFPAs;
+                        double xFPAs, xFPAe;
+                        psastroFindChipXedges (&xFPAs, &xFPAe, fpa, nChip);
+                        if (xFPAs > xFPAe) PS_SWAP (xFPAs, xFPAe);
+
+                        xFPA0 = xFPAs;
                         yFPA0 = star->FP->y;
-                        glintLength-= (yFPAs-star->FP->x);
+                        glintLength-= (xFPAs-star->FP->x);
                     }
 
@@ -431 +442 @@
                         
                         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;