IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 33408


Ignore:
Timestamp:
Mar 5, 2012, 2:40:05 PM (14 years ago)
Author:
eugene
Message:

photomBadMask and photomPoorMask must be 32 bit ints; add PHOT_FLAGS to bright star output; remove clip for galaxies (not a reliable test)

Location:
branches/eam_branches/ipp-20111122/Ohana/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20111122/Ohana/src/libautocode/def/photcode-ps1-v3.d

    r33397 r33408  
    22EXTNAME      DVO_PHOTCODE_PS1_V3
    33TYPE         BINTABLE
    4 SIZE         104
     4SIZE         112
    55DESCRIPTION  DVO Photcode Description Table
    66
    … …  
    2222FIELD  astromErrScale,    ASTROM_ERR_SCALE,      float,          astrometric error scale
    2323FIELD  astromErrMagScale, ASTROM_ERR_MAG_SCALE,  float,          astrometric error / mag error scale
    24 FIELD  astromPoorMask,    ASTROM_POOR_MASK,      short,          detections matching this mask should only be used in emergencies
    25 FIELD  astromBadMask,     ASTROM_BAD_MASK,       short,          detections matching this mask should not be used
     24FIELD  astromPoorMask,    ASTROM_POOR_MASK,      int,            detections matching this mask should only be used in emergencies
     25FIELD  astromBadMask,     ASTROM_BAD_MASK,       int,            detections matching this mask should not be used
    2626FIELD  photomErrSys,      PHOTOM_ERR_SYS,        float,          systematic photometric error
    27 FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      short,          detections matching this mask should only be used in emergencies
    28 FIELD  photomBadMask,     PHOTOM_BAD_MASK,       short,          detections matching this mask should not be used
     27FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      int,            detections matching this mask should only be used in emergencies
     28FIELD  photomBadMask,     PHOTOM_BAD_MASK,       int,            detections matching this mask should not be used
    2929
    3030#   dR_total^2 =  dR_sys^2 + AS * dR_obs^2 + MS * dM_obs^2

  • branches/eam_branches/ipp-20111122/Ohana/src/libautocode/def/photcode.d

    r17189 r33408  
    22EXTNAME      DVO_PHOTCODE_RAW
    33TYPE         BINTABLE
    4 SIZE         104
     4SIZE         112
    55DESCRIPTION  DVO Photcode Description Table
    66
    … …  
    2222FIELD  astromErrScale,    ASTROM_ERR_SCALE,      float,          astrometric error scale
    2323FIELD  astromErrMagScale, ASTROM_ERR_MAG_SCALE,  float,          astrometric error / mag error scale
    24 FIELD  astromPoorMask,    ASTROM_POOR_MASK,      short,          detections matching this mask should only be used in emergencies
    25 FIELD  astromBadMask,     ASTROM_BAD_MASK,       short,          detections matching this mask should not be used
     24FIELD  astromPoorMask,    ASTROM_POOR_MASK,      int,            detections matching this mask should only be used in emergencies
     25FIELD  astromBadMask,     ASTROM_BAD_MASK,       int,            detections matching this mask should not be used
    2626FIELD  photomErrSys,      PHOTOM_ERR_SYS,        float,          systematic photometric error
    27 FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      short,          detections matching this mask should only be used in emergencies
    28 FIELD  photomBadMask,     PHOTOM_BAD_MASK,       short,          detections matching this mask should not be used
     27FIELD  photomPoorMask,    PHOTOM_POOR_MASK,      int,            detections matching this mask should only be used in emergencies
     28FIELD  photomBadMask,     PHOTOM_BAD_MASK,       int,            detections matching this mask should not be used
    2929
    3030#   dR_total^2 =  dR_sys^2 + AS * dR_obs^2 + MS * dM_obs^2

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/BrightCatalog.c

    r33391 r33408  
    257257    gfits_define_bintable_column (&theader, "J", "IMAGE_ID", "image",                       NULL,    1.0, 1.0*0x8000);
    258258    gfits_define_bintable_column (&theader, "J", "DB_FLAGS", "flags",                       NULL,    1.0, 1.0*0x8000);
     259    gfits_define_bintable_column (&theader, "J", "PHOT_FLAGS", "photflags",                 NULL,    1.0, 1.0*0x8000);
    259260    gfits_define_bintable_column (&theader, "J", "CAT_ID",   "catalog",                     NULL,    1.0, 1.0*0x8000);
    260261    gfits_define_bintable_column (&theader, "I", "PHOTCODE", "photcode",                    NULL,    1.0, 1.0*0x80);

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/StarOps.c

    r33406 r33408  
    670670          float mySigma = hypot (stats.sigma, dlist[k]);
    671671          if (fabs (list[k] - stats.median) > NSIGMA_REJECT*mySigma) {
    672             // fprintf (f, "%10.6f %10.6f %d %f %f %f %f 0x%08x\n", catalog[i].averageT[j].R, catalog[i].averageT[j].D, catalog[i].measureT[ilist[k]].imageID, list[k], stats.median, stats.sigma, mySigma, catalog[i].measureT[ilist[k]].photFlags);
    673672            catalog[i].measureT[ilist[k]].dbFlags |= ID_MEAS_POOR_PHOTOM;
    674673            if (final) {
    … …  
    677676            }
    678677            Ndel ++;
    679           } else {
    680             if (catalog[i].measureT[ilist[k]].photFlags & 0x02) {
    681               fprintf (stderr, "failed to mark %10.6f %10.6f %d\n", catalog[i].averageT[j].R, catalog[i].averageT[j].D, catalog[i].measureT[ilist[k]].imageID);
    682             }
    683678          }
    684679        }

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/bcatalog.c

    r33391 r33408  
    130130      if (isnan(catalog[0].measure[offset].M)) { Nnan ++; continue; }
    131131
    132       if (catalog[0].measure[offset].photFlags & code->photomBadMask) { Nbad++; continue;}
     132      if (catalog[0].measure[offset].photFlags & code->photomBadMask) {
     133        Nbad++;
     134        continue;
     135      }
    133136      if (catalog[0].measure[offset].photFlags & code->photomPoorMask) { Npoor++; continue;}
    134137
    135       // check for galaxies
    136       if (!isnan(catalog[0].measure[offset].Map)) {
     138      // check for galaxies (XXX skip for now)
     139      if (FALSE && !isnan(catalog[0].measure[offset].Map)) {
    137140        if (catalog[0].measure[offset].M - catalog[0].measure[offset].Map > 0.15) {
    138141          nEXT ++;
    … …  
    175178
    176179    // skip object if it is likely to be a galaxy
    177     if (nEXT >= nPSF) {
     180    if (FALSE && (nEXT >= nPSF)) {
    178181      Nmeasure -= Nm;
    179182      Ngalaxy ++;
Note: See TracChangeset for help on using the changeset viewer.