IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 34382


Ignore:
Timestamp:
Sep 4, 2012, 6:31:26 AM (14 years ago)
Author:
eugene
Message:

deprecating average.Xp, replacing with average.stargal (or use average.ChiSqAve where appropriate); adding average.psfQF and average.psfQFperf; replaced measure.psfQual with psfQF, adding measure.psfQFperf

Location:
branches/eam_branches/ipp-20120805/Ohana/src
Files:
53 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20120805/Ohana/src/addstar/src/ReadStarsFITS.c

    r34260 r34382  
    120120
    121121    stars[i].measure.psfChisq   = NAN;       // not provided by SMPDATA:
    122     stars[i].measure.psfQual    = NAN;       // not provided by SMPDATA:
     122    stars[i].measure.psfQF      = NAN;       // not provided by SMPDATA:
    123123    stars[i].measure.psfNdof    = NAN_S_INT; // not provided by SMPDATA:
    124124    stars[i].measure.psfNpix    = NAN_S_INT; // not provided by SMPDATA:
    … …  
    189189
    190190    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
    191     stars[i].measure.psfQual    = ps1data[i].psfQual;
     191    stars[i].measure.psfQF      = ps1data[i].psfQF;
    192192    stars[i].measure.psfNdof    = NAN_S_INT; // not provided by PS1_DEV_0:
    193193    stars[i].measure.psfNpix    = NAN_S_INT; // not provided by PS1_DEV_0:
    … …  
    261261
    262262    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
    263     stars[i].measure.psfQual    = ps1data[i].psfQual;
     263    stars[i].measure.psfQF      = ps1data[i].psfQF;
    264264    stars[i].measure.psfNdof    = NAN_S_INT; // not provided by PS1_DEV_1:
    265265    stars[i].measure.psfNpix    = NAN_S_INT; // not provided by PS1_DEV_1:
    … …  
    345345                       
    346346    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
    347     stars[i].measure.psfQual    = ps1data[i].psfQual;
     347    stars[i].measure.psfQF      = ps1data[i].psfQF;
    348348    stars[i].measure.psfNdof    = ps1data[i].psfNdof;
    349349    stars[i].measure.psfNpix    = ps1data[i].psfNpix;
    … …  
    430430                       
    431431    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
    432     stars[i].measure.psfQual    = ps1data[i].psfQual;
     432    stars[i].measure.psfQF      = ps1data[i].psfQF;
    433433    stars[i].measure.psfNdof    = ps1data[i].psfNdof;
    434434    stars[i].measure.psfNpix    = ps1data[i].psfNpix;
    … …  
    507507                       
    508508    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
    509     stars[i].measure.psfQual    = ps1data[i].psfQual;
     509    stars[i].measure.psfQF      = ps1data[i].psfQF;
    510510    stars[i].measure.psfNdof    = ps1data[i].psfNdof;
    511511    stars[i].measure.psfNpix    = ps1data[i].psfNpix;
    … …  
    584584                       
    585585    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
    586     stars[i].measure.psfQual    = ps1data[i].psfQual;
     586    stars[i].measure.psfQF      = ps1data[i].psfQF;
    587587    stars[i].measure.psfNdof    = ps1data[i].psfNdof;
    588588    stars[i].measure.psfNpix    = ps1data[i].psfNpix;
    … …  
    669669                       
    670670    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
    671     stars[i].measure.psfQual    = ps1data[i].psfQual;
     671    stars[i].measure.psfQF      = ps1data[i].psfQF;
    672672    stars[i].measure.psfNdof    = ps1data[i].psfNdof;
    673673    stars[i].measure.psfNpix    = ps1data[i].psfNpix;
    … …  
    748748                       
    749749    stars[i].measure.psfChisq   = ps1data[i].psfChisq;
    750     stars[i].measure.psfQual    = ps1data[i].psfQual;
     750    stars[i].measure.psfQF      = ps1data[i].psfQF;
    751751    stars[i].measure.psfNdof    = ps1data[i].psfNdof;
    752752    stars[i].measure.psfNpix    = ps1data[i].psfNpix;

  • branches/eam_branches/ipp-20120805/Ohana/src/addstar/src/SEDfit.c

    r21508 r34382  
    147147    // construct an average object for this object
    148148    // XXX for now, the output objects will have limited astrometric interpretation...
     149    dvo_average_init (&outcat[0].average[Nave]);
    149150    outcat[0].average[Nave].R         = incat[0].average[i].R;
    150151    outcat[0].average[Nave].D         = incat[0].average[i].D;
    151     outcat[0].average[Nave].dR    = 0;
    152     outcat[0].average[Nave].dD    = 0;
    153     outcat[0].average[Nave].uR    = 0;
    154     outcat[0].average[Nave].uD    = 0;
    155     outcat[0].average[Nave].duR   = 0;
    156     outcat[0].average[Nave].duD   = 0;
    157     outcat[0].average[Nave].P     = 0;
    158     outcat[0].average[Nave].dP    = 0;
    159 
    160     // XXX for now, set the average mag data to NULL
    161     outcat[0].average[Nave].Nmeasure      = 0;
    162     outcat[0].average[Nave].Nmissing      = 0;
    163     outcat[0].average[Nave].Xp            = NAN_S_SHORT;
    164     outcat[0].average[Nave].measureOffset = Nmeas;
    165     outcat[0].average[Nave].missingOffset = -1;
    166     outcat[0].average[Nave].flags         = 0;
    167152
    168153    for (j = 0; j < Nsec; j++) {
    169       outcat[0].secfilt[Nave*Nsec+j].M  = NAN;
    170       outcat[0].secfilt[Nave*Nsec+j].dM = NAN;
    171       outcat[0].secfilt[Nave*Nsec+j].Xm = NAN_S_SHORT;
     154      dvo_secfilt_init (&outcat[0].secfilt[Nave*Nsec+j]);
    172155    }
    173156
    … …  
    181164    for (j = 0; valid && (j < Nmodel); j++) {
    182165      n = modelRow[j];
     166      dvo_measure_init (&outcat[0].measure[Nmeas]);
    183167      outcat[0].measure[Nmeas].dR        = 0.0;
    184168      outcat[0].measure[Nmeas].dD        = 0.0;

  • branches/eam_branches/ipp-20120805/Ohana/src/addstar/src/load2mass_catalog.c

    r21508 r34382  
    3434    catalog[0].average[Nave].Nmeasure      = 0;
    3535    catalog[0].average[Nave].Nmissing      = 0;
    36     catalog[0].average[Nave].Xp            = NAN_S_SHORT;
     36    catalog[0].average[Nave].ChiSqAve      = NAN_S_SHORT;
    3737    catalog[0].average[Nave].measureOffset = Nmeas;
    3838    catalog[0].average[Nave].missingOffset = -1;

  • branches/eam_branches/ipp-20120805/Ohana/src/addstar/src/mkcmf.c

    r34260 r34382  
    419419    stars[i].fy        = FY;
    420420    stars[i].df        = DF;
    421     stars[i].psfQual   = PSFQUAL;
     421    stars[i].psfQF   = PSFQUAL;
    422422    stars[i].nFrames   = 1;
    423423  }
    … …  
    466466    stars[i].fy        = FY;
    467467    stars[i].df        = DF;
    468     stars[i].psfQual   = PSFQUAL;
     468    stars[i].psfQF   = PSFQUAL;
    469469    stars[i].nFrames   = 1;
    470470    stars[i].flags     = FLAGS;
    … …  
    514514    stars[i].fy        = FY;
    515515    stars[i].df        = DF;
    516     stars[i].psfQual   = PSFQUAL;
     516    stars[i].psfQF   = PSFQUAL;
    517517    stars[i].nFrames   = 1;
    518518    stars[i].flags     = FLAGS;
    … …  
    551551    // randomly give poor PSFQF values
    552552    if ((BAD_PSFQF_FRAC > 0.0) && (drand48() < BAD_PSFQF_FRAC)) {
    553       stars[i].psfQual   = 0.25;
     553      stars[i].psfQF   = 0.25;
    554554    } else {
    555       stars[i].psfQual   = PSFQUAL;
     555      stars[i].psfQF   = PSFQUAL;
    556556    }
    557557   
    … …  
    606606    // randomly give poor PSFQF values
    607607    if ((BAD_PSFQF_FRAC > 0.0) && (drand48() < BAD_PSFQF_FRAC)) {
    608       stars[i].psfQual   = 0.25;
     608      stars[i].psfQF   = 0.25;
    609609    } else {
    610       stars[i].psfQual   = PSFQUAL;
     610      stars[i].psfQF   = PSFQUAL;
    611611    }
    612612   

  • branches/eam_branches/ipp-20120805/Ohana/src/addstar/src/update_coords.c

    r27435 r34382  
    4747  dR2 = r2 / Npt - r*r;
    4848  dD2 = d2 / Npt - d*d;
    49   average[0].Xp = sqrt (dD2 + dR2 / SQ(cos(d*RAD_DEG)));
    50   /* Xp is scatter in position in hundredths of arcsec */
     49  average[0].ChiSqAve = sqrt (dD2 + dR2 / SQ(cos(d*RAD_DEG)));
     50  /* ChiSqAve is supposed to be a chisq */
    5151
    5252  return;

  • branches/eam_branches/ipp-20120805/Ohana/src/dvomerge/src/merge_catalogs_old.c

    r33963 r34382  
    320320    output[0].average[Nave].dP             = 0;
    321321
    322     output[0].average[Nave].Xp             = 0;
     322    output[0].average[Nave].stargal        = 0;
    323323    output[0].average[Nave].ChiSqAve       = 0.0;
    324324    output[0].average[Nave].ChiSqPM        = 0.0;

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/Makefile.Targets

    r34260 r34382  
    7070$(ASRC)/cmf-ps1-v2.$(ARCH).o \
    7171$(ASRC)/cmf-ps1-v3.$(ARCH).o \
     72$(ASRC)/cmf-ps1-v4.$(ARCH).o \
    7273$(ASRC)/cmf-ps1-sv1.$(ARCH).o \
     74$(ASRC)/cmf-ps1-sv2.$(ARCH).o \
    7375$(ASRC)/cmf-smpdata.$(ARCH).o \
    7476$(ASRC)/getstar-ps1-dev-0.$(ARCH).o \
    … …  
    154156$(AINC)/cmf-ps1-v2.h \
    155157$(AINC)/cmf-ps1-v3.h \
     158$(AINC)/cmf-ps1-v4.h \
    156159$(AINC)/cmf-ps1-sv1.h \
     160$(AINC)/cmf-ps1-sv2.h \
    157161$(AINC)/cmf-smpdata.h \
    158162$(AINC)/getstar-ps1-dev-0.h \

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/Stars.d

    r21508 r34382  
     1*** note that this file / structure has been deprecated
     2
     3
    14STRUCT  Stars
    25EXTNAME STARS

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/average-ps1-v4.d

    r34260 r34382  
    22EXTNAME      DVO_AVERAGE_PS1_V4
    33TYPE         BINTABLE
    4 SIZE         120
     4SIZE         128
    55DESCRIPTION  DVO Average Object Table
    66
    … …  
    2525FIELD Trange,         TIME_RANGE,  int,             mean epoch (PM,PAR ref),       unix time seconds
    2626
    27 FIELD Xp,             SIGMA_POS,   float,           position scatter,             1/100 arcsec
     27FIELD psfQF,          PSF_QF,      float,           psf coverage (bad masks)
     28FIELD psfQFperf,      PSF_QF_PERF, float,           psf coverage (all masks)
     29
     30FIELD stargal,        STARGAL_SEP, float,           star / galaxy separator,       1/100 arcsec
    2831FIELD Npos,           NUMBER_POS,  unsigned short,  number of detections used for astrometry
    2932

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/average.d

    r33647 r34382  
    22EXTNAME      DVO_AVERAGE
    33TYPE         BINTABLE
    4 SIZE         120
     4SIZE         128
    55DESCRIPTION  DVO Average Object Table
    66
    … …  
    2525FIELD Trange,         TIME_RANGE,  int,             mean epoch (PM,PAR ref),       unix time seconds
    2626
    27 FIELD Xp,             SIGMA_POS,   float,           position scatter,             1/100 arcsec
     27FIELD psfQF,          PSF_QF,      float,           psf coverage (bad masks)
     28FIELD psfQFperf,      PSF_QF_PERF, float,           psf coverage (all masks)
     29
     30FIELD stargal,        STARGAL_SEP, float,           star / galaxy separator,       1/100 arcsec
    2831FIELD Npos,           NUMBER_POS,  unsigned short,  number of detections used for astrometry
    2932

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/cmf-ps1-dev-0.d

    r21508 r34382  
    2020FIELD fy,       PSF_WIDTH_Y,      float,    semi-minor,           pixels
    2121FIELD df,       PSF_THETA,        float,    ellipse angle,        degrees
    22 FIELD psfQual,  PSF_QF,           float,    quality factor
     22FIELD psfQF,    PSF_QF,           float,    quality factor
    2323FIELD nFrames,  N_FRAMES,         short,    images overlapping peak
    2424FIELD dummy,    DUMMY,            short,    padding

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/cmf-ps1-dev-1.d

    r21508 r34382  
    2222FIELD fy,        PSF_WIDTH_Y,      float,    semi-minor,           pixels
    2323FIELD df,        PSF_THETA,        float,    ellipse angle,        degrees
    24 FIELD psfQual,   PSF_QF,           float,    quality factor
     24FIELD psfQF,     PSF_QF,           float,    quality factor
    2525FIELD nFrames,   N_FRAMES,         short,    images overlapping peak
    2626FIELD flags,     FLAGS,            short,    padding

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/cmf-ps1-sv1.d

    r34260 r34382  
    5151
    5252FIELD df,             PSF_THETA,         float,    ellipse angle,         degrees
    53 FIELD psfQual,        PSF_QF,            float,    quality factor
    54 FIELD psfQualPerfect, PSF_QF_PERFECT,    float,    quality factor perfect
     53FIELD psfQF,          PSF_QF,            float,    quality factor
     54FIELD psfQFperf,      PSF_QF_PERFECT,    float,    quality factor perfect
    5555FIELD psfNdof,        PSF_NDOF,          int,      psf degrees of freedom
    5656
    … …  
    112112# FIELD fy,             PSF_MINOR,         PSF_MINOR          1E      float,    psf fit minor axis,    pixels
    113113# FIELD df,             PSF_THETA,         PSF_THETA          1E      float,    ellipse angle,         degrees
    114 # FIELD psfQual,        PSF_QF,            PSF_QF             1E      float,    quality factor
    115 # FIELD psfQualPerfect, PSF_QF_PERFECT,    PSF_QF_PERFECT     1E      float,    quality factor perfect
     114# FIELD psfQF,          PSF_QF,            PSF_QF             1E      float,    quality factor
     115# FIELD psfQFperf,      PSF_QF_PERFECT,    PSF_QF_PERFECT     1E      float,    quality factor perfect
    116116# FIELD psfNdof,        PSF_NDOF,          PSF_NDOF           1J      int,      psf degrees of freedom
    117117# FIELD psfNpix,        PSF_NPIX,          PSF_NPIX           1J      int,      psf number of pixels

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/cmf-ps1-v1.d

    r34260 r34382  
    3030FIELD fy,        PSF_MINOR,        float,    psf fit minor axis,    pixels
    3131FIELD df,        PSF_THETA,        float,    ellipse angle,         degrees
    32 FIELD psfQual,   PSF_QF,           float,    quality factor
     32FIELD psfQF,     PSF_QF,           float,    quality factor
    3333FIELD psfNdof,   PSF_NDOF,         int,      psf degrees of freedom
    3434FIELD psfNpix,   PSF_NPIX,         int,      psf number of pixels

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/cmf-ps1-v2.d

    r34260 r34382  
    3030FIELD fy,        PSF_MINOR,        float,    psf fit minor axis,    pixels
    3131FIELD df,        PSF_THETA,        float,    ellipse angle,         degrees
    32 FIELD psfQual,   PSF_QF,           float,    quality factor
     32FIELD psfQF,     PSF_QF,           float,    quality factor
    3333FIELD psfNdof,   PSF_NDOF,         int,      psf degrees of freedom
    3434FIELD psfNpix,   PSF_NPIX,         int,      psf number of pixels

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/cmf-ps1-v3.d

    r34260 r34382  
    3636FIELD fy,             PSF_MINOR,         float,    psf fit minor axis,    pixels
    3737FIELD df,             PSF_THETA,         float,    ellipse angle,         degrees
    38 FIELD psfQual,        PSF_QF,            float,    quality factor
    39 FIELD psfQualPerfect, PSF_QF_PERFECT,    float,    quality factor perfect
     38FIELD psfQF,          PSF_QF,            float,    quality factor
     39FIELD psfQFperf,      PSF_QF_PERFECT,    float,    quality factor perfect
    4040FIELD psfNdof,        PSF_NDOF,          int,      psf degrees of freedom
    4141FIELD psfNpix,        PSF_NPIX,          int,      psf number of pixels
    … …  
    6868# FIELD dFlux,          PSF_INST_FLUX_SIG, float,    psf flux error,        counts     
    6969# FIELD MapRaw,         AP_MAG_RAW,        float,    raw aperture mag,      mags
    70 # FIELD psfQualPerfect, PSF_QF_PERFECT,    float,    quality factor perfect
     70# FIELD psfQFperf,      PSF_QF_PERFECT,    float,    quality factor perfect
    7171# FIELD M3c,            MOMENTS_M3C,       float,    third moment cos(t),   pixels^3
    7272# FIELD M3s,            MOMENTS_M3S,       float,    third moment sin(t),   pixels^3

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/measure-panstarrs-dev-0.d

    r21508 r34382  
    4646
    4747# do we need more resolution than a short? should this be a log?
    48 FIELD psfQual,        PSF_QF,       short,          psf coverage/quality factor
     48FIELD psfQF,          PSF_QF,       short,          psf coverage/quality factor
    4949
    5050FIELD dophot,         DOPHOT,       char,           dophot type

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/measure-panstarrs-dev-1.d

    r21508 r34382  
    4646
    4747# do we need more resolution than a short? should this be a log?
    48 FIELD psfQual,        PSF_QF,       short,          psf coverage/quality factor
     48FIELD psfQF,          PSF_QF,       short,          psf coverage/quality factor
    4949
    5050FIELD dophot,         DOPHOT,       char,           dophot type

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/measure-ps1-dev-1.d

    r21508 r34382  
    3333
    3434# do we need more resolution than a short? should this be a log?
    35 FIELD psfQual,        PSF_QF,       float,          psf coverage/quality factor
     35FIELD psfQF,          PSF_QF,       float,          psf coverage/quality factor
    3636FIELD psfChisq,       PSF_CHISQ,    float,          psf coverage/quality factor
    3737FIELD crNsigma,       CR_NSIGMA,    float,          psf coverage/quality factor

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/measure-ps1-dev-2.d

    r21508 r34382  
    3434
    3535# do we need more resolution than a short? should this be a log?
    36 FIELD psfQual,        PSF_QF,       float,          psf coverage/quality factor
     36FIELD psfQF,          PSF_QF,       float,          psf coverage/quality factor
    3737FIELD psfChisq,       PSF_CHISQ,    float,          psf fit chisq
    3838FIELD crNsigma,       CR_NSIGMA,    float,          Nsigma deviation towards CR

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/measure-ps1-v1.d

    r21508 r34382  
    3939
    4040# do we need more resolution than a short? should this be a log?
    41 FIELD psfQual,        PSF_QF,       float,          psf coverage/quality factor
     41FIELD psfQF,          PSF_QF,       float,          psf coverage/quality factor
    4242FIELD psfChisq,       PSF_CHISQ,    float,          psf fit chisq
    4343FIELD psfNdof,        PSF_NDOF,     int,            psf degrees of freedom

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/measure-ps1-v2.d

    r30604 r34382  
    3939
    4040# do we need more resolution than a short? should this be a log?
    41 FIELD psfQual,        PSF_QF,       float,          psf coverage/quality factor
     41FIELD psfQF,          PSF_QF,       float,          psf coverage/quality factor
    4242FIELD psfChisq,       PSF_CHISQ,    float,          psf fit chisq
    4343FIELD psfNdof,        PSF_NDOF,     int,            psf degrees of freedom

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/measure-ps1-v3.d

    r34260 r34382  
    3939
    4040# do we need more resolution than a short? should this be a log?
    41 FIELD psfQual,        PSF_QF,       float,          psf coverage/quality factor
     41FIELD psfQF,          PSF_QF,       float,          psf coverage/quality factor
    4242FIELD psfChisq,       PSF_CHISQ,    float,          psf fit chisq
    4343FIELD psfNdof,        PSF_NDOF,     int,            psf degrees of freedom

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/measure-ps1-v4.d

    r34260 r34382  
    4747
    4848# do we need more resolution than a short? should this be a log?
    49 FIELD psfQual,        PSF_QF,       float,          psf coverage/quality factor
    50 FIELD psfChisq,       PSF_CHISQ,    float,          psf fit chisq
    51 FIELD psfNdof,        PSF_NDOF,     int,            psf degrees of freedom
    52 FIELD psfNpix,        PSF_NPIX,     int,            psf number of pixels
    53 FIELD crNsigma,       CR_NSIGMA,    float,          Nsigma deviation towards CR
    54 FIELD extNsigma,      EXT_NSIGMA,   float,          Nsigma deviation towards EXT
     49FIELD psfQF,          PSF_QF,        float,          psf coverage/quality factor
     50FIELD psfQFPerf,      PSF_QF_PEFECT, float,          psf coverage / quality factor (all mask bits)
     51FIELD psfChisq,       PSF_CHISQ,     float,          psf fit chisq
     52
     53FIELD psfNdof,        PSF_NDOF,      int,            psf degrees of freedom
     54FIELD psfNpix,        PSF_NPIX,      int,            psf number of pixels
     55FIELD crNsigma,       CR_NSIGMA,     float,          Nsigma deviation towards CR
     56FIELD extNsigma,      EXT_NSIGMA,    float,          Nsigma deviation towards EXT
    5557
    5658# model shape parameters
    … …  
    7375FIELD dRsys,          POS_SYS_ERR,  short,          systematic error from astrom,   1/100 of pixels
    7476
    75 FIELD pad,            PAD,          char[4],        padding
    76 
    7777# local astrometry scales
    7878FIELD posangle,       POSANGLE,     short,          position angle sky to chip,     (0xffff/360) deg

  • branches/eam_branches/ipp-20120805/Ohana/src/libautocode/def/measure.d

    r34260 r34382  
    22EXTNAME      DVO_MEASURE
    33TYPE         BINTABLE
    4 SIZE         172
     4SIZE         176
    55DESCRIPTION  DVO Detection Measurement Table
    66
    … …  
    4747
    4848# do we need more resolution than a short? should this be a log?
    49 FIELD psfQual,        PSF_QF,       float,          psf coverage/quality factor
    50 FIELD psfChisq,       PSF_CHISQ,    float,          psf fit chisq
    51 FIELD psfNdof,        PSF_NDOF,     int,            psf degrees of freedom
    52 FIELD psfNpix,        PSF_NPIX,     int,            psf number of pixels
    53 FIELD crNsigma,       CR_NSIGMA,    float,          Nsigma deviation towards CR
    54 FIELD extNsigma,      EXT_NSIGMA,   float,          Nsigma deviation towards EXT
     49FIELD psfQF,          PSF_QF,        float,          psf coverage/quality factor
     50FIELD psfQFPerf,      PSF_QF_PEFECT, float,          psf coverage / quality factor (all mask bits)
     51FIELD psfChisq,       PSF_CHISQ,     float,          psf fit chisq
     52
     53FIELD psfNdof,        PSF_NDOF,      int,            psf degrees of freedom
     54FIELD psfNpix,        PSF_NPIX,      int,            psf number of pixels
     55FIELD crNsigma,       CR_NSIGMA,     float,          Nsigma deviation towards CR
     56FIELD extNsigma,      EXT_NSIGMA,    float,          Nsigma deviation towards EXT
    5557
    5658# model shape parameters

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dbExtractAverages.c

    r34260 r34382  
    147147    case AVE_TRANGE:
    148148      value.Flt = TimeValue (average[0].Trange, 0, TimeFormat);
    149       break;
    150 
    151     case AVE_Xp:
    152       value.Flt = 0.01*average[0].Xp;
    153149      break;
    154150

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dbExtractMeasures.c

    r34346 r34382  
    480480      break;
    481481    case MEAS_PSF_QF: /* OK */
    482       value.Flt = measure[0].psfQual;
     482      value.Flt = measure[0].psfQF;
    483483      break;
    484484    case MEAS_PSF_QF_PERFECT: /* OK */

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dbFields.c

    r34260 r34382  
    335335  if (!strcasecmp (fieldName, "EXTID_LO"))  ESCAPE (AVE_EXTID_LO,  MAG_NONE, OPIHI_INT);
    336336
    337   // if (!strcasecmp (fieldName, "Xp"))      ESCAPE (AVE_Xp,        MAG_NONE, OPIHI_FLT);
    338   // if (!strcasecmp (fieldName, "TYPE"))    ESCAPE (AVE_TYPE,      MAG_NONE, OPIHI_INT);
    339   // for words that don't parse, try a photcode
    340 
    341337  // check for code:mode in photcode name
    342338  code = ParsePhotcodeField (fieldName, &mode, MAG_AVE);

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_catalog.c

    r34260 r34382  
    8989  average->Trange          = 0;
    9090
    91   average->Xp              = 0;
     91  average->stargal         = 0.0;
    9292  average->Npos            = 0;
    9393
    … …  
    174174 measure->extID     = 0;
    175175
    176  measure->psfQual   = NAN;
     176 measure->psfQF     = NAN;
    177177 measure->psfChisq  = NAN;
    178178 measure->psfNdof   = 0;

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_1.c

    r34260 r34382  
    2727    out[i].detID      = in[i].detID;
    2828    out[i].imageID    = in[i].imageID;
    29     out[i].psfQual    = in[i].psfQual;
     29    out[i].psfQF      = in[i].psfQF;
    3030    out[i].psfChisq   = in[i].psfChisq;
    3131    out[i].crNsigma   = in[i].crNsigma;
    … …  
    6565    out[i].FluxKron   = NAN;
    6666    out[i].dFluxKron  = NAN;
     67    out[i].psfQFperf  = NAN;
    6768  }
    6869  return (out);
    … …  
    9394    out[i].detID      = in[i].detID;
    9495    out[i].imageID    = in[i].imageID;
    95     out[i].psfQual    = in[i].psfQual;
     96    out[i].psfQF      = in[i].psfQF;
    9697    out[i].psfChisq   = in[i].psfChisq;
    9798    out[i].crNsigma   = in[i].crNsigma;
    … …  
    126127    out[i].R             = in[i].R;     
    127128    out[i].D             = in[i].D;     
    128     out[i].Xp            = in[i].Xp;     
    129129    out[i].dR            = in[i].dR;
    130130    out[i].dD            = in[i].dD;
    … …  
    159159    out[i].photFlagsUpper = 0;
    160160    out[i].photFlagsLower = 0;
     161
     162    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     163    out[i].psfQF         = NAN;
     164    out[i].psfQFperf     = NAN;
     165    out[i].stargal       = NAN;
    161166  }
    162167  return (out);
    … …  
    174179    out[i].R             = in[i].R;     
    175180    out[i].D             = in[i].D;     
    176     out[i].Xp            = in[i].Xp;     
    177181    out[i].dR            = in[i].dR;
    178182    out[i].dD            = in[i].dD;

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_PS1_DEV_2.c

    r34260 r34382  
    2929    out[i].detID      = in[i].detID;
    3030    out[i].imageID    = in[i].imageID;
    31     out[i].psfQual    = in[i].psfQual;
     31    out[i].psfQF      = in[i].psfQF;
    3232    out[i].psfChisq   = in[i].psfChisq;
    3333    out[i].crNsigma   = in[i].crNsigma;
    … …  
    6262    out[i].FluxKron   = NAN;
    6363    out[i].dFluxKron  = NAN;
    64   }
     64    out[i].psfQFperf  = NAN;
     65 }
    6566  return (out);
    6667}
    … …  
    9293    out[i].detID      = in[i].detID;
    9394    out[i].imageID    = in[i].imageID;
    94     out[i].psfQual    = in[i].psfQual;
     95    out[i].psfQF      = in[i].psfQF;
    9596    out[i].psfChisq   = in[i].psfChisq;
    9697    out[i].crNsigma   = in[i].crNsigma;
    … …  
    130131    out[i].P             = in[i].P;
    131132    out[i].dP            = in[i].dP;
    132     out[i].Xp            = in[i].Xp;     
    133133    out[i].Nmeasure      = in[i].Nmeasure;     
    134134    out[i].Nmissing      = in[i].Nmissing;     
    … …  
    153153    out[i].photFlagsUpper = 0;
    154154    out[i].photFlagsLower = 0;
     155
     156    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     157    out[i].psfQF         = NAN;
     158    out[i].psfQFperf     = NAN;
     159    out[i].stargal       = NAN;
    155160  }
    156161  return (out);
    … …  
    176181    out[i].P             = in[i].P;
    177182    out[i].dP            = in[i].dP;
    178     out[i].Xp            = in[i].Xp;     
    179183    out[i].Nmeasure      = in[i].Nmeasure;     
    180184    out[i].Nmissing      = in[i].Nmissing;     

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_PS1_REF.c

    r34260 r34382  
    3333    out[i].catID      = in[i].catID;
    3434    out[i].extID      = 0;
    35     out[i].psfQual    = 1.0; // we do not save a value, but some operations (relphot/average) filter on this value..
     35    out[i].psfQF      = 1.0; // we do not save a value, but some operations (relphot/average) filter on this value..
    3636    out[i].psfChisq   = NAN;
    3737    out[i].psfNdof    = 0;
    … …  
    6060    out[i].FluxKron   = NAN;
    6161    out[i].dFluxKron  = NAN;
     62    out[i].psfQFperf  = NAN;
    6263  }
    6364  return (out);
    … …  
    105106    out[i].P             = NAN;
    106107    out[i].dP            = NAN;
    107     out[i].Xp            = NAN_S_SHORT;
    108108    out[i].ChiSqAve      = NAN;
    109109    out[i].ChiSqPM       = NAN;
    … …  
    126126    out[i].photFlagsUpper = 0;
    127127    out[i].photFlagsLower = 0;
     128
     129    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     130    out[i].psfQF         = NAN;
     131    out[i].psfQFperf     = NAN;
     132    out[i].stargal       = NAN;
    128133  }
    129134  return (out);

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_PS1_V1.c

    r34260 r34382  
    3333    out[i].catID      = in[i].catID;
    3434    out[i].extID      = in[i].extID;
    35     out[i].psfQual    = in[i].psfQual;
     35    out[i].psfQF      = in[i].psfQF;
    3636    out[i].psfChisq   = in[i].psfChisq;
    3737    out[i].psfNdof    = in[i].psfNdof;
    … …  
    6060    out[i].FluxKron   = NAN;
    6161    out[i].dFluxKron  = NAN;
     62    out[i].psfQFperf  = NAN;
    6263  }
    6364  return (out);
    … …  
    9495    out[i].catID      = in[i].catID;
    9596    out[i].extID      = in[i].extID;
    96     out[i].psfQual    = in[i].psfQual;
     97    out[i].psfQF      = in[i].psfQF;
    9798    out[i].psfChisq   = in[i].psfChisq;
    9899    out[i].psfNdof    = in[i].psfNdof;
    … …  
    137138    out[i].P             = in[i].P;
    138139    out[i].dP            = in[i].dP;
    139     out[i].Xp            = in[i].Xp;     
    140140    out[i].ChiSqAve      = in[i].ChiSq;     
    141141    out[i].ChiSqPM       = NAN;
    … …  
    158158    out[i].photFlagsUpper = 0;
    159159    out[i].photFlagsLower = 0;
     160
     161    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     162    out[i].psfQF         = NAN;
     163    out[i].psfQFperf     = NAN;
     164    out[i].stargal       = NAN;
    160165  }
    161166  return (out);
    … …  
    181186    out[i].P             = in[i].P;
    182187    out[i].dP            = in[i].dP;
    183     out[i].Xp            = in[i].Xp;     
    184188    out[i].ChiSq         = in[i].ChiSqAve;     
    185189    out[i].Npos          = in[i].Npos;     

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_PS1_V2.c

    r34260 r34382  
    3333    out[i].catID      = in[i].catID;
    3434    out[i].extID      = in[i].extID;
    35     out[i].psfQual    = in[i].psfQual;
     35    out[i].psfQF      = in[i].psfQF;
    3636    out[i].psfChisq   = in[i].psfChisq;
    3737    out[i].psfNdof    = in[i].psfNdof;
    … …  
    6161    out[i].FluxKron   = NAN;
    6262    out[i].dFluxKron  = NAN;
     63    out[i].psfQFperf  = NAN;
    6364  }
    6465  return (out);
    … …  
    9596    out[i].catID      = in[i].catID;
    9697    out[i].extID      = in[i].extID;
    97     out[i].psfQual    = in[i].psfQual;
     98    out[i].psfQF      = in[i].psfQF;
    9899    out[i].psfChisq   = in[i].psfChisq;
    99100    out[i].psfNdof    = in[i].psfNdof;
    … …  
    138139    out[i].P             = in[i].P;
    139140    out[i].dP            = in[i].dP;
    140     out[i].Xp            = in[i].Xp;     
    141141    out[i].ChiSqAve      = in[i].ChiSqAve;     
    142142    out[i].ChiSqPM       = in[i].ChiSqPM;     
    … …  
    159159    out[i].photFlagsUpper = 0;
    160160    out[i].photFlagsLower = 0;
     161
     162    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     163    out[i].psfQF         = NAN;
     164    out[i].psfQFperf     = NAN;
     165    out[i].stargal       = NAN;
    161166  }
    162167  return (out);
    … …  
    182187    out[i].P             = in[i].P;
    183188    out[i].dP            = in[i].dP;
    184     out[i].Xp            = in[i].Xp;     
    185189    out[i].ChiSqAve      = in[i].ChiSqAve;     
    186190    out[i].ChiSqPM       = in[i].ChiSqPM;     

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_PS1_V3.c

    r34260 r34382  
    3333    out[i].catID      = in[i].catID;
    3434    out[i].extID      = in[i].extID;
    35     out[i].psfQual    = in[i].psfQual;
     35    out[i].psfQF      = in[i].psfQF;
    3636    out[i].psfChisq   = in[i].psfChisq;
    3737    out[i].psfNdof    = in[i].psfNdof;
    … …  
    6161    out[i].FluxKron   = NAN;
    6262    out[i].dFluxKron  = NAN;
     63    out[i].psfQFperf  = NAN;
    6364  }
    6465  return (out);
    … …  
    9596    out[i].catID      = in[i].catID;
    9697    out[i].extID      = in[i].extID;
    97     out[i].psfQual    = in[i].psfQual;
     98    out[i].psfQF      = in[i].psfQF;
    9899    out[i].psfChisq   = in[i].psfChisq;
    99100    out[i].psfNdof    = in[i].psfNdof;
    … …  
    138139    out[i].P             = in[i].P;
    139140    out[i].dP            = in[i].dP;
    140     out[i].Xp            = in[i].Xp;     
    141141    out[i].ChiSqAve      = in[i].ChiSqAve;     
    142142    out[i].ChiSqPM       = in[i].ChiSqPM;     
    … …  
    157157    out[i].catID         = in[i].catID;
    158158    out[i].extID         = in[i].extID;
     159
     160    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     161    out[i].psfQF         = NAN;
     162    out[i].psfQFperf     = NAN;
     163    out[i].stargal       = NAN;
    159164  }
    160165  return (out);
    … …  
    180185    out[i].P             = in[i].P;
    181186    out[i].dP            = in[i].dP;
    182     out[i].Xp            = in[i].Xp;     
    183187    out[i].ChiSqAve      = in[i].ChiSqAve;     
    184188    out[i].ChiSqPM       = in[i].ChiSqPM;     

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_PS1_V4.c

    r34260 r34382  
    3939    out[i].catID      = in[i].catID;
    4040    out[i].extID      = in[i].extID;
    41     out[i].psfQual    = in[i].psfQual;
     41    out[i].psfQF      = in[i].psfQF;
     42    out[i].psfQFperf  = in[i].psfQFperf;
    4243    out[i].psfChisq   = in[i].psfChisq;
    4344    out[i].psfNdof    = in[i].psfNdof;
    … …  
    99100    out[i].catID      = in[i].catID;
    100101    out[i].extID      = in[i].extID;
    101     out[i].psfQual    = in[i].psfQual;
     102    out[i].psfQF      = in[i].psfQF;
     103    out[i].psfQFperf  = in[i].psfQFperf;
    102104    out[i].psfChisq   = in[i].psfChisq;
    103105    out[i].psfNdof    = in[i].psfNdof;
    … …  
    142144    out[i].P             = in[i].P;
    143145    out[i].dP            = in[i].dP;
    144     out[i].Xp            = in[i].Xp;     
     146    out[i].psfQF         = in[i].psfQF;
     147    out[i].psfQFperf     = in[i].psfQFperf;
     148    out[i].stargal       = in[i].stargal;     
    145149    out[i].ChiSqAve      = in[i].ChiSqAve;     
    146150    out[i].ChiSqPM       = in[i].ChiSqPM;     
    … …  
    184188    out[i].P             = in[i].P;
    185189    out[i].dP            = in[i].dP;
    186     out[i].Xp            = in[i].Xp;     
     190    out[i].psfQF         = in[i].psfQF;
     191    out[i].psfQFperf     = in[i].psfQFperf;
     192    out[i].stargal       = in[i].stargal;     
    187193    out[i].ChiSqAve      = in[i].ChiSqAve;     
    188194    out[i].ChiSqPM       = in[i].ChiSqPM;     

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_elixir.c

    r34260 r34382  
    3535    out[i].Sky       = 0;
    3636    out[i].dSky      = 0;
    37     out[i].psfQual   = 0;
     37    out[i].psfQF     = 0;
    3838    out[i].psfChisq  = 0;
    3939    out[i].crNsigma  = 0;
    … …  
    7272    out[i].FluxKron   = NAN;
    7373    out[i].dFluxKron  = NAN;
     74    out[i].psfQFperf  = NAN;
    7475  }
    7576  return (out);
    … …  
    127128    out[i].R             = in[i].R;     
    128129    out[i].D             = in[i].D;     
    129     out[i].Xp            = in[i].Xp;     
    130130
    131131    // changed for PANSTARRS_DEV_0 (moved from Average to Measure)
    … …  
    170170    out[i].photFlagsUpper = 0;
    171171    out[i].photFlagsLower = 0;
     172
     173    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     174    out[i].psfQF         = NAN;
     175    out[i].psfQFperf     = NAN;
     176    out[i].stargal       = NAN;
    172177  }
    173178  return (out);
    … …  
    185190    out[i].R       = in[i].R;     
    186191    out[i].D       = in[i].D;     
    187     out[i].Xp      = in[i].Xp;     
    188192
    189193    // changed for PANSTARRS_DEV_0 (moved from Average to Measure)

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_loneos.c

    r34260 r34382  
    3939    out[i].Sky       = 0;
    4040    out[i].dSky      = 0;
    41     out[i].psfQual   = 0;
     41    out[i].psfQF     = 0;
    4242    out[i].psfChisq  = 0;
    4343    out[i].crNsigma  = 0;
    … …  
    7474    out[i].FluxKron   = NAN;
    7575    out[i].dFluxKron  = NAN;
     76    out[i].psfQFperf  = NAN;
    7677  }
    7778  return (out);
    … …  
    118119    out[i].R             = in[i].R;     
    119120    out[i].D             = in[i].D;     
    120     out[i].Xp            = in[i].Xp;     
    121121
    122122    // added for ELIXIR
    … …  
    162162    out[i].photFlagsUpper = 0;
    163163    out[i].photFlagsLower = 0;
     164
     165    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     166    out[i].psfQF         = NAN;
     167    out[i].psfQFperf     = NAN;
     168    out[i].stargal       = NAN;
    164169  }
    165170  return (out);
    … …  
    177182    out[i].R       = in[i].R;     
    178183    out[i].D       = in[i].D;     
    179     out[i].Xp      = in[i].Xp;     
    180184
    181185    // changed for PANSTARRS_DEV_0 (moved from Average to Measure)

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

    r34260 r34382  
    3636
    3737    // changed or added for PS1_DEV_1 (2008.02.26)
    38     out[i].psfQual    = (in[i].psfQual == NAN_S_SHORT) ? NAN : in[i].psfQual;
     38    out[i].psfQF      = (in[i].psfQF == NAN_S_SHORT) ? NAN : in[i].psfQF;
    3939    out[i].dbFlags    = in[i].flags;
    4040    out[i].detID      = in[i].detID_lo;
    … …  
    6565    out[i].Mkron      = NAN;
    6666    out[i].dMkron     = NAN;
    67     out[i].FluxPSF     = NAN;
    68     out[i].dFluxPSF    = NAN;
    69     out[i].FluxKron    = NAN;
    70     out[i].dFluxKron   = NAN;
     67    out[i].FluxPSF    = NAN;
     68    out[i].dFluxPSF   = NAN;
     69    out[i].FluxKron   = NAN;
     70    out[i].dFluxKron  = NAN;
     71    out[i].psfQFperf  = NAN;
    7172  }
    7273  return (out);
    … …  
    105106    // changed or added for PS1_DEV_1 (2008.02.26)
    106107    out[i].flags      = in[i].dbFlags;
    107     out[i].psfQual    = isnan(in[i].psfQual) ? NAN_S_SHORT : in[i].psfQual;
     108    out[i].psfQF      = isnan(in[i].psfQF) ? NAN_S_SHORT : in[i].psfQF;
    108109    out[i].detID_hi   = 0;
    109110    out[i].detID_lo   = in[i].detID;
    … …  
    133134    out[i].R             = in[i].R;     
    134135    out[i].D             = in[i].D;     
    135     out[i].Xp            = in[i].Xp;     
    136136    out[i].dR            = in[i].dR;
    137137    out[i].dD            = in[i].dD;
    … …  
    166166    out[i].photFlagsUpper = 0;
    167167    out[i].photFlagsLower = 0;
     168
     169    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     170    out[i].psfQF         = NAN;
     171    out[i].psfQFperf     = NAN;
     172    out[i].stargal       = NAN;
    168173  }
    169174  return (out);
    … …  
    182187    out[i].R        = in[i].R;     
    183188    out[i].D        = in[i].D;     
    184     out[i].Xp       = in[i].Xp;     
    185189    out[i].dR       = in[i].dR;
    186190    out[i].dD       = in[i].dD;

  • branches/eam_branches/ipp-20120805/Ohana/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

    r34260 r34382  
    3636
    3737    // changed or added for PS1_DEV_1 (2008.02.26)
    38     out[i].psfQual    = (in[i].psfQual == NAN_S_SHORT) ? NAN : in[i].psfQual;
     38    out[i].psfQF      = (in[i].psfQF == NAN_S_SHORT) ? NAN : in[i].psfQF;
    3939    out[i].dbFlags    = in[i].flags;
    4040    out[i].detID      = in[i].detID_lo;
    … …  
    6565    out[i].Mkron      = NAN;
    6666    out[i].dMkron     = NAN;
    67     out[i].FluxPSF     = NAN;
    68     out[i].dFluxPSF    = NAN;
    69     out[i].FluxKron    = NAN;
    70     out[i].dFluxKron   = NAN;
     67    out[i].FluxPSF    = NAN;
     68    out[i].dFluxPSF   = NAN;
     69    out[i].FluxKron   = NAN;
     70    out[i].dFluxKron  = NAN;
     71    out[i].psfQFperf  = NAN;
    7172  }
    7273  return (out);
    … …  
    105106    // changed or added for PS1_DEV_1 (2008.02.26)
    106107    out[i].flags      = in[i].dbFlags;
    107     out[i].psfQual    = isnan(in[i].psfQual) ? NAN_S_SHORT : in[i].psfQual;
     108    out[i].psfQF      = isnan(in[i].psfQF) ? NAN_S_SHORT : in[i].psfQF;
    108109    out[i].detID_hi   = 0;
    109110    out[i].detID_lo   = in[i].detID;
    … …  
    133134    out[i].R             = in[i].R;     
    134135    out[i].D             = in[i].D;     
    135     out[i].Xp            = in[i].Xp;     
    136136    out[i].dR            = in[i].dR;
    137137    out[i].dD            = in[i].dD;
    … …  
    166166    out[i].photFlagsUpper = 0;
    167167    out[i].photFlagsLower = 0;
     168
     169    // added for PS1_V4 (Xp dropped in V4 onward, was not really used anyway)
     170    out[i].psfQF         = NAN;
     171    out[i].psfQFperf     = NAN;
     172    out[i].stargal       = NAN;
    168173  }
    169174  return (out);
    … …  
    182187    out[i].R        = in[i].R;     
    183188    out[i].D        = in[i].D;     
    184     out[i].Xp       = in[i].Xp;     
    185189    out[i].dR       = in[i].dR;
    186190    out[i].dD       = in[i].dD;

  • branches/eam_branches/ipp-20120805/Ohana/src/opihi/dvo/avextract.c

    r34088 r34382  
    325325    gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for average magnitude in this photcode\n");
    326326
    327     // gprint (GP_ERR, "  Xp : NOT VALID\n");
    328327    // gprint (GP_ERR, "  type : dophot type (unused)\n");
    329328    // gprint (GP_ERR, "  typefrac : dophot type fraction (unused)\n");

  • branches/eam_branches/ipp-20120805/Ohana/src/opihi/dvo/avmatch.c

    r33963 r34382  
    351351    gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for average magnitude in this photcode\n");
    352352
    353     // gprint (GP_ERR, "  Xp : NOT VALID\n");
    354353    // gprint (GP_ERR, "  type : dophot type (unused)\n");
    355354    // gprint (GP_ERR, "  typefrac : dophot type fraction (unused)\n");

  • branches/eam_branches/ipp-20120805/Ohana/src/opihi/dvo/gstar.c

    r33963 r34382  
    190190        gprint (GP_LOG, "%5.2f ",   3600.0*sqrt(r));
    191191        gprint (GP_LOG, "%3d   ",  catalog.average[k].Nmeasure);
    192         gprint (GP_LOG, "%4.1f ",  0.01*catalog.average[k].Xp);
     192        gprint (GP_LOG, "%4.1f ",  catalog.average[k].ChiSqAve);
    193193        gprint (GP_LOG, "%5x ",    catalog.average[k].flags);
    194194        gprint (GP_LOG, "%x ",     catalog.average[k].objID);
    … …  
    205205            gprint (GP_LOG, "%f   ",     catalog.average[k].dP);
    206206
    207             gprint (GP_LOG, "%f   ",     catalog.average[k].ChiSqAve);
    208207            gprint (GP_LOG, "%f   ",     catalog.average[k].ChiSqPM);
    209208            gprint (GP_LOG, "%f   ",     catalog.average[k].ChiSqPar);
    … …  
    292291                gprint (GP_LOG, "0x%08x ", catalog.measure[m].detID);
    293292                gprint (GP_LOG, "0x%08x ", catalog.measure[m].imageID);
    294                 gprint (GP_LOG, "%.3f ", catalog.measure[m].psfQual);
     293                gprint (GP_LOG, "%.3f ", catalog.measure[m].psfQF);
    295294                gprint (GP_LOG, "%.1f ", catalog.measure[m].psfChisq);
    296295                gprint (GP_LOG, "%.1f ", catalog.measure[m].crNsigma);

  • branches/eam_branches/ipp-20120805/Ohana/src/opihi/dvo/photometry.c

    r31635 r34382  
    226226  if (!strcasecmp (parname, "Nmeas")) param = AVE_NMEAS;
    227227  if (!strcasecmp (parname, "Nmiss")) param = AVE_NMISS;
    228   if (!strcasecmp (parname, "Xp"))    param = AVE_Xp;
    229228  if (!strcasecmp (parname, "Xm"))    param = AVE_Xm;
    230229  if (!strcasecmp (parname, "flag"))  param = AVE_OBJ_FLAGS;
    … …  
    294293void GetAverageParamHelp () {
    295294  gprint (GP_ERR, "value may be one of the following:\n");
    296   gprint (GP_ERR, " ra dec dmag Nmeas Nmiss Xm Xp Nphot Ncode flag type typefrac\n\n");
     295  gprint (GP_ERR, " ra dec dmag Nmeas Nmiss Xm Nphot Ncode flag type typefrac\n\n");
    297296  gprint (GP_ERR, "value may also be a valid photcode\n");
    298297  gprint (GP_ERR, "photcodes or 'mag' may have optional magnitude mode: mag,[Mave, Mref]\n");
    … …  
    637636    case AVE_NMISS:
    638637      value = average[0].Nmissing;
    639       break;
    640     case AVE_Xp:
    641       value = 0.01*average[0].Xp;
    642638      break;
    643639    case AVE_OBJ_FLAGS:

  • branches/eam_branches/ipp-20120805/Ohana/src/relastro/src/BrightCatalog.c

    r33652 r34382  
    154154    GET_COLUMN(Tmean,          "MEAN_EPOCH",  int);
    155155    GET_COLUMN(Trange,         "TIME_RANGE",  int);
    156     GET_COLUMN(Xp,             "SIGMA_POS",  float);
     156    GET_COLUMN(stargal,        "STARGAL_SEP", float);
    157157    GET_COLUMN(Npos,           "NUMBER_POS",  short);
    158158    GET_COLUMN(Nmeasure,       "NMEASURE",    short);
    … …  
    189189      average[i].Tmean           = Tmean[i]           ;
    190190      average[i].Trange          = Trange[i]          ;
    191       average[i].Xp              = Xp[i]              ;
     191      average[i].stargal         = stargal[i]         ;
    192192      average[i].Npos            = Npos[i]            ;
    193193      average[i].Nmeasure        = Nmeasure[i]        ;
    … …  
    221221    free (Tmean);
    222222    free (Trange);
    223     free (Xp);
     223    free (stargal);
    224224    free (Npos);
    225225    free (Nmeasure);
    … …  
    487487    int      *Tmean         ; ALLOCATE (Tmean         , int     , catalog->Naverage);
    488488    int      *Trange        ; ALLOCATE (Trange        , int     , catalog->Naverage);
    489     float    *Xp            ; ALLOCATE (Xp            , float   , catalog->Naverage);
     489    float    *stargal       ; ALLOCATE (stargal       , float   , catalog->Naverage);
    490490    short    *Npos          ; ALLOCATE (Npos          , short   , catalog->Naverage);
    491491    short    *Nmeasure      ; ALLOCATE (Nmeasure      , short   , catalog->Naverage);
    … …  
    520520      Tmean[i]           = average[i].Tmean           ;
    521521      Trange[i]          = average[i].Trange          ;
    522       Xp[i]              = average[i].Xp              ;
     522      stargal[i]         = average[i].stargal         ;
    523523      Npos[i]            = average[i].Npos            ;
    524524      Nmeasure[i]        = average[i].Nmeasure        ;
    … …  
    552552    gfits_set_bintable_column (&theader, &ftable, "MEAN_EPOCH",  Tmean,           catalog->Naverage);
    553553    gfits_set_bintable_column (&theader, &ftable, "TIME_RANGE",  Trange,          catalog->Naverage);
    554     gfits_set_bintable_column (&theader, &ftable, "SIGMA_POS",   Xp,              catalog->Naverage);
     554    gfits_set_bintable_column (&theader, &ftable, "STARGAL_SEP", stargal,         catalog->Naverage);
    555555    gfits_set_bintable_column (&theader, &ftable, "NUMBER_POS",  Npos,            catalog->Naverage);
    556556    gfits_set_bintable_column (&theader, &ftable, "NMEASURE",    Nmeasure,        catalog->Naverage);
    … …  
    582582    free (Tmean);
    583583    free (Trange);
    584     free (Xp);
     584    free (stargal);
    585585    free (Npos);
    586586    free (Nmeasure);

  • branches/eam_branches/ipp-20120805/Ohana/src/relastro/src/UpdateObjectOffsets.c

    r33963 r34382  
    9595    // RESET (-reset)
    9696    // TimeSelect -time
    97     // (note that psfQual is applied rigidly at 0.85, as is the galaxy test)
     97    // (note that psfQF is applied rigidly at 0.85, as is the galaxy test)
    9898    // ImagSelect, ImagMin, ImagMax
    9999    // MaxDensityUse, MaxDensityValue

  • branches/eam_branches/ipp-20120805/Ohana/src/relastro/src/UpdateObjects.c

    r33652 r34382  
    352352      catalog[i].average[j].dP  = fit.dp; // parallax error in arcsec
    353353
    354       // Xp is supposed to be the position scatter, not the chisq : fix this:
    355       // catalog[i].average[j].Xp  = (fit.Nfit > 1) ? 100.0*log10(fit.chisq) : NAN_S_SHORT;
    356354      catalog[i].average[j].ChiSqAve  = fitAve.chisq;
    357355      catalog[i].average[j].ChiSqPM   = fitPM.chisq;
    358356      catalog[i].average[j].ChiSqPar  = fitPAR.chisq;
    359       catalog[i].average[j].Xp        = 0.0;
    360357      catalog[i].average[j].Tmean = (Tmean * 86400 * 365.26) + T2000;
    361358      catalog[i].average[j].Trange = (Trange * 86400 * 365.26);

  • branches/eam_branches/ipp-20120805/Ohana/src/relastro/src/load_catalogs.c

    r33963 r34382  
    137137    // RESET (-reset)
    138138    // TimeSelect -time
    139     // (note that psfQual is applied rigidly at 0.85, as is the galaxy test)
     139    // (note that psfQF is applied rigidly at 0.85, as is the galaxy test)
    140140    // ImagSelect, ImagMin, ImagMax
    141141    // MaxDensityUse, MaxDensityValue

  • branches/eam_branches/ipp-20120805/Ohana/src/relastro/src/relastro_objects.c

    r34260 r34382  
    123123    // RESET (-reset)
    124124    // TimeSelect -time
    125     // (note that psfQual is applied rigidly at 0.85, as is the galaxy test)
     125    // (note that psfQF is applied rigidly at 0.85, as is the galaxy test)
    126126    // ImagSelect, ImagMin, ImagMax
    127127    // MaxDensityUse, MaxDensityValue

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

    r33963 r34382  
    117117
    118118      // skip garbage measurements
    119       if (catalog[0].measure[offset].psfQual < 0.85) { Npsfqf ++; continue; }
     119      if (catalog[0].measure[offset].psfQF < 0.85) { Npsfqf ++; continue; }
    120120      if (isnan(catalog[0].measure[offset].M)) { Nnan ++; continue; }
    121121

  • branches/eam_branches/ipp-20120805/Ohana/src/relphot/src/load_catalogs.c

    r33963 r34382  
    136136    // TimeSelect -time
    137137    // DophotSelect
    138     // (note that psfQual is applied rigidly at 0.85, as is the galaxy test)
     138    // (note that psfQF is applied rigidly at 0.85, as is the galaxy test)
    139139    // MAG_LIM
    140140    // SIGMA_LIM

  • branches/eam_branches/ipp-20120805/Ohana/src/relphot/src/relphot_objects.c

    r33963 r34382  
    143143    // TimeSelect -time
    144144    // DophotSelect
    145     // (note that psfQual is applied rigidly at 0.85, as is the galaxy test)
     145    // (note that psfQF is applied rigidly at 0.85, as is the galaxy test)
    146146    // MAG_LIM
    147147    // SIGMA_LIM

  • branches/eam_branches/ipp-20120805/Ohana/src/relphot/src/setMrelFinal.c

    r34088 r34382  
    237237          if (catalog[0].measure[m].photFlags & code->photomBadMask) goto skip;
    238238          if ((catalog[0].measure[m].photcode > 10000) && (catalog[0].measure[m].photcode < 10500)) {
    239             if (catalog[0].measure[m].psfQual < 0.85) goto skip;
     239            if (catalog[0].measure[m].psfQF < 0.85) goto skip;
    240240          }
    241241        }
Note: See TracChangeset for help on using the changeset viewer.