IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 6, 2010, 4:06:31 PM (16 years ago)
Author:
eugene
Message:

merging changes from branches/eam_branches/Ohana.20100606: re-work the off_t print/scan format; fix and test NAN implementation in gnu89 context; fix and test BYTE_SWAP for libohana

Location:
trunk/Ohana
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/libdvo/src/cmf-ps1-v1-alt.c

    r27435 r28241  
    1313  // this function is a special case : it must have Nx = 136
    1414  if (ftable[0].header[0].Naxis[0] != 136) {
    15     fprintf (stderr, "ERROR: wrong format for CMF_PS1_V1_Alt: %lld vs %d\n", (long long) ftable[0].header[0].Naxis[0], 136);
     15    fprintf (stderr, "ERROR: wrong format for CMF_PS1_V1_Alt: "OFF_T_FMT" vs %d\n", ftable[0].header[0].Naxis[0], 136);
    1616    exit (2);
    1717  }

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

    r27588 r28241  
    2424  }
    2525  /* get the components from the header */
    26   if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, (long long *) &Naverage)) return (FALSE);
    27   if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, (long long *) &Nmeasure)) return (FALSE);
    28   if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, (long long *) &Nmissing)) return (FALSE);
     26  if (!gfits_scan (&catalog[0].header, "NSTARS",   OFF_T_FMT, 1, &Naverage)) return (FALSE);
     27  if (!gfits_scan (&catalog[0].header, "NMEAS",    OFF_T_FMT, 1, &Nmeasure)) return (FALSE);
     28  if (!gfits_scan (&catalog[0].header, "NMISS",    OFF_T_FMT, 1, &Nmissing)) return (FALSE);
    2929  if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d",   1,               &Nsecfilt)) Nsecfilt = 0;
    3030
    … …  
    7373    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary);
    7474    if (Naverage != catalog[0].Naves_disk) {
    75       fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers (%lld vs %lld)\n", (long long) Naverage, (long long) catalog[0].Naves_disk);
     75      fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Naverage, catalog[0].Naves_disk);
    7676    }
    7777    catalog[0].Naverage = catalog[0].Naves_disk;
    … …  
    100100    catalog[0].measure = FtableToMeasure (&ftable, &catalog[0].Nmeasure, &catalog[0].catformat);
    101101    if (Nmeasure != catalog[0].Nmeas_disk) {
    102       fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%lld vs %lld)\n", (long long) Nmeasure, (long long) catalog[0].Nmeas_disk);
     102      fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nmeasure, catalog[0].Nmeas_disk);
    103103    }
    104104    catalog[0].Nmeasure = catalog[0].Nmeas_disk;
    … …  
    126126    catalog[0].missing = gfits_table_get_Missing (&ftable, &catalog[0].Nmissing, NULL);
    127127    if (Nmissing != catalog[0].Nmiss_disk) {
    128       fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%lld vs %lld)\n", (long long) Nmissing, (long long) catalog[0].Nmiss_disk);
     128      fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nmissing, catalog[0].Nmiss_disk);
    129129    }
    130130    catalog[0].Nmissing = catalog[0].Nmiss_disk;
    … …  
    154154    catalog[0].secfilt = FtableToSecFilt (&ftable, &Nitems, &catalog[0].catformat);
    155155    if (Nexpect != Nitems) {
    156       fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%lld vs %lld)\n", (long long) Nexpect, (long long) Nitems);
     156      fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nexpect, Nitems);
    157157    }
    158158
    … …  
    238238
    239239  /* make sure header is consistent with data */
    240   gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) catalog[0].Naverage);
    241   gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) catalog[0].Nmeasure);
    242   gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) catalog[0].Nmissing);
     240  gfits_modify (&catalog[0].header, "NSTARS",   OFF_T_FMT, 1, catalog[0].Naverage);
     241  gfits_modify (&catalog[0].header, "NMEAS",    OFF_T_FMT, 1, catalog[0].Nmeasure);
     242  gfits_modify (&catalog[0].header, "NMISS",    OFF_T_FMT, 1, catalog[0].Nmissing);
    243243  gfits_modify (&catalog[0].header, "NSECFILT", "%d",   1,                        Nsecfilt);
    244244  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);

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

    r27588 r28241  
    2121  /* get the components from the header */
    2222  catalog[0].Naverage = catalog[0].Nmeasure = catalog[0].Nmissing = catalog[0].Nsecfilt = 0;
    23   if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, (long long *) &catalog[0].Naverage)) return (FALSE);
    24   if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, (long long *) &catalog[0].Nmeasure)) return (FALSE);
    25   if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, (long long *) &catalog[0].Nmissing)) return (FALSE);
     23  if (!gfits_scan (&catalog[0].header, "NSTARS",   OFF_T_FMT, 1, &catalog[0].Naverage)) return (FALSE);
     24  if (!gfits_scan (&catalog[0].header, "NMEAS",    OFF_T_FMT, 1, &catalog[0].Nmeasure)) return (FALSE);
     25  if (!gfits_scan (&catalog[0].header, "NMISS",    OFF_T_FMT, 1, &catalog[0].Nmissing)) return (FALSE);
    2626  if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d",   1,               &catalog[0].Nsecfilt)) catalog[0].Nsecfilt = 0;
    2727
    … …  
    113113    if (VERBOSE) {
    114114      fprintf (stderr, "star catalog has inconsistent size\n");
    115       fprintf (stderr, "average: %lld = %lld bytes\n", (long long) catalog[0].Naverage, (long long) catalog[0].Naverage*AverageSize);
    116       fprintf (stderr, "measure: %lld = %lld bytes\n", (long long) catalog[0].Nmeasure, (long long) catalog[0].Nmeasure*MeasureSize);
    117       fprintf (stderr, "missing: %lld = %lld bytes\n", (long long) catalog[0].Nmissing, (long long) catalog[0].Nmissing*MissingSize);
    118       fprintf (stderr, "secfilt: %lld = %lld bytes\n", (long long) catalog[0].Nsecfilt, (long long) catalog[0].Nsecfilt*SecFiltSize*catalog[0].Naverage);
    119       fprintf (stderr, "expect: %lld, found: %lld\n", (long long) size, (long long) filestatus.st_size);
     115      fprintf (stderr, "average: "OFF_T_FMT" = "OFF_T_FMT" bytes\n",  catalog[0].Naverage, catalog[0].Naverage*AverageSize);
     116      fprintf (stderr, "measure: "OFF_T_FMT" = "OFF_T_FMT" bytes\n",  catalog[0].Nmeasure, catalog[0].Nmeasure*MeasureSize);
     117      fprintf (stderr, "missing: "OFF_T_FMT" = "OFF_T_FMT" bytes\n",  catalog[0].Nmissing, catalog[0].Nmissing*MissingSize);
     118      fprintf (stderr, "secfilt: %d = "OFF_T_FMT" bytes\n",  catalog[0].Nsecfilt, catalog[0].Nsecfilt*SecFiltSize*catalog[0].Naverage);
     119      fprintf (stderr, "expect: "OFF_T_FMT", found: "OFF_T_FMT"\n",  size, filestatus.st_size);
    120120    }
    121121    return (FALSE);
    … …  
    155155    nitems = fread (catalog[0].missing, MissingSize, Nitems, f);
    156156    if (nitems != Nitems) {
    157       if (VERBOSE) fprintf (stderr, "failed to read missing from catalog file %s (%lld vs %lld)\n", catalog[0].filename, (long long) nitems, (long long) Nitems);
     157      if (VERBOSE) fprintf (stderr, "failed to read missing from catalog file %s ("OFF_T_FMT" vs "OFF_T_FMT")\n", catalog[0].filename,  nitems, Nitems);
    158158      return (FALSE);
    159159    }
    … …  
    198198  }
    199199
    200   if (VERBOSE) fprintf (stderr, "read %lld stars from catalog file %s (%lld measurements, %lld missing, %lld secondary filters)\n",
    201                         (long long) catalog[0].Naverage,
     200  if (VERBOSE) fprintf (stderr, "read "OFF_T_FMT" stars from catalog file %s ("OFF_T_FMT" measurements, "OFF_T_FMT" missing, %d secondary filters)\n",
     201                        catalog[0].Naverage,
    202202                        catalog[0].filename,
    203                         (long long) catalog[0].Nmeasure,
    204                         (long long) catalog[0].Nmissing,
    205                         (long long) catalog[0].Nsecfilt);
     203                        catalog[0].Nmeasure,
     204                        catalog[0].Nmissing,
     205                        catalog[0].Nsecfilt);
    206206
    207207  /* check data integrity */
    … …  
    214214      if (VERBOSE) {
    215215        fprintf (stderr, "****** data in catalog %s is corrupt, sums don't check\n", catalog[0].filename);
    216         fprintf (stderr, "****** Nmeas: %lld, %lld\n", (long long) Nmeas, (long long) catalog[0].Nmeasure);
    217         fprintf (stderr, "****** Nmiss: %lld, %lld\n", (long long) Nmiss, (long long) catalog[0].Nmissing);
     216        fprintf (stderr, "****** Nmeas: "OFF_T_FMT", "OFF_T_FMT"\n",  Nmeas, catalog[0].Nmeasure);
     217        fprintf (stderr, "****** Nmiss: "OFF_T_FMT", "OFF_T_FMT"\n",  Nmiss, catalog[0].Nmissing);
    218218      }
    219219      return (FALSE);
    … …  
    264264
    265265  /* make sure header is consistent with data */
    266   gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) catalog[0].Naverage);
    267   gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) catalog[0].Nmeasure);
    268   gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) catalog[0].Nmissing);
    269   gfits_modify (&catalog[0].header, "NSECFILT", "%lld", 1, (long long) catalog[0].Nsecfilt);
     266  gfits_modify (&catalog[0].header, "NSTARS",   OFF_T_FMT, 1, catalog[0].Naverage);
     267  gfits_modify (&catalog[0].header, "NMEAS",    OFF_T_FMT, 1, catalog[0].Nmeasure);
     268  gfits_modify (&catalog[0].header, "NMISS",    OFF_T_FMT, 1, catalog[0].Nmissing);
     269  gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, catalog[0].Nsecfilt);
    270270  gfits_modify (&catalog[0].header, "OBJID",    "%d", 1, catalog[0].objID);
    271271
    … …  
    353353      nitems = fread (tmpAverage, sizeof(Average_##TYPE), Naverage, f); \
    354354      if (nitems != Naverage) { \
    355         fprintf (stderr, "failed to read averages (%lld vs %lld)\n", (long long) nitems, (long long) Naverage); \
     355        fprintf (stderr, "failed to read averages ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Naverage); \
    356356        return (NULL); \
    357357      } \
    … …  
    367367      nitems = fread (average, sizeof(Average), Naverage, f);
    368368      if (nitems != Naverage) {
    369         fprintf (stderr, "failed to read averages (%lld vs %lld)\n", (long long) nitems, (long long) Naverage);
     369        fprintf (stderr, "failed to read averages ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Naverage);
    370370        return (NULL);
    371371      }
    … …  
    406406      free (tmpAverage); \
    407407      if (nitems != Naverage) { \
    408         fprintf (stderr, "failed to write averages (%lld vs %lld)\n", (long long) nitems, (long long) Naverage); \
     408        fprintf (stderr, "failed to write averages ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Naverage); \
    409409        return (FALSE); \
    410410      } \
    … …  
    417417      nitems = fwrite (average, sizeof(Average), Naverage, f);
    418418      if (nitems != Naverage) {
    419         fprintf (stderr, "failed to write averages (%lld vs %lld)\n", (long long) nitems, (long long) Naverage);
     419        fprintf (stderr, "failed to write averages ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Naverage);
    420420        return (FALSE);
    421421      }
    … …  
    455455      nitems = fread (tmpMeasure, sizeof(Measure_##TYPE), Nmeasure, f); \
    456456      if (nitems != Nmeasure) { \
    457         fprintf (stderr, "failed to read measures (%lld vs %lld)\n", (long long) nitems, (long long) Nmeasure); \
     457        fprintf (stderr, "failed to read measures ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Nmeasure); \
    458458        return (NULL); \
    459459      } \
    … …  
    469469      nitems = fread (measure, sizeof(Measure), Nmeasure, f);
    470470      if (nitems != Nmeasure) {
    471         fprintf (stderr, "failed to read measures (%lld vs %lld)\n", (long long) nitems, (long long) Nmeasure);
     471        fprintf (stderr, "failed to read measures ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Nmeasure);
    472472        return (NULL);
    473473      }
    … …  
    508508      free (tmpMeasure); \
    509509      if (nitems != Nmeasure) { \
    510         fprintf (stderr, "failed to write measures (%lld vs %lld)\n", (long long) nitems, (long long) Nmeasure); \
     510        fprintf (stderr, "failed to write measures ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Nmeasure); \
    511511        return (FALSE); \
    512512      } \
    … …  
    519519      nitems = fwrite (measure, sizeof(Measure), Nmeasure, f);
    520520      if (nitems != Nmeasure) {
    521         fprintf (stderr, "failed to write measures (%lld vs %lld)\n", (long long) nitems, (long long) Nmeasure);
     521        fprintf (stderr, "failed to write measures ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Nmeasure);
    522522        return (FALSE);
    523523      }
    … …  
    557557      nitems = fread (tmpSecFilt, sizeof(SecFilt_##TYPE), Nsecfilt, f); \
    558558      if (nitems != Nsecfilt) { \
    559         fprintf (stderr, "failed to read secfilts (%lld vs %lld)\n", (long long) nitems, (long long) Nsecfilt); \
     559        fprintf (stderr, "failed to read secfilts ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Nsecfilt); \
    560560        return (NULL); \
    561561      } \
    … …  
    571571      nitems = fread (secfilt, sizeof(SecFilt), Nsecfilt, f);
    572572      if (nitems != Nsecfilt) {
    573         fprintf (stderr, "failed to read secfilts (%lld vs %lld)\n", (long long) nitems, (long long) Nsecfilt);
     573        fprintf (stderr, "failed to read secfilts ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Nsecfilt);
    574574        return (NULL);
    575575      }
    … …  
    610610      free (tmpSecFilt); \
    611611      if (nitems != Nsecfilt) { \
    612         fprintf (stderr, "failed to write secfilts (%lld vs %lld)\n", (long long) nitems, (long long) Nsecfilt); \
     612        fprintf (stderr, "failed to write secfilts ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Nsecfilt); \
    613613        return (FALSE); \
    614614      } \
    … …  
    621621      nitems = fwrite (secfilt, sizeof(SecFilt), Nsecfilt, f);
    622622      if (nitems != Nsecfilt) {
    623         fprintf (stderr, "failed to write secfilts (%lld vs %lld)\n", (long long) nitems, (long long) Nsecfilt);
     623        fprintf (stderr, "failed to write secfilts ("OFF_T_FMT" vs "OFF_T_FMT")\n",  nitems, Nsecfilt);
    624624        return (FALSE);
    625625      }

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

    r27435 r28241  
    174174
    175175  /* get the components from the header - these duplicate information in the split files (NAXIS2) */
    176   if (!gfits_scan (&catalog[0].header, "NSTARS",   "%lld", 1, (long long *) &Naverage)) return (FALSE);
    177   if (!gfits_scan (&catalog[0].header, "NMEAS",    "%lld", 1, (long long *) &Nmeasure)) return (FALSE);
    178   if (!gfits_scan (&catalog[0].header, "NMISS",    "%lld", 1, (long long *) &Nmissing)) return (FALSE);
     176  if (!gfits_scan (&catalog[0].header, "NSTARS",   OFF_T_FMT, 1, &Naverage)) return (FALSE);
     177  if (!gfits_scan (&catalog[0].header, "NMEAS",    OFF_T_FMT, 1, &Nmeasure)) return (FALSE);
     178  if (!gfits_scan (&catalog[0].header, "NMISS",    OFF_T_FMT, 1, &Nmissing)) return (FALSE);
    179179  if (!gfits_scan (&catalog[0].header, "NSECFILT", "%d",   1,               &Nsecfilt)) Nsecfilt = 0;
    180180
    … …  
    227227    catalog[0].average = FtableToAverage (&ftable, &Naverage, &catalog[0].catformat, &primary);
    228228    if (Naverage != catalog[0].Naves_disk) {
    229       fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers (%lld vs %lld)\n", (long long) Naverage, (long long) catalog[0].Naves_disk);
     229      fprintf (stderr, "Warning: mismatch between Naverage in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Naverage, catalog[0].Naves_disk);
    230230    }
    231231    gfits_free_header (&header);
    … …  
    256256    catalog[0].measure = FtableToMeasure (&ftable, &Nmeasure, &catalog[0].catformat);
    257257    if (Nmeasure != catalog[0].Nmeas_disk) {
    258       fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%lld vs %lld)\n", (long long) Nmeasure, (long long) catalog[0].Nmeas_disk);
     258      fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nmeasure, catalog[0].Nmeas_disk);
    259259    }
    260260    catalog[0].Nmeasure = catalog[0].Nmeas_disk;
    … …  
    286286    catalog[0].missing = gfits_table_get_Missing (&ftable, &Nmissing, NULL);
    287287    if (Nmissing != catalog[0].Nmiss_disk) {
    288       fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%lld vs %lld)\n", (long long) Nmissing, (long long) catalog[0].Nmiss_disk);
     288      fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nmissing, catalog[0].Nmiss_disk);
    289289    }
    290290    catalog[0].Nmissing = catalog[0].Nmiss_disk;
    … …  
    315315    catalog[0].secfilt = FtableToSecFilt (&ftable, &Nitems, &catalog[0].catformat);
    316316    if (Nitems != catalog[0].Nsecf_disk) {
    317       fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%lld vs %lld)\n", (long long) Nitems, (long long) catalog[0].Nsecf_disk);
     317      fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nitems, catalog[0].Nsecf_disk);
    318318    }
    319319    catalog[0].Nsecf_mem = catalog[0].Nsecf_disk;
    … …  
    408408    catalog[0].secfilt = FtableToSecFilt (&ftable, &Nitems, &catalog[0].catformat);
    409409    if (Nitems != Nexpect) {
    410       fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers (%lld vs %lld)\n", (long long) Nitems, (long long) Nexpect);
     410      fprintf (stderr, "Warning: mismatch between Nsecfilt items in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nitems, Nexpect);
    411411    }
    412412    catalog[0].Nsecf_mem = catalog[0].Naverage * catalog[0].Nsecfilt;
    … …  
    444444    catalog[0].measure = FtableToMeasure (&ftable, &Nmeasure, &catalog[0].catformat);
    445445    if (Nmeasure != Nrows) {
    446       fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers (%lld vs %lld)\n", (long long) Nmeasure, (long long) Nrows);
     446      fprintf (stderr, "Warning: mismatch between Nmeasure in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nmeasure, Nrows);
    447447    }
    448448    gfits_free_header (&header);
    … …  
    474474    catalog[0].missing = gfits_table_get_Missing (&ftable, &Nmissing, NULL);
    475475    if (Nmissing != Nrows) {
    476       fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers (%lld vs %lld)\n", (long long) Nmissing, (long long) Nrows);
     476      fprintf (stderr, "Warning: mismatch between Nmissing in PHU and Table headers ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nmissing, Nrows);
    477477    }
    478478    gfits_free_header (&header);
    … …  
    524524
    525525  /* make sure header is consistent with data */
    526   gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) Naves_disk_new);
    527   gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) Nmeas_disk_new);
    528   gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) Nmiss_disk_new);
     526  gfits_modify (&catalog[0].header, "NSTARS",   OFF_T_FMT, 1, Naves_disk_new);
     527  gfits_modify (&catalog[0].header, "NMEAS",    OFF_T_FMT, 1, Nmeas_disk_new);
     528  gfits_modify (&catalog[0].header, "NMISS",    OFF_T_FMT, 1, Nmiss_disk_new);
    529529  gfits_modify (&catalog[0].header, "NSECFILT", "%d",   1, Nsecfilt);
    530530  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    … …  
    723723
    724724  /* make sure header is consistent with data */
    725   gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) Naves_disk_new);
    726   gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) Nmeas_disk_new);
    727   gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) Nmiss_disk_new);
     725  gfits_modify (&catalog[0].header, "NSTARS",   OFF_T_FMT, 1, Naves_disk_new);
     726  gfits_modify (&catalog[0].header, "NMEAS",    OFF_T_FMT, 1, Nmeas_disk_new);
     727  gfits_modify (&catalog[0].header, "NMISS",    OFF_T_FMT, 1, Nmiss_disk_new);
    728728  gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, Nsecfilt);
    729729  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);
    … …  
    902902
    903903  /* make sure header is consistent with data */
    904   gfits_modify (&catalog[0].header, "NSTARS",   "%lld", 1, (long long) Naves_disk_new);
    905   gfits_modify (&catalog[0].header, "NMEAS",    "%lld", 1, (long long) Nmeas_disk_new);
    906   gfits_modify (&catalog[0].header, "NMISS",    "%lld", 1, (long long) Nmiss_disk_new);
     904  gfits_modify (&catalog[0].header, "NSTARS",   OFF_T_FMT, 1, Naves_disk_new);
     905  gfits_modify (&catalog[0].header, "NMEAS",    OFF_T_FMT, 1, Nmeas_disk_new);
     906  gfits_modify (&catalog[0].header, "NMISS",    OFF_T_FMT, 1, Nmiss_disk_new);
    907907  gfits_modify (&catalog[0].header, "NSECFILT", "%d", 1, Nsecfilt);
    908908  gfits_modify_alt (&catalog[0].header, "EXTEND",   "%t", 1, TRUE);

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

    r27580 r28241  
    267267    gfits_free_header (theader);
    268268    gfits_table_mkheader_Image (theader);
    269     gfits_modify (theader, "NAXIS2", "%lld", 1, (long long) Nimage);
     269    gfits_modify (theader, "NAXIS2", OFF_T_FMT, 1, Nimage);
    270270    theader[0].Naxis[1] = Nimage;
    271271    ftable[0].datasize = gfits_data_size (theader);
    … …  
    288288    gfits_free_header (theader); \
    289289    gfits_table_mkheader_Image (theader); \
    290     gfits_modify (theader, "NAXIS2", "%lld", 1, (long long) Nimage); \
     290    gfits_modify (theader, "NAXIS2", OFF_T_FMT, 1, Nimage); \
    291291    theader[0].Naxis[1] = Nimage; \
    292292    ftable[0].datasize = gfits_data_size (theader); \
    … …  
    373373      } \
    374374      /* convert header from old format to new format */ \
    375       gfits_scan (theader, "NAXIS2", "%lld", 1, (long long *) &Nimage); \
     375      gfits_scan (theader, "NAXIS2", OFF_T_FMT, 1, &Nimage); \
    376376      gfits_free_header (theader); \
    377377      gfits_table_mkheader_Image_##TYPE (theader); \
    378       gfits_modify (theader, "NAXIS2", "%lld", 1, (long long) Nimage); \
     378      gfits_modify (theader, "NAXIS2", OFF_T_FMT, 1, Nimage); \
    379379      theader[0].Naxis[1] = Nimage; \
    380380      vtable[0].datasize = gfits_data_size (theader); \

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

    r27580 r28241  
    120120  /* adjust header */
    121121  Nimages = 0;
    122   gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimages);
     122  gfits_scan (&db[0].header, "NIMAGES", OFF_T_FMT, 1, &Nimages);
    123123  Nimages += Nnew;
    124   gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, (long long) Nimages);
     124  gfits_modify (&db[0].header, "NIMAGES", OFF_T_FMT, 1, Nimages);
    125125
    126126  gfits_table_to_vtable (&db[0].ftable, &db[0].vtable, 0, 0);
    … …  
    195195  gfits_table_set_Image (&db[0].ftable, NULL, 0);
    196196
    197   gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, 0LL);
     197  gfits_modify (&db[0].header, "NIMAGES", "%d", 1, 0);
    198198  gfits_modify (&db[0].header, "ZERO_PT", "%lf", 1, ZeroPoint);
    199199

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

    r27580 r28241  
    3939  /* find number of images */
    4040  Nimage = 0;
    41   gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
     41  gfits_scan (&db[0].header, "NIMAGES", OFF_T_FMT, 1, &Nimage);
    4242  if (stat (db[0].filename, &filestatus) == -1) {
    4343    if (VERBOSE) fprintf (stderr, "ERROR: failed to get status of image catalog\n");
    … …  
    6464    Ndata = (filestatus.st_size - db[0].header.datasize) / ImageSize;
    6565    if (VERBOSE) fprintf (stderr, "ERROR: image catalog has inconsistent size\n");
    66     if (VERBOSE) fprintf (stderr, "header: %lld, data: %lld\n", (long long) Nimage, (long long) Ndata);
     66    if (VERBOSE) fprintf (stderr, "header: "OFF_T_FMT", data: "OFF_T_FMT"\n",  Nimage, Ndata);
    6767    if (!FORCE_READ) exit (1);
    6868    Nimage = Ndata;
    … …  
    9696  }
    9797
    98   gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, (long long) Nimage);
     98  gfits_modify (&db[0].theader, "NAXIS2", OFF_T_FMT, 1, Nimage);
    9999  db[0].theader.Naxis[1] = Nimage;
    100100  db[0].ftable.datasize = gfits_data_size (&db[0].theader);
    … …  
    110110  off_t *row;
    111111
    112   if (VERBOSE) fprintf (stderr, "writing out %lld images\n", (long long) db[0].vtable.Nrow);
     112  if (VERBOSE) fprintf (stderr, "writing out "OFF_T_FMT" images\n", db[0].vtable.Nrow);
    113113
    114114  /* position to start of file */
    … …  
    125125  Nrow = db[0].vtable.Nrow;
    126126  row = db[0].vtable.row;
    127   gfits_scan (db[0].vtable.header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    128   gfits_scan (db[0].vtable.header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     127  gfits_scan (db[0].vtable.header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     128  gfits_scan (db[0].vtable.header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    129129
    130130  /* file pointer is at beginning of desired table data */
    … …  
    146146  int status;
    147147
    148   if (VERBOSE) fprintf (stderr, "writing out %lld images\n", (long long) db[0].theader.Naxis[1]);
     148  if (VERBOSE) fprintf (stderr, "writing out "OFF_T_FMT" images\n", db[0].theader.Naxis[1]);
    149149
    150150  /* position to start of file */
    … …  
    158158  }
    159159
    160   gfits_scan (db[0].ftable.header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    161   gfits_scan (db[0].ftable.header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     160  gfits_scan (db[0].ftable.header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     161  gfits_scan (db[0].ftable.header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    162162  size = Nx * Ny;
    163163  Nbytes = fwrite (db[0].ftable.buffer, sizeof(char), size, db[0].f);
Note: See TracChangeset for help on using the changeset viewer.