Changeset 36672

Timestamp:

Apr 16, 2014, 2:46:29 PM (12 years ago)

Author:

watersc1

Message:

Merge from trunk with new CT rule.

Location:

tags/ipp-20130712/psastro/src

Files:

• psastroLoadCrosstalk.c (modified) (8 diffs, 1 prop)
• psastroMaskUpdates.c (modified) (1 prop)

tags/ipp-20130712/psastro/src/psastroLoadCrosstalk.c

@@ -108 +108 @@
   SPIKE_MAX_MAG = psMetadataLookupF32(&status, recipe, "REFSTAR_MASK_BLEED_MAG_MAX");
   SPIKE_MAX_MAG += MagOffset;
-  
+  //  psTraceSetLevel("psastro.crosstalk",2);  
   psTrace("psastro.crosstalk",2,"%f %f %f %f\n",zeropt,exptime,MAX_MAG,MagOffset);
 
@@ -147 +147 @@
           // Check each reference star
           for (int i = 0; i < refstars->n; i++) {
+            // This is the source of the ct.
             pmAstromObj *ref = refstars->data[i];
 
@@ -174 +175 @@
 
             float x_t_chip,y_t_chip;
-
+            int faint_ct = 0;
             pmCellCoordsForChip(&x_cell,&y_cell,CTsourceCell,ref->chip->x,ref->chip->y);
 
@@ -180 +181 @@
             y_t_cell = y_cell;
 
+            // 2014-04-15 CZW: Here are the list of known cross talks:
+            // Inter-chip
+            // OTA2yXY3v <=> OTA3yXY3v
+            // OTA4yXY3v <=> OTA5yXY3v
+            // Intra-chip
+            // OTA2yXY5v <=> OTA2yXY6v
+            // OTA5yXY5v <=> OTA5yXY6v
+            // One way fainter
+            // OTA2yXY7v => OTA3yXY2v
+            // OTA5yXY7v => OTA4yXY2v
             // Determine if this combination of chip and cell produces a crosstalk artifact
-            if ((X == 2)&&(! ((U == 3)||(U == 5)||(U == 6)))) {
+            if ((X == 2)&&(! ((U == 3)||(U == 5)||(U == 6)||(U == 7)))) {
               psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
+              psTrace ("psastro.crosstalk",2,"t1: %d t2: %d",
+                       (X == 2),
+                       (! ((U == 3)||(U == 5)||(U == 6)||(U == 7))));
               continue;
             }
@@ -193 +207 @@
               continue;
             }
-            if ((X == 5)&&(! ((U == 3)||(U == 5)||(U == 6)))) {
+            if ((X == 5)&&(! ((U == 3)||(U == 5)||(U == 6)||(U == 7)))) {
               psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
               continue;
@@ -212 +226 @@
                 Ut = 5;
               }
+              if (U == 7) {
+                Xt = 3;
+                Ut = 2;
+                faint_ct = 1;
+              }
             }
             else if (X == 3) {
@@ -229 +248 @@
                 Ut = 5;
               }
+              if (U == 7) {
+                Xt = 4;
+                Ut = 2;
+                faint_ct = 1;
+              }
             }
 
@@ -284 +308 @@
 
             // Determine if we need to add a spike mask.
+            // CZW 2014-04-15 I'm not adding the new faint CT to this operation.  There's no evidence they produce such things.
 /*          psWarning("BLAH: %g %g %g\n",ref->Mag,MagOffset,SPIKE_MAX_MAG); */
             if (ref->Mag < SPIKE_MAX_MAG) {