Changeset 33851 for trunk/psastro/src/psastroLoadGhosts.c

Timestamp:

May 8, 2012, 5:30:49 PM (14 years ago)

Author:

watersc1

Message:

Crosstalk spike masking and improved ghost model application.

File:

• trunk/psastro/src/psastroLoadGhosts.c (modified) (3 diffs)

trunk/psastro/src/psastroLoadGhosts.c

@@ -128 +128 @@
                 for (int i = 0; i < refstars->n; i++) {
                     pmAstromObj *ref = refstars->data[i];
+                    psTrace("psastro.ghost",5,"Begin ghost %d/%ld: MAX_MAG: %g; ref_mag: %g @ (%.10g,%.10g)",i,refstars->n,MAX_MAG,ref->Mag,ref->sky->r * 180 / M_PI,ref->sky->d * 180.0 / M_PI);
                     if (ref->Mag > MAX_MAG) continue;
 
@@ -163 +164 @@
                     pmChip *ghostChip = psastroFindChip (&ghost->chip->x, &ghost->chip->y, fpa, -ghost->srcFP->x, -ghost->srcFP->y);
                     // fprintf (stderr, "raw chip position: %f, %f ", ghost->chip->x, ghost->chip->y);
-
+                    float ref_chip_x = ghost->chip->x;
+                    float ref_chip_y = ghost->chip->y;
                     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) {
+                      psTrace("psastro.ghost",5,"   in ghost: %d/%ld: ref: (%f,%f) or (%f,%f,%s) ghost: (%f,%f) or (%f,%f,%s) %f inner: (%f,%f,%f) outer: (%f,%f,%f)",
+                              i,refstars->n,
+                              ref->FP->x,ref->FP->y,
+                              ref_chip_x,ref_chip_y,psMetadataLookupStr(NULL,chip->concepts,"CHIP.NAME"),
+                              ghost->FP->x,ghost->FP->y,
+                              ghost->chip->x,ghost->chip->y,psMetadataLookupStr(NULL,ghostChip->concepts,"CHIP.NAME"),
+                              rSrc,
+                              ghost->inner.major,ghost->inner.minor,ghost->inner.theta,
+                              ghost->outer.major,ghost->outer.minor,ghost->outer.theta);
+/*                    psWarning("   GHOST_DATA: %d/%ld: ref: (%f,%f) or (%f,%f,%s) ghost: (%f,%f) or (%f,%f,%s) %f inner: (%f,%f,%f) outer: (%f,%f,%f)", */
+/*                            i,refstars->n, */
+/*                            ref->FP->x,ref->FP->y, */
+/*                            ref_chip_x,ref_chip_y,psMetadataLookupStr(NULL,chip->concepts,"CHIP.NAME"), */
+/*                            ghost->FP->x,ghost->FP->y, */
+/*                            ghost->chip->x,ghost->chip->y,psMetadataLookupStr(NULL,ghostChip->concepts,"CHIP.NAME"), */
+/*                            rSrc, */
+/*                            ghost->inner.major,ghost->inner.minor,ghost->inner.theta, */
+/*                            ghost->outer.major,ghost->outer.minor,ghost->outer.theta); */
+                    }
+                    else {
+                      psTrace("psastro.ghost",5,"   in ghost: %d/%ld: ref: (%f,%f) ghost: (%f,%f) or (%f,%f,%s) inner: (%f,%f,%f) outer: (%f,%f,%f)",
+                              i,refstars->n,
+                              ref->FP->x,ref->FP->y,
+                              ghost->FP->x,ghost->FP->y,
+                              ghost->chip->x,ghost->chip->y,"NONE",
+                              ghost->inner.major,ghost->inner.minor,ghost->inner.theta,
+                              ghost->outer.major,ghost->outer.minor,ghost->outer.theta);
+                    }                 
+                      
+
+                            
                     if (!ghostChip) goto skip;
                     if (!ghostChip->cells) goto skip;
                     if (!ghostChip->cells->n) goto skip;
+
+                    
                     pmCell *ghostCell = ghostChip->cells->data[0];
                     if (!ghostCell) goto skip;
@@ -190 +226 @@
 
                 skip:
+                    
                     psFree (ghost);
                 }