Changeset 33851 for trunk/psastro/src/psastroMaskUpdates.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/psastroMaskUpdates.c (modified) (1 diff)

trunk/psastro/src/psastroMaskUpdates.c

@@ -406 +406 @@
                     // XXX for now, assume cell binning is 1x1 relative to chip
                     psastroMaskCircle (readoutMask->mask, crosstalkMaskValue, ref->chip->x, ref->chip->y, radius, radius);
+                  }
+                }
+                // Crosstalk Bleeds
+                psArray *bleedcrosstalks = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.CROSSTALKS.SPIKES");
+                if (bleedcrosstalks) {
+                  for (int i = 0; i < bleedcrosstalks->n; i++) {
+                    pmAstromObj *ref = bleedcrosstalks->data[i];
+                    float width = REFSTAR_MASK_BLEED_MAG_SLOPE * (REFSTAR_MASK_BLEED_MAG_MAX - ref->Mag);
+                    psTrace("psastro.crosstalk",2,"Masking spike on Chip %s @ (%f,%f) Magnitude: %f Radius %f\n",
+                            psMetadataLookupStr(&status,readout->parent->parent->concepts,"CHIP.NAME"),
+                            ref->chip->x,ref->chip->y,ref->Mag,width);
+                    // XXX for now, assume cell binning is 1x1 relative to chip
+                    pmCell *refCell = pmCellInChip(refChip,ref->chip->x,ref->chip->y);
+                    if (refCell) {
+                      float xCell = 0.0;
+                      float yCell = 0.0;
+                      pmCellCoordsForChip (&xCell, &yCell, refCell, ref->chip->x, ref->chip->y);
+                      int ySize = psMetadataLookupS32(NULL,refCell->concepts,"CELL.YSIZE");
+/*                    psWarning("Masking CTspike on Chip %s @ (%f,%f) Magnitude: %f (%f %f) Radius %f Z: %d %d %d %d\n", */
+/*                              psMetadataLookupStr(&status,readout->parent->parent->concepts,"CHIP.NAME"), */
+/*                              ref->chip->x,ref->chip->y,ref->Mag,REFSTAR_MASK_BLEED_MAG_SLOPE,REFSTAR_MASK_BLEED_MAG_MAX,width, */
+/*                              (int) (ref->chip->x - 0.5 * width),   (int) (ref->chip->y - yCell), */
+/*                              (int) (ref->chip->x+0.5 * width + 1), (int) (ref->chip->y + (ySize - yCell))); */
+                      psastroMaskRectangle (readoutMask->mask, crosstalkMaskValue,
+                                            (int) (ref->chip->x - 0.5 * width),   (int) (ref->chip->y - yCell),
+                                            (int) (ref->chip->x+0.5 * width + 1), (int) (ref->chip->y + (ySize - yCell)));
+                    }
                   }
                 }