IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5945


Ignore:
Timestamp:
Jan 6, 2006, 6:45:40 PM (21 years ago)
Author:
eugene
Message:

moved filename out of SkyRegion into SkyList, SkyTable

Location:
trunk/Ohana/src
Files:
41 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/addstar/include/addstar.h

    r5900 r5945  
    119119void       help                   PROTO(());
    120120int        in_image               PROTO((double r, double d, Image *image));
    121 int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region, char *path));  /*** choose new name ***/
     121int        load_pt_catalog        PROTO((Catalog *catalog, SkyRegion *region));  /*** choose new name ***/
    122122void       load_subpix            PROTO(());
    123123void       lock_image_db          PROTO((FITS_DB *db, char *filename));

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

    r5451 r5945  
    1414  /* match the basename against the GSCRegion file names */
    1515  for (i = 0; i < input[0].Nregions; i++) {
    16     status = stat ((char *) input[0].regions[i][0].filename, &filestats);
     16    status = stat (input[0].filename[i], &filestats);
    1717    if ((status == -1) && (errno == ENOENT)) continue;
    1818    /* give an error for other conditions? */

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

    r5584 r5945  
    5858  for (i = 0; i < skylist[0].Nregions; i++) {
    5959
     60    catalog.filename = skylist[0].filename[i];
    6061    load_pt_catalog (&catalog, skylist[0].regions[i]);
    6162

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

    r5584 r5945  
    5252  for (i = 0; i < skylist[0].Nregions; i++) {
    5353
     54    catalog.filename = skylist[0].filename[i];
    5455    load_pt_catalog (&catalog, skylist[0].regions[i]);
    5556

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

    r5584 r5945  
    5757  for (i = 0; i < skylist[0].Nregions; i++) {
    5858
     59    catalog.filename = skylist[0].filename[i];
    5960    load_pt_catalog (&catalog, skylist[0].regions[i]);
    6061

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

    r5585 r5945  
    1111  AddstarClientOptions options;
    1212
    13   SkyTable *sky;
    14   SkyList *skylist;
     13  SkyTable *sky = NULL;
     14  SkyList *skylist = NULL;
    1515
    1616  double dtime;
    … …  
    7474    gettimeofday (&t1, NULL);
    7575
    76     load_pt_catalog (&catalog, skylist[0].regions[i], CATDIR);
     76    catalog.filename = skylist[0].filename[i];
     77    load_pt_catalog (&catalog, skylist[0].regions[i]);
    7778
    7879    /* for only_match, skip empty catalogs XXX EAM : this leaves behind empty files */

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

    r5451 r5945  
    3131    switch (mode) {
    3232      case 0:
     33        // XXX put filename from table here
    3334        refcat = get2mass_AS_data (&sky[0].regions[i], patch, photcode, &Nrefcat);
    3435        if (VERBOSE) fprintf (stderr, "loaded %d stars from 2MASS (allsky)\n", Nrefcat);
    … …  
    8485    if (De < patch[0].Dmin) continue;
    8586    sprintf (datafile, "%s/%s", path, filename);
    86     regions[Nregions].filename = (e_void) strcreate (datafile);
     87    // XXX : put in table regions[Nregions].filename = (e_void) strcreate (datafile);
    8788    regions[Nregions].Rmin = Rs;
    8889    regions[Nregions].Rmax = Re;

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

    r5903 r5945  
    5555  if (!FilterSkip) Shutdown ("invalid photcode %s", GetPhotcodeNamebyCode(photcode));
    5656
    57   filename = (char *) region[0].filename;
     57  // filename = (char *) region[0].filename;
    5858  gf = gzopen (filename, "rb");
    5959  if (gf == NULL) Shutdown ("can't read 2mass data file: %s", filename);

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

    r5451 r5945  
    2727  fprintf (stderr, "overlap: %f - %f, %f - %f\n", RA0, RA1, DEC0, DEC1);
    2828
    29   filename = (char *) region[0].filename;
     29  // XXX get from args
     30  // filename = (char *) region[0].filename;
    3031  gf = gzopen (filename, "rb");
    3132  if (gf == NULL) Shutdown ("can't read 2mass data file: %s", filename);

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

    r5451 r5945  
    2525 
    2626  for (i = 0; i < skylist[0].Nregions; i++) {
    27     gsc = rd_gsc ((char *)skylist[0].regions[i][0].filename, &Ngsc);
     27    // XXX : get from table gsc = rd_gsc ((char *)skylist[0].regions[i][0].filename, &Ngsc);
    2828
    2929    REALLOCATE (stars, Stars, MAX (1, Nstars + Ngsc));

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

    r5451 r5945  
    11# include "addstar.h"
    22
    3 int load_pt_catalog (Catalog *catalog, SkyRegion *region, char *path) {
     3int load_pt_catalog (Catalog *catalog, SkyRegion *region) {
    44 
    5   catalog[0].filename = (char *) region[0].filename;
    6 
    75  check_permissions (catalog[0].filename);
    86  if (VERBOSE) fprintf (stderr, "adding to %s\n", catalog[0].filename);

  • trunk/Ohana/src/delstar/src/delete_imagefile.c

    r5451 r5945  
    2323
    2424  for (i = 0; i < skylist[0].Nregions; i++) {
    25     if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].regions[i][0].filename);
    26     catalog.filename = (char *) skylist[0].regions[i][0].filename;  /* don't free region before catalog! */
     25    if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].filename[i]);
     26    catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
    2727    switch (lock_catalog (&catalog, LCK_XCLD)) {
    2828      case 0:

  • trunk/Ohana/src/delstar/src/delete_imagename.c

    r5451 r5945  
    3333
    3434    for (i = 0; i < skylist[0].Nregions; i++) {
    35       if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].regions[i][0].filename);
    36       catalog.filename = (char *) skylist[0].regions[i][0].filename;  /* don't free region before catalog! */
     35      if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].filename[i]);
     36      catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
    3737      switch (lock_catalog (&catalog, LCK_XCLD)) {
    3838        case 0:

  • trunk/Ohana/src/delstar/src/delete_times.c

    r5853 r5945  
    5353  /* delete from all identified regions */
    5454  for (i = 0; i < skylist[0].Nregions; i++) {
    55     if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].regions[i][0].filename);
    56     catalog.filename = (char *) skylist[0].regions[i][0].filename;  /* don't free region before catalog! */
     55    if (VERBOSE) fprintf (stderr, "deleting from %s\n", skylist[0].filename[i]);
     56    catalog.filename = skylist[0].filename[i];  /* don't free region before catalog! */
    5757    switch (lock_catalog (&catalog, LCK_XCLD)) {
    5858      case 0:

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

    r5448 r5945  
    22EXTNAME SKY_REGION
    33TYPE    BINTABLE
    4 SIZE    64
     4SIZE    56
    55
    66FIELD   Rmin,      R_MIN,          float,
    … …  
    1616FIELD   table,     TABLE,          char,          does this entry have a table?
    1717FIELD   name,      NAME,           char[21],      name / filename
    18 FIELD   filename,  FILENAME,       e_void,        filename pointer

  • trunk/Ohana/src/libdvo/include/dvo.h

    r5451 r5945  
    109109typedef struct {
    110110  int Nregions;
     111  char **filename;
    111112  SkyRegion *regions;
    112113} SkyTable;
    … …  
    114115typedef struct {
    115116  int Nregions;
     117  char **filename;
    116118  SkyRegion **regions;
    117119} SkyList;

  • trunk/Ohana/src/libdvo/src/skyregion_gsc.c

    r5451 r5945  
    5959  regions[Nr].child     =  TRUE;
    6060  regions[Nr].table     =  (depth == 0);
    61   regions[Nr].filename  =  (e_void) NULL;
    6261  strcpy (regions[Nr].name, "fullsky");
    6362 
    … …  
    7978    regions[Nr].child     =  TRUE;
    8079    regions[Nr].table     =  (depth == 1);
    81     regions[Nr].filename  =  (e_void) NULL;
    8280    strcpy (regions[Nr].name, DecNames[i]);
    8381  }
    … …  
    9391    regions[Nr].child     =  TRUE;
    9492    regions[Nr].table     =  (depth == 1);
    95     regions[Nr].filename  =  (e_void) NULL;
    9693    strcpy (regions[Nr].name, DecNames[i+13]);
    9794  }
    … …  
    141138      regions[Nr].child    =  TRUE;
    142139      regions[Nr].table    =  (depth == 2);
    143       regions[Nr].filename =  (e_void) NULL;
    144140      regions[Nr].childS   =  0;
    145141      regions[Nr].childE   =  0;
    … …  
    179175        regions[Nr].child    =  FALSE;
    180176        regions[Nr].table    =  (depth == 3);
    181         regions[Nr].filename =  (e_void) NULL;
    182177        regions[Nr].childS   =  0;
    183178        regions[Nr].childE   =  0;
    … …  
    198193  skytable[0].regions = regions;
    199194  skytable[0].Nregions = Nr;
     195
     196  ALLOCATE (skytable[0].filename, char *, skytable[0].Nregions);
     197  for (i = 0; i < skytable[0].Nregions; i++) {
     198    skytable[0].filename[i] = NULL;
     199  }
     200
    200201  return (skytable);
    201202}

  • trunk/Ohana/src/libdvo/src/skyregion_io.c

    r5900 r5945  
    4040  ALLOCATE (skytable, SkyTable, 1);
    4141  skytable[0].regions = fits_table_get_SkyRegion (&ftable, &skytable[0].Nregions, NULL);
     42  ALLOCATE (skytable[0].filename, char *, skytable[0].Nregions);
    4243  for (i = 0; i < skytable[0].Nregions; i++) {
    43     skytable[0].regions[i].filename = (e_void) NULL;
     44    skytable[0].filename[i] = NULL;
    4445  }
    4546 
    … …  
    146147  for (i = 0; i < list[0].Nregions; i++) {
    147148    sprintf (line, "%s/%s.%s", path, list[0].regions[i][0].name, ext);
    148     list[0].regions[i][0].filename = (e_void) strcreate (line);
     149    list[0].filename[i] = strcreate (line);
    149150  }
    150151
    … …  
    160161  for (i = 0; i < sky[0].Nregions; i++) {
    161162    sprintf (line, "%s/%s.%s", path, sky[0].regions[i].name, ext);
    162     sky[0].regions[i].filename = (e_void) strcreate (line);
     163    sky[0].filename[i] = strcreate (line);
    163164  }
    164165

  • trunk/Ohana/src/libdvo/src/skyregion_ops.c

    r5451 r5945  
    272272    if (ELEMENTS) {
    273273      for (i = 0; i < list[0].Nregions; i++) {
    274         if (list[0].regions[i][0].filename != (e_void) NULL) {
    275           free ((size_t *) list[0].regions[i][0].filename);
     274        if (list[0].filename[i] != NULL) {
     275          free (list[0].filename[i]);
    276276        }
    277277        free (list[0].regions[i]);
    … …  
    292292  if (table[0].regions != NULL) {
    293293    for (i = 0; i < table[0].Nregions; i++) {
    294       if (table[0].regions[i].filename != (e_void) NULL) {
    295         free ((size_t *) table[0].regions[i].filename);
     294      if (table[0].filename[i] != NULL) {
     295        free (table[0].filename[i]);
    296296      }
    297297    }

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

    r5451 r5945  
    5555  for (i = 0; i < skylist[0].Nregions; i++) {
    5656    /* lock, load, unlock catalog */
    57     catalog.filename = (char *) skylist[0].regions[i][0].filename;
     57    catalog.filename = skylist[0].filename[i];
    5858    switch (lock_catalog (&catalog, LCK_SOFT)) {
    5959    case 2:

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

    r5451 r5945  
    6161
    6262    /* lock, load, unlock catalog */
    63     catalog.filename = (char *) skylist[0].regions[Nr][0].filename;
     63    catalog.filename = skylist[0].filename[Nr];
    6464    switch (lock_catalog (&catalog, LCK_SOFT)) {
    6565    case 2:

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

    r5451 r5945  
    7474
    7575    /* lock, load, unlock catalog */
    76     catalog.filename = (char *) skylist[0].regions[Nr][0].filename;
     76    catalog.filename = skylist[0].filename[Nr];
    7777    switch (lock_catalog (&catalog, LCK_SOFT)) {
    7878    case 2:

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

    r5451 r5945  
    5858  for (k = 0; k < skylist[0].Nregions; k++) {
    5959    /* lock, load, unlock catalog */
    60     catalog.filename = (char *) skylist[0].regions[k][0].filename;
     60    catalog.filename = skylist[0].filename[k];
    6161    switch (lock_catalog (&catalog, LCK_SOFT)) {
    6262      case 2:

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

    r5451 r5945  
    5656  for (j = 0; j < skylist[0].Nregions; j++) {
    5757    /* lock, load, unlock catalog */
    58     catalog.filename = (char *) skylist[0].regions[j][0].filename;
     58    catalog.filename = skylist[0].filename[j];
    5959    switch (lock_catalog (&catalog, LCK_SOFT)) {
    6060    case 2:

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

    r5451 r5945  
    5858  for (k = 0; k < skylist[0].Nregions; k++) {
    5959    /* lock, load, unlock catalog */
    60     catalog.filename = (char *) skylist[0].regions[k][0].filename;
     60    catalog.filename = skylist[0].filename[k];
    6161    switch (lock_catalog (&catalog, LCK_SOFT)) {
    6262      case 2:

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

    r5451 r5945  
    5050  for (j = 0; j < skylist[0].Nregions; j++) {
    5151    /* lock, load, unlock catalog */
    52     catalog.filename = (char *) skylist[0].regions[j][0].filename;
     52    catalog.filename = skylist[0].filename[j];
    5353    switch (lock_catalog (&catalog, LCK_SOFT)) {
    5454    case 2:

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

    r5451 r5945  
    5858  for (j = 0; j < skylist[0].Nregions; j++) {
    5959    /* lock, load, unlock catalog */
    60     catalog.filename = (char *) skylist[0].regions[j][0].filename;
     60    catalog.filename = skylist[0].filename[j];
    6161    switch (lock_catalog (&catalog, LCK_SOFT)) {
    6262      case 2:

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

    r5451 r5945  
    5656  for (j = 0; j < skylist[0].Nregions; j++) {
    5757    /* lock, load, unlock catalog */
    58     catalog.filename = (char *) skylist[0].regions[j][0].filename;
     58    catalog.filename = skylist[0].filename[j];
    5959    switch (lock_catalog (&catalog, LCK_SOFT)) {
    6060      case 2:

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

    r5451 r5945  
    6969
    7070    /* lock, load, unlock catalog */
    71     catalog.filename = (char *) skylist[0].regions[k][0].filename;
     71    catalog.filename = skylist[0].filename[k];
    7272    switch (lock_catalog (&catalog, LCK_SOFT)) {
    7373    case 2:

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

    r5451 r5945  
    9999  for (k = 0; k < skylist[0].Nregions; k++) {
    100100    /* lock, load, unlock catalog */
    101     catalog[k].filename = (char *) skylist[0].regions[k][0].filename;
     101    catalog[k].filename = skylist[0].filename[k];
    102102    switch (lock_catalog (&catalog[k], LCK_SOFT)) {
    103103      case 2:

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

    r5451 r5945  
    2626
    2727  for (i = 0; i < skylist[0].Nregions; i++) {
    28     if (stat ((char *) skylist[0].regions[i][0].filename, &filestat) != -1) {
     28    if (stat (skylist[0].filename[i], &filestat) != -1) {
    2929      fprintf (stderr, "%3d %s *\n", i, skylist[0].regions[i][0].name);
    3030    } else {
    3131      fprintf (stderr, "%3d %s\n", i, skylist[0].regions[i][0].name);
    3232    }
    33     set_str_variable ("CATNAME", (char *) skylist[0].regions[i][0].filename);
     33    set_str_variable ("CATNAME", skylist[0].filename[i]);
    3434  }
    3535

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

    r5451 r5945  
    6060
    6161  /* lock, load, unlock catalog */
    62   catalog.filename = (char *) skylist[0].regions[0][0].filename;
     62  catalog.filename = skylist[0].filename[0];
    6363  switch (lock_catalog (&catalog, LCK_SOFT)) {
    6464  case 2:

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

    r5850 r5945  
    120120
    121121    /* get file name and open */
    122     catalog.filename = (char *) skylist[0].regions[j][0].filename;
     122    catalog.filename = skylist[0].filename[j];
    123123    switch (lock_catalog (&catalog, LCK_SOFT)) {
    124124    case 2:

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

    r5451 r5945  
    3333  for (i = 0; i < skylist[0].Nregions; i++) {
    3434    exists = 'Y';
    35     if (stat ((char *) skylist[0].regions[i][0].filename, &filestat) == -1) exists = 'N';
     35    if (stat (skylist[0].filename[i], &filestat) == -1) exists = 'N';
    3636    if (ShowAll) {
    3737      fprintf (stderr, "%3d %s  %c\n", i, skylist[0].regions[i][0].name, exists);

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

    r5850 r5945  
    8181
    8282  /* set filename, read in header */
    83   catalog.filename = (char *) skylist[0].regions[0][0].filename;
     83  catalog.filename = skylist[0].filename[0];
    8484  switch (lock_catalog (&catalog, LCK_SOFT)) {
    8585  case 2:

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

    r5451 r5945  
    5757
    5858  /* set filename, read in header */
    59   catalog.filename = (char *) skylist[0].regions[0][0].filename;
     59  catalog.filename = skylist[0].filename[0];
    6060  switch (lock_catalog (&catalog, LCK_SOFT)) {
    6161  case 2:

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

    r5451 r5945  
    5656
    5757  for (i = 0; i < skylist[0].Nregions; i++) {
    58     catalog.filename = (char *) skylist[0].regions[i][0].filename;
     58    catalog.filename = skylist[0].filename[i];
    5959    switch (lock_catalog (&catalog, LCK_SOFT)) {
    6060    case 2:

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

    r5451 r5945  
    8181   
    8282    /* lock, load, unlock catalog */
    83     catalog.filename = (char *) skylist[0].regions[j][0].filename;
     83    catalog.filename = skylist[0].filename[j];
    8484    switch (lock_catalog (&catalog, LCK_SOFT)) {
    8585    case 2:

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

    r5900 r5945  
    9696    ALLOCATE (skylist[0].regions, SkyRegion *, 1);
    9797    ALLOCATE (skylist[0].regions[0], SkyRegion, 1);
     98    ALLOCATE (skylist[0].filename, char *, 1);
     99   
    98100    strcpy (skylist[0].regions[0][0].name, RegionName);
    99101    sprintf (filename, "%s/%s.cpt", CATDIR, RegionName);
    100     skylist[0].regions[0][0].filename = (e_void) strcreate (filename);
     102    skylist[0].filename[0] = strcreate (filename);
    101103    free (RegionName);
    102104    RegionName = NULL;
    … …  
    142144  NREGIONS = 50;
    143145  ALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS);
     146  ALLOCATE (skylist[0].filename, char *, NREGIONS);
    144147
    145148  while (fscanf (f, "%s", filename) != EOF) {
    … …  
    147150    strcpy (skylist[0].regions[Nregions][0].name, filename);
    148151    sprintf (filename, "%s/%s.cpt", CATDIR, skylist[0].regions[Nregions][0].name);
    149     skylist[0].regions[Nregions][0].filename = (e_void) strcreate (filename);
     152    skylist[0].filename[Nregions] = strcreate (filename);
    150153    Nregions ++;
    151154    CHECK_REALLOCATE (skylist[0].regions, SkyRegion *, NREGIONS, Nregions, 50);

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

    r5451 r5945  
    6363
    6464  for (i = 0; i < Nregions; i++) {
    65     if (ShowAll || (stat ((char *) regions[i][0].filename, &filestat) != -1)) {
     65    if (ShowAll || (stat (skylist[0].filename[i], &filestat) != -1)) {
    6666      if (VERBOSE) fprintf (stderr, "%3d %s %6.2f - %6.2f, %6.2f - %6.2f\n", i, regions[i][0].name,
    6767                            regions[i][0].Rmin, regions[i][0].Rmax, regions[i][0].Dmin, regions[i][0].Dmax);

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

    r5451 r5945  
    4141
    4242  /* lock, load, unlock catalog */
    43   catalog.filename = (char *) skylist[0].regions[0][0].filename;
     43  catalog.filename = skylist[0].filename[0];
    4444  switch (lock_catalog (&catalog, LCK_SOFT)) {
    4545  case 2:
Note: See TracChangeset for help on using the changeset viewer.