Changeset 41430

Timestamp:

Oct 21, 2020, 4:37:05 PM (6 years ago)

Author:

tdeboer

Message:

changed the gp1 crosstalk recipe

File:

• trunk/psastro/src/psastroLoadCrosstalk.c (modified) (7 diffs)

trunk/psastro/src/psastroLoadCrosstalk.c

@@ -84 +84 @@
     return false;
   }
-  // Activate teh reference mask to generate an FPA structure we can use to map stars down to cells
+  // Activate the reference mask to generate an FPA structure we can use to map stars down to cells
 
   pmFPAfileActivate (config->files, false, NULL);
@@ -136 +136 @@
 
           // If this chip doesn't crosstalk, skip to the next one.
-          if (! ((X == 2)||(X == 3)||(X == 4)||(X == 5))) {
+          if (! ((X == 2)||(X == 5))) {
             psTrace ("psastro.crosstalk",2,"Chip (%d%d) not a known crosstalk source.",X,Y);
             continue;
@@ -154 +154 @@
             }
 
-            // Identify which cell holds the cell
+            // Identify which cell holds the star
             pmChip *CTsourceChip = refChip;
             pmCell *CTsourceCell = pmCellInChip(refChip,ref->chip->x,ref->chip->y);
@@ -181 +181 @@
             y_t_cell = y_cell;
 
-            // 2014-04-15 CZW: Here are the list of known cross talks:
+            // 2020-10-21 TdB: Here is the list of known cross talks from the bright star analysis:
+            // The relationships work using OTA"XY"XY"UV"
             // Inter-chip
-            // OTA2yXY3v <=> OTA3yXY3v
-            // OTA4yXY3v <=> OTA5yXY3v
+            // OTA2yXY3v => OTA3yXY3v
+            // OTA4yXY3v <= OTA5yXY3v
             // Intra-chip
             // OTA2yXY5v <=> OTA2yXY6v
@@ -199 +200 @@
               continue;
             }
-            if ((X == 3)&&(! ((U == 3)))) {
-              psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
-              continue;
-            }
-            if ((X == 4)&&(! ((U == 3)))) {
-              psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
-              continue;
-            }
             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;
             }
-            // czw: 2010-01-27 
-            // Potential new crosstalk: OTA4yXY5v <=> OTA4yXY6v
-            // Currently not enough info to be convinced of this, however, as the artifacts are very faint.
 
             // Calculate destination positions
@@ -231 +221 @@
                 // faint_ct = 1; NOTE: not currently used
               }
-            }
-            else if (X == 3) {
-              Xt = 2;
-            }
-            else if (X == 4) {
-              Xt = 5;
             }
             if (X == 5) {
@@ -312 +296 @@
             if (ref->Mag < SPIKE_MAX_MAG) {
               if ((X == 2)&&(! ((U == 3)||(U == 5)||(U == 6)))) {
-                psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
-                continue;
-              }
-              if ((X == 3)&&(! ((U == 3)))) {
-                psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
-                continue;
-              }
-              if ((X == 4)&&(! ((U == 3)))) {
                 psTrace ("psastro.crosstalk",2,"Cell (%d%d) on chip (%d%d) not a known crosstalk source.",U,V,X,Y);
                 continue;