Changeset 41551 for trunk/psastro/src/psastroMaskUpdates.c

Timestamp:

Apr 13, 2021, 12:55:39 PM (5 years ago)

Author:

tdeboer

Message:

updated handling of crosstalk

File:

• trunk/psastro/src/psastroMaskUpdates.c (modified) (2 diffs)

trunk/psastro/src/psastroMaskUpdates.c

@@ -152 +152 @@
     double REFSTAR_MASK_BLEED_MAG_SLOPE_Y  = psMetadataLookupF32 (&status, recipe, "REFSTAR_MASK_BLEED_MAG_SLOPE_Y");
 
-    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");
+    //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");
 
     // Mask stats variables
@@ -472 +472 @@
                   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);
+                    //float radius = REFSTAR_MASK_CROSSTALK_MAG_SLOPE * (REFSTAR_MASK_CROSSTALK_MAG_MAX - ref->Mag);
+                    float radius = REFSTAR_MASK_SATSTAR_RAD_OFFSET + pow(REFSTAR_MASK_SATSTAR_EXP,(REFSTAR_MASK_SATSTAR_MAG_MAX - (ref->Mag+MagOffset)));
+
                     psTrace("psastro.crosstalk",2,"Masking star on Chip %s @ (%f,%f) Magnitude: %f Radius %f\n",
                             psMetadataLookupStr(&status,readout->parent->parent->concepts,"CHIP.NAME"),