IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 21419


Ignore:
Timestamp:
Feb 8, 2009, 12:38:05 PM (17 years ago)
Author:
eugene
Message:

upgrades to PS1 Initial Deployed version; some field renames (average.code -> average.flags; image.code -> image.flags)

Location:
branches/eam_branch_20090208/Ohana/src
Files:
1 added
64 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20090208/Ohana/src/addstar/include/skycells.h

    r21153 r21419  
    3030  int NX;
    3131  int NY;
    32   int code;
     32  int photcode;
    3333  char name[64];
    3434} SkyRectangle;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/FilterStars.c

    r19823 r21419  
    2121    /* allow for some dynamic filtering of star list */
    2222    if (SNLIMIT && instars[j].dM > SNLIMIT) continue;
    23     if (XMAX && (instars[j].X > XMAX)) continue;
    24     if (XMIN && (instars[j].X < XMIN)) continue;
    25     if (YMAX && (instars[j].Y > YMAX)) continue;
    26     if (YMIN && (instars[j].Y < YMIN)) continue;
     23    if (XMAX && (instars[j].Xccd > XMAX)) continue;
     24    if (XMIN && (instars[j].Xccd < XMIN)) continue;
     25    if (YMAX && (instars[j].Yccd > YMAX)) continue;
     26    if (YMIN && (instars[j].Yccd < YMIN)) continue;
    2727    stars[N] = instars[j];
    2828
    29     XY_to_RD (&stars[N].R, &stars[N].D, stars[N].X, stars[N].Y, &image[0].coords);
     29    XY_to_RD (&stars[N].R, &stars[N].D, stars[N].Xccd, stars[N].Yccd, &image[0].coords);
    3030    stars[N].R = ohana_normalize_angle (stars[N].R);
    3131    stars[N].found = -1;
    32     stars[N].code = image[0].photcode;
     32    stars[N].photcode = image[0].photcode;
    3333
    3434    RMIN = MIN (RMIN, stars[N].R);
    … …  
    4141    stars[N].airmass = airmass (image[0].secz, stars[N].R, stars[N].D, image[0].sidtime, image[0].latitude);
    4242    stars[N].Mcal    = image[0].Mcal;
    43     stars[N].t       = image[0].tzero + 1e-4*stars[N].Y*image[0].trate;  /* trate is in 0.1 msec / row */
     43    stars[N].t       = image[0].tzero + 1e-4*stars[N].Yccd*image[0].trate;  /* trate is in 0.1 msec / row */
    4444    stars[N].dt      = MTIME;
    4545
    … …  
    5454    dMx = 0.0;
    5555    if (SUBPIX) {
    56       dMs = get_subpix (stars[N].X, stars[N].Y);
    57       dMx = scat_subpix (stars[N].X, stars[N].Y);
     56      dMs = get_subpix (stars[N].Xccd, stars[N].Yccd);
     57      dMx = scat_subpix (stars[N].Xccd, stars[N].Yccd);
    5858      if (!isnan(stars[N].dM)) {
    5959        stars[N].dM = hypot (stars[N].dM, dMx);

  • branches/eam_branch_20090208/Ohana/src/addstar/src/LoadDataPMM.c

    r21408 r21419  
    105105      inStars[Ninstars].t       = images[0][0].tzero;
    106106      inStars[Ninstars].dt      = images[0][0].exptime;
    107       inStars[Ninstars].code    = code;
     107      inStars[Ninstars].photcode    = code;
    108108      inStars[Ninstars].airmass = airmass;
    109109      inStars[Ninstars].az      = az;
    … …  
    238238    image[0].Mcal = 0.0;
    239239    image[0].Xm   = NAN_S_SHORT;
    240     image[0].code = 0;
     240    image[0].flags = 0;
    241241
    242242    image[0].nstar = 0;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/ReadImageHeader.c

    r20936 r21419  
    200200  image[0].Mcal = 0.0;
    201201  image[0].Xm   = NAN_S_SHORT;
    202   image[0].code = 0;
     202  image[0].flags = 0;
    203203
    204204  /* find expected number of stars */

  • branches/eam_branch_20090208/Ohana/src/addstar/src/ReadStarsFITS.c

    r17191 r21419  
    6767  ALLOCATE (stars, Stars, Nstars);
    6868  for (i = 0; i < Nstars; i++) {
    69     stars[i].X      = smpdata[i].X;
    70     stars[i].Y      = smpdata[i].Y;
     69    stars[i].Xccd   = smpdata[i].X;
     70    stars[i].Yccd   = smpdata[i].Y;
    7171
    7272    if ((smpdata[i].M >= ZeroPt) || isnan(smpdata[i].M)) {
    … …  
    7979
    8080    stars[i].dM     = smpdata[i].dM*0.001;
    81     stars[i].dophot = smpdata[i].dophot;
     81
     82    // the dophot type information get pushed into the upper 2 bytes of photFlags
     83    stars[i].photFlags = (smpdata[i].dophot << 16);
    8284
    8385    stars[i].fx     = smpdata[i].fx;
    … …  
    101103  ALLOCATE (stars, Stars, Nstars);
    102104  for (i = 0; i < Nstars; i++) {
    103     stars[i].X       = ps1data[i].X;
    104     stars[i].Y       = ps1data[i].Y;
    105     stars[i].dX      = ps1data[i].dX;
    106     stars[i].dY      = ps1data[i].dY;
     105    stars[i].Xccd    = ps1data[i].X;
     106    stars[i].Yccd    = ps1data[i].Y;
     107    stars[i].dXccd   = ps1data[i].dX;
     108    stars[i].dYccd   = ps1data[i].dY;
    107109    if ((ps1data[i].M >= 0.0) || isnan(ps1data[i].M)) {
    108110      stars[i].M     = NAN;
    … …  
    113115    stars[i].Mpeak   = ps1data[i].Mpeak;
    114116
    115     stars[i].sky     = ps1data[i].sky;
    116     stars[i].dsky    = ps1data[i].dSky;
     117    stars[i].Sky     = ps1data[i].sky;
     118    stars[i].dSky    = ps1data[i].dSky;
    117119
    118120    stars[i].fx      = ps1data[i].fx;
    … …  
    143145    stars[i].dt      = 0;
    144146    stars[i].airmass = 0;
    145     stars[i].code    = 0;
     147    stars[i].photcode    = 0;
    146148    stars[i].found   = 0;
    147149
    148150    /* these are not used */
    149151    stars[i].Map     = NAN;
    150     stars[i].dophot  = 0;
    151152  }   
    152153  *nstars = Nstars;
    … …  
    168169  ALLOCATE (stars, Stars, Nstars);
    169170  for (i = 0; i < Nstars; i++) {
    170     stars[i].X       = ps1data[i].X;
    171     stars[i].Y       = ps1data[i].Y;
    172     stars[i].dX      = ps1data[i].dX;
    173     stars[i].dY      = ps1data[i].dY;
     171    stars[i].Xccd       = ps1data[i].X;
     172    stars[i].Yccd       = ps1data[i].Y;
     173    stars[i].dXccd      = ps1data[i].dX;
     174    stars[i].dYccd      = ps1data[i].dY;
    174175    if ((ps1data[i].M >= 0.0) || isnan(ps1data[i].M)) {
    175176        stars[i].M   = NAN;
    … …  
    180181    stars[i].Mpeak   = ps1data[i].Mpeak;
    181182
    182     stars[i].sky     = ps1data[i].sky;
    183     stars[i].dsky    = ps1data[i].dSky;
     183    stars[i].Sky     = ps1data[i].sky;
     184    stars[i].dSky    = ps1data[i].dSky;
    184185
    185186    stars[i].fx      = ps1data[i].fx;
    … …  
    193194
    194195    stars[i].detID     = ps1data[i].detID;
    195     stars[i].flags     = ps1data[i].flags;
     196    stars[i].photFlags     = ps1data[i].flags;
    196197
    197198    // XXX not defined anyway
    … …  
    217218    stars[i].airmass = 0;
    218219    stars[i].az      = 0;
    219     stars[i].code    = 0;
     220    stars[i].photcode    = 0;
    220221    stars[i].found   = 0;
    221222
    222223    /* these are not used */
    223224    stars[i].Map     = NAN;
    224     stars[i].dophot  = 0;
    225225  }   
    226226  *nstars = Nstars;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/ReadStarsSDSS.c

    r21408 r21419  
    140140    for (j = 0; j < NFILTER; j++) {
    141141      N = NFILTER*i + j;
    142       stars[N].X         = colc[N];
    143       stars[N].Y         = rowc[N];
    144       stars[N].dX        = colcErr[N];
    145       stars[N].dY        = rowcErr[N];
     142      stars[N].Xccd      = colc[N];
     143      stars[N].Yccd      = rowc[N];
     144      stars[N].dXccd     = colcErr[N];
     145      stars[N].dYccd     = rowcErr[N];
    146146      stars[N].M         = psfCounts[N] + ZeroPt - zeropt[j];
    147147      stars[N].dM        = psfCountsErr[N];
    148148      stars[N].Map       = fiberCounts[N] + ZeroPt - zeropt[j];
    149149      stars[N].Mpeak     = NAN;
    150       stars[N].sky       = sky[N]; // adjust this to counts?
    151       stars[N].dsky      = skyErr[N];
     150      stars[N].Sky       = sky[N]; // adjust this to counts?
     151      stars[N].dSky      = skyErr[N];
    152152      stars[N].fx        = seeing[j]; // reported in arcsec?
    153153      stars[N].fy        = seeing[j];
    … …  
    189189      stars[N].az        = az;
    190190
    191       stars[N].code      = photcode[j];
     191      stars[N].photcode  = photcode[j];
    192192      stars[N].found     = -1;
    193       stars[N].dophot    = 0;
    194193    }
    195194  }   
    … …  
    205204    images[N].coords.crval2 = stars[0].D;
    206205   
    207     images[N].coords.crpix1 = stars[0].X;
    208     images[N].coords.crpix2 = stars[0].Y;
     206    images[N].coords.crpix1 = stars[0].Xccd;
     207    images[N].coords.crpix2 = stars[0].Yccd;
    209208    images[N].coords.cdelt1 = images[N].coords.cdelt2 = 0.4 / 3600.0;
    210209
    … …  
    257256    images[N].Mcal = 0.0;
    258257    images[N].Xm   = NAN_S_SHORT;
    259     images[N].code = 0;
     258    images[N].flags = 0;
    260259
    261260    images[N].nstar = Nstars;
    … …  
    297296
    298297  // XXX this is wrong, need to roll left to set the correct bit
    299   if (flags1 & 0x00000002) star[0].flags |= 0x0001; // BRIGHT            - 1  1
    300   if (flags1 & 0x00000004) star[0].flags |= 0x0002; // EDGE              - 1  2
    301   if (flags1 & 0x00000008) star[0].flags |= 0x0004; // BLENDED           - 1  3
    302   if (flags1 & 0x00000010) star[0].flags |= 0x0008; // CHILD             - 1  4
    303   if (flags1 & 0x00000020) star[0].flags |= 0x0010; // PEAKCENTER        - 1  5
    304   if (flags1 & 0x00000040) star[0].flags |= 0x0020; // NODEBLEND         - 1  6
    305   if (flags1 & 0x00040000) star[0].flags |= 0x0040; // SATUR             - 1 18
    306   if (flags1 & 0x00080000) star[0].flags |= 0x0080; // NOTCHECKED        - 1 19
    307   if (flags1 & 0x10000000) star[0].flags |= 0x0100; // BINNED1           - 1 28
    308   if (flags1 & 0x20000000) star[0].flags |= 0x0200; // BINNED2           - 1 29
    309   if (flags1 & 0x40000000) star[0].flags |= 0x0400; // BINNED4           - 1 30
    310   if (flags2 & 0x00000040) star[0].flags |= 0x0800; // LOCAL_EDGE        - 2  7
    311   if (flags2 & 0x00000800) star[0].flags |= 0x1000; // INTERP_CENTER     - 2 12
    312   if (flags2 & 0x00002000) star[0].flags |= 0x2000; // DEBLEND_NOPEAK    - 2 14
    313   if (flags2 & 0x02000000) star[0].flags |= 0x4000; // NOTCHECKED_CENTER - 2 26
     298  if (flags1 & 0x00000002) star[0].photFlags |= 0x0001; // BRIGHT            - 1  1
     299  if (flags1 & 0x00000004) star[0].photFlags |= 0x0002; // EDGE              - 1  2
     300  if (flags1 & 0x00000008) star[0].photFlags |= 0x0004; // BLENDED           - 1  3
     301  if (flags1 & 0x00000010) star[0].photFlags |= 0x0008; // CHILD             - 1  4
     302  if (flags1 & 0x00000020) star[0].photFlags |= 0x0010; // PEAKCENTER        - 1  5
     303  if (flags1 & 0x00000040) star[0].photFlags |= 0x0020; // NODEBLEND         - 1  6
     304  if (flags1 & 0x00040000) star[0].photFlags |= 0x0040; // SATUR             - 1 18
     305  if (flags1 & 0x00080000) star[0].photFlags |= 0x0080; // NOTCHECKED        - 1 19
     306  if (flags1 & 0x10000000) star[0].photFlags |= 0x0100; // BINNED1           - 1 28
     307  if (flags1 & 0x20000000) star[0].photFlags |= 0x0200; // BINNED2           - 1 29
     308  if (flags1 & 0x40000000) star[0].photFlags |= 0x0400; // BINNED4           - 1 30
     309  if (flags2 & 0x00000040) star[0].photFlags |= 0x0800; // LOCAL_EDGE        - 2  7
     310  if (flags2 & 0x00000800) star[0].photFlags |= 0x1000; // INTERP_CENTER     - 2 12
     311  if (flags2 & 0x00002000) star[0].photFlags |= 0x2000; // DEBLEND_NOPEAK    - 2 14
     312  if (flags2 & 0x02000000) star[0].photFlags |= 0x4000; // NOTCHECKED_CENTER - 2 26
    314313  return (TRUE);
    315314

  • branches/eam_branch_20090208/Ohana/src/addstar/src/ReadStarsTEXT.c

    r16810 r21419  
    77
    88  int j, N, Nextra, Ninstar, Nskip, Nbytes, nbytes;
    9   int done;
     9  int done, itmp;
    1010  char *buffer, *c, *c2;
    1111  double tmp;
    … …  
    6666    Nextra = nbytes % BYTES_STAR;
    6767    for (j = 0; (j < Ninstar) && (N < *nstars); j++, N++) {
    68       dparse (&stars[N].X,  1, &buffer[j*BYTES_STAR]);
    69       dparse (&stars[N].Y,  2, &buffer[j*BYTES_STAR]);
     68      dparse (&stars[N].Xccd,  1, &buffer[j*BYTES_STAR]);
     69      dparse (&stars[N].Yccd,  2, &buffer[j*BYTES_STAR]);
    7070      dparse (&stars[N].M,  3, &buffer[j*BYTES_STAR]);
    7171      if ((stars[N].M > ZeroPt) || isnan(stars[N].M)) {
    … …  
    7777      stars[N].dM = 0.001*tmp;
    7878
     79      // the dophot type information get pushed into the upper 2 bytes of photFlags
    7980      dparse (&tmp,         5, &buffer[j*BYTES_STAR]);
    80       stars[N].dophot = tmp;
     81      itmp = tmp;
     82      stars[N].photFlags = (itmp << 16);
    8183
    8284      // XXX I've removed the Mgal field from the measure.d table, and am using Map

  • branches/eam_branch_20090208/Ohana/src/addstar/src/SEDfit.c

    r16810 r21419  
    164164    outcat[0].average[Nave].measureOffset = Nmeas;
    165165    outcat[0].average[Nave].missingOffset = -1;
    166     outcat[0].average[Nave].code          = 0;
     166    outcat[0].average[Nave].flags         = 0;
    167167
    168168    for (j = 0; j < Nsec; j++) {
    … …  
    181181    for (j = 0; valid && (j < Nmodel); j++) {
    182182      n = modelRow[j];
    183       outcat[0].measure[Nmeas].dR       = 0.0;
    184       outcat[0].measure[Nmeas].dD       = 0.0;
    185       outcat[0].measure[Nmeas].M        = table[0].row[minFit.row][0].mags[n] + minFit.Md;
    186       outcat[0].measure[Nmeas].dM       = 0.0;
    187       outcat[0].measure[Nmeas].Mcal     = 0;
    188       outcat[0].measure[Nmeas].t        = TIMEREF;
    189       outcat[0].measure[Nmeas].averef   = Nave;
    190       outcat[0].measure[Nmeas].photcode = table[0].code[n];
    191       outcat[0].measure[Nmeas].dophot  = 0;
    192       outcat[0].measure[Nmeas].dbFlags  = 0;
    193       outcat[0].measure[Nmeas].dt       = 0xffff;
    194 
    195       outcat[0].measure[Nmeas].airmass  = 0;
    196       outcat[0].measure[Nmeas].FWx      = NAN_S_SHORT;
    197       outcat[0].measure[Nmeas].FWy      = NAN_S_SHORT;
    198       outcat[0].measure[Nmeas].theta    = NAN_S_SHORT;
     183      outcat[0].measure[Nmeas].dR        = 0.0;
     184      outcat[0].measure[Nmeas].dD        = 0.0;
     185      outcat[0].measure[Nmeas].M         = table[0].row[minFit.row][0].mags[n] + minFit.Md;
     186      outcat[0].measure[Nmeas].dM        = 0.0;
     187      outcat[0].measure[Nmeas].Mcal      = 0;
     188      outcat[0].measure[Nmeas].t         = TIMEREF;
     189      outcat[0].measure[Nmeas].averef    = Nave;
     190      outcat[0].measure[Nmeas].photcode  = table[0].code[n];
     191      outcat[0].measure[Nmeas].photFlags = 0;
     192      outcat[0].measure[Nmeas].dbFlags   = 0;
     193      outcat[0].measure[Nmeas].dt        = 0xffff;
     194                                         
     195      outcat[0].measure[Nmeas].airmass   = 0;
     196      outcat[0].measure[Nmeas].FWx       = NAN_S_SHORT;
     197      outcat[0].measure[Nmeas].FWy       = NAN_S_SHORT;
     198      outcat[0].measure[Nmeas].theta     = NAN_S_SHORT;
    199199
    200200      outcat[0].average[Nave].Nmeasure++;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/dump.c

    r3404 r21419  
    1212             i,
    1313             stars[i].R, stars[i].D,
    14              stars[i].X, stars[i].Y,
     14             stars[i].Xccd, stars[i].Yccd,
    1515             stars[i].M, stars[i].dM);
    1616  }

  • branches/eam_branch_20090208/Ohana/src/addstar/src/fakeimage.c

    r16983 r21419  
    129129    image[i+1].ccdnum = 0xff;
    130130
    131     image[i+1].Mcal = 0.0;
    132     image[i+1].Xm   = NAN_S_SHORT;
    133     image[i+1].code = 0;
     131    image[i+1].Mcal  = 0.0;
     132    image[i+1].Xm    = NAN_S_SHORT;
     133    image[i+1].flags = 0;
    134134
    135135    image[i+1].nstar = 0;
    … …  
    189189  image[0].Mcal = 0.0;
    190190  image[0].Xm   = NAN_S_SHORT;
    191   image[0].code = 0;
     191  image[0].flags = 0;
    192192  image[0].nstar = 0;
    193193  image[0].Myyyy = 0;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/find_matches.c

    r20936 r21419  
    168168      catalog[0].measure[Nmeas].dD       = 3600.0*(catalog[0].average[n].D - stars[N].D);
    169169
    170       catalog[0].measure[Nmeas].Xccd     = stars[N].X;
    171       catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
     170      catalog[0].measure[Nmeas].Xccd     = stars[N].Xccd;
     171      catalog[0].measure[Nmeas].Yccd     = stars[N].Yccd;
    172172
    173173      catalog[0].measure[Nmeas].M        = stars[N].M;
    … …  
    175175      catalog[0].measure[Nmeas].Mcal     = stars[N].Mcal;
    176176      catalog[0].measure[Nmeas].t        = stars[N].t;
    177       catalog[0].measure[Nmeas].averef   = n;              /* this must be an absolute sequence number, if partial average is loaded */
    178       catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
    179       catalog[0].measure[Nmeas].dophot   = stars[N].dophot; 
    180       catalog[0].measure[Nmeas].dbFlags  = 0;
     177      catalog[0].measure[Nmeas].photcode = stars[N].photcode;
    181178      catalog[0].measure[Nmeas].dt       = stars[N].dt;
    182179      catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
    183180
    184       catalog[0].measure[Nmeas].photFlags = stars[N].flags;
    185       catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
     181      catalog[0].measure[Nmeas].photFlags = stars[N].photFlags;
     182      catalog[0].measure[Nmeas].psfQual   = stars[N].psfQual;
    186183      catalog[0].measure[Nmeas].psfChisq  = stars[N].psfChisq;
    187184      catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
    188185      catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
    189       catalog[0].measure[Nmeas].Sky       = stars[N].sky;
    190       catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
     186      catalog[0].measure[Nmeas].Sky       = stars[N].Sky;
     187      catalog[0].measure[Nmeas].dSky      = stars[N].dSky;
    191188
    192189      catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
    … …  
    195192      catalog[0].measure[Nmeas].imageID   = stars[N].imageID;
    196193
    197       catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
    198       catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
     194      catalog[0].measure[Nmeas].dXccd     = stars[N].dXccd;
     195      catalog[0].measure[Nmeas].dYccd     = stars[N].dYccd;
    199196
    200197      catalog[0].measure[Nmeas].Map      = stars[N].Map;
    … …  
    203200      catalog[0].measure[Nmeas].theta    = (0xffff/360.0)*stars[N].df;
    204201       
     202      catalog[0].measure[Nmeas].dbFlags  = 0;
     203      catalog[0].measure[Nmeas].averef   = n;              /* this must be an absolute sequence number, if partial average is loaded */
     204
    205205      /* adds the measurement to the calibration if appropriate color terms are found */
    206206      /* we call this before (optionally) setting the average magnitude to avoid auto-correlations */
    … …  
    275275    catalog[0].average[Nave].measureOffset = Nmeas;
    276276    catalog[0].average[Nave].missingOffset = -1;
    277     catalog[0].average[Nave].code          = 0;
     277    catalog[0].average[Nave].flags         = 0;
    278278
    279279    catalog[0].average[Nave].dR        = 0;
    … …  
    296296    }
    297297
    298     catalog[0].measure[Nmeas].Xccd     = stars[N].X;
    299     catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
     298    catalog[0].measure[Nmeas].Xccd     = stars[N].Xccd;
     299    catalog[0].measure[Nmeas].Yccd     = stars[N].Yccd;
    300300
    301301    catalog[0].measure[Nmeas].dR        = 0.0;
    … …  
    305305    catalog[0].measure[Nmeas].Mcal      = stars[N].Mcal;
    306306    catalog[0].measure[Nmeas].t         = stars[N].t;
    307     catalog[0].measure[Nmeas].averef    = Nave;           /* XXX EAM : must be absolute Nave if partial read */
    308     catalog[0].measure[Nmeas].photcode  = stars[N].code;  /* photcode */
    309     catalog[0].measure[Nmeas].dophot    = stars[N].dophot; 
    310     catalog[0].measure[Nmeas].dbFlags   = 0;
     307    catalog[0].measure[Nmeas].photcode  = stars[N].photcode;
    311308    catalog[0].measure[Nmeas].dt        = stars[N].dt;
    312309    catalog[0].measure[Nmeas].airmass   = stars[N].airmass;
    313310
    314     catalog[0].measure[Nmeas].photFlags = stars[N].flags;
    315     catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
     311    catalog[0].measure[Nmeas].photFlags = stars[N].photFlags;
     312    catalog[0].measure[Nmeas].psfQual   = stars[N].psfQual;
    316313    catalog[0].measure[Nmeas].psfChisq  = stars[N].psfChisq;
    317314    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
    318315    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
    319     catalog[0].measure[Nmeas].Sky       = stars[N].sky;
    320     catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
    321 
    322     catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
     316    catalog[0].measure[Nmeas].Sky       = stars[N].Sky;
     317    catalog[0].measure[Nmeas].dSky      = stars[N].dSky;
    323318
    324319    catalog[0].measure[Nmeas].detID     = stars[N].detID;
    325320    catalog[0].measure[Nmeas].imageID   = stars[N].imageID;
    326321
    327     catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
    328     catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
     322    catalog[0].measure[Nmeas].dXccd     = stars[N].dXccd;
     323    catalog[0].measure[Nmeas].dYccd     = stars[N].dYccd;
    329324
    330325    catalog[0].measure[Nmeas].Map       = stars[N].Map;
    … …  
    332327    catalog[0].measure[Nmeas].FWy       = 100*stars[N].fy;
    333328    catalog[0].measure[Nmeas].theta     = (0xffff/360.0)*stars[N].df;
     329
     330    catalog[0].measure[Nmeas].stargal   = 0; // XXX not yet set
     331
     332    catalog[0].measure[Nmeas].dbFlags   = 0;
     333    catalog[0].measure[Nmeas].averef    = Nave;           /* XXX EAM : must be absolute Nave if partial read */
     334
    334335    /* XXX replace df here with theta, right? */
    335336

  • branches/eam_branch_20090208/Ohana/src/addstar/src/find_matches_closest.c

    r20936 r21419  
    188188    catalog[0].measure[Nmeas].dD       = 3600.0*(catalog[0].average[n].D - stars[N].D);
    189189
    190     /* XXX need to add dX, dY : need to load into stars[N].dX,dY */
    191     /* XXX need to add stargal, Sky, dSky, qPSF, detID, imageID */
    192     catalog[0].measure[Nmeas].Xccd     = stars[N].X;
    193     catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
     190    catalog[0].measure[Nmeas].Xccd     = stars[N].Xccd;
     191    catalog[0].measure[Nmeas].Yccd     = stars[N].Yccd;
    194192
    195193    catalog[0].measure[Nmeas].M        = stars[N].M;
    … …  
    197195    catalog[0].measure[Nmeas].Mcal     = stars[N].Mcal;
    198196    catalog[0].measure[Nmeas].t        = stars[N].t;
    199     catalog[0].measure[Nmeas].averef   = n;
    200     catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
    201     catalog[0].measure[Nmeas].dophot   = stars[N].dophot; 
    202     catalog[0].measure[Nmeas].dbFlags  = 0;
     197    catalog[0].measure[Nmeas].photcode = stars[N].photcode;
    203198    catalog[0].measure[Nmeas].dt       = stars[N].dt;
    204199    catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
    205200
    206     catalog[0].measure[Nmeas].photFlags = stars[N].flags;
    207     catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
     201    catalog[0].measure[Nmeas].photFlags = stars[N].photFlags;
     202    catalog[0].measure[Nmeas].psfQual   = stars[N].psfQual;
    208203    catalog[0].measure[Nmeas].psfChisq  = stars[N].psfChisq;
    209204    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
    210205    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
    211     catalog[0].measure[Nmeas].Sky       = stars[N].sky;
    212     catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
    213 
    214     catalog[0].measure[Nmeas].stargal   = 0;
     206    catalog[0].measure[Nmeas].Sky       = stars[N].Sky;
     207    catalog[0].measure[Nmeas].dSky      = stars[N].dSky;
    215208
    216209    catalog[0].measure[Nmeas].detID     = stars[N].detID;
    217210    catalog[0].measure[Nmeas].imageID   = stars[N].imageID;
    218211
    219     catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
    220     catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
     212    catalog[0].measure[Nmeas].dXccd     = stars[N].dXccd;
     213    catalog[0].measure[Nmeas].dYccd     = stars[N].dYccd;
    221214
    222215    catalog[0].measure[Nmeas].Map       = stars[N].Map;
    … …  
    228221    catalog[0].measure[Nmeas].theta    = (0xffff/360.0)*stars[N].df;
    229222       
     223    catalog[0].measure[Nmeas].stargal   = 0;
     224
     225    catalog[0].measure[Nmeas].dbFlags  = 0;
     226    catalog[0].measure[Nmeas].averef   = n;
     227
    230228    /* set the average magnitude if not already set and the photcode.equiv is not 0 */
    231229    /* in UPDATE mode, this value is not saved; use relphot to recalculate */
    … …  
    279277    catalog[0].average[Nave].measureOffset = Nmeas;
    280278    catalog[0].average[Nave].missingOffset = -1;
    281     catalog[0].average[Nave].code          = 0;
     279    catalog[0].average[Nave].flags         = 0;
    282280
    283281    catalog[0].average[Nave].dR        = 0;
    … …  
    300298    }
    301299
    302     catalog[0].measure[Nmeas].Xccd     = stars[N].X;
    303     catalog[0].measure[Nmeas].Yccd     = stars[N].Y;
     300    catalog[0].measure[Nmeas].Xccd     = stars[N].Xccd;
     301    catalog[0].measure[Nmeas].Yccd     = stars[N].Yccd;
    304302
    305303    catalog[0].measure[Nmeas].dR       = 0.0;
    … …  
    309307    catalog[0].measure[Nmeas].Mcal     = stars[N].Mcal;
    310308    catalog[0].measure[Nmeas].t        = stars[N].t;
    311     catalog[0].measure[Nmeas].averef   = Nave;
    312     catalog[0].measure[Nmeas].photcode = stars[N].code;  /* photcode */
    313     catalog[0].measure[Nmeas].dophot   = stars[N].dophot; 
    314     catalog[0].measure[Nmeas].dbFlags  = 0;
     309    catalog[0].measure[Nmeas].photcode = stars[N].photcode;
    315310    catalog[0].measure[Nmeas].dt       = stars[N].dt;
    316311    catalog[0].measure[Nmeas].airmass  = stars[N].airmass;
    317312
    318     catalog[0].measure[Nmeas].photFlags = stars[N].flags;
    319     catalog[0].measure[Nmeas].qPSF      = stars[N].psfQual;
     313    catalog[0].measure[Nmeas].photFlags = stars[N].photFlags;
     314    catalog[0].measure[Nmeas].psfQual   = stars[N].psfQual;
    320315    catalog[0].measure[Nmeas].psfChisq  = stars[N].psfChisq;
    321316    catalog[0].measure[Nmeas].crNsigma  = stars[N].crNsigma;
    322317    catalog[0].measure[Nmeas].extNsigma = stars[N].extNsigma;
    323     catalog[0].measure[Nmeas].Sky       = stars[N].sky;
    324     catalog[0].measure[Nmeas].dSky      = stars[N].dsky;
     318    catalog[0].measure[Nmeas].Sky       = stars[N].Sky;
     319    catalog[0].measure[Nmeas].dSky      = stars[N].dSky;
    325320
    326321    catalog[0].measure[Nmeas].stargal   = 0;
    … …  
    329324    catalog[0].measure[Nmeas].imageID   = stars[N].imageID;
    330325
    331     catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
    332     catalog[0].measure[Nmeas].dYccd     = stars[N].dY;
     326    catalog[0].measure[Nmeas].dXccd     = stars[N].dXccd;
     327    catalog[0].measure[Nmeas].dYccd     = stars[N].dYccd;
    333328
    334329    catalog[0].measure[Nmeas].Map      = stars[N].Map;
    … …  
    336331    catalog[0].measure[Nmeas].FWy      = 100*stars[N].fy;
    337332    catalog[0].measure[Nmeas].theta    = (0xffff/360.0)*stars[N].df;
     333
     334    catalog[0].measure[Nmeas].dbFlags  = 0;
     335    catalog[0].measure[Nmeas].averef   = Nave;
    338336
    339337    /* set the average magnitude if not already set and the photcode.equiv is not 0 */

  • branches/eam_branch_20090208/Ohana/src/addstar/src/find_matches_refstars.c

    r21408 r21419  
    149149      catalog[0].measure[Nmeas].t        = (TIMEREF == 0) ? stars[N][0].t : TIMEREF; /** careful : time_t vs e_time **/
    150150      catalog[0].measure[Nmeas].averef   = n;
    151       catalog[0].measure[Nmeas].photcode = stars[N][0].code;
    152       catalog[0].measure[Nmeas].dophot   = 0;
     151      catalog[0].measure[Nmeas].photcode = stars[N][0].photcode;
    153152      catalog[0].measure[Nmeas].dbFlags  = 0;
    154153      catalog[0].measure[Nmeas].dt       = 0xffff;
    … …  
    160159      catalog[0].measure[Nmeas].theta    = stars[N][0].df; // XXX make sure these are zero'ed as needed
    161160       
    162       catalog[0].measure[Nmeas].photFlags = stars[N][0].flags; // XXX make sure these are zero'ed as needed
    163       catalog[0].measure[Nmeas].qPSF      = 0;
     161      catalog[0].measure[Nmeas].photFlags = stars[N][0].photFlags; // XXX make sure these are zero'ed as needed
     162      catalog[0].measure[Nmeas].psfQual   = 0;
    164163      catalog[0].measure[Nmeas].psfChisq  = 0;
    165164      catalog[0].measure[Nmeas].crNsigma  = 0;
    … …  
    176175      catalog[0].measure[Nmeas].dYccd     = 0;
    177176
    178       catalog[0].measure[Nmeas].Xccd     = stars[N][0].X; // XXX make sure these are zero'ed as needed
    179       catalog[0].measure[Nmeas].Yccd     = stars[N][0].Y; // XXX make sure these are zero'ed as needed
     177      catalog[0].measure[Nmeas].Xccd     = stars[N][0].Xccd; // XXX make sure these are zero'ed as needed
     178      catalog[0].measure[Nmeas].Yccd     = stars[N][0].Yccd; // XXX make sure these are zero'ed as needed
    180179
    181180      if (ACCEPT_MOTION) {
    … …  
    242241    catalog[0].average[Nave].measureOffset = Nmeas;
    243242    catalog[0].average[Nave].missingOffset = -1;
    244     catalog[0].average[Nave].code          = 0;
     243    catalog[0].average[Nave].flags         = 0;
    245244
    246245    if (ACCEPT_MOTION) {
    … …  
    283282      catalog[0].measure[Nmeas].t        = (stars[N][0].t == 0) ? TIMEREF : stars[N][0].t; /** careful : time_t vs e_time **/
    284283      catalog[0].measure[Nmeas].averef   = Nave;
    285       catalog[0].measure[Nmeas].photcode = stars[N][0].code;
    286       catalog[0].measure[Nmeas].dophot   = 0;
     284      catalog[0].measure[Nmeas].photcode = stars[N][0].photcode;
    287285      catalog[0].measure[Nmeas].dbFlags  = 0;
    288286      catalog[0].measure[Nmeas].dt       = 0xffff;
    289287
    290       catalog[0].measure[Nmeas].photFlags = stars[N][0].flags; // XXX make sure these are zero'ed as needed
    291       catalog[0].measure[Nmeas].qPSF      = 0;
     288      catalog[0].measure[Nmeas].photFlags = stars[N][0].photFlags; // XXX make sure these are zero'ed as needed
     289      catalog[0].measure[Nmeas].psfQual   = 0;
    292290      catalog[0].measure[Nmeas].psfChisq  = 0;
    293291      catalog[0].measure[Nmeas].crNsigma  = 0;
    … …  
    304302      catalog[0].measure[Nmeas].dYccd     = 0;
    305303
    306       catalog[0].measure[Nmeas].Xccd     = stars[N][0].X; // XXX make sure these are zero'ed as needed
    307       catalog[0].measure[Nmeas].Yccd     = stars[N][0].Y; // XXX make sure these are zero'ed as needed
     304      catalog[0].measure[Nmeas].Xccd     = stars[N][0].Xccd; // XXX make sure these are zero'ed as needed
     305      catalog[0].measure[Nmeas].Yccd     = stars[N][0].Yccd; // XXX make sure these are zero'ed as needed
    308306
    309307      catalog[0].measure[Nmeas].airmass  = 0;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/get2mass_dr2.c

    r16810 r21419  
    6868        dparse (&J,  1, &buffer[NBYTE*i + 53]);
    6969        dparse (&dJ, 2, &buffer[NBYTE*i + 53]);
    70         stars[Nstars].M    = J;
    71         stars[Nstars].dM   = dJ;
    72         stars[Nstars].code = TM_J;
     70        stars[Nstars].M        = J;
     71        stars[Nstars].dM       = dJ;
     72        stars[Nstars].photcode = TM_J;
    7373      }
    7474      if (photcode == TM_H) {
    7575        dparse (&H,  1, &buffer[NBYTE*i + 72]);
    7676        dparse (&dH, 2, &buffer[NBYTE*i + 72]);
    77         stars[Nstars].M    = H;
    78         stars[Nstars].dM   = dH;
    79         stars[Nstars].code = TM_H;
     77        stars[Nstars].M        = H;
     78        stars[Nstars].dM       = dH;
     79        stars[Nstars].photcode = TM_H;
    8080      }
    8181      if (photcode == TM_K) {
    8282        dparse (&K,  1, &buffer[NBYTE*i + 91]);
    8383        dparse (&dK, 2, &buffer[NBYTE*i + 91]);
    84         stars[Nstars].M    = K;
    85         stars[Nstars].dM   = dK;
    86         stars[Nstars].code = TM_K;
     84        stars[Nstars].M        = K;
     85        stars[Nstars].dM       = dK;
     86        stars[Nstars].photcode = TM_K;
    8787      }
    8888      Nstars ++;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/get2mass_full.c

    r17439 r21419  
    5454  ptr = next2MASSfield (ptr); // k_snr (skip)
    5555
    56   star[2][0].flags = star[1][0].flags = star[0][0].flags = 0;
     56  star[2][0].photFlags = star[1][0].photFlags = star[0][0].photFlags = 0;
    5757
    5858  ptr = next2MASSfield (ptr); // ph_qual
    … …  
    9999
    100100  ptr = next2MASSfield (ptr); // x_scan
    101   star[0][0].X = strtod (ptr, NULL);
    102   star[2][0].X = star[1][0].X = star[0][0].X;
     101  star[0][0].Xccd = strtod (ptr, NULL);
     102  star[2][0].Xccd = star[1][0].Xccd = star[0][0].Xccd;
    103103
    104104  ptr = next2MASSfield (ptr); // jdate (julian date)
    … …  
    140140  set2MASS_use_flag (star[2], ptr[0]);
    141141
    142   star[0][0].code  = TM_J;
     142  star[0][0].photcode  = TM_J;
    143143  star[0][0].found = -1;
    144144  star[0][0].detID   = 0;
    145145  star[0][0].imageID = 0;
    146146
    147   star[1][0].code  = TM_H;
     147  star[1][0].photcode  = TM_H;
    148148  star[1][0].found = -1;
    149149  star[1][0].detID   = 0;
    150150  star[1][0].imageID = 0;
    151151
    152   star[2][0].code  = TM_K;
     152  star[2][0].photcode  = TM_K;
    153153  star[2][0].found = -1;
    154154  star[2][0].detID   = 0;
    … …  
    174174
    175175  switch (qual) {
    176     case 'X': star[0].flags |= 0x0000; break;
    177     case 'U': star[0].flags |= 0x0001; break;
    178     case 'F': star[0].flags |= 0x0002; break;
    179     case 'E': star[0].flags |= 0x0003; break;
    180     case 'A': star[0].flags |= 0x0004; break;
    181     case 'B': star[0].flags |= 0x0005; break;
    182     case 'C': star[0].flags |= 0x0006; break;
    183     case 'D': star[0].flags |= 0x0007; break;
     176    case 'X': star[0].photFlags |= 0x0000; break;
     177    case 'U': star[0].photFlags |= 0x0001; break;
     178    case 'F': star[0].photFlags |= 0x0002; break;
     179    case 'E': star[0].photFlags |= 0x0003; break;
     180    case 'A': star[0].photFlags |= 0x0004; break;
     181    case 'B': star[0].photFlags |= 0x0005; break;
     182    case 'C': star[0].photFlags |= 0x0006; break;
     183    case 'D': star[0].photFlags |= 0x0007; break;
    184184    default:
    185185      fprintf (stderr, "error!\n");
    … …  
    192192
    193193  switch (qual) {
    194     case '0': star[0].flags |= 0x0000; break;
    195     case '1': star[0].flags |= 0x0010; break;
    196     case '2': star[0].flags |= 0x0020; break;
    197     case '3': star[0].flags |= 0x0030; break;
    198     case '4': star[0].flags |= 0x0040; break;
    199     case '6': star[0].flags |= 0x0050; break;
    200     case '9': star[0].flags |= 0x0060; break;
     194    case '0': star[0].photFlags |= 0x0000; break;
     195    case '1': star[0].photFlags |= 0x0010; break;
     196    case '2': star[0].photFlags |= 0x0020; break;
     197    case '3': star[0].photFlags |= 0x0030; break;
     198    case '4': star[0].photFlags |= 0x0040; break;
     199    case '6': star[0].photFlags |= 0x0050; break;
     200    case '9': star[0].photFlags |= 0x0060; break;
    201201    default:
    202202      fprintf (stderr, "error!\n");
    … …  
    209209
    210210  switch (qual) {
    211     case 'p': star[0].flags |= 0x0000; break;
    212     case 'c': star[0].flags |= 0x0100; break;
    213     case 'd': star[0].flags |= 0x0200; break;
    214     case 's': star[0].flags |= 0x0300; break;
    215     case 'b': star[0].flags |= 0x0400; break;
    216     case '0': star[0].flags |= 0x0500; break;
     211    case 'p': star[0].photFlags |= 0x0000; break;
     212    case 'c': star[0].photFlags |= 0x0100; break;
     213    case 'd': star[0].photFlags |= 0x0200; break;
     214    case 's': star[0].photFlags |= 0x0300; break;
     215    case 'b': star[0].photFlags |= 0x0400; break;
     216    case '0': star[0].photFlags |= 0x0500; break;
    217217    default:
    218218      fprintf (stderr, "error!\n");
    … …  
    225225
    226226  switch (qual) {
    227     case '0': star[0].flags &= ~0x0008; break;
    228     case '1': star[0].flags &= ~0x0008; break;
    229     default:  star[0].flags |=  0x0008; break;
     227    case '0': star[0].photFlags &= ~0x0008; break;
     228    case '1': star[0].photFlags &= ~0x0008; break;
     229    default:  star[0].photFlags |=  0x0008; break;
    230230  }     
    231231  return (TRUE);
    … …  
    235235
    236236  switch (qual) {
    237     case '0': star[0].flags &= ~0x0080; break;
    238     case '1': star[0].flags &= ~0x0080; break;
     237    case '0': star[0].photFlags &= ~0x0080; break;
     238    case '1': star[0].photFlags &= ~0x0080; break;
    239239    default: 
    240       star[0].flags |= 0x0080;
     240      star[0].photFlags |= 0x0080;
    241241      star[0].extNsigma = 100.0;
    242242      break;
    … …  
    248248
    249249  switch (qual) {
    250     case '0': star[0].flags &= ~0x0800; break;
    251     case '1': star[0].flags &= ~0x0800; break;
    252     default:  star[0].flags |=  0x0800; break;
     250    case '0': star[0].photFlags &= ~0x0800; break;
     251    case '1': star[0].photFlags &= ~0x0800; break;
     252    default:  star[0].photFlags |=  0x0800; break;
    253253  }     
    254254  return (TRUE);
    … …  
    258258
    259259  switch (qual) {
    260     case '0': star[0].flags &= ~0x1000; break;
    261     case '1': star[0].flags &= ~0x1000; break;
    262     default:  star[0].flags |=  0x1000; break;
     260    case '0': star[0].photFlags &= ~0x1000; break;
     261    case '1': star[0].photFlags &= ~0x1000; break;
     262    default:  star[0].photFlags |=  0x1000; break;
    263263  }     
    264264  return (TRUE);
    … …  
    268268
    269269  switch (qual) {
    270     case '0': star[0].flags &= ~0x2000; break;
    271     case '1': star[0].flags |=  0x2000; break;
     270    case '0': star[0].photFlags &= ~0x2000; break;
     271    case '1': star[0].photFlags |=  0x2000; break;
    272272    default:  abort();
    273273  }     

  • branches/eam_branch_20090208/Ohana/src/addstar/src/get2mass_ops.c

    r17196 r21419  
    5757  }
    5858
    59   star[0].M       = M;
    60   star[0].dM      = dM;
    61   star[0].code    = Photcode;
    62   star[0].t       = time;
    63   star[0].found   = -1;
    64   star[0].detID   = 0;
    65   star[0].imageID = 0;
     59  star[0].M        = M;
     60  star[0].dM       = dM;
     61  star[0].photcode = Photcode;
     62  star[0].t        = time;
     63  star[0].found    = -1;
     64  star[0].detID    = 0;
     65  star[0].imageID  = 0;
    6666
    6767  return TRUE;
    … …  
    107107  // how many bits are being used for the 2mass flags; can we just set photFlags based on them?
    108108
    109   star[0].M     = J;
    110   star[0].dM    = dJ;
    111   star[0].code  = TM_J;
    112   star[0].t     = time;
    113   star[0].found = -1;
    114   star[0].detID   = 0;
    115   star[0].imageID = 0;
    116 
    117   star[1].M     = H;
    118   star[1].dM    = dH;
    119   star[1].code  = TM_H;
    120   star[1].t     = time;
    121   star[1].found = -1;
    122   star[1].detID   = 0;
    123   star[1].imageID = 0;
    124 
    125   star[2].M     = K;
    126   star[2].dM    = dK;
    127   star[2].code  = TM_K;
    128   star[2].t     = time;
    129   star[2].found = -1;
    130   star[2].detID   = 0;
    131   star[2].imageID = 0;
     109  star[0].M         = J;
     110  star[0].dM        = dJ;
     111  star[0].photcode  = TM_J;
     112  star[0].t         = time;
     113  star[0].found     = -1;
     114  star[0].detID     = 0;
     115  star[0].imageID   = 0;
     116
     117  star[1].M         = H;
     118  star[1].dM        = dH;
     119  star[1].photcode  = TM_H;
     120  star[1].t         = time;
     121  star[1].found     = -1;
     122  star[1].detID     = 0;
     123  star[1].imageID   = 0;
     124
     125  star[2].M         = K;
     126  star[2].dM        = dK;
     127  star[2].photcode  = TM_K;
     128  star[2].t         = time;
     129  star[2].found     = -1;
     130  star[2].detID     = 0;
     131  star[2].imageID   = 0;
    132132
    133133  return TRUE;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/getgsc.c

    r17439 r21419  
    7676
    7777      dparse (&stars[Nstars].M, 3, &buffer[Nbyte]);
    78       stars[Nstars].dM    = NAN;
    79       stars[Nstars].t     = 0;
    80       stars[Nstars].code  = GSC_M;
    81       stars[Nstars].found = -1;
     78      stars[Nstars].dM        = NAN;
     79      stars[Nstars].t         = 0;
     80      stars[Nstars].photcode  = GSC_M;
     81      stars[Nstars].found     = -1;
    8282
    8383      stars[Nstars].detID   = 0;
    8484      stars[Nstars].imageID = 0;
    8585
    86       stars[Nstars].X  = 0;
    87       stars[Nstars].Y  = 0;
     86      stars[Nstars].Xccd  = 0;
     87      stars[Nstars].Yccd  = 0;
    8888      stars[Nstars].fx = 0;
    8989      stars[Nstars].fy = 0;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/gettycho.c

    r17439 r21419  
    104104        stars[Ntycho].found = -1;
    105105     
    106         stars[Ntycho].X  = 0;
    107         stars[Ntycho].Y  = 0;
     106        stars[Ntycho].Xccd  = 0;
     107        stars[Ntycho].Yccd  = 0;
    108108        stars[Ntycho].fx = 0;
    109109        stars[Ntycho].fy = 0;
    … …  
    114114          stars[Ntycho].M     = atof (&line[110]);
    115115          stars[Ntycho].dM    = atof (&line[117]);
    116           stars[Ntycho].code  = TYCHO_B;
     116          stars[Ntycho].photcode  = TYCHO_B;
    117117        } else {
    118118          stars[Ntycho].M     = atof (&line[123]);
    119119          stars[Ntycho].dM    = atof (&line[130]);
    120           stars[Ntycho].code  = TYCHO_V;
     120          stars[Ntycho].photcode  = TYCHO_V;
    121121        }       
    122122     

  • branches/eam_branch_20090208/Ohana/src/addstar/src/getusno.c

    r17439 r21419  
    120120      stars[Nusno].imageID = 0;
    121121
    122       stars[Nusno].X  = 0;
    123       stars[Nusno].Y  = 0;
     122      stars[Nusno].Xccd  = 0;
     123      stars[Nusno].Yccd  = 0;
    124124      stars[Nusno].fx = 0;
    125125      stars[Nusno].fy = 0;
    … …  
    128128      /* one pass of addstar does either r or b */
    129129      if (photcode == USNO_RED) {
    130         stars[Nusno].code  = USNO_RED;
     130        stars[Nusno].photcode  = USNO_RED;
    131131        stars[Nusno].M     = fabs (0.1*(buf[2] - 1000*((int)(buf[2]/1000))));
    132132      }
    133133      if (photcode == USNO_BLUE) {     
    134         stars[Nusno].code  = USNO_BLUE;
     134        stars[Nusno].photcode  = USNO_BLUE;
    135135        stars[Nusno].M     = fabs (0.1*((int)(buf[2] - 1000000*((int)(buf[2]/1000000))) / 1000));
    136136      }

  • branches/eam_branch_20090208/Ohana/src/addstar/src/getusnob.c

    r17439 r21419  
    149149      stars[Nusno].imageID = 0;
    150150
    151       stars[Nusno].X  = 0;
    152       stars[Nusno].Y  = 0;
     151      stars[Nusno].Xccd  = 0;
     152      stars[Nusno].Yccd  = 0;
    153153      stars[Nusno].fx = 0;
    154154      stars[Nusno].fy = 0;
    … …  
    172172          m2 = 0;
    173173      }
    174       stars[Nusno].code = photcode;
     174      stars[Nusno].photcode = photcode;
    175175
    176176      /* if two mags are available, get an average */

  • branches/eam_branch_20090208/Ohana/src/addstar/src/grefstars.c

    r19823 r21419  
    2727    stars[N].R = ohana_normalize_angle (stars[N].R);
    2828    stars[N].t = 0;
    29     stars[N].code = photcode;
     29    stars[N].photcode = photcode;
    3030    stars[N].found = FALSE;
    3131    stars[N].detID   = 0;
    3232    stars[N].imageID = 0;
    3333
    34     stars[N].X  = 0;
    35     stars[N].Y  = 0;
     34    stars[N].Xccd  = 0;
     35    stars[N].Yccd  = 0;
    3636    stars[N].fx = 0;
    3737    stars[N].fy = 0;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/load2mass_catalog.c

    r16810 r21419  
    3737    catalog[0].average[Nave].measureOffset = Nmeas;
    3838    catalog[0].average[Nave].missingOffset = -1;
    39     catalog[0].average[Nave].code          = 0;
     39    catalog[0].average[Nave].flags         = 0;
    4040
    4141    for (j = 0; j < Nsec; j++) {
    … …  
    4949      catalog[0].measure[Nmeas].dR        = 0.0;
    5050      catalog[0].measure[Nmeas].dD        = 0.0;
    51       catalog[0].measure[Nmeas].Xccd      = stars[i+j].X;
    52       catalog[0].measure[Nmeas].Yccd      = stars[i+j].Y;
     51      catalog[0].measure[Nmeas].Xccd      = stars[i+j].Xccd;
     52      catalog[0].measure[Nmeas].Yccd      = stars[i+j].Yccd;
    5353      catalog[0].measure[Nmeas].dXccd     = 0.0;
    5454      catalog[0].measure[Nmeas].dYccd     = 0.0;
    … …  
    5959      catalog[0].measure[Nmeas].t         = stars[i+j].t;
    6060      catalog[0].measure[Nmeas].averef    = Nave;
    61       catalog[0].measure[Nmeas].photcode  = stars[i+j].code;
    62       catalog[0].measure[Nmeas].dophot    = 0;
    63       catalog[0].measure[Nmeas].photFlags = stars[i+j].flags;
     61      catalog[0].measure[Nmeas].photcode  = stars[i+j].photcode;
     62      catalog[0].measure[Nmeas].photFlags = stars[i+j].photFlags;
    6463      catalog[0].measure[Nmeas].dbFlags   = 0;
    6564      catalog[0].measure[Nmeas].dt        = 0xffff;

  • branches/eam_branch_20090208/Ohana/src/addstar/src/replace_match.c

    r16810 r21419  
    77  /* search for entry and replace values M, dM, R, D */
    88  for (i = 0; i < average[0].Nmeasure; i++) {
    9     if (measure[i].photcode != star[0].code) continue;
     9    if (measure[i].photcode != star[0].photcode) continue;
    1010    measure[i].dR = 3600.0*(average[0].R - star[0].R);
    1111    measure[i].dD = 3600.0*(average[0].D - star[0].D);

  • branches/eam_branch_20090208/Ohana/src/addstar/src/sky_tessalation.c

    r21408 r21419  
    281281  image[0].NY = NY;
    282282
    283   image[0].code = 1; // this needs to be set more sensibly
     283  image[0].photcode = 1; // this needs to be set more sensibly
    284284
    285285  image[0].Mx   = xv[0];  image[0].My   = yv[0];
    … …  
    433433  rectangle[0].NX = NX;
    434434  rectangle[0].NY = NY;
    435   rectangle[0].code = 1; // this needs to be set more sensibly
     435  rectangle[0].photcode = 1; // this needs to be set more sensibly
    436436
    437437  return (TRUE);
    … …  
    477477  rectangle[0].NX = NX;
    478478  rectangle[0].NY = NY;
    479   rectangle[0].code = 1; // this needs to be set more sensibly
     479  rectangle[0].photcode = 1; // this needs to be set more sensibly
    480480
    481481  return (TRUE);
    … …  
    511511      output[N].NX = NX;
    512512      output[N].NY = NY;
    513       output[N].code = input[0].code;
     513      output[N].photcode = input[0].photcode;
    514514
    515515      output[N].coords.crpix1 = input[0].coords.crpix1 - i*NX;

  • branches/eam_branch_20090208/Ohana/src/getstar/src/ReadImageFiles.c

    r21408 r21419  
    6464      /* find image rootname */
    6565      name = filebasename (file[i]);
    66       snprintf (image[N].name, DVO_IMAGE_NAME_LEN, name);
     66      snprintf (image[N].name, DVO_IMAGE_NAME_LEN, "%s", name);
    6767      free (name);
    6868

  • branches/eam_branch_20090208/Ohana/src/getstar/src/ReadImageHeader.c

    r20184 r21419  
    112112  image[0].Mcal = 0.0;
    113113  image[0].Xm   = NAN_S_SHORT;
    114   image[0].code = 0;
     114  image[0].flags = 0;
    115115
    116116  return (TRUE);

  • branches/eam_branch_20090208/Ohana/src/getstar/src/write_getstar_ps1_dev_0.c

    r16810 r21419  
    4646    output[i].D        = average[i].D;
    4747
    48     output[i].code     = average[i].code;
     48    output[i].code     = average[i].flags;
    4949    output[i].photcode = code_c0;
    5050

  • branches/eam_branch_20090208/Ohana/src/getstar/src/write_getstar_ps1_dev_1.c

    r16810 r21419  
    4949    output[i].P        = average[i].P;
    5050
    51     output[i].code     = average[i].code;
     51    output[i].code     = average[i].flags;
    5252    output[i].photcode = code_c0;
    5353

  • branches/eam_branch_20090208/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c

    r16810 r21419  
    5555    output[i].dP       = average[i].dP;
    5656
    57     output[i].code     = average[i].code;
     57    output[i].code     = average[i].flags;
    5858    output[i].photcode = code_c0;
    5959

  • branches/eam_branch_20090208/Ohana/src/imregister/imphot/modify.c

    r7080 r21419  
    1313    if (options.modify) {
    1414      if (!strcasecmp (options.ModifyEntry, "and")) {
    15         image[i].code &= atoi (options.ModifyValue);
     15        image[i].flags &= atoi (options.ModifyValue);
    1616      }
    1717      if (!strcasecmp (options.ModifyEntry, "or")) {
    18         image[i].code |= atoi (options.ModifyValue);
     18        image[i].flags |= atoi (options.ModifyValue);
    1919      }
    2020      if (!strcasecmp (options.ModifyEntry, "xor")) {
    21         image[i].code ^= atoi (options.ModifyValue);
     21        image[i].flags ^= atoi (options.ModifyValue);
    2222      }
    2323      if (!strcasecmp (options.ModifyEntry, "=")) {
    24         image[i].code = atoi (options.ModifyValue);
     24        image[i].flags = atoi (options.ModifyValue);
    2525      }
    2626    }

  • branches/eam_branch_20090208/Ohana/src/imregister/imphot/output.c

    r14590 r21419  
    3939     
    4040    fprintf (stdout, "%s %s %s  %7.4f %7.4f  %7.4f %5d %02x\n", image[i].name, photstr, timestr,
    41              image[i].Mcal, image[i].dMcal, image[i].secz, image[i].nstar, image[i].code);
     41             image[i].Mcal, image[i].dMcal, image[i].secz, image[i].nstar, image[i].flags);
    4242    free (timestr);
    4343  }

  • branches/eam_branch_20090208/Ohana/src/imregister/imphot/subset.c

    r12332 r21419  
    2424    if (!status && criteria.Ntimes) continue;
    2525    if (criteria.PhotcodeSelect && (image[i].photcode != criteria.photcode)) continue;
    26     if (criteria.CodeSelect     && (image[i].code != criteria.Code)) continue;
     26    if (criteria.CodeSelect     && (image[i].flags != criteria.Code)) continue;
    2727    if (criteria.NameSelect     && strncasecmp (image[i].name, criteria.Name, NameSelectLength)) continue;
    2828

  • branches/eam_branch_20090208/Ohana/src/libohana/include/ohana.h

    r21408 r21419  
    66# include <time.h>
    77# include <stdlib.h>
     8# include <stdint.h>
    89# include <string.h>
    910# include <sys/socket.h>

  • branches/eam_branch_20090208/Ohana/src/opihi/dvo/dbExtractAverages.c

    r21408 r21419  
    121121      break;
    122122    case AVE_FLAG:
    123       value.Int = average[0].code;
     123      value.Int = average[0].flags;
    124124      break;
    125125    case AVE_OBJID:

  • branches/eam_branch_20090208/Ohana/src/opihi/dvo/dbExtractImages.c

    r20936 r21419  
    247247      break;
    248248    case IMAGE_FLAG:
    249       value.Int = image[N].code;
     249      value.Int = image[N].flags;
    250250      break;
    251251    case IMAGE_CCDNUM:

  • branches/eam_branch_20090208/Ohana/src/opihi/dvo/dbExtractMeasures.c

    r21408 r21419  
    146146        case MAG_NPHOT:
    147147          if (equiv == NULL) {
    148             value.Int = NAN;
     148            value.Int = 0;
    149149            break;
    150150          }
    … …  
    260260      break;
    261261    case MEAS_OBJFLAGS: /* OK */
    262       value.Int = average[0].code;
     262      value.Int = average[0].flags;
    263263      break;
    264264    // note that these represent the ra displacement relative to the average, not
    … …  
    312312      break;
    313313    case MEAS_DOPHOT: /* OK */
    314       value.Flt = measure[0].dophot;
     314      value.Int = (measure[0].photFlags >> 16);
    315315      break;
    316316    case MEAS_DB_FLAGS: /* ? */
    … …  
    394394      break;
    395395    case MEAS_PSF_QF: /* OK */
    396       value.Flt = measure[0].qPSF;
     396      value.Flt = measure[0].psfQual;
    397397      break;
    398398    case MEAS_PSF_CHISQ: /* OK */

  • branches/eam_branch_20090208/Ohana/src/opihi/dvo/dbFields.c

    r21408 r21419  
    170170  if (!strcasecmp (fieldName, "FWHM_MIN"))   ESCAPE (MEAS_FWHM_MIN,       MAG_NONE, OPIHI_FLT);
    171171  if (!strcasecmp (fieldName, "THETA"))      ESCAPE (MEAS_THETA,          MAG_NONE, OPIHI_FLT);
    172   if (!strcasecmp (fieldName, "DOPHOT"))     ESCAPE (MEAS_DOPHOT,         MAG_NONE, OPIHI_FLT);
     172  if (!strcasecmp (fieldName, "DOPHOT"))     ESCAPE (MEAS_DOPHOT,         MAG_NONE, OPIHI_INT);
    173173  if (!strcasecmp (fieldName, "DB_FLAGS"))   ESCAPE (MEAS_DB_FLAGS,       MAG_NONE, OPIHI_INT);
    174174  if (!strcasecmp (fieldName, "PHOT_FLAGS")) ESCAPE (MEAS_PHOT_FLAGS,     MAG_NONE, OPIHI_INT);

  • branches/eam_branch_20090208/Ohana/src/opihi/dvo/gimages.c

    r21408 r21419  
    220220    if (PixelCoords) {
    221221      gprint (GP_LOG, "%3d %s %6.1f %6.1f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x\n",
    222                Nfound, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].code);
     222               Nfound, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags);
    223223    } else {
    224224      XY_to_RD (&ra, &dec, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
    225225      gprint (GP_LOG, "%3d %s %8.4f %8.4f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x\n",
    226                Nfound, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].code);
     226               Nfound, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags);
    227227    }
    228228    sprintf (name, "IMAGEx:%d", Nfound);

  • branches/eam_branch_20090208/Ohana/src/opihi/dvo/gstar.c

    r20936 r21419  
    158158        gprint (GP_LOG, "%3d   ",  catalog.average[k].Nmeasure);
    159159        gprint (GP_LOG, "%4.1f ",  0.01*catalog.average[k].Xp);
    160         gprint (GP_LOG, "%5d",     catalog.average[k].code);
     160        gprint (GP_LOG, "%5d",     catalog.average[k].flags);
    161161
    162162        if (FULL_OUTPUT) {
    … …  
    211211            gprint (GP_LOG, "%7.4f ",  catalog.measure[m].dR);
    212212            gprint (GP_LOG, "%7.4f",   catalog.measure[m].dD);
    213             gprint (GP_LOG, "%2d ",    catalog.measure[m].dophot);
     213            gprint (GP_LOG, "%4x ",    catalog.measure[m].photFlags);
    214214            gprint (GP_LOG, "%3x ",    catalog.measure[m].dbFlags);
    215215            gprint (GP_LOG, "%5d ",    catalog.measure[m].photcode);
    … …  
    233233                gprint (GP_LOG, "%d", catalog.measure[m].detID);
    234234                gprint (GP_LOG, "%d", catalog.measure[m].imageID);
    235                 gprint (GP_LOG, "%f", catalog.measure[m].qPSF);
     235                gprint (GP_LOG, "%f", catalog.measure[m].psfQual);
    236236                gprint (GP_LOG, "%f", catalog.measure[m].psfChisq);
    237237                gprint (GP_LOG, "%f", catalog.measure[m].crNsigma);
    … …  
    240240                gprint (GP_LOG, "%f", 0.01*catalog.measure[m].FWy);
    241241                gprint (GP_LOG, "%f", (360.0/(float)0xffff)*catalog.measure[m].theta);
    242 
    243                 gprint (GP_LOG, "%x", catalog.measure[m].photFlags);
    244242                gprint (GP_LOG, "%d", catalog.measure[m].stargal);
    245243            }

  • branches/eam_branch_20090208/Ohana/src/opihi/dvo/paverage.c

    r20936 r21419  
    122122    /* project stars to screen display coords */
    123123    for (i = 0; (i < catalog.Naverage) && !interrupt; i++) {
    124       if (IDclip && (average[i].code != IDchoice)) continue;
     124      if (IDclip && (average[i].flags != IDchoice)) continue;
    125125      average[i].R = ohana_normalize_angle (average[i].R);
    126126      while (average[i].R < Rmin) average[i].R += 360.0;

  • branches/eam_branch_20090208/Ohana/src/opihi/dvo/photometry.c

    r17200 r21419  
    22
    33/* match code to measure  */
    4 # define TESTCODE(C,M) \
    5   if (C != NULL) { \
    6     switch (C[0].type) { \
    7     case PHOT_DEP: \
    8     case PHOT_REF: \
    9       if (C[0].code != M.photcode) continue; \
    10       break; \
    11     case PHOT_SEC: \
    12       if (C[0].code != GetPhotcodeEquivCodebyCode (M.photcode)) continue; \
    13       break; \
    14     default: \
    15       break; \
    16   } }
     4# define TESTCODE(C,M)                                                  \
     5  if (C != NULL) {                                                      \
     6    switch (C[0].type) {                                                \
     7      case PHOT_DEP:                                                    \
     8      case PHOT_REF:                                                    \
     9        if (C[0].code != M.photcode) continue;                          \
     10        break;                                                          \
     11      case PHOT_SEC:                                                    \
     12        if (C[0].code != GetPhotcodeEquivCodebyCode (M.photcode)) continue; \
     13        break;                                                          \
     14      default:                                                          \
     15        break;                                                          \
     16    } }
    1717
    1818/* exclusions based on measure.params  */
    19 # define TESTMEASURE(M) \
    20   if (ApplySelections[SelectionParam]) { \
    21     if (TimeSelect && (M.t < tzero)) continue; \
    22     if (TimeSelect && (M.t > tend)) continue; \
    23     if (ErrSelect  && (M.dM > ErrValue)) continue; \
     19# define TESTMEASURE(M)                                                 \
     20  if (ApplySelections[SelectionParam]) {                                \
     21    if (TimeSelect && (M.t < tzero)) continue;                          \
     22    if (TimeSelect && (M.t > tend)) continue;                           \
     23    if (ErrSelect  && (M.dM > ErrValue)) continue;                      \
     24    if (iMagSelect && (PhotInst (&M) < iMagMin)) continue;              \
     25    if (FlagSelect && (M.dbFlags != FlagValue)) continue;               \
    2426    if (TypeSelect && (TypeValue != GetMeasureTypeCode (&M))) continue; \
    25     if (iMagSelect && (PhotInst (&M) < iMagMin)) continue; \
    26     if (FlagSelect && (M.dbFlags != FlagValue)) continue; \
    27   }
    28 
    29 # define SETMAG(MOUT,MEAS,MODE) \
    30   MOUT = NAN; \
    31   if (MODE == MAG_INST) MOUT = PhotInst (&MEAS);  \
    32   if (MODE == MAG_CAT)  MOUT = PhotCat  (&MEAS); \
    33   if (MODE == MAG_SYS)  MOUT = PhotSys  (&MEAS, average, secfilt); \
    34   if (MODE == MAG_REL)  MOUT = PhotRel  (&MEAS, average, secfilt); \
     27  }
     28
     29# define SETMAG(MOUT,MEAS,MODE)                                         \
     30  MOUT = NAN;                                                           \
     31  if (MODE == MAG_INST) MOUT = PhotInst (&MEAS);                        \
     32  if (MODE == MAG_CAT)  MOUT = PhotCat  (&MEAS);                        \
     33  if (MODE == MAG_SYS)  MOUT = PhotSys  (&MEAS, average, secfilt);      \
     34  if (MODE == MAG_REL)  MOUT = PhotRel  (&MEAS, average, secfilt);      \
    3535  if (MODE == MAG_CAL)  MOUT = PhotCal  (&MEAS, average, secfilt, measure, GetPhotcodeEquivbyCode (MEAS.photcode)); \
    3636  if (MODE == MAG_AVE)  MOUT = PhotAve  (GetPhotcodeEquivbyCode (MEAS.photcode), average, secfilt); \
    3737  if (MODE == MAG_REF)  MOUT = PhotRef  (GetPhotcodeEquivbyCode (MEAS.photcode), average, secfilt, measure); \
    38   if (ApplySelections[SelectionParam]) { \
    39     if (MagSelect && (MOUT > MagMax)) continue; \
    40     if (MagSelect && (MOUT < MagMin)) continue; \
     38  if (ApplySelections[SelectionParam]) {                                \
     39    if (MagSelect && (MOUT > MagMax)) continue;                         \
     40    if (MagSelect && (MOUT < MagMin)) continue;                         \
    4141  }
    4242
    … …  
    182182  if (!strcasecmp (parname, "dec"))      param = MEAS_DEC;
    183183  if (!strcasecmp (parname, "mag"))      param = MEAS_MAG;
    184   // if (!strcasecmp (parname, "dmag"))          param = MEAS_dMAG;
    185184  if (!strcasecmp (parname, "airmass"))  param = MEAS_AIRMASS;
    186185  if (!strcasecmp (parname, "exptime"))  param = MEAS_EXPTIME;
    … …  
    190189  if (!strcasecmp (parname, "dD"))       param = MEAS_DEC_OFFSET;
    191190  if (!strcasecmp (parname, "fwhm"))     param = MEAS_FWHM;
    192   // if (!strcasecmp (parname, "dophot"))        param = MEAS_DOPHOT;
    193191  if (!strcasecmp (parname, "FLAGS"))    param = MEAS_DB_FLAGS;
    194192  if (!strcasecmp (parname, "XCCD"))     param = MEAS_XCCD;
    … …  
    198196  if (!strcasecmp (parname, "help")) {
    199197    gprint (GP_ERR, "value may be one of the following:\n");
    200     gprint (GP_ERR, " ra dR dec dD mag dmag Mrel Mcal photcode time fwhm dophot xccd yccd xmosaic ymosaic flags\n");
     198    gprint (GP_ERR, " ra dR dec dD mag dmag Mrel Mcal photcode time fwhm xccd yccd xmosaic ymosaic flags\n");
    201199    gprint (GP_ERR, "value may also be a valid photcode\n");
    202200    gprint (GP_ERR, "photcodes or 'mag' may have optional magnitude type: mag,[Minst, Mcat, Msys, Mrel, Mcal]\n");
    … …  
    311309
    312310  if (VarConfig ("ZERO_PT", "%lf", &ZERO_POINT) == (char *) NULL) {
    313       gprint (GP_ERR, "ZERO_PT undefined in config\n");
    314       return (FALSE);
     311    gprint (GP_ERR, "ZERO_PT undefined in config\n");
     312    return (FALSE);
    315313  }
    316314  SetZeroPoint (ZERO_POINT);
    … …  
    324322
    325323  if (VarConfig ("PHOTCODE_FILE", "%s", MasterPhotcodeFile) == (char *) NULL) {
    326       gprint (GP_ERR, "PHOTCODE_FILE undefined in config\n");
    327       return (FALSE);
     324    gprint (GP_ERR, "PHOTCODE_FILE undefined in config\n");
     325    return (FALSE);
    328326  }
    329327  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile)) {
    … …  
    642640      break;
    643641    case AVE_FLAG:
    644       value = average[0].code;
     642      value = average[0].flags;
    645643      break;
    646644    case AVE_MAG:
    … …  
    659657          value = NAN;
    660658          for (i = 0; i < average[0].Nmeasure; i++) {
    661               if (code[0].code != measure[i].photcode) continue;
    662               value = measure[i].M;
     659            if (code[0].code != measure[i].photcode) continue;
     660            value = measure[i].M;
    663661          }
    664662          break;
    … …  
    675673      break;
    676674    case AVE_TYPEFRAC:
    677       value = DetermineTypefrac (average, measure, code);
     675      // value = DetermineTypefrac (average, measure, code);
     676      value = NAN;
    678677      break;
    679678    case AVE_NCODE:
    … …  
    719718    if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[k].photcode))) continue;
    720719    Nc ++;
    721     if (measure[k].dophot != TypefracType) continue;
     720    if ((measure[k].photFlags >> 16) != TypefracType) continue;
    722721    Nt ++;
    723722  }
    … …  
    744743
    745744int GetMeasureTypeCode (Measure *measure) {
    746   switch (measure[0].dophot) {
     745  switch ((measure[0].photFlags >> 16)) {
    747746    case 0:
    748747    case 1:
    … …  
    770769  if (IsDophot) {
    771770   
    772     if (measure[0].dophot == 4) return (FALSE);
     771    if ((measure[0].photFlags >> 16) == 4) return (FALSE);
    773772    return (TRUE);
    774773 
    … …  
    866865  if (ErrSelect) {
    867866    dM = PhotdM (code, average, secfilt);
    868     if (dM > ErrValue) return (NAN);
     867    if (dM > ErrValue) return (FALSE);
    869868  }
    870869 
    … …  
    11371136      value = average[0].D - measure[0].dD / 3600.0;
    11381137      break;
    1139 # if (0)
    1140     case MEAS_dMAG: /* OK */
    1141       value = measure[0].dM;
    1142       break;
    11431138    case MEAS_DOPHOT: /* OK */
    1144       value = measure[0].dophot;
    1145       break;
    1146 # endif
     1139      value = (measure[0].photFlags >> 16);
     1140      break;
    11471141    case MEAS_AIRMASS: /* OK */
    11481142      value = measure[0].airmass;

  • branches/eam_branch_20090208/Ohana/src/opihi/dvo/pmeasure.c

    r20936 r21419  
    192192    /* project stars to screen display coords */
    193193    for (i = 0; (i < catalog.Naverage) && !interrupt; i++) {
    194       if (IDclip && (catalog.average[i].code != IDchoice)) continue;
     194      if (IDclip && (catalog.average[i].flags != IDchoice)) continue;
    195195      catalog.average[i].R = ohana_normalize_angle (catalog.average[i].R);
    196196      while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;

  • branches/eam_branch_20090208/Ohana/src/relastro/include/relastro.h

    r21153 r21419  
    6161  short Xm;
    6262  float secz;
    63   char code;
     63  char flags;
    6464  Coords coords;
    6565} Mosaic;

  • branches/eam_branch_20090208/Ohana/src/relastro/src/MosaicOps.c

    r16810 r21419  
    4747    mosaic[Nmosaic].dMcal = 0.0;
    4848    mosaic[Nmosaic].Xm    = 0.0;
    49     mosaic[Nmosaic].code  = image[i].code;
     49    mosaic[Nmosaic].flags  = image[i].flags;
    5050    mosaic[Nmosaic].secz  = image[i].secz;
    5151    mosaic[Nmosaic].coords = image[i].coords;

  • branches/eam_branch_20090208/Ohana/src/relastro/src/UpdateObjects.c

    r17419 r21419  
    169169      // position, consider including the lower-quality detections
    170170
    171       catalog[i].average[j].code &= ~ID_STAR_FEW;
     171      catalog[i].average[j].flags &= ~ID_STAR_FEW;
    172172
    173173      // XXX add the parallax factor range as a criterion as well

  • branches/eam_branch_20090208/Ohana/src/relastro/src/bcatalog.c

    r17212 r21419  
    3636      // XXX define astrometry vs photometry average.dbFlags
    3737      // XXX put photometry flags in secfilt (ie, per average mag?)
    38       subcatalog[0].average[Naverage].code &= ~ID_STAR_FEW;
    39       subcatalog[0].average[Naverage].code &= ~ID_STAR_POOR;
     38      subcatalog[0].average[Naverage].flags &= ~ID_STAR_FEW;
     39      subcatalog[0].average[Naverage].flags &= ~ID_STAR_POOR;
    4040    }
    4141
    … …  
    7070
    7171      /* select measurements by quality */
    72       if (DophotSelect && (catalog[0].measure[offset].dophot != DophotValue)) continue;
     72      // XXX FIX THIS!!
     73      // if (DophotSelect && (catalog[0].measure[offset].dophot != DophotValue)) continue;
    7374
    7475      /* select measurements by quality */

  • branches/eam_branch_20090208/Ohana/src/relastro/src/load_catalogs.c

    r16810 r21419  
    3838      if (RESET) {
    3939        for (j = 0; j < catalog[i].Naverage; j++) {
    40           catalog[i].average[j].code = 0;
     40          catalog[i].average[j].flags = 0;
    4141          m = catalog[i].average[j].measureOffset;
    4242          for (k = 0; k < catalog[i].average[j].Nmeasure; k++) {

  • branches/eam_branch_20090208/Ohana/src/relastro/src/relastro_objects.c

    r17243 r21419  
    4040    if (RESET) {
    4141      for (j = 0; j < catalog.Naverage; j++) {
    42         catalog.average[j].code = 0;
     42        catalog.average[j].flags = 0;
    4343        m = catalog.average[j].measureOffset;
    4444        for (k = 0; k < catalog.average[j].Nmeasure; k++) {

  • branches/eam_branch_20090208/Ohana/src/relastro/src/select_images.c

    r17205 r21419  
    147147      image[nimage] = timage[i];
    148148      /* always allow 'few' images to succeed, if possible */
    149       if (image[nimage].code & ID_IMAGE_FEW) {
    150         image[nimage].code &= ~(ID_IMAGE_FEW | ID_IMAGE_POOR);
     149      if (image[nimage].flags & ID_IMAGE_FEW) {
     150        image[nimage].flags &= ~(ID_IMAGE_FEW | ID_IMAGE_POOR);
    151151      }
    152152      if (RESET) {
    … …  
    154154        assignMcal (&image[nimage], (double *) NULL, -1);
    155155        image[nimage].dMcal = NAN;
    156         image[nimage].code &= ~ID_IMAGE_POOR;
     156        image[nimage].flags &= ~ID_IMAGE_POOR;
    157157      }
    158158      line_number[nimage] = i;

  • branches/eam_branch_20090208/Ohana/src/relphot/include/relphot.h

    r21153 r21419  
    2323  short Xm;
    2424  float secz;
    25   char code;
     25  char flags;
    2626  Coords coords;
    2727} Mosaic;

  • branches/eam_branch_20090208/Ohana/src/relphot/src/GridOps.c

    r20936 r21419  
    369369
    370370      // skip stars marked as BAD
    371       if (catalog[c].average[n].code & STAR_BAD) {
     371      if (catalog[c].average[n].flags & STAR_BAD) {
    372372        Nrel ++;
    373373        continue;

  • branches/eam_branch_20090208/Ohana/src/relphot/src/ImageOps.c

    r20936 r21419  
    244244  if (i == -1) return (NAN);
    245245
    246   if (image[i].code & IMAGE_BAD) return (NAN); 
     246  if (image[i].flags & IMAGE_BAD) return (NAN); 
    247247  value = image[i].Mcal;
    248248  return (value);
    … …  
    285285    /* on PoorImages run, skip good images */
    286286    if (PoorImages) {
    287       bad = image[i].code & (ID_IMAGE_FEW | ID_IMAGE_POOR | ID_IMAGE_SKIP);
     287      bad = image[i].flags & (ID_IMAGE_FEW | ID_IMAGE_POOR | ID_IMAGE_SKIP);
    288288      if (!bad) continue;
    289289    }     
    … …  
    331331      mark = (N < IMAGE_TOOFEW) || (N < IMAGE_GOOD_FRACTION*Nlist[i]);
    332332      if (mark) {
    333         image[i].code |= ID_IMAGE_FEW;
     333        image[i].flags |= ID_IMAGE_FEW;
    334334        Nfew ++;
    335335      } else {
    336         image[i].code &= ~ID_IMAGE_FEW;
     336        image[i].flags &= ~ID_IMAGE_FEW;
    337337      }     
    338338    }
    … …  
    373373
    374374  for (i = N = 0; i < Nimage; i++) {
    375     if (image[i].code & IMAGE_BAD) continue;
     375    if (image[i].flags & IMAGE_BAD) continue;
    376376    mlist[N] = fabs (image[i].Mcal);
    377377    slist[N] = image[i].dMcal;
    … …  
    390390  for (i = 0; i < Nimage; i++) {
    391391    mark = FALSE;
    392     image[i].code &= ~ID_IMAGE_POOR;
     392    image[i].flags &= ~ID_IMAGE_POOR;
    393393    mark = (image[i].dMcal > MaxScatter) || (fabs(image[i].Mcal - MedOffset) > MaxOffset);
    394394    if (mark) {
    395395      Nmark ++;
    396       image[i].code |= ID_IMAGE_POOR;
     396      image[i].flags |= ID_IMAGE_POOR;
    397397    } else {
    398       image[i].code &= ~ID_IMAGE_POOR;
     398      image[i].flags &= ~ID_IMAGE_POOR;
    399399    }
    400400  }
    … …  
    470470  n = 0;
    471471  for (i = 0; i < Nimage; i++) {
    472     if (image[i].code & IMAGE_BAD)  continue;
     472    if (image[i].flags & IMAGE_BAD)  continue;
    473473
    474474    N = 0;
    … …  
    512512  for (i = 0; i < Nimage; i++) {
    513513
    514     if (image[i].code & IMAGE_BAD)  continue;
     514    if (image[i].flags & IMAGE_BAD)  continue;
    515515
    516516    list[n] = pow (10.0, 0.01*image[i].Xm);
    … …  
    540540  for (i = 0; i < Nimage; i++) {
    541541
    542     if (image[i].code & IMAGE_BAD)  continue;
     542    if (image[i].flags & IMAGE_BAD)  continue;
    543543
    544544    list[n] = image[i].Mcal;
    … …  
    568568  for (i = 0; i < Nimage; i++) {
    569569
    570     if (image[i].code & IMAGE_BAD)  continue;
     570    if (image[i].flags & IMAGE_BAD)  continue;
    571571
    572572    list[n] = image[i].dMcal;

  • branches/eam_branch_20090208/Ohana/src/relphot/src/MosaicOps.c

    r20323 r21419  
    6868    mosaic[Nmosaic].dMcal = 0.0;
    6969    mosaic[Nmosaic].Xm    = 0.0;
    70     mosaic[Nmosaic].code  = image[i].code;
     70    mosaic[Nmosaic].flags  = image[i].flags;
    7171    mosaic[Nmosaic].secz  = image[i].secz;
    7272
    … …  
    183183      image[im].dMcal = mosaic[i].dMcal;
    184184      image[im].Xm = mosaic[i].Xm;
    185       image[im].code |= (mosaic[i].code & ID_IMAGE_FEW);
    186       image[im].code |= (mosaic[i].code & ID_IMAGE_POOR);
     185      image[im].flags |= (mosaic[i].flags & ID_IMAGE_FEW);
     186      image[im].flags |= (mosaic[i].flags & ID_IMAGE_POOR);
    187187    }
    188188  }     
    … …  
    306306  if (i == -1) return (NAN);
    307307
    308   if (mosaic[i].code & IMAGE_BAD) return (NAN); 
     308  if (mosaic[i].flags & IMAGE_BAD) return (NAN); 
    309309  value = mosaic[i].Mcal;
    310310  return (value);
    … …  
    343343    /* on PoorImages run, skip good images */
    344344    if (PoorImages) {
    345       bad = mosaic[i].code & (ID_IMAGE_FEW | ID_IMAGE_POOR | ID_IMAGE_SKIP);
     345      bad = mosaic[i].flags & (ID_IMAGE_FEW | ID_IMAGE_POOR | ID_IMAGE_SKIP);
    346346      if (!bad) continue;
    347347    }     
    … …  
    393393      if (mark) {
    394394        fprintf (stderr, "marked image %s (%d), (%d < %d) || (%d < %f*%d)\n", image[imlist[i][0]].name, i, N, IMAGE_TOOFEW, N, IMAGE_GOOD_FRACTION, Nlist[i]);
    395         mosaic[i].code |= ID_IMAGE_FEW;
     395        mosaic[i].flags |= ID_IMAGE_FEW;
    396396        Nfew ++;
    397397      } else {
    398         mosaic[i].code &= ~ID_IMAGE_FEW;
     398        mosaic[i].flags &= ~ID_IMAGE_FEW;
    399399      }
    400400    }
    … …  
    434434  n = 0;
    435435  for (i = 0; i < Nmosaic; i++) {
    436     if (mosaic[i].code & IMAGE_BAD) continue;
     436    if (mosaic[i].flags & IMAGE_BAD) continue;
    437437    list[n] = mosaic[i].Mcal;
    438438    dlist[n] = 1;
    … …  
    462462  for (i = 0; i < Nmosaic; i++) {
    463463
    464     if (mosaic[i].code & IMAGE_BAD) continue;
     464    if (mosaic[i].flags & IMAGE_BAD) continue;
    465465    list[n] = mosaic[i].dMcal;
    466466    dlist[n] = 1;
    … …  
    490490  n = 0;
    491491  for (i = 0; i < Nmosaic; i++) {
    492     if (mosaic[i].code & IMAGE_BAD)  continue;
     492    if (mosaic[i].flags & IMAGE_BAD)  continue;
    493493
    494494    N = 0;
    … …  
    534534  for (i = 0; i < Nmosaic; i++) {
    535535
    536     if (mosaic[i].code & IMAGE_BAD) continue;
     536    if (mosaic[i].flags & IMAGE_BAD) continue;
    537537    list[n] = pow(10.0, 0.01*mosaic[i].Xm);
    538538    dlist[n] = 1;
    … …  
    564564
    565565  for (i = N = 0; i < Nmosaic; i++) {
    566     if (mosaic[i].code & IMAGE_BAD) continue;
     566    if (mosaic[i].flags & IMAGE_BAD) continue;
    567567    mlist[N] = mosaic[i].Mcal;
    568568    slist[N] = mosaic[i].dMcal;
    … …  
    584584    if (mark) {
    585585      Nmark ++;
    586       mosaic[i].code |= ID_IMAGE_POOR;
     586      mosaic[i].flags |= ID_IMAGE_POOR;
    587587    } else {
    588       mosaic[i].code &= ~ID_IMAGE_POOR;
     588      mosaic[i].flags &= ~ID_IMAGE_POOR;
    589589    }
    590590  }

  • branches/eam_branch_20090208/Ohana/src/relphot/src/StarOps.c

    r21408 r21419  
    2626
    2727  ave = catalog[cat].measure[meas].averef;
    28   if (catalog[cat].average[ave].code & STAR_BAD) return (NAN); 
     28  if (catalog[cat].average[ave].flags & STAR_BAD) return (NAN); 
    2929 
    3030  value = catalog[cat].secfilt[PhotNsec*ave+PhotSec].M;
    … …  
    4444
    4545      /* calculate the average value for a single star */
    46       if (catalog[i].average[j].code & STAR_BAD) continue; 
     46      if (catalog[i].average[j].flags & STAR_BAD) continue; 
    4747      m = catalog[i].average[j].measureOffset;
    4848
    … …  
    8989
    9090      if (N <= STAR_TOOFEW) { /* too few measurements */
    91         catalog[i].average[j].code |= ID_STAR_FEW;
     91        catalog[i].average[j].flags |= ID_STAR_FEW;
    9292        Nfew ++;
    9393      } else {
    94         catalog[i].average[j].code &= ~ID_STAR_FEW;
     94        catalog[i].average[j].flags &= ~ID_STAR_FEW;
    9595      }
    9696
    … …  
    208208
    209209          // XXX this is a hack for the 2MASS search; better to save an average value?
    210           if (catalog[i].measure[m].qPSF < 0.85) continue;
     210          if (catalog[i].measure[m].psfQual < 0.85) continue;
    211211
    212212          list[N] = Msys - catalog[i].measure[m].Mcal;
    … …  
    280280  for (i = Ntot = 0; i < Ncatalog; i++) {
    281281    for (j = 0; j < catalog[i].Naverage; j++) {
    282       if (catalog[i].average[j].code & STAR_BAD) continue;
     282      if (catalog[i].average[j].flags & STAR_BAD) continue;
    283283      Xm = catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
    284284      if (Xm == -1) continue;
    … …  
    306306      mark = (dM > MaxScatter) || (Xm == NAN_S_SHORT) || (Chisq > MaxChisq);
    307307      if (mark) {
    308         catalog[i].average[j].code |= ID_STAR_POOR;
     308        catalog[i].average[j].flags |= ID_STAR_POOR;
    309309        Ndel ++;
    310310      } else {
    311         catalog[i].average[j].code &= ~ID_STAR_POOR;
     311        catalog[i].average[j].flags &= ~ID_STAR_POOR;
    312312      }
    313313      Nave ++;
    … …  
    351351
    352352      /* skip bad stars to prevent them from becoming good (on inner sample) */
    353       if (catalog[i].average[j].code & STAR_BAD) continue; 
     353      if (catalog[i].average[j].flags & STAR_BAD) continue; 
    354354
    355355      /* on final processing, skip stars already measured */
    … …  
    448448
    449449      /* calculate the average value for a single star */
    450       if (catalog[i].average[j].code & STAR_BAD) continue; 
     450      if (catalog[i].average[j].flags & STAR_BAD) continue; 
    451451      m = catalog[i].average[j].measureOffset;
    452452
    … …  
    493493
    494494      /* calculate the average value for a single star */
    495       if (catalog[i].average[j].code & STAR_BAD) continue; 
     495      if (catalog[i].average[j].flags & STAR_BAD) continue; 
    496496
    497497      Xm = catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;
    … …  
    529529
    530530      /* calculate the average value for a single star */
    531       if (catalog[i].average[j].code & STAR_BAD) continue; 
     531      if (catalog[i].average[j].flags & STAR_BAD) continue; 
    532532
    533533      dM = catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
    … …  
    559559  for (i = 0; i < Ncatalog; i++) {
    560560    for (j = 0; j < catalog[i].Naverage; j++) {
    561       if (catalog[i].average[j].code & STAR_BAD) continue; 
     561      if (catalog[i].average[j].flags & STAR_BAD) continue; 
    562562      dMrel = catalog[i].secfilt[PhotNsec*j+PhotSec].dM;
    563563      bin = dMrel / 0.00025;
    … …  
    590590  for (i = 0; i < Ncatalog; i++) {
    591591    for (j = 0; j < catalog[i].Naverage; j++) {
    592       if (catalog[i].average[j].code & STAR_BAD) continue;
     592      if (catalog[i].average[j].flags & STAR_BAD) continue;
    593593      xlist[N] = catalog[i].secfilt[PhotNsec*j+PhotSec].M;
    594594      value    = catalog[i].secfilt[PhotNsec*j+PhotSec].Xm;

  • branches/eam_branch_20090208/Ohana/src/relphot/src/bcatalog.c

    r20323 r21419  
    3434      subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].M  = NAN;
    3535      subcatalog[0].secfilt[PhotNsec*Naverage+PhotSec].dM = NAN;
    36       subcatalog[0].average[Naverage].code &= ~ID_STAR_FEW;
    37       subcatalog[0].average[Naverage].code &= ~ID_STAR_POOR;
     36      subcatalog[0].average[Naverage].flags &= ~ID_STAR_FEW;
     37      subcatalog[0].average[Naverage].flags &= ~ID_STAR_POOR;
    3838    }
    3939
    … …  
    5555      /* select measurements by quality */
    5656      // XXX ignore this criterion for REF measurements?
    57       if (DophotSelect && (catalog[0].measure[offset].dophot != DophotValue)) continue;
     57      // XXX chnage this to select by bitflags
     58      if (DophotSelect && ((catalog[0].measure[offset].photFlags >> 16) != DophotValue)) continue;
    5859
    5960      /* select measurements by mag limit */

  • branches/eam_branch_20090208/Ohana/src/relphot/src/plot_scatter.c

    r20193 r21419  
    2323
    2424      /* calculate the average value for a single star */
    25       if (catalog[i].average[j].code & STAR_BAD) continue; 
     25      if (catalog[i].average[j].flags & STAR_BAD) continue; 
    2626      m = catalog[i].average[j].measureOffset;
    2727

  • branches/eam_branch_20090208/Ohana/src/relphot/src/relphot_objects.c

    r21408 r21419  
    4242      Nsecfilt = catalog.Nsecfilt;
    4343      for (j = 0; j < catalog.Naverage; j++) {
    44         catalog.average[j].code = 0;
     44        catalog.average[j].flags = 0;
    4545        for (k = 0; k < Nsecfilt; k++) {
    46           catalog.secfilt[j*Nsecfilt + k].M  = NAN;
    47           catalog.secfilt[j*Nsecfilt + k].dM = NAN;
    48           catalog.secfilt[j*Nsecfilt + k].Xm = NAN_S_SHORT;
     46          catalog.secfilt[j*Nsecfilt + k].M     = NAN;
     47          catalog.secfilt[j*Nsecfilt + k].M_20  = NAN;
     48          catalog.secfilt[j*Nsecfilt + k].M_80  = NAN;
     49          catalog.secfilt[j*Nsecfilt + k].dM    = NAN;
     50          catalog.secfilt[j*Nsecfilt + k].Xm    = NAN_S_SHORT;
    4951          catalog.secfilt[j*Nsecfilt + k].Ncode = 0;
    5052          catalog.secfilt[j*Nsecfilt + k].Nused = 0;
    51           catalog.secfilt[j*Nsecfilt + k].dummy = 0;
    5253        }
    5354        m = catalog.average[j].measureOffset;

  • branches/eam_branch_20090208/Ohana/src/relphot/src/select_images.c

    r15509 r21419  
    133133      image[nimage] = timage[i];
    134134      /* always allow 'few' images to succeed, if possible */
    135       if (image[nimage].code & ID_IMAGE_FEW) {
    136         image[nimage].code &= ~(ID_IMAGE_FEW | ID_IMAGE_POOR);
     135      if (image[nimage].flags & ID_IMAGE_FEW) {
     136        image[nimage].flags &= ~(ID_IMAGE_FEW | ID_IMAGE_POOR);
    137137      }
    138138      if (RESET) {
    139139        assignMcal (&image[nimage], (double *) NULL, -1);
    140140        image[nimage].dMcal = NAN;
    141         image[nimage].code &= ~ID_IMAGE_POOR;
     141        image[nimage].flags &= ~ID_IMAGE_POOR;
    142142      }
    143143      line_number[nimage] = i;

  • branches/eam_branch_20090208/Ohana/src/relphot/src/setMrelFinal.c

    r17201 r21419  
    5454  /* clear ID_STAR_POOR, ID_STAR_FEW, ID_MEAS_NOCAL values before writing ??? */
    5555  for (i = 0; i < catalog[0].Naverage; i++) {
    56     catalog[0].average[i].code &= ~ID_STAR_FEW;
    57     catalog[0].average[i].code &= ~ID_STAR_POOR;
     56    catalog[0].average[i].flags &= ~ID_STAR_FEW;
     57    catalog[0].average[i].flags &= ~ID_STAR_POOR;
    5858    m = catalog[0].average[i].measureOffset;
    5959    for (j = 0; j < catalog[0].average[i].Nmeasure; j++, m++) {
    … …  
    102102
    103103      /* skip measurements with sat. dophot values */
    104       if ((pass < 4) && (catalog[0].measure[m].dophot == 10)) goto skip;
     104      // XXX we need to fix this: use the photFlags to ID saturation...
     105      // if ((pass < 4) && (catalog[0].measure[m].dophot == 10)) goto skip;
    105106
    106107      /* skip measurements from BAD images and mosaics */
    … …  
    116117      }
    117118
    118       d1 = (catalog[0].measure[m].dophot == 1);
    119       d2 = (catalog[0].measure[m].dophot == 2);
     119      // d1 = (catalog[0].measure[m].dophot == 1);
     120      // d2 = (catalog[0].measure[m].dophot == 2);
     121      fprintf (stderr, "fix the dophot / type selections!");
     122      abort ();
    120123
    121124      /* skip measurements by measurement error */

  • branches/eam_branch_20090208/Ohana/src/uniphot/src/find_image_sgroups.c

    r7080 r21419  
    2727  for (i = 0; i < Nimage; i++) {
    2828    if (imlink[i].sgroup != NULL) continue;
    29     if (image[i].code & ID_IMAGE_NOCAL) continue;
     29    if (image[i].flags & ID_IMAGE_NOCAL) continue;
    3030
    3131    /* new sgroup, set ref coords */
    … …  
    5252
    5353    for (j = 0; j < Nimage; j++) {
    54       if (image[j].code & ID_IMAGE_NOCAL) continue;
     54      if (image[j].flags & ID_IMAGE_NOCAL) continue;
    5555      if (imlink[j].sgroup != NULL) continue;
    5656

  • branches/eam_branch_20090208/Ohana/src/uniphot/src/find_image_tgroups.c

    r16040 r21419  
    6363      if (image[j].tzero < tmin[i]) continue;
    6464      if (image[j].tzero > tmax[i]) continue;
    65       if (image[j].code & ID_IMAGE_NOCAL) continue;
     65      if (image[j].flags & ID_IMAGE_NOCAL) continue;
    6666     
    6767      group[i].image[Nentry] = &image[j];

  • branches/eam_branch_20090208/Ohana/src/uniphot/src/fit_groups.c

    r12332 r21419  
    1616  for (i = 0; i < Ntgroup; i++) {
    1717    for (j = Nlist = 0; j < tgroup[i].Nimage; j++) {
    18       if (tgroup[i].image[j][0].code & IMAGE_BAD) continue;
     18      if (tgroup[i].image[j][0].flags & IMAGE_BAD) continue;
    1919      sgroup = (Group *) tgroup[i].imlink[j][0].sgroup;
    2020      Mcal = tgroup[i].image[j][0].Mcal;
    … …  
    5454  for (i = 0; i < Nsgroup; i++) {
    5555    for (j = Nlist = 0; j < sgroup[i].Nimage; j++) {
    56       if (sgroup[i].image[j][0].code & IMAGE_BAD) continue;
     56      if (sgroup[i].image[j][0].flags & IMAGE_BAD) continue;
    5757      tgroup = (Group *) sgroup[i].imlink[j][0].tgroup;
    5858      Mcal = sgroup[i].image[j][0].Mcal;

  • branches/eam_branch_20090208/Ohana/src/uniphot/src/subset_images.c

    r12332 r21419  
    1616  for (i = 0; i < Nimage; i++) {
    1717     
    18     image[i].code |= ID_IMAGE_NOCAL;
     18    image[i].flags |= ID_IMAGE_NOCAL;
    1919
    2020    /* select images by photcode */
    … …  
    2727      if (image[i].tzero > TSTOP) continue;
    2828    }
    29     image[i].code &= ~ID_IMAGE_NOCAL;
     29    image[i].flags &= ~ID_IMAGE_NOCAL;
    3030    keep[Nkeep] = i;
    3131    Nkeep ++;

  • branches/eam_branch_20090208/Ohana/src/uniphot/src/update.c

    r19823 r21419  
    1616  /* clear the NOCAL flags */
    1717  for (i = 0; i < Nimage; i++) {
    18     image[i].code &= ~ID_IMAGE_NOCAL;
     18    image[i].flags &= ~ID_IMAGE_NOCAL;
    1919  }
    2020
Note: See TracChangeset for help on using the changeset viewer.