Changeset 41643

Timestamp:

Jun 4, 2021, 5:38:43 PM (5 years ago)

Author:

tdeboer

Message:

change to handling of crosstalk

Location:

tags/ipp-ps1-20210510/psastro/src

Files:

• psastroLoadCrosstalk.c (modified) (4 diffs)
• psastroLoadGhosts.c (modified) (2 diffs)

tags/ipp-ps1-20210510/psastro/src/psastroLoadCrosstalk.c

@@ -437 +437 @@
               }
 
-
               //the source star needs to be bright enough to produce a crosstalk feature on the target chip/cell that is above the refmag
               //float INSTR_CROSS_MAX_MAG = de->magRef - crossMagOff;
@@ -451 +450 @@
                 pmAstromObj *cal = calstars->data[i];
                 //kick out stars too faint to produce crosstalk with any rule
-                //if (cal->Mag > INSTR_CROSS_MAX_MAG) { continue; }
-                if (cal->Mag > (INSTR_CROSS_MAX_MAG-11.)) { continue; }
+                if (cal->Mag > (INSTR_CROSS_MAX_MAG-6.)) { continue; }
 
                 // Identify which cell holds the star
@@ -534 +532 @@
                     float TARGET_CROSS_MAX_MAG = tarde->magRef-crossMagOffset[k];
                     if (cal->Mag > TARGET_CROSS_MAX_MAG) { continue; }
-
                     pmAstromObj *crosstalk = pmAstromObjAlloc();
             
@@ -630 +627 @@
                 // This is the source of the ct.
                 pmAstromObj *ref = refstars->data[i];
-
-                if (ref->Mag > CROSS_MAX_MAG-11.) { continue; }
+                if (ref->Mag > (CROSS_MAX_MAG-6.)) { continue; }
 
                 // Identify which cell holds the star

tags/ipp-ps1-20210510/psastro/src/psastroLoadGhosts.c

@@ -179 +179 @@
         //Check if we are in the central 8 chips, where old ghost-style locations work better
         int cenChip = 0;
-        if ( (Y >= 3)&&(Y <=4)&&(X >= 2)&&(X <= 5) ) {cenChip = 1;}
+        if ( (Y >= 3)&&(Y <=4)&&(X >= 2)&&(X <= 5) ) {cenChip = 0;}
 
         while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) {
@@ -208 +208 @@
 
                     double rSrc = hypot (cal->FP->x, cal->FP->y);
-                    double theta0 = atan2(cal->FP->x,cal->FP->y);
+                    double theta0 = atan2(cal->FP->y,cal->FP->x);
 
                     if((mirCheck) & (!cenChip)) {