IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 5, 2006, 5:44:26 PM (20 years ago)
Author:
eugene
Message:

big move: fits_ to gfits_; minor updates to relphot

Location:
trunk/Ohana/src/addstar
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r6764 r7080  
     1
     2- addstar 1.7
     3  * converted to gfits APIs (forces libfits 1.6)
     4  * added the -resort option
     5  * added timeout for large operations
    16
    27- addstar 1.6

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

    r4810 r7080  
    3939  /* init & load in table data */
    4040  table.header = &theader;
    41   if (!fits_fread_header (f, &header))           Shutdown ("can't read primary header for GSC Region table");
    42   if (!fits_fread_matrix (f, &matrix, &header))  Shutdown ("can't read primary matrix for GSC Region table");
    43   if (!fits_fread_ftable (f, &table, "REGIONS")) Shutdown ("can't read GSC Region table");
    44 
    45   fits_scan (table.header, "NAXIS1", "%d", 1, &Nx);
    46   fits_scan (table.header, "NAXIS2", "%d", 1, &Ny);
     41  if (!gfits_fread_header (f, &header))           Shutdown ("can't read primary header for GSC Region table");
     42  if (!gfits_fread_matrix (f, &matrix, &header))  Shutdown ("can't read primary matrix for GSC Region table");
     43  if (!gfits_fread_ftable (f, &table, "REGIONS")) Shutdown ("can't read GSC Region table");
     44
     45  gfits_scan (table.header, "NAXIS1", "%d", 1, &Nx);
     46  gfits_scan (table.header, "NAXIS2", "%d", 1, &Ny);
    4747
    4848  Nregions = 0;

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

    r4864 r7080  
    2222
    2323  SetProtect (TRUE);
    24   fits_db_close (db);
     24  gfits_db_close (db);
    2525  fprintf (stderr, "ERROR: addstar halted\n");
    2626  exit (1);

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

    r6993 r7080  
    106106
    107107    remove_argument (N, &argc, argv);
    108     if (!fits_read_header (argv[N], &header)) {
     108    if (!gfits_read_header (argv[N], &header)) {
    109109      fprintf (stderr, "ERROR: can't read header for mosaic %s\n", argv[N]);
    110110      exit (1);
    … …  
    119119    }
    120120    remove_argument (N, &argc, argv);
    121     fits_free_header (&header);
     121    gfits_free_header (&header);
    122122    options.mosaic = TRUE;
    123123  }

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

    r5445 r7080  
    6969
    7070    remove_argument (N, &argc, argv);
    71     if (!fits_read_header (argv[N], &header)) {
     71    if (!gfits_read_header (argv[N], &header)) {
    7272      fprintf (stderr, "ERROR: can't read header for mosaic %s\n", argv[N]);
    7373      exit (1);
    … …  
    8282    }
    8383    remove_argument (N, &argc, argv);
    84     fits_free_header (&header);
     84    gfits_free_header (&header);
    8585    options.mosaic = TRUE;
    8686  }

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

    r5347 r7080  
    1414
    1515  /* should this be moved into save_catalog?? */
    16   status = fits_scan (&catalog[0].header, "SORTED", "%t", 1, &catalog[0].sorted);
     16  status = gfits_scan (&catalog[0].header, "SORTED", "%t", 1, &catalog[0].sorted);
    1717  if (!status) catalog[0].sorted = TRUE;
    1818  /* XXX EAM - is this a good choice?  should the default be 'FALSE'? */

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

    r5443 r7080  
    2626    Shutdown ("can't read image catalog %s", db[0].filename);
    2727  }
    28   timage = fits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].swapped);
     28  timage = gfits_table_get_Image (&db[0].ftable, &Ntimage, &db[0].swapped);
    2929
    30   fits_scan (&db[0].header, "ZERO_PT", "%lf", 1, &zeropt);
     30  gfits_scan (&db[0].header, "ZERO_PT", "%lf", 1, &zeropt);
    3131  if (fabs (ZeroPt - zeropt) > 1e-4) {
    3232    Shutdown ("zero point in image (%f:%s) inconsistent with zero point in catalog (%f)",

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

    r5384 r7080  
    1111  Header header;
    1212
    13   if (!fits_read_header (file, &header)) {
     13  if (!gfits_read_header (file, &header)) {
    1414    fprintf (stderr, "ERROR: can't read header for %s\n", file);
    1515    exit (1);
    … …  
    2727  }
    2828  itmp = 0;
    29   fits_scan (&header, "NASTRO",   "%d", 1, &itmp);
     29  gfits_scan (&header, "NASTRO",   "%d", 1, &itmp);
    3030  if ((itmp == 0) && !ACCEPT_ASTROM) {
    3131    fprintf (stderr, "ERROR: bad astrometric solution in header\n");
    … …  
    4545   
    4646  /* get ST (used for airmass calculation) */
    47   fits_scan (&header, STKeyword, "%s", 1, line);
     47  gfits_scan (&header, STKeyword, "%s", 1, line);
    4848  /* remove ':' characters */
    4949  for (c = strchr (line, ':'); c != (char *) NULL; c = strchr (line, ':')) { *c = ' '; }
    … …  
    5353
    5454  /* CERROR in data file is in arcsec */
    55   if (!fits_scan (&header, "CERROR",   "%lf", 1, &tmp)) tmp = 1.0;
     55  if (!gfits_scan (&header, "CERROR",   "%lf", 1, &tmp)) tmp = 1.0;
    5656  image[0].cerror = tmp * 50.0;
    57   fits_scan (&header, "NAXIS1",   "%hd", 1, &image[0].NX);
    58   fits_scan (&header, "NAXIS2",   "%hd", 1, &image[0].NY);
     57  gfits_scan (&header, "NAXIS1",   "%hd", 1, &image[0].NX);
     58  gfits_scan (&header, "NAXIS2",   "%hd", 1, &image[0].NY);
    5959 
    6060  /* get photcode from header */
    6161  if (photcode == 0) {
    62     if (!fits_scan (&header, "PHOTCODE", "%s", 1, photname)) {
     62    if (!gfits_scan (&header, "PHOTCODE", "%s", 1, photname)) {
    6363      fprintf (stderr, "ERROR: photcode not supplied in header\n");
    6464      exit (1);
    … …  
    7878  image[0].NX -= XOVERSCAN;
    7979  image[0].NY -= YOVERSCAN;
    80   fits_scan (&header, ExptimeKeyword,  "%lf", 1, &tmp);
     80  gfits_scan (&header, ExptimeKeyword,  "%lf", 1, &tmp);
    8181  image[0].exptime = tmp;
    8282 
    8383  /*** why are we no longer using APMIFIT?? ***/
    8484  tmp = 0;
    85   /* fits_scan (&header, "APMIFIT",  "%lf", 1, &tmp); */
     85  /* gfits_scan (&header, "APMIFIT",  "%lf", 1, &tmp); */
    8686  image[0].apmifit_PS = tmp;
    8787
    8888  tmp = 0;
    89   /* fits_scan (&header, "dAPMIFIT", "%lf", 1, &tmp); */
     89  /* gfits_scan (&header, "dAPMIFIT", "%lf", 1, &tmp); */
    9090  image[0].dapmifit_PS = tmp;
    9191
    9292  tmp = 0;
    93   fits_scan (&header, "FLIMIT",   "%lf", 1, &tmp);
     93  gfits_scan (&header, "FLIMIT",   "%lf", 1, &tmp);
    9494  image[0].detection_limit = tmp * 10.0;
    9595
    9696  tmp = 0;
    97   fits_scan (&header, "FSATUR",   "%lf", 1, &tmp);
     97  gfits_scan (&header, "FSATUR",   "%lf", 1, &tmp);
    9898  image[0].saturation_limit = tmp * 10.0;
    9999
    100100  tmp = 0;
    101   fits_scan (&header, "FWHM_X",   "%lf", 1, &tmp);
     101  gfits_scan (&header, "FWHM_X",   "%lf", 1, &tmp);
    102102  image[0].fwhm_x = tmp * 25.0 * image[0].coords.cdelt1 * 3600.0;
    103103
    104104  tmp = 0;
    105   fits_scan (&header, "FWHM_Y",   "%lf", 1, &tmp);
     105  gfits_scan (&header, "FWHM_Y",   "%lf", 1, &tmp);
    106106  image[0].fwhm_y = tmp * 25.0 * image[0].coords.cdelt1 * 3600.0;
    107107
    108   if (!fits_scan (&header, "TZERO",   "%d",  1, &image[0].tzero)) {
     108  if (!gfits_scan (&header, "TZERO",   "%d",  1, &image[0].tzero)) {
    109109    image[0].tzero = parse_time (&header);
    110110  }
    111111
    112112  tmp = 0;
    113   fits_scan (&header, "TRATE",   "%lf", 1, &tmp);
     113  gfits_scan (&header, "TRATE",   "%lf", 1, &tmp);
    114114  image[0].trate = 10000 * tmp;
    115115
    116116  tmp = 0;
    117   fits_scan (&header, AirmassKeyword, "%lf", 1, &tmp);
     117  gfits_scan (&header, AirmassKeyword, "%lf", 1, &tmp);
    118118  image[0].secz_PS = MIN (NO_MAG, tmp);
    119119
    120   if (!fits_scan (&header, CCDNumKeyword, "%d", 1, &itmp)) {
     120  if (!gfits_scan (&header, CCDNumKeyword, "%d", 1, &itmp)) {
    121121    image[0].ccdnum = 0xff;
    122122  } else {
    … …  
    124124  }
    125125
    126   fits_scan (&header, "ZERO_PT", "%lf", 1, &ZeroPt);
     126  gfits_scan (&header, "ZERO_PT", "%lf", 1, &ZeroPt);
    127127  SetZeroPoint (ZeroPt);
    128128
    … …  
    134134
    135135  /* find expected number of stars */
    136   if (!fits_scan (&header, "NSTARS", "%d", 1, &image[0].nstar)) {
     136  if (!gfits_scan (&header, "NSTARS", "%d", 1, &image[0].nstar)) {
    137137    fprintf (stderr, "ERROR: can't get NSTARS from header\n");
    138138    exit (1);
    … …  
    154154   
    155155    sky = 0;
    156     fits_scan (&header, "HISTORY", "%S", 10, line);
     156    gfits_scan (&header, "HISTORY", "%S", 10, line);
    157157    p = strstr (line, "|I=");
    158158    if (p != (char *) NULL) {
    … …  
    178178    /* read from FITS table or from text table */
    179179    extend = FALSE;
    180     fits_scan (&header, "EXTEND",  "%t", 1, &extend);
     180    gfits_scan (&header, "EXTEND",  "%t", 1, &extend);
    181181    if (extend && !TEXTMODE) {
    182       Nbytes = fits_matrix_size (&header);
     182      Nbytes = gfits_matrix_size (&header);
    183183      fseek (f, Nbytes, SEEK_CUR);
    184184      rdstars = rfits (f, &image[0].nstar);
    … …  
    189189    } else {
    190190      /* allocate space for stars */
    191       if (!fits_scan (&header, "NSTARS", "%d", 1, &image[0].nstar)) {
     191      if (!gfits_scan (&header, "NSTARS", "%d", 1, &image[0].nstar)) {
    192192        fprintf (stderr, "ERROR: failed to find NSTARS\n");
    193193        exit (1);

  • trunk/Ohana/src/addstar/src/image-db.c

    r6684 r7080  
    66
    77  /* create new header */
    8   fits_init_header (&db[0].header);
     8  gfits_init_header (&db[0].header);
    99
    1010  /* set the recommended mode */
    … …  
    1616    db[0].header.Naxis[0] = 1;
    1717    db[0].header.Naxis[1] = 1;
    18     fits_create_header (&db[0].header);
     18    gfits_create_header (&db[0].header);
    1919    db[0].mode = DVO_MODE_RAW;
    2020  }
    2121  if (!strcasecmp (CATMODE, "MEF") || !strcasecmp (CATMODE, "SPLIT")) {
    2222    db[0].header.extend   = TRUE;
    23     fits_create_header (&db[0].header);
     23    gfits_create_header (&db[0].header);
    2424    db[0].mode = DVO_MODE_MEF;
    2525  }
    … …  
    4141  }
    4242
    43   fits_create_matrix (&db[0].header, &db[0].matrix);
    44   fits_table_set_Image (&db[0].ftable, NULL, 0);
     43  gfits_create_matrix (&db[0].header, &db[0].matrix);
     44  gfits_table_set_Image (&db[0].ftable, NULL, 0);
    4545
    4646  /* assign Zero Point provided by first image in dB */
    47   fits_modify (&db[0].header, "ZERO_PT", "%lf", 1, ZeroPt);
    48   fits_modify (&db[0].header, "NIMAGES", "%d", 1, 0);
     47  gfits_modify (&db[0].header, "ZERO_PT", "%lf", 1, ZeroPt);
     48  gfits_modify (&db[0].header, "NIMAGES", "%d", 1, 0);
    4949
    50   if (db[0].format == DVO_FORMAT_INTERNAL)  fits_modify (&db[0].header, "FORMAT", "%s", 1, "INTERNAL");
    51   if (db[0].format == DVO_FORMAT_LONEOS)    fits_modify (&db[0].header, "FORMAT", "%s", 1, "LONEOS");
    52   if (db[0].format == DVO_FORMAT_ELIXIR)    fits_modify (&db[0].header, "FORMAT", "%s", 1, "ELIXIR");
    53   if (db[0].format == DVO_FORMAT_PANSTARRS) fits_modify (&db[0].header, "FORMAT", "%s", 1, "PANSTARRS");
    54   if (db[0].format == DVO_FORMAT_PMTEST)    fits_modify (&db[0].header, "FORMAT", "%s", 1, "PMTEST");
     50  if (db[0].format == DVO_FORMAT_INTERNAL)  gfits_modify (&db[0].header, "FORMAT", "%s", 1, "INTERNAL");
     51  if (db[0].format == DVO_FORMAT_LONEOS)    gfits_modify (&db[0].header, "FORMAT", "%s", 1, "LONEOS");
     52  if (db[0].format == DVO_FORMAT_ELIXIR)    gfits_modify (&db[0].header, "FORMAT", "%s", 1, "ELIXIR");
     53  if (db[0].format == DVO_FORMAT_PANSTARRS) gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PANSTARRS");
     54  if (db[0].format == DVO_FORMAT_PMTEST)    gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PMTEST");
    5555}

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

    r6684 r7080  
    3131  }
    3232
    33   fits_init_header (&catalog[0].header);
     33  gfits_init_header (&catalog[0].header);
    3434
    3535  if (catalog[0].catmode == DVO_MODE_RAW) {
    … …  
    4141  }
    4242
    43   fits_create_header (&catalog[0].header);
     43  gfits_create_header (&catalog[0].header);
    4444 
    4545  if (catalog[0].catmode == DVO_MODE_SPLIT) {
    … …  
    5050    /* define measure catalog file */
    5151    ALLOCATE (catalog[0].measure_catalog, Catalog, 1);
    52     fits_init_header (&catalog[0].measure_catalog[0].header);
    53     fits_create_header (&catalog[0].measure_catalog[0].header);
     52    gfits_init_header (&catalog[0].measure_catalog[0].header);
     53    gfits_create_header (&catalog[0].measure_catalog[0].header);
    5454    ALLOCATE (catalog[0].measure_catalog[0].filename, char, length);
    5555    sprintf (catalog[0].measure_catalog[0].filename, "%s/%s.cpm", path, root);
    … …  
    6060    }
    6161    file = filebasename (catalog[0].measure_catalog[0].filename);
    62     fits_modify (&catalog[0].header, "MEASURE", "%s", 1, file);
     62    gfits_modify (&catalog[0].header, "MEASURE", "%s", 1, file);
    6363    free (file);
    6464
    6565    /* define missing catalog file */
    6666    ALLOCATE (catalog[0].missing_catalog, Catalog, 1);
    67     fits_init_header (&catalog[0].missing_catalog[0].header);
    68     fits_create_header (&catalog[0].missing_catalog[0].header);
     67    gfits_init_header (&catalog[0].missing_catalog[0].header);
     68    gfits_create_header (&catalog[0].missing_catalog[0].header);
    6969    ALLOCATE (catalog[0].missing_catalog[0].filename, char, length);
    7070    sprintf (catalog[0].missing_catalog[0].filename, "%s/%s.cpn", path, root);
    … …  
    7474    }
    7575    file = filebasename (catalog[0].missing_catalog[0].filename);
    76     fits_modify (&catalog[0].header, "MISSING", "%s", 1, file);
     76    gfits_modify (&catalog[0].header, "MISSING", "%s", 1, file);
    7777    free (file);
    7878
    7979    /* define secfilt catalog file */
    8080    ALLOCATE (catalog[0].secfilt_catalog, Catalog, 1);
    81     fits_init_header (&catalog[0].secfilt_catalog[0].header);
    82     fits_create_header (&catalog[0].secfilt_catalog[0].header);
     81    gfits_init_header (&catalog[0].secfilt_catalog[0].header);
     82    gfits_create_header (&catalog[0].secfilt_catalog[0].header);
    8383    ALLOCATE (catalog[0].secfilt_catalog[0].filename, char, length);
    8484    sprintf (catalog[0].secfilt_catalog[0].filename, "%s/%s.cps", path, root);
    … …  
    8888    }
    8989    file = filebasename (catalog[0].secfilt_catalog[0].filename);
    90     fits_modify (&catalog[0].header, "SECFILT", "%s", 1, file);
     90    gfits_modify (&catalog[0].header, "SECFILT", "%s", 1, file);
    9191    free (file);
    9292    free (path);
    … …  
    9595
    9696  /* write RA,DEC range in header */
    97   fits_modify (&catalog[0].header, "RA0",  "%lf", 1, region[0].Rmin);
    98   fits_modify (&catalog[0].header, "DEC0", "%lf", 1, region[0].Dmin);
    99   fits_modify (&catalog[0].header, "RA1",  "%lf", 1, region[0].Rmax);
    100   fits_modify (&catalog[0].header, "DEC1", "%lf", 1, region[0].Dmax);
     97  gfits_modify (&catalog[0].header, "RA0",  "%lf", 1, region[0].Rmin);
     98  gfits_modify (&catalog[0].header, "DEC0", "%lf", 1, region[0].Dmin);
     99  gfits_modify (&catalog[0].header, "RA1",  "%lf", 1, region[0].Rmax);
     100  gfits_modify (&catalog[0].header, "DEC1", "%lf", 1, region[0].Dmax);
    101101
    102102  /* write creation date in header */
    103103  str_to_time ("now", &now);
    104104  line = sec_to_date (now);
    105   fits_modify (&catalog[0].header, "DATE", "%s", 1, line);
     105  gfits_modify (&catalog[0].header, "DATE", "%s", 1, line);
    106106  free (line);
    107107

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

    r3517 r7080  
    1414  if (strcasecmp (JDKeyword, "NONE")) {
    1515    uppercase (JDKeyword);
    16     fits_scan (header, JDKeyword, "%lf", 1, &jd);
     16    gfits_scan (header, JDKeyword, "%lf", 1, &jd);
    1717    Nsec = (jd - 2440587.5)*86400;
    1818    return (Nsec);
    … …  
    2222  if (strcasecmp (MJDKeyword, "NONE")) {
    2323    uppercase (MJDKeyword);
    24     fits_scan (header, MJDKeyword, "%lf", 1, &jd);
     24    gfits_scan (header, MJDKeyword, "%lf", 1, &jd);
    2525    Nsec = (jd - 40587.0)*86400;
    2626    return (Nsec);
    … …  
    2929  /* get UT and DATE */
    3030  uppercase (UTKeyword);
    31   fits_scan (header, UTKeyword, "%s", 1, line);
     31  gfits_scan (header, UTKeyword, "%s", 1, line);
    3232  /* remove ':' characters */
    3333  for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }
    … …  
    6868  /* parse date entry */
    6969  uppercase (DateKeyword);
    70   fits_scan (header, DateKeyword, "%s",  1, line);
     70  gfits_scan (header, DateKeyword, "%s",  1, line);
    7171  /* remove possible separators: ':', '/' '.', '-' */
    7272  for (c = strchr (line, 0x3a); c != (char *) NULL; c = strchr (line, 0x3a)) { *c = ' '; }

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

    r6641 r7080  
    1414  /* init & load in table data */
    1515  table.header   = &theader;
    16   if (!fits_fread_ftable (f, &table, "SMPFILE")) goto escape;
     16  if (!gfits_fread_ftable (f, &table, "SMPFILE")) goto escape;
    1717
    18   smpdata = fits_table_get_SMPData (&table, &Nstars, NULL);
     18  smpdata = gfits_table_get_SMPData (&table, &Nstars, NULL);
    1919
    2020  ALLOCATE (stars, Stars, Nstars);

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

    r5322 r7080  
    77
    88  /* should this be moved into save_catalog?? */
    9   fits_modify (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
     9  gfits_modify (&catalog[0].header, "SORTED",  "%t", 1, catalog[0].sorted);
    1010
    1111  /* if partial load, must use update */
    … …  
    4040    catalog[0].Nsecfilt = 0;
    4141  }
    42   fits_free_header (&catalog[0].header);
     42  gfits_free_header (&catalog[0].header);
    4343}
    4444

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

    r4864 r7080  
    1212  /* adjust header */
    1313  Nimages = 0;
    14   fits_scan (&db[0].header, "NIMAGES", "%d", 1, &Nimages);
     14  gfits_scan (&db[0].header, "NIMAGES", "%d", 1, &Nimages);
    1515  Nimages ++;
    16   fits_modify (&db[0].header, "NIMAGES", "%d", 1, Nimages);
     16  gfits_modify (&db[0].header, "NIMAGES", "%d", 1, Nimages);
    1717
    18   fits_table_to_vtable (&db[0].ftable, &db[0].vtable, 0, 0);
     18  gfits_table_to_vtable (&db[0].ftable, &db[0].vtable, 0, 0);
    1919  for (i = 0; i < Nimage; i++) {
    20     fits_vadd_rows (&db[0].vtable, (char *) image, 1, sizeof(Image));
     20    gfits_vadd_rows (&db[0].vtable, (char *) image, 1, sizeof(Image));
    2121  }
    2222
Note: See TracChangeset for help on using the changeset viewer.