Index: trunk/psastro/src/psastroLoadCrosstalk.c =================================================================== --- trunk/psastro/src/psastroLoadCrosstalk.c (revision 26173) +++ trunk/psastro/src/psastroLoadCrosstalk.c (revision 26174) @@ -1,5 +1,5 @@ /** @file psastroMaskUpdates.c * - * @brief + * @brief * * @ingroup libpsastro @@ -42,5 +42,5 @@ } - + bool psastroLoadCrosstalk (pmConfig *config) { @@ -50,6 +50,9 @@ pmReadout *readout = NULL; + pmFPAview *view = pmFPAviewAlloc (0); + pmFPAview *viewMask = pmFPAviewAlloc (0); + float zeropt, exptime, MAX_MAG; - + psLogMsg ("psastro", PS_LOG_INFO, "determine crosstalk positions"); @@ -66,5 +69,5 @@ return(true); } - + // select the input astrometry data (also carries the refstars) pmFPAfile *astrom = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT"); @@ -82,11 +85,8 @@ } // Activate teh reference mask to generate an FPA structure we can use to map stars down to cells - + pmFPAfileActivate (config->files, true, "PSASTRO.REFMASK"); - + // pmFPA *refFPA = refMask->fpa; - - pmFPAview *view = pmFPAviewAlloc (0); - pmFPAview *viewMask = pmFPAviewAlloc (0); if (!pmFPAfileIOChecks (config, view, PM_FPA_BEFORE)) ESCAPE; @@ -103,8 +103,8 @@ float MagOffset = zeropt + 2.5*log10(exptime); MAX_MAG += MagOffset; - + psTrace("psastro.crosstalk",2,"%f %f %f %f\n",zeropt,exptime,MAX_MAG,MagOffset); - - // Load each chip. + + // Load each chip. while ((chip = pmFPAviewNextChip (view, fpa, 1)) != NULL) { psTrace ("psastro.crosstalk", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process); @@ -122,170 +122,170 @@ // Read each cell (at this stage, we should only have one of them) while ((cell = pmFPAviewNextCell (view, fpa, 1)) != NULL) { - psTrace ("psastro.crosstalk", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process); - - if (!cell->process || !cell->file_exists) { continue; } - - // Read each readout (similarly, we should only have one of these, too) - while ((readout = pmFPAviewNextReadout (view, fpa, 1)) != NULL) { - if (! readout->data_exists) { continue; } - - // If this chip doesn't crosstalk, skip to the next one. - if (! ((X == 2)||(X == 3)||(X == 4)||(X == 5))) { - psTrace ("psastro.crosstalk",2,"Chip (%d%d) not a known crosstalk source.",X,Y); - continue; - } - - // Get the array of reference stars we're concerned with. - psArray *refstars = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.REFSTARS"); - if (refstars == NULL) { return(true); } - - // Check each reference star - for (int i = 0; i < refstars->n; i++) { - pmAstromObj *ref = refstars->data[i]; - - if (ref->Mag > MAX_MAG) { - continue; - } - - // Identify which cell holds the cell - pmChip *CTsourceChip = refChip; - pmCell *CTsourceCell = pmCellInChip(refChip,ref->chip->x,ref->chip->y); - - if (!CTsourceCell) { - continue; - } - - psTrace ("psastro.crosstalk",2,"REF: %d %f (%f %f) %f %f :: %f %f\n", - i,ref->Mag, ref->sky->r,ref->sky->d, ref->FP->x,ref->FP->y, ref->chip->x,ref->chip->y); - - - const char *cellName = psMetadataLookupStr(NULL,CTsourceCell->concepts, "CELL.NAME"); - int U = cellName[2] - '0'; - int V = cellName[3] - '0'; - - int Xt = X,Yt = Y,Ut = U,Vt = V; - float x_cell,y_cell; - float x_t_cell,y_t_cell; - - float x_t_chip,y_t_chip; - - pmCellCoordsForChip(&x_cell,&y_cell,CTsourceCell,ref->chip->x,ref->chip->y); - - x_t_cell = x_cell; - y_t_cell = y_cell; - - // Determine if this combination of chip and cell produces a crosstalk artifact - 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; - } - if ((X == 5)&&(! ((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; - } - - // Calculate destination positions - if (X == 2) { - if (U == 3) { - Xt = 3; - } - if (U == 5) { - Ut = 6; - } - if (U == 6) { - Ut = 5; - } - } - else if (X == 3) { - Xt = 2; - } - else if (X == 4) { - Xt = 5; - } - if (X == 5) { - if (U == 3) { - Xt = 4; - } - if (U == 5) { - Ut = 6; - } - if (U == 6) { - Ut = 5; - } - } - - // Convert target cell coordinates to target chip coordinates - psString targetChipName = NULL; - psStringAppend(&targetChipName,"XY%d%d",Xt,Yt); - psString targetCellName = NULL; - psStringAppend(&targetCellName,"xy%d%d",Ut,Vt); - - psTrace ("psastro.crosstalk",2,"CTsource @ OTA%d%dxy%d%d@%f,%f CTtarget OTA%d%dxy%d%d@%f,%f [%s %s]", - X,Y,U,V,x_cell,y_cell,Xt,Yt,Ut,Vt,x_t_cell,y_t_cell, - targetChipName,targetCellName); - - pmCell *CTtargetCell = getCellByName (CTsourceChip,targetCellName); - if (!CTtargetCell) continue; - - pmChipCoordsForCell(&x_t_chip,&y_t_chip,CTtargetCell,x_t_cell,y_t_cell); - - psTrace ("psastro.crosstalk",2,"CTsource @ OTA%d%dxy%d%d@%f,%f CTtarget OTA%d%dxy%d%d@%f,%f ChipLoc: (%f,%f)", - X,Y,U,V,x_cell,y_cell,Xt,Yt,Ut,Vt,x_t_cell,y_t_cell,x_t_chip,y_t_chip); - - // Hunt down the readout for the target, and save the chip position and magnitude of source star. - pmChip *targetChip = getChipByName(fpa,targetChipName); - if (!targetChip) continue; - if (!targetChip->cells) continue; - if (!targetChip->cells->n) continue; - - pmCell *targetCell = targetChip->cells->data[0]; - if (!targetCell) continue; - if (!targetCell->readouts) continue; - if (!targetCell->readouts->n) continue; - pmReadout *targetReadout = targetCell->readouts->data[0]; - if (!targetReadout) continue; - - pmAstromObj *crosstalk = pmAstromObjAlloc(); - - crosstalk->Mag = ref->Mag - MagOffset; - crosstalk->chip->x = x_t_chip; - crosstalk->chip->y = y_t_chip; - - psArray *crosstalks = psMetadataLookupPtr (&status, targetReadout->analysis, "PSASTRO.CROSSTALKS"); - if (crosstalks == NULL) { - crosstalks = psArrayAllocEmpty(100); - if (!psMetadataAdd(targetReadout->analysis,PS_LIST_TAIL,"PSASTRO.CROSSTALKS", PS_DATA_ARRAY, "crosstalk locations", crosstalks)) { - psError(PSASTRO_ERR_CONFIG, false, "failure to add crosstalks to readout"); - goto escape; - } - psFree(crosstalks); - } - psArrayAdd(crosstalks,100,crosstalk); - - psFree(targetChipName); - psFree(targetCellName); - psFree(crosstalk); - } // refstars - } // readout + psTrace ("psastro.crosstalk", 4, "Cell %d: %x %x\n", view->cell, cell->file_exists, cell->process); + + if (!cell->process || !cell->file_exists) { continue; } + + // Read each readout (similarly, we should only have one of these, too) + while ((readout = pmFPAviewNextReadout (view, fpa, 1)) != NULL) { + if (! readout->data_exists) { continue; } + + // If this chip doesn't crosstalk, skip to the next one. + if (! ((X == 2)||(X == 3)||(X == 4)||(X == 5))) { + psTrace ("psastro.crosstalk",2,"Chip (%d%d) not a known crosstalk source.",X,Y); + continue; + } + + // Get the array of reference stars we're concerned with. + psArray *refstars = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.REFSTARS"); + if (refstars == NULL) { return(true); } + + // Check each reference star + for (int i = 0; i < refstars->n; i++) { + pmAstromObj *ref = refstars->data[i]; + + if (ref->Mag > MAX_MAG) { + continue; + } + + // Identify which cell holds the cell + pmChip *CTsourceChip = refChip; + pmCell *CTsourceCell = pmCellInChip(refChip,ref->chip->x,ref->chip->y); + + if (!CTsourceCell) { + continue; + } + + psTrace ("psastro.crosstalk",2,"REF: %d %f (%f %f) %f %f :: %f %f\n", + i,ref->Mag, ref->sky->r,ref->sky->d, ref->FP->x,ref->FP->y, ref->chip->x,ref->chip->y); + + + const char *cellName = psMetadataLookupStr(NULL,CTsourceCell->concepts, "CELL.NAME"); + int U = cellName[2] - '0'; + int V = cellName[3] - '0'; + + int Xt = X,Yt = Y,Ut = U,Vt = V; + float x_cell,y_cell; + float x_t_cell,y_t_cell; + + float x_t_chip,y_t_chip; + + pmCellCoordsForChip(&x_cell,&y_cell,CTsourceCell,ref->chip->x,ref->chip->y); + + x_t_cell = x_cell; + y_t_cell = y_cell; + + // Determine if this combination of chip and cell produces a crosstalk artifact + 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; + } + if ((X == 5)&&(! ((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; + } + + // Calculate destination positions + if (X == 2) { + if (U == 3) { + Xt = 3; + } + if (U == 5) { + Ut = 6; + } + if (U == 6) { + Ut = 5; + } + } + else if (X == 3) { + Xt = 2; + } + else if (X == 4) { + Xt = 5; + } + if (X == 5) { + if (U == 3) { + Xt = 4; + } + if (U == 5) { + Ut = 6; + } + if (U == 6) { + Ut = 5; + } + } + + // Convert target cell coordinates to target chip coordinates + psString targetChipName = NULL; + psStringAppend(&targetChipName,"XY%d%d",Xt,Yt); + psString targetCellName = NULL; + psStringAppend(&targetCellName,"xy%d%d",Ut,Vt); + + psTrace ("psastro.crosstalk",2,"CTsource @ OTA%d%dxy%d%d@%f,%f CTtarget OTA%d%dxy%d%d@%f,%f [%s %s]", + X,Y,U,V,x_cell,y_cell,Xt,Yt,Ut,Vt,x_t_cell,y_t_cell, + targetChipName,targetCellName); + + pmCell *CTtargetCell = getCellByName (CTsourceChip,targetCellName); + if (!CTtargetCell) continue; + + pmChipCoordsForCell(&x_t_chip,&y_t_chip,CTtargetCell,x_t_cell,y_t_cell); + + psTrace ("psastro.crosstalk",2,"CTsource @ OTA%d%dxy%d%d@%f,%f CTtarget OTA%d%dxy%d%d@%f,%f ChipLoc: (%f,%f)", + X,Y,U,V,x_cell,y_cell,Xt,Yt,Ut,Vt,x_t_cell,y_t_cell,x_t_chip,y_t_chip); + + // Hunt down the readout for the target, and save the chip position and magnitude of source star. + pmChip *targetChip = getChipByName(fpa,targetChipName); + if (!targetChip) continue; + if (!targetChip->cells) continue; + if (!targetChip->cells->n) continue; + + pmCell *targetCell = targetChip->cells->data[0]; + if (!targetCell) continue; + if (!targetCell->readouts) continue; + if (!targetCell->readouts->n) continue; + pmReadout *targetReadout = targetCell->readouts->data[0]; + if (!targetReadout) continue; + + pmAstromObj *crosstalk = pmAstromObjAlloc(); + + crosstalk->Mag = ref->Mag - MagOffset; + crosstalk->chip->x = x_t_chip; + crosstalk->chip->y = y_t_chip; + + psArray *crosstalks = psMetadataLookupPtr (&status, targetReadout->analysis, "PSASTRO.CROSSTALKS"); + if (crosstalks == NULL) { + crosstalks = psArrayAllocEmpty(100); + if (!psMetadataAdd(targetReadout->analysis,PS_LIST_TAIL,"PSASTRO.CROSSTALKS", PS_DATA_ARRAY, "crosstalk locations", crosstalks)) { + psError(PSASTRO_ERR_CONFIG, false, "failure to add crosstalks to readout"); + goto escape; + } + psFree(crosstalks); + } + psArrayAdd(crosstalks,100,crosstalk); + + psFree(targetChipName); + psFree(targetCellName); + psFree(crosstalk); + } // refstars + } // readout } // cell // } - + // File cleanup code. - *viewMask = *view; + *viewMask = *view; while ((cell = pmFPAviewNextCell (viewMask, refMask->fpa, 1)) != NULL) { psTrace ("psastro", 4, "Mask Cell %d: %x %x\n", viewMask->cell, cell->file_exists, cell->process); if (!cell->process || !cell->file_exists) { continue; } - + while ((readout = pmFPAviewNextReadout (viewMask, refMask->fpa, 1)) != NULL) { - if (! readout->data_exists) { continue; } - if (!pmFPAfileIOChecks (config, viewMask, PM_FPA_AFTER)) ESCAPE; + if (! readout->data_exists) { continue; } + if (!pmFPAfileIOChecks (config, viewMask, PM_FPA_AFTER)) ESCAPE; } if (!pmFPAfileIOChecks (config, viewMask, PM_FPA_AFTER)) ESCAPE; @@ -303,4 +303,5 @@ escape: psFree(view); + psFree(viewMask); return(false); }