IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jan 9, 2013, 1:19:08 PM (14 years ago)
Author:
eugene
Message:

add rename command to splines; allow relastro to use the fixed pixel coordinates, Xfix,Yfix

Location:
branches/eam_branches/ipp-20121219/Ohana/src
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20121219/Ohana/src/libdvo/include/dvo.h

    r34872 r34898  
    367367  float          Xccd;
    368368  float          Yccd;
     369  float          Xfix;
     370  float          Yfix;
    369371  float          dt;
    370372  int            t;

  • branches/eam_branches/ipp-20121219/Ohana/src/libdvo/src/dvo_tiny_values.c

    r34088 r34898  
    2020  measureT[0].Xccd       = measure[0].Xccd;
    2121  measureT[0].Yccd       = measure[0].Yccd;
     22  measureT[0].Xfix       = measure[0].Xfix;
     23  measureT[0].Yfix       = measure[0].Yfix;
    2224  measureT[0].t          = measure[0].t;
    2325  measureT[0].dt         = measure[0].dt;

  • branches/eam_branches/ipp-20121219/Ohana/src/opihi/cmd.data/spline.c

    r34895 r34898  
    22
    33int spline_list (int argc, char **argv);
     4int spline_help (int argc, char **argv);
    45int spline_create (int argc, char **argv);
    56int spline_apply (int argc, char **argv);
    … …  
    78int spline_save (int argc, char **argv);
    89int spline_delete (int argc, char **argv);
     10int spline_rename (int argc, char **argv);
    911int spline_getspline (int argc, char **argv);
    1012
    1113static Command spline_commands[] = {
     14  {1, "help",       spline_help,       "list spline help info"},
    1215  {1, "list",       spline_list,       "list splines"},
    1316  {1, "create",     spline_create,     "create a spline"},
    … …  
    1619  {1, "save",       spline_save,       "read a spline from a FITS file"},
    1720  {1, "delete",     spline_delete,     "delete a spline"},
     21  {1, "rename",     spline_rename,     "rename a spline"},
    1822};
     23
     24int spline_help (int argc, char **argv) {
     25
     26  gprint (GP_ERR, "USAGE: spline (command)\n");
     27  gprint (GP_ERR, "    spline help                                  : this listing\n");
     28  gprint (GP_ERR, "    spline list                                  : list splines\n");
     29  gprint (GP_ERR, "    spline create (spline) (Xknots) (Yknots)     : create a spline\n");
     30  gprint (GP_ERR, "    spline apply  (spline) (Xpts) (Ypts)         : apply a spline to Xpts to get Ypts\n");
     31  gprint (GP_ERR, "    spline delete (spline)                       : delete named spline\n");
     32  gprint (GP_ERR, "    spline rename (spline) (new)                 : change spline name to new name\n");
     33  gprint (GP_ERR, "    spline load   (spline) (filename)            : load a spline from a FITS file\n");
     34  gprint (GP_ERR, "    spline save   (spline) (filename) [-append]  : save a spline in FITS format\n");
     35
     36  return FALSE;
     37}
    1938
    2039int spline_command (int argc, char **argv) {
    … …  
    2342
    2443  if (argc < 2) {
    25     gprint (GP_ERR, "USAGE: spline (command)\n");
    26     gprint (GP_ERR, "    spline list                                  : list splines\n");
    27     gprint (GP_ERR, "    spline create (spline) (Xknots) (Yknots)     : create a spline\n");
    28     gprint (GP_ERR, "    spline apply  (spline) (Xpts) (Ypts)         : apply a spline to Xpts to get Ypts\n");
    29     gprint (GP_ERR, "    spline delete (spline)                       : delete named spline\n");
    30     gprint (GP_ERR, "    spline load   (spline) (filename)            : load a spline from a FITS file\n");
    31     gprint (GP_ERR, "    spline save   (spline) (filename) [-append]  : save a spline in FITS format\n");
     44    spline_help(0,NULL);
    3245    return (FALSE);
    3346  }

  • branches/eam_branches/ipp-20121219/Ohana/src/opihi/cmd.data/spline_commands.c

    r34584 r34898  
    126126}
    127127
     128int spline_rename (int argc, char **argv) {
     129
     130  Spline *spline;
     131
     132  if (argc != 3) {
     133    gprint (GP_ERR, "USAGE: spline rename (spline) (newname)\n");
     134    return FALSE;
     135  }
     136
     137  spline = FindSpline (argv[1]);
     138  if (spline == NULL) {
     139    gprint (GP_ERR, "spline %s not found\n", argv[1]);
     140    return FALSE;
     141  }
     142
     143  free (spline->name);
     144  spline->name = strcreate (argv[2]);
     145  return TRUE;
     146}
     147
    128148/*
    129149int spline_listspline (int argc, char **argv) {

  • branches/eam_branches/ipp-20121219/Ohana/src/relastro/include/relastro.h

    r34576 r34898  
    157157int    VERBOSE;
    158158int    VERBOSE2;
     159
     160int    USE_FIXED_PIXCOORDS;
    159161
    160162int    RESET;

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

    r34405 r34898  
    7676    GET_COLUMN(Xccd,      "X_CCD",      float);
    7777    GET_COLUMN(Yccd,      "Y_CCD",      float);
     78    GET_COLUMN(Xfix,      "X_FIX",      float);
     79    GET_COLUMN(Yfix,      "Y_FIX",      float);
    7880    GET_COLUMN(dt,        "EXPTIME",    float);
    7981    GET_COLUMN(t,         "TIME",       int);
    … …  
    98100      measure[i].Xccd      = Xccd[i];
    99101      measure[i].Yccd      = Yccd[i];
     102      measure[i].Xfix      = Xfix[i];
     103      measure[i].Yfix      = Yfix[i];
    100104      measure[i].dt        = dt[i];
    101105      measure[i].t         = t[i];
    … …  
    117121    free (Xccd    );
    118122    free (Yccd    );
     123    free (Xfix    );
     124    free (Yfix    );
    119125    free (dt      );
    120126    free (t       );
    … …  
    363369    float *Xccd      ; ALLOCATE (Xccd     ,  float, catalog->Nmeasure);
    364370    float *Yccd      ; ALLOCATE (Yccd     ,  float, catalog->Nmeasure);
     371    float *Xfix      ; ALLOCATE (Xfix     ,  float, catalog->Nmeasure);
     372    float *Yfix      ; ALLOCATE (Yfix     ,  float, catalog->Nmeasure);
    365373    float *dt        ; ALLOCATE (dt       ,  float, catalog->Nmeasure);
    366374    int   *t         ; ALLOCATE (t        ,  int  , catalog->Nmeasure);
    … …  
    383391      Xccd[i]     = measure[i].Xccd     ;
    384392      Yccd[i]     = measure[i].Yccd     ;
     393      Xfix[i]     = measure[i].Xfix     ;
     394      Yfix[i]     = measure[i].Yfix     ;
    385395      dt[i]       = measure[i].dt       ;
    386396      t[i]        = measure[i].t        ;
    … …  
    402412    gfits_set_bintable_column (&theader, &ftable, "X_CCD",      Xccd,      catalog->Nmeasure);
    403413    gfits_set_bintable_column (&theader, &ftable, "Y_CCD",      Yccd,      catalog->Nmeasure);
     414    gfits_set_bintable_column (&theader, &ftable, "X_FIX",      Xfix,      catalog->Nmeasure);
     415    gfits_set_bintable_column (&theader, &ftable, "Y_FIX",      Yfix,      catalog->Nmeasure);
    404416    gfits_set_bintable_column (&theader, &ftable, "EXPTIME",    dt,        catalog->Nmeasure);
    405417    gfits_set_bintable_column (&theader, &ftable, "TIME",       t,         catalog->Nmeasure);
    … …  
    419431    free (Xccd    );
    420432    free (Yccd    );
     433    free (Xfix    );
     434    free (Yfix    );
    421435    free (dt      );
    422436    free (t       );

  • branches/eam_branches/ipp-20121219/Ohana/src/relastro/src/ConfigInit.c

    r34749 r34898  
    3535  GetConfig (config, "RELASTRO_DPOS_MAX",      "%lf", 0, &DPOS_MAX);
    3636  GetConfig (config, "ADDSTAR_RADIUS",         "%lf", 0, &ADDSTAR_RADIUS);
     37
     38  if (!ScanConfig (config, "USE_FIXED_PIXCOORDS", "%d", 0, &USE_FIXED_PIXCOORDS)) {
     39    USE_FIXED_PIXCOORDS = FALSE;
     40  }
    3741
    3842  // force CATDIR to be absolute (so parallel mode will work)

  • branches/eam_branches/ipp-20121219/Ohana/src/relastro/src/ImageOps.c

    r34749 r34898  
    446446    Measure *measure = &catalog[c].measure[m];
    447447
    448     X = measure[0].Xccd;
    449     Y = measure[0].Yccd;
     448    if (USE_FIXED_PIXCOORDS) {
     449      X = isfinite(measure[0].Xfix) ? measure[0].Xfix : measure[0].Xccd;
     450      Y = isfinite(measure[0].Yfix) ? measure[0].Yfix : measure[0].Yccd;
     451    } else {
     452      X = measure[0].Xccd;
     453      Y = measure[0].Yccd;
     454    }
    450455    n = measure[0].averef;
    451456
    … …  
    570575    Measure *measure = &catalog[c].measure[m];
    571576
    572     X = measure[0].Xccd;
    573     Y = measure[0].Yccd;
     577    if (USE_FIXED_PIXCOORDS) {
     578      X = isfinite(measure[0].Xfix) ? measure[0].Xfix : measure[0].Xccd;
     579      Y = isfinite(measure[0].Yfix) ? measure[0].Yfix : measure[0].Yccd;
     580    } else {
     581      X = measure[0].Xccd;
     582      Y = measure[0].Yccd;
     583    }
    574584    n = measure[0].averef;
    575585
    … …  
    635645
    636646    /* apply the current image transformation or use the current value of R+dR, D+dD? */
    637     raw[i].X = measure[0].Xccd;
    638     raw[i].Y = measure[0].Yccd;
     647    if (USE_FIXED_PIXCOORDS) {
     648      raw[i].X = isfinite(measure[0].Xfix) ? measure[0].Xfix : measure[0].Xccd;
     649      raw[i].Y = isfinite(measure[0].Yfix) ? measure[0].Yfix : measure[0].Yccd;
     650    } else {
     651      raw[i].X = measure[0].Xccd;
     652      raw[i].Y = measure[0].Yccd;
     653    }
    639654
    640655    raw[i].Mag  = measure[0].M;

  • branches/eam_branches/ipp-20121219/Ohana/src/relastro/src/StarMaps.c

    r34088 r34898  
    7373    if (N < 0) continue;
    7474
     75    // NOTE: we use Xccd,Yccd even if USE_FIXED_PIXCOORDS is true: the difference is too
     76    // small to be relevant for this analysis
    7577    xbin = measure[0].Xccd / starmap[N].Nx;
    7678    ybin = measure[0].Yccd / starmap[N].Ny;
Note: See TracChangeset for help on using the changeset viewer.