IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4800


Ignore:
Timestamp:
Aug 16, 2005, 3:04:36 PM (21 years ago)
Author:
eugene
Message:

moving to internal vs external measure/average: R,D + dR,dD.
NOTE * dR,dD now represent 1.0 arcsec, not 0.01 arcsec.

* all use has been updated to match

Location:
trunk/Ohana/src
Files:
3 added
25 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/addstar/doc/Changes.txt

    r4772 r4800  
    1 
    2 2005.08.15:
    3         cleanup of the minor Wall,Werror messages
    41
    522005.02.24 : I am adding the mosaic two-level astrometry information to the Image table.
    63
    742005.07.06 : current release is addstar-1.1
     5
    86        I have made a variety of fairly substantial changes since
    97        v1.0.  I have added autocode for the basic DVO data types.  I
    … …  
    2321        need to know about the mysql backend interface. 
    2422
    25 
     232005.08.15:
     24        cleanup of the minor Wall,Werror messages

  • trunk/Ohana/src/addstar/src/find_matches.c

    r3389 r4800  
    7474 
    7575  for (i = 0; i < Nave; i++) {
    76     fRD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R, catalog[0].average[i].D, &tcoords);
     76    fRD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R_PS, catalog[0].average[i].D_PS, &tcoords);
    7777    N2[i] = i;
    7878    catalog[0].found[N2[i]] = -1;
    … …  
    146146     
    147147      /** add measurements for this star **/
    148       catalog[0].measure[Nmeas].dR       = 360000.0*(catalog[0].average[n].R - stars[N].R);
    149       catalog[0].measure[Nmeas].dD       = 360000.0*(catalog[0].average[n].D - stars[N].D);
     148      /** dR,dD now represent arcsec **/
     149      catalog[0].measure[Nmeas].dR_PS       = 3600.0*(catalog[0].average[n].R_PS - stars[N].R);
     150      catalog[0].measure[Nmeas].dD_PS       = 3600.0*(catalog[0].average[n].D_PS - stars[N].D);
    150151      catalog[0].measure[Nmeas].M        = MIN (1000*stars[N].M + MTIME, NO_MAG);
    151152      catalog[0].measure[Nmeas].dM       = MIN (1000*stars[N].dM, NO_ERR);  /* error in input files stored in thousandths of mag */
    … …  
    216217    if (catalog[0].found[n] < 0) {
    217218      /* should the catalog star be on this image? project into image coords */
    218       if (!in_image (catalog[0].average[n].R, catalog[0].average[n].D, image)) continue;
     219      if (!in_image (catalog[0].average[n].R_PS, catalog[0].average[n].D_PS, image)) continue;
    219220      /* find last missing meas */
    220221      if (catalog[0].average[n].Nn < 1) { /* no previous missing obs */
    … …  
    234235      }
    235236      /* calculate time of exposure for this coordinate in the image */
    236       RD_to_XY (&X, &Y, catalog[0].average[n].R, catalog[0].average[n].D, &image[0].coords);     
     237      RD_to_XY (&X, &Y, catalog[0].average[n].R_PS, catalog[0].average[n].D_PS, &image[0].coords);       
    237238      catalog[0].missing[Nmiss].t  = image[0].tzero + 1e-4*Y*image[0].trate;  /* trate is in 0.1 msec / row */
    238239      catalog[0].average[n].Nn ++;
    … …  
    254255    secz = airmass (image[0].secz, stars[N].R, stars[N].D, SiderealTime, Latitude);
    255256
    256     catalog[0].average[Nave].R         = stars[N].R;
    257     catalog[0].average[Nave].D         = stars[N].D;
     257    catalog[0].average[Nave].R_PS              = stars[N].R;
     258    catalog[0].average[Nave].D_PS              = stars[N].D;
    258259    catalog[0].average[Nave].M         = NO_MAG;
    259260    catalog[0].average[Nave].dM        = NO_MAG;
    … …  
    273274    }
    274275
    275     catalog[0].measure[Nmeas].dR       = 0.0;
    276     catalog[0].measure[Nmeas].dD       = 0.0;
     276    catalog[0].measure[Nmeas].dR_PS       = 0.0;
     277    catalog[0].measure[Nmeas].dD_PS       = 0.0;
    277278    catalog[0].measure[Nmeas].M        = MIN (1000*stars[N].M + MTIME, NO_MAG);
    278279    catalog[0].measure[Nmeas].dM       = MIN (1000*stars[N].dM, NO_ERR);
    … …  
    298299    for (j = 0; (j < Noverlap) && !SKIP_MISSED; j++) {
    299300      if (!FindMosaicForImage (overlap, Noverlap, j)) continue;
    300       if (!in_image (catalog[0].average[Nave].R, catalog[0].average[Nave].D, &overlap[j])) continue;
     301      if (!in_image (catalog[0].average[Nave].R_PS, catalog[0].average[Nave].D_PS, &overlap[j])) continue;
    301302      if (catalog[0].average[Nave].Nn < 1) {
    302303        catalog[0].average[Nave].missing = Nmiss;
    … …  
    306307      last_miss = Nmiss;
    307308      /* get time of exposure of this portion of the image */
    308       RD_to_XY (&X, &Y, catalog[0].average[Nave].R, catalog[0].average[Nave].D, &overlap[j].coords);     
     309      RD_to_XY (&X, &Y, catalog[0].average[Nave].R_PS, catalog[0].average[Nave].D_PS, &overlap[j].coords);       
    309310      catalog[0].missing[Nmiss].t  = overlap[j].tzero + 1e-4*Y*overlap[j].trate;  /* rough guess at time */
    310311      catalog[0].average[Nave].Nn ++;

  • trunk/Ohana/src/addstar/src/find_matches_refstars.c

    r3361 r4800  
    6262 
    6363  for (i = 0; i < Nave; i++) {
    64     fRD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R, catalog[0].average[i].D, &tcoords);
     64    fRD_to_XY (&X2[i], &Y2[i], catalog[0].average[i].R_PS, catalog[0].average[i].D_PS, &tcoords);
    6565    N2[i] = i;
    6666    catalog[0].found[N2[i]] = -1;
    … …  
    127127       
    128128      /** add measurements for this star **/
    129       catalog[0].measure[Nmeas].dR       = 360000.0*(catalog[0].average[n].R - stars[N][0].R);
    130       catalog[0].measure[Nmeas].dD       = 360000.0*(catalog[0].average[n].D - stars[N][0].D);
     129      /** *** dR,dD now in arcsec *** **/
     130      catalog[0].measure[Nmeas].dR_PS       = 3600.0*(catalog[0].average[n].R_PS - stars[N][0].R);
     131      catalog[0].measure[Nmeas].dD_PS       = 3600.0*(catalog[0].average[n].D_PS - stars[N][0].D);
    131132      catalog[0].measure[Nmeas].M        = MIN (1000*stars[N][0].M,  NO_MAG);
    132133      catalog[0].measure[Nmeas].dM       = MIN (1000*stars[N][0].dM, NO_ERR);
    … …  
    192193    if (stars[N][0].found >= 0) continue;
    193194
    194     catalog[0].average[Nave].R         = stars[N][0].R;
    195     catalog[0].average[Nave].D         = stars[N][0].D;
     195    catalog[0].average[Nave].R_PS         = stars[N][0].R;
     196    catalog[0].average[Nave].D_PS         = stars[N][0].D;
    196197    catalog[0].average[Nave].M         = NO_MAG;
    197198    catalog[0].average[Nave].dM        = NO_MAG;
    … …  
    211212    }
    212213
    213     catalog[0].measure[Nmeas].dR       = 0.0;
    214     catalog[0].measure[Nmeas].dD       = 0.0;
     214    catalog[0].measure[Nmeas].dR_PS       = 0.0;
     215    catalog[0].measure[Nmeas].dD_PS       = 0.0;
    215216    catalog[0].measure[Nmeas].M        = MIN (1000*stars[N][0].M,  NO_MAG);
    216217    catalog[0].measure[Nmeas].dM       = MIN (1000*stars[N][0].dM, NO_ERR);

  • trunk/Ohana/src/addstar/src/replace_match.c

    r3376 r4800  
    1010  for (i = 0; i < average[0].Nm; i++) {
    1111    if (measure[i].source != thiscode[0].code) continue;
    12     measure[i].dR       = 360000.0*(average[0].R - star[0].R);
    13     measure[i].dD       = 360000.0*(average[0].D - star[0].D);
     12    measure[i].dR_PS       = 3600.0*(average[0].R_PS - star[0].R);
     13    measure[i].dD_PS       = 3600.0*(average[0].D_PS - star[0].D);
    1414    measure[i].M        = MIN (1000*star[0].M,  NO_MAG);
    1515    measure[i].dM       = MIN (1000*star[0].dM, NO_ERR);

  • trunk/Ohana/src/addstar/src/update_coords.c

    r3376 r4800  
    1919      continue;
    2020    }
    21     R = measure[m].dR;
    22     D = measure[m].dD;
     21    R = measure[m].dR_PS;
     22    D = measure[m].dD_PS;
    2323    r += R;
    2424    d += D;
    … …  
    3333  r = r / Npt;  /* these are corrections in 1/100 arcsec to RA and DEC */
    3434  d = d / Npt;
    35   average[0].R -= r / 360000.0;
    36   average[0].D -= d / 360000.0;
     35  average[0].R_PS -= r / 3600.0;
     36  average[0].D_PS -= d / 3600.0;
    3737  m = average[0].offset;  /* first measurement of this star */
    3838  for (i = 0; i < average[0].Nm; i++) {
    39     measure[m].dR -= r;
    40     measure[m].dD -= d;
     39    measure[m].dR_PS -= r;
     40    measure[m].dD_PS -= d;
    4141    m = next[m];
    4242  }

  • trunk/Ohana/src/gastro/src/gptolemy.c

    r2435 r4800  
    4141  /* select all entries, ignore magnitudes */
    4242  for (i = 0; i < catalog.Naverage; i++, nstar++) {
    43     stars[0][nstar].X = catalog.average[i].R;
    44     stars[0][nstar].Y = catalog.average[i].D;
     43    stars[0][nstar].X = catalog.average[i].R_PS;
     44    stars[0][nstar].Y = catalog.average[i].D_PS;
    4545    stars[0][nstar].mag = 0.001*catalog.measure[catalog.average[i].offset].M;
    4646  }
    … …  
    4949# if (0) 
    5050  for (i = 0; i < catalog.Naverage; i++, nstar++) {
    51     stars[0][nstar].X = catalog.average[i].R;
    52     stars[0][nstar].Y = catalog.average[i].D;
     51    stars[0][nstar].X = catalog.average[i].R_PS;
     52    stars[0][nstar].Y = catalog.average[i].D_PS;
    5353    GotIt = FALSE;
    5454    if (catalog.average[i].M != NO_MAG) {

  • trunk/Ohana/src/gastro2/src/gptolemy2.c

    r2442 r4800  
    3939  /* select all entries, ignore magnitudes */
    4040  for (i = 0; i < catalog.Naverage; i++, nstar++) {
    41     stars[nstar].R = catalog.average[i].R;
    42     stars[nstar].D = catalog.average[i].D;
     41    stars[nstar].R = catalog.average[i].R_PS;
     42    stars[nstar].D = catalog.average[i].D_PS;
    4343    stars[nstar].M = 0.001*catalog.measure[catalog.average[i].offset].M;
    4444  }

  • trunk/Ohana/src/libautocode/def/average.d

    r4023 r4800  
    22EXTNAME DVO_AVERAGE
    33TYPE    BINTABLE
    4 SIZE    32
     4SIZE    40
    55
    66# elements of data structure / FITS table
    77
    8 FIELD R,              RA,         float,            RA,                           decimal degrees
    9 FIELD D,              DEC,        float,            DEC,                          decimal degrees
     8FIELD R_PS,              RA,         double,            RA,                               decimal degrees
     9FIELD D_PS,              DEC,        double,            DEC,                              decimal degrees
    1010FIELD M,              MAG,        short,            primary mag,                  millimag
    1111FIELD Nm,             NMEAS,      unsigned short,   number of measures

  • trunk/Ohana/src/libautocode/def/measure.d

    r4023 r4800  
    22EXTNAME DVO_MEASURE
    33TYPE    BINTABLE
    4 SIZE    32
     4SIZE    36
    55
    66# elements of data structure / FITS table
    77
    8 FIELD dR,             D_RA,       short,          RA offset,                      1/100 arcsec
    9 FIELD dD,             D_DEC,      short,          DEC offset,                     1/100 arcsec
     8# these are the entries from the Elixir DB format:
     9# FIELD dR,             D_RA,      short,          RA offset,                     1/100 arcsec
     10# FIELD dD,             D_DEC,     short,          DEC offset,                    1/100 arcsec
     11# replace these with the above names
     12FIELD dR_PS,             D_RA,   float,          RA offset,                       arcsec
     13FIELD dD_PS,             D_DEC,  float,          DEC offset,                      arcsec
     14
    1015FIELD M,              MAG,        short,          catalog mag,                    millimag
    1116FIELD Mcal,           Mcal,       short,          image cal mag,                  millimag

  • trunk/Ohana/src/libautocode/doc/notes.txt

    r3515 r4800  
    1414    - fits_fread_datatable_NAME
    1515    - fits_fwrite_datatable_NAME
    16 
    17  
    1816
    1917FITS db APIs
    … …  
    112110  - unlock file
    113111
     112
     113---
     114
     115DVO tables
     116
     117I am converting all DVO tables to have an internal representation of
     118the table with the necessary precision (ie, double for RA & DEC, etc),
     119and a set of external representations in which the precision and
     120available columns are truncated to fit a specific representation.  the
     121autocode tables then include the internal name (ie, measure.d) and the
     122external versions (ie, measure-elixir.d, etc). 
     123
     124To pursue this, I have modifed the definion of measure.d to replace,
     125eg, dR with dR_PS.  I am now compiling all of ohana and looking for
     126places where the new name is needed in the code, stopping the
     127compilation.  (In the process, I am being forced to clean up the
     128relphot - at least - coding problems: unused variables, undeclared
     129functions, etc).  After I have made the changes, I will search for all
     130instances of dR_PS and return them to their original.
     131
     132The only things to watch for in this process are units for the
     133values.  In the older code, the value of measure.dR was interpreted as
     1341/100th of an arcsec.  Everywhere this was the interpretation must be
     135changed to make the value represent 1 arcsec.  This will also be an
     136issue for the internal magnitude representations, which all use
     137millimags...
     138

  • trunk/Ohana/src/mosastro/src/gptolemy.c

    r3294 r4800  
    2929  for (i = 0; i < catalog.Naverage; i++) {
    3030    bzero (&stars[i], sizeof(StarData));
    31     stars[i].R   = catalog.average[i].R;
    32     stars[i].D   = catalog.average[i].D;
     31    stars[i].R   = catalog.average[i].R_PS;
     32    stars[i].D   = catalog.average[i].D_PS;
    3333    stars[i].Mag = 0.001*catalog.measure[catalog.average[i].offset].M;
    3434  }

  • trunk/Ohana/src/opihi/dvo/calextract.c

    r4689 r4800  
    103103      vec[Nm ][0].elements[N] = M2;
    104104      vec[NC ][0].elements[N] = color;
    105       vec[NR ][0].elements[N] = catalog.average[i].R;
    106       vec[ND ][0].elements[N] = catalog.average[i].D;
     105      vec[NR ][0].elements[N] = catalog.average[i].R_PS;
     106      vec[ND ][0].elements[N] = catalog.average[i].D_PS;
    107107      vec[Nd1][0].elements[N] = ExtractAverages (code[0], mode[0], &catalog.average[i], &catalog.secfilt[i*Nsec], &catalog.measure[m], AVE_dMAG);
    108108      vec[Nd2][0].elements[N] = dM2;

  • trunk/Ohana/src/opihi/dvo/calmextract.c

    r4689 r4800  
    138138        vec[Nc ][0].elements[N] = color;
    139139        vec[Ns ][0].elements[N] = Nstar;
    140         vec[NR ][0].elements[N] = catalog.average[i].R;
    141         vec[ND ][0].elements[N] = catalog.average[i].D;
     140        vec[NR ][0].elements[N] = catalog.average[i].R_PS;
     141        vec[ND ][0].elements[N] = catalog.average[i].D_PS;
    142142      }
    143143      Nstar ++;

  • trunk/Ohana/src/opihi/dvo/catalog.c

    r4689 r4800  
    196196        dparse (&D, Ad, tbuffer);
    197197        dparse (&M, Am, tbuffer);
    198         catalog.average[nstar].R = R;
    199         catalog.average[nstar].D = D;
     198        catalog.average[nstar].R_PS = R;
     199        catalog.average[nstar].D_PS = D;
    200200        catalog.average[nstar].M = M * 1000.0;
    201201        nstar++;
    … …  
    238238          dparse (&D, Ad, &tbuffer[i*Bytes_Star]);
    239239          dparse (&M, Am, &tbuffer[i*Bytes_Star]);
    240           catalog.average[nstar].R = R;
    241           catalog.average[nstar].D = D;
     240          catalog.average[nstar].R_PS = R;
     241          catalog.average[nstar].D_PS = D;
    242242          catalog.average[nstar].M = M * 1000.0;
    243243          nstar++;
    … …  
    288288          dparse (&D, 2, &tbuffer[i*BYTES_STAR]);
    289289          dparse (&M, 3, &tbuffer[i*BYTES_STAR]);
    290           catalog.average[nstar].R = R;
    291           catalog.average[nstar].D = D;
     290          catalog.average[nstar].R_PS = R;
     291          catalog.average[nstar].D_PS = D;
    292292          catalog.average[nstar].M = M * 1000.0;
    293293          nstar++;
    … …  
    347347        if (LimExclude && (Zvec.elements[N] > 0.99)) continue;
    348348        if (Zvec.elements[N] < 0.011) continue;
    349         while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
    350         while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
    351         if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R, catalog.average[i].D, &graphmode.coords)) N ++;
     349        while (catalog.average[i].R_PS < Rmin) catalog.average[i].R_PS += 360.0;
     350        while (catalog.average[i].R_PS > Rmax) catalog.average[i].R_PS -= 360.0;
     351        if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS, catalog.average[i].D_PS, &graphmode.coords)) N ++;
    352352      }
    353353      break;
    … …  
    362362        if (Zvec.elements[N] == 0.01)
    363363          continue;
    364         while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
    365         while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
    366         if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R, catalog.average[i].D, &graphmode.coords)) N++;
     364        while (catalog.average[i].R_PS < Rmin) catalog.average[i].R_PS += 360.0;
     365        while (catalog.average[i].R_PS > Rmax) catalog.average[i].R_PS -= 360.0;
     366        if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS, catalog.average[i].D_PS, &graphmode.coords)) N++;
    367367      }
    368368      break;
    … …  
    377377        if (Zvec.elements[N] == 0.01)
    378378          continue;
    379         while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
    380         while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
    381         if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R, catalog.average[i].D, &graphmode.coords)) N++;
     379        while (catalog.average[i].R_PS < Rmin) catalog.average[i].R_PS += 360.0;
     380        while (catalog.average[i].R_PS > Rmax) catalog.average[i].R_PS -= 360.0;
     381        if (fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS, catalog.average[i].D_PS, &graphmode.coords)) N++;
    382382      }
    383383      break;

  • trunk/Ohana/src/opihi/dvo/cmatch.c

    r3462 r4800  
    8585      dparse (&D, 2, &tbuffer[i*BYTES_STAR]);
    8686      dparse (&M, 3, &tbuffer[i*BYTES_STAR]);
    87       catalog2.average[nstar].R = R;
    88       catalog2.average[nstar].D = D;
     87      catalog2.average[nstar].R_PS = R;
     88      catalog2.average[nstar].D_PS = D;
    8989      catalog2.average[nstar].M = M * 1000.0;
    9090      nstar++;

  • trunk/Ohana/src/opihi/dvo/compare.c

    r3462 r4800  
    1919  for (i = j = 0; (i < catlog1[0].Naverage) && (j < catlog2[0].Naverage);) {
    2020   
    21     dX = catlog1[0].average[i].R - catlog2[0].average[j].R;
     21    dX = catlog1[0].average[i].R_PS - catlog2[0].average[j].R_PS;
    2222
    2323    if (!(i % 100))
    … …  
    3232      first_j = j;
    3333      for (j = first_j; (fabs (dX) < radius) && (j < catlog2[0].Naverage); j++) {
    34         dX = catlog1[0].average[i].R - catlog2[0].average[j].R;
    35         dY = catlog1[0].average[i].D - catlog2[0].average[j].D;
     34        dX = catlog1[0].average[i].R_PS - catlog2[0].average[j].R_PS;
     35        dY = catlog1[0].average[i].D_PS - catlog2[0].average[j].D_PS;
    3636        dR = hypot (dX, dY);
    3737        if (dR < radius) {
    38            rvec[0].elements[Nmatch] = catlog1[0].average[i].R;
    39            dvec[0].elements[Nmatch] = catlog1[0].average[i].D;
     38           rvec[0].elements[Nmatch] = catlog1[0].average[i].R_PS;
     39           dvec[0].elements[Nmatch] = catlog1[0].average[i].D_PS;
    4040           mvec[0].elements[Nmatch] = catlog1[0].average[i].M;
    4141          drvec[0].elements[Nmatch] = dX;

  • trunk/Ohana/src/opihi/dvo/dmt.c

    r4689 r4800  
    9797      Yvec.elements[N] = (dmt1 + dmt2) / 2.0;
    9898      if (SaveVectors) {
    99         Rvec.elements[N] = catalog.average[i].R;
    100         Dvec.elements[N] = catalog.average[i].D;
     99        Rvec.elements[N] = catalog.average[i].R_PS;
     100        Dvec.elements[N] = catalog.average[i].D_PS;
    101101        Zvec.elements[N] = M0;
    102102      }

  • trunk/Ohana/src/opihi/dvo/dvomisc.c

    r3462 r4800  
    1515 
    1616  for (i = 0; i < Naverage; i++) {
    17     A = average[i].R;
    18     D = average[i].D;
     17    A = average[i].R_PS;
     18    D = average[i].D_PS;
    1919    SD =  cos(RAD_DEG*A + zeta)*sin(theta)*cos(RAD_DEG*D) + cos(theta)*sin(RAD_DEG*D);
    2020    CD = sqrt (1 - SD*SD);
    … …  
    2828      RA += 360;
    2929   
    30     average[i].R = RA;
    31     average[i].D = DEC;
     30    average[i].R_PS = RA;
     31    average[i].D_PS = DEC;
    3232  }
    3333
    … …  
    5959    j = (l << 1) + 1;
    6060    while (j <= ir) {
    61       if (j < ir && ave[j].R < ave[j+1].R) j++;
    62       if (tmp.R < ave[j].R) {
     61      if (j < ir && ave[j].R_PS < ave[j+1].R_PS) j++;
     62      if (tmp.R_PS < ave[j].R_PS) {
    6363        ave[i] = ave[j];
    6464        j += (i=j) + 1;

  • trunk/Ohana/src/opihi/dvo/gstar.c

    r4689 r4800  
    8181  /* stars are not guaranteed to be sorted in RA or in DEC, so first sort the list */
    8282  for (i = 0; i < Nstars; i++) {
    83     RA[i] = catalog.average[i].R;
    84     DEC[i] = catalog.average[i].D;
     83    RA[i] = catalog.average[i].R_PS;
     84    DEC[i] = catalog.average[i].D_PS;
    8585    N1[i] = i;
    8686  }
    … …  
    127127      k = N1[i];
    128128      fprintf (GetOutfile(), "star: %d\n", k);
    129       fprintf (GetOutfile(), "%9.5f %9.5f %3d of %3d  %4.1f %5d\n", catalog.average[k].R, catalog.average[k].D,
     129      fprintf (GetOutfile(), "%9.5f %9.5f %3d of %3d  %4.1f %5d\n", catalog.average[k].R_PS, catalog.average[k].D_PS,
    130130               catalog.average[k].Nm, catalog.average[k].Nn + catalog.average[k].Nm,
    131131               0.01*catalog.average[k].Xp, catalog.average[k].code);
    … …  
    164164            fprintf (GetOutfile(), "%6.3f %6.3f %5.3f  %20s  %5.2f %5.2f %2d %3x %3d %-20s\n",
    165165                     Mcat, Mrel, 0.001*catalog.measure[m].dM,
    166                      date, 0.01*catalog.measure[m].dR, 0.01*catalog.measure[m].dD,
     166                     date, catalog.measure[m].dR_PS, catalog.measure[m].dD_PS,
    167167                     catalog.measure[m].dophot, catalog.measure[m].flags,
    168168                     catalog.measure[m].source, GetPhotcodeNamebyCode (catalog.measure[m].source));

  • trunk/Ohana/src/opihi/dvo/imdata.c

    r4689 r4800  
    134134        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
    135135        n = catalog.measure[i].averef;
    136         vec[0].elements[N] = catalog.average[n].R - catalog.measure[i].dR / 360000.0;
     136        vec[0].elements[N] = catalog.average[n].R_PS - catalog.measure[i].dR_PS / 3600.0;
    137137        N++;
    138138        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);
    … …  
    143143        if ((catalog.measure[i].t < start) || (catalog.measure[i].t > stop)) continue;
    144144        n = catalog.measure[i].averef;
    145         vec[0].elements[N] = catalog.average[n].D - catalog.measure[i].dD / 360000.0;
     145        vec[0].elements[N] = catalog.average[n].D_PS - catalog.measure[i].dD_PS / 3600.0;
    146146        N++;
    147147        CHECK_REALLOCATE (vec[0].elements, float, NPTS, N, 1000);

  • trunk/Ohana/src/opihi/dvo/lcurve.c

    r4689 r4800  
    101101  /* stars are not guaranteed to be sorted in RA or in DEC, so first sort the list */
    102102  for (i = 0; i < Nstars; i++) {
    103     RA[i] = catalog.average[i].R;
    104     DEC[i] = catalog.average[i].D;
     103    RA[i] = catalog.average[i].R_PS;
     104    DEC[i] = catalog.average[i].D_PS;
    105105    N1[i] = i;
    106106  }

  • trunk/Ohana/src/opihi/dvo/lightcurve.c

    r4689 r4800  
    7878  /* stars are not guaranteed to be sorted in RA or in DEC, so first sort the list */
    7979  for (i = 0; i < Nstars; i++) {
    80     RA[i] = catalog.average[i].R;
    81     DEC[i] = catalog.average[i].D;
     80    RA[i] = catalog.average[i].R_PS;
     81    DEC[i] = catalog.average[i].D_PS;
    8282    N1[i] = i;
    8383  }

  • trunk/Ohana/src/opihi/dvo/photometry.c

    r4689 r4800  
    564564  switch (param) {
    565565    case AVE_RA:
    566       value = average[0].R;
     566      value = average[0].R_PS;
    567567      break;
    568568    case AVE_DEC:
    569       value = average[0].D;
     569      value = average[0].D_PS;
    570570      break;
    571571    case AVE_NMEAS:
    … …  
    10571057      break;
    10581058    case MEAS_RA: /* OK */
    1059       value = average[0].R - measure[0].dR / 360000.0;
     1059      value = average[0].R_PS - measure[0].dR_PS / 3600.0;
    10601060      break;
    10611061    case MEAS_DEC: /* OK */
    1062       value = average[0].D - measure[0].dD / 360000.0;
     1062      value = average[0].D_PS - measure[0].dD_PS / 3600.0;
    10631063      break;
    10641064    case MEAS_dMAG: /* OK */
    … …  
    10781078      break;
    10791079    case MEAS_dR: /* OK */
    1080       value = 0.01*measure[0].dR;
     1080      value = measure[0].dR_PS;
    10811081      break;
    10821082    case MEAS_dD: /* OK */
    1083       value = 0.01*measure[0].dD;
     1083      value = measure[0].dD_PS;
    10841084      break;
    10851085    case MEAS_FWHM: /* OK */
    … …  
    10931093      break;
    10941094    case MEAS_XCCD: /* OK */
    1095       ra  = average[0].R - measure[0].dR / 360000.0;
    1096       dec = average[0].D - measure[0].dD / 360000.0;
     1095      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
     1096      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
    10971097      image = MatchImage (measure[0].t, measure[0].source);
    10981098      if (image == NULL) break;
    … …  
    11011101      break;
    11021102    case MEAS_YCCD: /* OK */
    1103       ra  = average[0].R - measure[0].dR / 360000.0;
    1104       dec = average[0].D - measure[0].dD / 360000.0;
     1103      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
     1104      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
    11051105      image = MatchImage (measure[0].t, measure[0].source);
    11061106      if (image == NULL) break;
    … …  
    11091109      break;
    11101110    case MEAS_XMOSAIC: /* OK */
    1111       ra  = average[0].R - measure[0].dR / 360000.0;
    1112       dec = average[0].D - measure[0].dD / 360000.0;
     1111      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
     1112      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
    11131113      mosaic = MatchMosaic (measure[0].t, measure[0].source);
    11141114      if (mosaic == NULL) break;
    … …  
    11171117      break;
    11181118    case MEAS_YMOSAIC: /* OK */
    1119       ra  = average[0].R - measure[0].dR / 360000.0;
    1120       dec = average[0].D - measure[0].dD / 360000.0;
     1119      ra  = average[0].R_PS - measure[0].dR_PS / 3600.0;
     1120      dec = average[0].D_PS - measure[0].dD_PS / 3600.0;
    11211121      mosaic = MatchMosaic (measure[0].t, measure[0].source);
    11221122      if (mosaic == NULL) break;

  • trunk/Ohana/src/opihi/dvo/pmeasure.c

    r4689 r4800  
    121121    for (N = i = 0; i < catalog.Naverage; i++) {
    122122      if (IDclip && (catalog.average[i].code != IDchoice)) continue;
    123       while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
    124       while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
     123      while (catalog.average[i].R_PS < Rmin) catalog.average[i].R_PS += 360.0;
     124      while (catalog.average[i].R_PS > Rmax) catalog.average[i].R_PS -= 360.0;
    125125      m = catalog.average[i].offset;
    126126      for (k = 0; k < catalog.average[i].Nm; k++) {
    … …  
    134134        if (LimExclude && (Zvec.elements[N] > 0.99)) continue;
    135135        if (Zvec.elements[N] < 0.011) continue;
    136         fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R - 2.777e-6*catalog.measure[m+k].dR, catalog.average[i].D - 2.777e-6*catalog.measure[m+k].dD, &graphmode.coords);
     136        fRD_to_XY (&Xvec.elements[N], &Yvec.elements[N], catalog.average[i].R_PS - catalog.measure[m+k].dR_PS/3600.0, catalog.average[i].D_PS - catalog.measure[m+k].dD_PS/3600.0, &graphmode.coords);
    137137        N ++;
    138138      }

  • trunk/Ohana/src/opihi/dvo/subpix.c

    r3462 r4800  
    6161  ALLOCATE (index, int, Nstars);
    6262  for (i = 0; i < Nstars; i++) {
    63     RA[i] = catalog.average[i].R;
    64     DEC[i] = catalog.average[i].D;
     63    RA[i] = catalog.average[i].R_PS;
     64    DEC[i] = catalog.average[i].D_PS;
    6565    index[i] = i;
    6666  }
Note: See TracChangeset for help on using the changeset viewer.