Changeset 26173 for trunk

Timestamp:

Nov 17, 2009, 2:19:04 PM (17 years ago)

Author:

watersc1

Message:

Crosstalk Masking implementation, based on the rules defined by John Tonry.

Location:

trunk

Files:

• ippconfig/gpc1/psastro.config (modified) (1 diff)
• ippconfig/recipes/psastro.config (modified) (2 diffs)
• psastro/src/Makefile.am (modified) (1 diff)
• psastro/src/psastro.h (modified) (1 diff)
• psastro/src/psastroLoadCrosstalk.c (added)
• psastro/src/psastroMaskUpdates.c (modified) (5 diffs)

trunk/ippconfig/gpc1/psastro.config

@@ -227 +227 @@
 END
 
+REFSTAR_MASK_CROSSTALK_MAG_SLOPE F32   3.44
+REFSTAR_MASK_CROSSTALK_MAG_MAX   F32 -14.47
+CROSSTALK_MAX_MAG                F32  20.0
+CROSSTALK_MASK                   BOOL TRUE

trunk/ippconfig/recipes/psastro.config

@@ -144 +144 @@
 END
 
+REFSTAR_MASK_CROSSTALK_MAG_SLOPE F32 3.44
+REFSTAR_MASK_CROSSTALK_MAG_MAX   F32 -14.47
+CROSSTALK_MAX_MAG    F32  20.0
+CROSSTALK_MASK       BOOL FALSE
+
 EXTRACT_MAX_MAG                 F32 -15.0
 
@@ -206 +211 @@
 PR_RECIPE METADATA
 END
+

trunk/psastro/src/Makefile.am

@@ -90 +90 @@
         psastroMaskUtils.c          \
         psastroChooseGlintStars.c   \
+        psastroLoadCrosstalk.c \
         psastroLoadGlints.c   \
         psastroLoadGhosts.c         \

trunk/psastro/src/psastro.h

@@ -75 +75 @@
 bool              psastroLoadGlints (pmConfig *config);
 bool              psastroChooseGlintStars (pmConfig *config, psArray *refs, const char *source);
+
+bool              psastroLoadCrosstalk (pmConfig *config);
 
 psArray          *psastroLoadRefstars (pmConfig *config, const char *source);

trunk/psastro/src/psastroMaskUpdates.c

@@ -34 +34 @@
     psImageMaskType spikeMaskValue = pmConfigMaskGet("SPIKE", config); // Mask value for ghost pixels
     psImageMaskType starMaskValue  = pmConfigMaskGet("STARCORE", config); // Mask value for ghost pixels
-
+    psImageMaskType crosstalkMaskValue = pmConfigMaskGet("GHOST", config); // Mask value for crosstalk ghosts
+    
     // psImageMaskType maskBlank  = pmConfigMaskGet("BLANK", config); // Mask value for blank pixels
 
@@ -48 +49 @@
     if (!REFSTAR_MASK) return true;
 
+    // convert star positions to crosstalk artifact positions and add to the readout->analysis data
+    bool CROSSTALK_MASK                    = psMetadataLookupBool (&status, recipe, "CROSSTALK_MASK");
+    if (CROSSTALK_MASK && !psastroLoadCrosstalk (config)) {
+      psError(PSASTRO_ERR_CONFIG, false, "Error loading crosstalk data");
+      return(false);
+    }
+    
     // convert star positions to ghost positions and add to the readout->analysis data
     if (!psastroLoadGhosts (config)) {
@@ -76 +84 @@
     double REFSTAR_MASK_BLEED_MAG_SLOPE    = psMetadataLookupF32 (&status, recipe, "REFSTAR_MASK_BLEED_MAG_SLOPE");
 
+    double REFSTAR_MASK_CROSSTALK_MAG_MAX  = psMetadataLookupF32 (&status, recipe, "REFSTAR_MASK_CROSSTALK_MAG_MAX");
+    double REFSTAR_MASK_CROSSTALK_MAG_SLOPE= psMetadataLookupF32 (&status, recipe, "REFSTAR_MASK_CROSSTALK_MAG_SLOPE");
+    
     // select the input data sources
     pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
@@ -201 +212 @@
 
                     if (ref->Mag > REFSTAR_MASK_MAX_MAG) continue;
+
 
                     // the reference magnitudes have been converted from the instrumental
@@ -282 +294 @@
                 }
 
+                // Select the crosstalk artifact regions for this readout, and mask a circular region
+                // corresponding to the source star
+
+                psArray *crosstalks = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.CROSSTALKS");
+                if (crosstalks) {
+                  for (int i = 0; i < crosstalks->n; i++) {
+                    pmAstromObj *ref = crosstalks->data[i];
+                    float radius = REFSTAR_MASK_CROSSTALK_MAG_SLOPE * (REFSTAR_MASK_CROSSTALK_MAG_MAX - ref->Mag);
+                    psTrace("psastro.crosstalk",2,"Masking star 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,radius);
+                    // XXX for now, assume cell binning is 1x1 relative to chip
+                    psastroMaskCircle (readoutMask->mask, crosstalkMaskValue, ref->chip->x, ref->chip->y, radius, radius);
+                  }
+                }
+                
                 // this probably should move into a function of its own:
                 {