IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28241


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:
101 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/configure.tcsh

    r27482 r28241  
    186186
    187187# use_gnu99
    188 if ($use_gnu99) set CFLAGS = "$CFLAGS -std=gnu99"
     188if ($use_gnu99) then
     189    set CFLAGS = "$CFLAGS -std=gnu99"
     190else
     191    set CFLAGS = "$CFLAGS -std=gnu89"
     192endif
    189193
    190194# no_largefiles
    … …  
    670674  --use-tcmalloc          use the alternate tcmalloc from Google
    671675  --use-gnu99             use gnu99 flags to ensure C99 compatibility
    672   --use-largefiles        ensure large file compatibility
     676  --no-largefiles         skip large file compatibility
    673677
    674678Installation directories:

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

    r27435 r28241  
    8181      continue;
    8282    }
    83     if (VERBOSE) fprintf (stderr, "file %s has %d headers, including %lld images\n", file[i], Nheaders, (long long) NheaderSets);
     83    if (VERBOSE) fprintf (stderr, "file %s has %d headers, including "OFF_T_FMT" images\n", file[i], Nheaders, NheaderSets);
    8484
    8585    /* supplied photcode is incompatible with multi-chip images */

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

    r27435 r28241  
    147147    skytable[0].filename[i] = NULL;
    148148  }
    149   if (VERBOSE) fprintf (stderr, "loaded %lld tables from tycho index\n", (long long) skytable[0].Nregions);
     149  if (VERBOSE) fprintf (stderr, "loaded "OFF_T_FMT" tables from tycho index\n", skytable[0].Nregions);
    150150
    151151  return (skytable);

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

    r27435 r28241  
    4848        newlist = SkyListByImage (sky, -1, &images[i]);
    4949        SkyListMerge (&skylist, newlist);
    50         if (VERBOSE) fprintf (stderr, "added %lld regions to yield %lld total\n", (long long) newlist[0].Nregions, (long long) skylist[0].Nregions);
     50        if (VERBOSE) fprintf (stderr, "added "OFF_T_FMT" regions to yield "OFF_T_FMT" total\n",  newlist[0].Nregions, skylist[0].Nregions);
    5151        SkyListFree (newlist);
    5252      }
    … …  
    8080    skylist = tmp;
    8181  }
    82   if (VERBOSE) fprintf (stderr, "writing to %lld regions\n", (long long) skylist[0].Nregions);
     82  if (VERBOSE) fprintf (stderr, "writing to "OFF_T_FMT" regions\n", skylist[0].Nregions);
    8383
    8484  /* don't load the object tables for only_images, unless we are getting the calibration. */
    … …  
    213213  gettimeofday (&stop, NULL);
    214214  dtime = DTIME (stop, start);
    215   fprintf (stderr, "SUCCESS: elapsed time %9.4f sec for %5d stars (%5d matches), %6lld average, %7lld measure\n", dtime, Nstars, Nmatch, (long long) Naverage, (long long) Nmeasure);
     215  fprintf (stderr, "SUCCESS: elapsed time %9.4f sec for %5d stars (%5d matches), "OFF_T_FMT" average, "OFF_T_FMT" measure\n", dtime, Nstars, Nmatch,  Naverage, Nmeasure);
    216216
    217217  exit (0);

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

    r28187 r28241  
    356356  catalog[0].Nmeasure = Nmeas;
    357357  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    358   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %lld %lld %lld, (%lld matches)\n", (long long) Nstars, (long long) Nave, (long long) Nmeas, (long long) Nmatch);
     358  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas, Nmatch);
    359359
    360360  free (catalog[0].found);

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

    r27582 r28241  
    350350  catalog[0].Nmeasure = Nmeas;
    351351  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    352   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %lld %lld %lld, (%lld matches)\n", (long long) Nstars, (long long) Nave, (long long) Nmeas, (long long) Nmatch);
     352  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas, Nmatch);
    353353
    354354  free (catalog[0].found);

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

    r27790 r28241  
    361361  catalog[0].Nmeasure = Nmeas;
    362362  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    363   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %lld %lld %lld, (%lld matches)\n", (long long) Nstars, (long long) Nave, (long long) Nmeas, (long long) Nmatch);
     363  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas, Nmatch);
    364364
    365365  free (catalog[0].found);

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

    r27582 r28241  
    329329  catalog[0].Nmeasure = Nmeas;
    330330  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    331   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %lld %lld %lld, (%lld matches)\n", (long long) Nstars, (long long) Nave, (long long) Nmeas, (long long) Nmatch);
     331  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas, Nmatch);
    332332
    333333  free (catalog[0].found);

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

    r27435 r28241  
    940940int dvo_image_clear_vtable (FITS_DB *db) {
    941941
    942   int i;
     942  int i, nbytes;
    943943
    944944  // free memory used by the current vtable rows
    … …  
    951951
    952952  // reset db[0].theader(NAXIS1) to match Image
    953   gfits_modify (&db[0].theader, "NAXIS1", "%lld", 1, (long long) sizeof(Image));
     953  nbytes = sizeof(Image);
     954  gfits_modify (&db[0].theader, "NAXIS1", "%d", 1,  nbytes);
    954955  db[0].theader.Naxis[0] = sizeof(Image);
    955956

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

    r27435 r28241  
    7777  Noutimage = Nimage - Nimlist;
    7878 
    79   if (VERBOSE) fprintf (stderr, "removing %lld images (leaving %lld of %lld)\n", (long long) Nimlist, (long long) Noutimage, (long long) Nimage);
     79  if (VERBOSE) fprintf (stderr, "removing "OFF_T_FMT" images (leaving "OFF_T_FMT" of "OFF_T_FMT")\n",  Nimlist,  Noutimage, Nimage);
    8080  // gfits_table_set_Image (&db[0].ftable, outimage, Noutimage);
    8181
    82   gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, (long long) Noutimage);
    83   gfits_modify (&db[0].header, "NIMAGES", "%lld", 1, (long long) Noutimage);
     82  gfits_modify (&db[0].theader, "NAXIS2", OFF_T_FMT, 1, Noutimage);
     83  gfits_modify (&db[0].header, "NIMAGES", OFF_T_FMT, 1, Noutimage);
    8484  db[0].theader.Naxis[1] = Noutimage;
    8585  db[0].ftable.buffer = (char *) outimage;

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

    r27435 r28241  
    1111  Nmiss = catalog[0].Nmissing;
    1212 
    13   if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss);
     13  if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT"\n",  Nave,  Nmeas, Nmiss);
    1414
    1515  /* set up references for missing to average */
    … …  
    1919  REALLOCATE (catalog[0].missing, Missing, 1);
    2020  catalog[0].Nmissing = 0;
    21   if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss);
     21  if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT"\n",  Nave,  Nmeas, Nmiss);
    2222}
    2323

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

    r27435 r28241  
    2222  ALLOCATE (ave_miss, off_t, MAX(Nmiss,1));
    2323 
    24   if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss);
     24  if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas, Nmiss: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT"\n",  Nave,  Nmeas, Nmiss);
    2525
    2626  /* set up pointers for linked list of measure */
    … …  
    7575      if (next_meas[j] != i) {
    7676        fprintf (stderr, "error? (1)  this link seems to have been lost\n");
    77         fprintf (stderr, "j: %lld, next_meas[j]: %lld, i: %lld\n", (long long) j, (long long) next_meas[j], (long long) i);
     77        fprintf (stderr, "j: "OFF_T_FMT", next_meas[j]: "OFF_T_FMT", i: "OFF_T_FMT"\n",  j,  next_meas[j], i);
    7878        exit (1);
    7979      }
    … …  
    108108        if (next_miss[j] != m) {
    109109          fprintf (stderr, "error? (2) this link seems to have been lost\n");
    110           fprintf (stderr, "j: %lld, next_miss[j]: %lld, i: %lld\n", (long long) j, (long long) next_miss[j], (long long) i);
     110          fprintf (stderr, "j: "OFF_T_FMT", next_miss[j]: "OFF_T_FMT", i: "OFF_T_FMT"\n",  j,  next_miss[j], i);
    111111          exit (1);
    112112        }
    … …  
    131131    }
    132132  }
    133   fprintf (stderr, "found %lld meas to remove\n", (long long) Nmeasfound);
     133  fprintf (stderr, "found "OFF_T_FMT" meas to remove\n", Nmeasfound);
    134134
    135135  if (VERBOSE) fprintf (stderr, "fixing missing...");
    … …  
    146146      if (next_miss[j] != i) {
    147147        fprintf (stderr, "error? (3) this link seems to have been lost\n");
    148         fprintf (stderr, "j: %lld, next_miss[j]: %lld, i: %lld\n", (long long) j, (long long) next_miss[j], (long long) i);
     148        fprintf (stderr, "j: "OFF_T_FMT", next_miss[j]: "OFF_T_FMT", i: "OFF_T_FMT"\n",  j,  next_miss[j], i);
    149149        exit (1);
    150150      }
    … …  
    249249  catalog[0].Nsecf_mem = Nave*Nsecfilt;
    250250
    251   if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: %lld %lld %lld\n", (long long) Nave, (long long) Nmeas, (long long) Nmiss);
     251  if (VERBOSE) fprintf (stderr, "  ending with Nave, Nmeas, Nmiss: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT"\n",  Nave,  Nmeas, Nmiss);
    252252
    253253  free (next_meas);

  • trunk/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

    r27435 r28241  
    1717 /* adjust header */
    1818  Nout = 0;
    19   gfits_scan (&out[0].header, "NIMAGES", "%lld", 1, (long long *) &Nout);
    20   status = gfits_scan (&out[0].header, "IMAGEID", "%lld", 1, (long long *) &IDstart);
     19  gfits_scan (&out[0].header, "NIMAGES", OFF_T_FMT, 1, &Nout);
     20  status = gfits_scan (&out[0].header, "IMAGEID", OFF_T_FMT, 1, &IDstart);
    2121  if (!status) {
    2222    IDstart = 1;
    … …  
    3636  Nout += Nimages;
    3737  IDstart += Nimages;
    38   gfits_modify (&out[0].header, "NIMAGES", "%lld", 1, (long long) Nout);
    39   gfits_modify (&out[0].header, "IMAGEID", "%lld", 1, (long long) IDstart);
     38  gfits_modify (&out[0].header, "NIMAGES", OFF_T_FMT, 1, Nout);
     39  gfits_modify (&out[0].header, "IMAGEID", OFF_T_FMT, 1, IDstart);
    4040
    4141  gfits_add_rows (&out[0].ftable, (char *) images, Nimages, sizeof(Image));
    … …  
    6565    newID = dvo_map_image_ID (IDmap, oldID);
    6666    if (newID == 0) {
    67       fprintf (stderr, "cannot find image ID %lld\n", (long long) oldID);
     67      fprintf (stderr, "cannot find image ID "OFF_T_FMT"\n", oldID);
    6868      exit (2);
    6969    }

  • trunk/Ohana/src/dvomerge/src/dvoconvert.c

    r27584 r28241  
    150150
    151151  // update additional metadata
    152   gfits_scan (&inDB.header, "IMAGEID", "%lld", 1, (long long *) &ID);
    153   gfits_modify (&outDB.header, "NIMAGES", "%lld", 1, (long long) Nimages);
    154   gfits_modify (&outDB.header, "IMAGEID", "%lld", 1, (long long) ID);
     152  gfits_scan (&inDB.header, "IMAGEID", OFF_T_FMT, 1, &ID);
     153  gfits_modify (&outDB.header, "NIMAGES", OFF_T_FMT, 1, Nimages);
     154  gfits_modify (&outDB.header, "IMAGEID", OFF_T_FMT, 1, ID);
    155155
    156156  // copy input rows to output table

  • trunk/Ohana/src/dvomerge/src/merge_catalogs_new.c

    r27435 r28241  
    7272 
    7373  if (VERBOSE) {
    74       fprintf (stderr, "%lld: using %lld stars (%lld measures) for catalog\n",
    75                (long long) i,
    76                (long long) output[0].Naverage,
    77                (long long) output[0].Nmeasure);
     74      fprintf (stderr, OFF_T_FMT": using "OFF_T_FMT" stars ("OFF_T_FMT" measures) for catalog\n",
     75                i,
     76                output[0].Naverage,
     77                output[0].Nmeasure);
    7878  }
    7979  return (TRUE);

  • trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

    r27724 r28241  
    183183      output[0].measure[Nmeas].catID    = output[0].catID;
    184184
    185       // fprintf (stderr, "Nave : %lld, Nmeas : %lld, dR: %f, dD: %f, catID: %d\n", (long long) n, (long long) Nmeas, output[0].measure[Nmeas].dR, output[0].measure[Nmeas].dD, output[0].measure[i].catID);
     185      // fprintf (stderr, "Nave : "OFF_T_FMT", Nmeas : "OFF_T_FMT", dR: %f, dD: %f, catID: %d\n",  n, Nmeas, output[0].measure[Nmeas].dR, output[0].measure[Nmeas].dD, output[0].measure[i].catID);
    186186
    187187      // rationalize dR
    … …  
    216216  fprintf (stderr, "--- 1 ---\n");
    217217  for (i = 0; i < Nmeas; i++) {
    218     fprintf (stderr, "Nave : %d, Nmeas : %lld, dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef, (long long) i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
     218    fprintf (stderr, "Nave : %d, Nmeas : "OFF_T_FMT", dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef, i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
    219219  }
    220220# endif
    … …  
    321321  fprintf (stderr, "--- 2 ---\n");
    322322  for (i = 0; i < Nmeas; i++) {
    323     fprintf (stderr, "Nave : %d, Nmeas : %lld, dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef, (long long) i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
     323    fprintf (stderr, "Nave : %d, Nmeas : "OFF_T_FMT", dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef, i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
    324324  }
    325325# endif
    … …  
    336336  fprintf (stderr, "--- 3 ---\n");
    337337  for (i = 0; i < Nmeas; i++) {
    338     fprintf (stderr, "Nave : %d, Nmeas : %lld, dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef, (long long) i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
     338    fprintf (stderr, "Nave : %d, Nmeas : "OFF_T_FMT", dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef, i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
    339339  }
    340340# endif
    … …  
    354354  output[0].Nmeasure = Nmeas;
    355355  output[0].Nsecf_mem = Nave*Nsecfilt;
    356   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %lld %lld %lld, (%lld matches)\n", (long long) Nstars, (long long) Nave, (long long) Nmeas, (long long) Nmatch);
     356  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas, Nmatch);
    357357
    358358  free (next_meas);

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

    r27435 r28241  
    3434  chmod (filename, mode);
    3535 
    36   gfits_modify (&catalog[0].header, "NSTARS", "%lld", 1, catalog[0].Naverage);
    37   gfits_modify (&catalog[0].header, "NMEAS",  "%lld", 1, catalog[0].Nmeasure);
    38   gfits_modify (&catalog[0].header, "NMISS",  "%lld", 1, catalog[0].Nmissing);
     36  gfits_modify (&catalog[0].header, "NSTARS", OFF_T_FMT, 1, catalog[0].Naverage);
     37  gfits_modify (&catalog[0].header, "NMEAS",  OFF_T_FMT, 1, catalog[0].Nmeasure);
     38  gfits_modify (&catalog[0].header, "NMISS",  OFF_T_FMT, 1, catalog[0].Nmissing);
    3939
    4040  gfits_modify_alt (&catalog[0].header, "MARKSTAR", "%t", 1, TRUE);

  • trunk/Ohana/src/getstar/src/MatchImages.c

    r27435 r28241  
    132132  }
    133133 
    134   if (VERBOSE) fprintf (stderr, "found %lld overlapping images\n", (long long) nmatch);
     134  if (VERBOSE) fprintf (stderr, "found "OFF_T_FMT" overlapping images\n", nmatch);
    135135
    136136  *Nmatch = nmatch;

  • trunk/Ohana/src/getstar/src/SelectImages.c

    r27435 r28241  
    3131  } 
    3232
    33   if (VERBOSE) fprintf (stderr, "found %lld matching images\n", (long long) nmatch);
     33  if (VERBOSE) fprintf (stderr, "found "OFF_T_FMT" matching images\n", nmatch);
    3434
    3535  *Nmatch = nmatch;

  • trunk/Ohana/src/getstar/src/select_by_region.c

    r27675 r28241  
    161161  output[0].Nsecf_mem = Nave*Nsecfilt;
    162162
    163   fprintf (stderr, "output catalog has %lld stars (%lld measures, %d secfilt)\n",
    164            (long long) output[0].Naverage, (long long) output[0].Nmeasure, output[0].Nsecfilt);
     163  fprintf (stderr, "output catalog has "OFF_T_FMT" stars ("OFF_T_FMT" measures, %d secfilt)\n",
     164            output[0].Naverage, output[0].Nmeasure, output[0].Nsecfilt);
    165165  return (TRUE);
    166166}

  • trunk/Ohana/src/imregister/detrend/delete.c

    r27435 r28241  
    1010  ALLOCATE (keep, off_t, MAX (Nimage, 1));
    1111  for (i = 0; i < Nimage; i++) keep[i] = TRUE;
    12   fprintf (stderr, "total of %lld detrend images\n", (long long) Nimage);
     12  fprintf (stderr, "total of "OFF_T_FMT" detrend images\n", Nimage);
    1313
    1414  Ndel = 0;
    … …  
    2020    delete_image (&image[i]);
    2121  }
    22   fprintf (stderr, "delete %lld images\n", (long long) Ndel);
     22  fprintf (stderr, "delete "OFF_T_FMT" images\n", Ndel);
    2323  if (Ndel == 0) {
    2424    fprintf (stderr, "SUCCESS\n");
    … …  
    3030  Nsubset = Nimage - Ndel;
    3131  ALLOCATE (subset, DetReg, MAX (1, Nsubset));
    32   fprintf (stderr, "keeping %lld images\n", (long long) Nsubset);
     32  fprintf (stderr, "keeping "OFF_T_FMT" images\n", Nsubset);
    3333  for (j = i = 0; i < Nimage; i++) {
    3434    if (!keep[i]) continue;

  • trunk/Ohana/src/imregister/imphot/rtext.c

    r27435 r28241  
    1010  /* check that file size makes sense */
    1111  Nimage = 0;
    12   gfits_scan (&db[0].header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
     12  gfits_scan (&db[0].header, "NIMAGES", OFF_T_FMT, 1, &Nimage);
    1313  if (stat (db[0].filename, &filestatus) == -1) {
    1414    if (VERBOSE) fprintf (stderr, "ERROR: failed to get status of image catalog\n");
    … …  
    2121    Ndata = (filestatus.st_size - db[0].header.datasize) / sizeof (Image);
    2222    if (VERBOSE) fprintf (stderr, "ERROR: image catalog has inconsistent size\n");
    23     if (VERBOSE) fprintf (stderr, "header: %lld, data: %d\n", (long long) Nimage, Ndata);
     23    if (VERBOSE) fprintf (stderr, "header: "OFF_T_FMT", data: %d\n", Nimage, Ndata);
    2424    if (!FORCE_READ) exit (1);
    2525    Nimage = Ndata;
    … …  
    4141  }
    4242  db[0].ftable.buffer = (char *) image;
    43   gfits_modify (&db[0].theader, "NAXIS2", "%lld", 1, (long long) Nimage);
     43  gfits_modify (&db[0].theader, "NAXIS2", OFF_T_FMT, 1, Nimage);
    4444  db[0].theader.Naxis[1] = Nimage;
    4545  db[0].ftable.datasize = gfits_data_size (&db[0].theader);

  • trunk/Ohana/src/imregister/imreg/delete.c

    r27435 r28241  
    1010  ALLOCATE (keep, off_t, MAX (Nimage, 1));
    1111  for (i = 0; i < Nimage; i++) keep[i] = TRUE;
    12   fprintf (stderr, "total of %lld images\n", (long long) Nimage);
     12  fprintf (stderr, "total of "OFF_T_FMT" images\n", Nimage);
    1313
    1414  Ndel = 0;
    … …  
    1919    Ndel ++;
    2020  }
    21   fprintf (stderr, "delete %lld images\n", (long long) Ndel);
     21  fprintf (stderr, "delete "OFF_T_FMT" images\n", Ndel);
    2222  if (Ndel == 0) {
    2323    fprintf (stderr, "SUCCESS\n");
    … …  
    2929  Nsubset = Nimage - Ndel;
    3030  ALLOCATE (subset, RegImage, MAX (1, Nsubset));
    31   fprintf (stderr, "keeping %lld images\n", (long long) Nsubset);
     31  fprintf (stderr, "keeping "OFF_T_FMT" images\n", Nsubset);
    3232  for (j = i = 0; i < Nimage; i++) {
    3333    if (!keep[i]) continue;

  • trunk/Ohana/src/imregister/photreg/delete.c

    r27435 r28241  
    1010  ALLOCATE (keep, off_t, MAX (Nphotdata, 1));
    1111  for (i = 0; i < Nphotdata; i++) keep[i] = TRUE;
    12   fprintf (stderr, "total of %lld photdata\n", (long long) Nphotdata);
     12  fprintf (stderr, "total of "OFF_T_FMT" photdata\n", Nphotdata);
    1313
    1414  Ndel = 0;
    … …  
    1919    Ndel ++;
    2020  }
    21   fprintf (stderr, "delete %lld photdata\n", (long long) Ndel);
     21  fprintf (stderr, "delete "OFF_T_FMT" photdata\n", Ndel);
    2222
    2323  if (Ndel == 0) {
    … …  
    3131  Nsubset = Nphotdata - Ndel;
    3232  ALLOCATE (subset, PhotPars, MAX (1, Nsubset));
    33   fprintf (stderr, "keeping %lld photdata\n", (long long) Nsubset);
     33  fprintf (stderr, "keeping "OFF_T_FMT" photdata\n", Nsubset);
    3434  for (j = i = 0; i < Nphotdata; i++) {
    3535    if (!keep[i]) continue;

  • trunk/Ohana/src/imregister/spreg/delete.c

    r27435 r28241  
    1010  ALLOCATE (keep, off_t, MAX (Nspectrum, 1));
    1111  for (i = 0; i < Nspectrum; i++) keep[i] = TRUE;
    12   fprintf (stderr, "total of %lld spectra\n", (long long) Nspectrum);
     12  fprintf (stderr, "total of "OFF_T_FMT" spectra\n", Nspectrum);
    1313
    1414  Nbad = 0;
    … …  
    1919    Nbad ++;
    2020  }
    21   fprintf (stderr, "delete %lld spectra\n", (long long) Nbad);
     21  fprintf (stderr, "delete "OFF_T_FMT" spectra\n", Nbad);
    2222  if (Nbad == 0) {
    2323    fprintf (stderr, "SUCCESS\n");
    … …  
    2828  Nsubset = Nspectrum - Nbad;
    2929  ALLOCATE (subset, Spectrum, MAX (1, Nsubset));
    30   fprintf (stderr, "keeping %lld spectra\n", (long long) Nsubset);
     30  fprintf (stderr, "keeping "OFF_T_FMT" spectra\n", Nsubset);
    3131  for (j = i = 0; i < Nspectrum; i++) {
    3232    if (!keep[i]) continue;

  • trunk/Ohana/src/imregister/src/convertimreg.c

    r27435 r28241  
    4141
    4242  /* load existing data from database */
    43   gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
     43  gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1, &Nimage);
    4444  ALLOCATE (pimage, RegImage, Nimage);
    4545  status = fread (pimage, sizeof(RegImage), Nimage, f);
    4646  if (status != Nimage) {
    47     fprintf (stderr, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
     47    fprintf (stderr, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nimage, status);
    4848    fclearlockfile (argv[1], f, lockstate, &dbstate);
    4949    exit (1);

  • trunk/Ohana/src/imregister/src/imphotmerge.c

    r27530 r28241  
    113113  }
    114114  Nimage += Nin;
    115   gfits_modify (&header, "NIMAGES", "%lld", 1, (long long) Nimage);
     115  gfits_modify (&header, "NIMAGES", OFF_T_FMT, 1, Nimage);
    116116
    117117  /* position to begining of file to write header */
    … …  
    152152  /* check that file size makes sense */
    153153  Nimage = 0;
    154   gfits_scan (header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
     154  gfits_scan (header, "NIMAGES", OFF_T_FMT, 1, &Nimage);
    155155  if (fstat (fileno(f), &filestatus) == -1) {
    156156    fprintf (stderr, "ERROR: failed to get status of image catalog\n");
    … …  
    161161    Ndata = (filestatus.st_size - header[0].datasize) / sizeof (Image);
    162162    fprintf (stderr, "ERROR: image catalog has inconsistent size\n");
    163     fprintf (stderr, "header: %lld, data: %lld\n", (long long) Nimage, (long long) Ndata);
     163    fprintf (stderr, "header: "OFF_T_FMT", data: "OFF_T_FMT"\n",  Nimage, Ndata);
    164164    Nimage = Ndata;
    165165  }

  • trunk/Ohana/src/kapa2/src/LoadPicture.c

    r27435 r28241  
    3232  gfits_init_header (&header);
    3333  header.Naxes = 2;
    34   KiiScanMessage (sock, "%lld %lld", (long long *) &header.Naxis[0], (long long *) &header.Naxis[1]);
     34  KiiScanMessage (sock, OFF_T_FMT" "OFF_T_FMT,  &header.Naxis[0], &header.Naxis[1]);
    3535
    3636  // internal image are 32 bit floats; sender must send in this format
    … …  
    4141
    4242  KiiScanMessage (sock, "%lf %lf %s %s",  &image[0].image[0].zero, &image[0].image[0].range, image[0].image[0].name, image[0].image[0].file);
    43   KiiScanMessage (sock, "%lf %lf %lld", &image[0].image[0].min,  &image[0].image[0].max, (long long *) &header.datasize);
     43  KiiScanMessage (sock, "%lf %lf "OFF_T_FMT, &image[0].image[0].min,  &image[0].image[0].max, &header.datasize);
    4444  KiiScanMessage (sock, "%lf %f %f %f %f", &image[0].image[0].coords.crval1, &image[0].image[0].coords.crpix1, &image[0].image[0].coords.cdelt1, &image[0].image[0].coords.pc1_1, &image[0].image[0].coords.pc1_2);
    4545  KiiScanMessage (sock, "%lf %f %f %f %f", &image[0].image[0].coords.crval2, &image[0].image[0].coords.crpix2, &image[0].image[0].coords.cdelt2, &image[0].image[0].coords.pc2_1, &image[0].image[0].coords.pc2_2);
    … …  
    8585  fcntl (sock, F_SETFL, !O_NONBLOCK); 
    8686
    87   if (DEBUG) fprintf (stderr, "read %lld bytes\n", (long long) image[0].image[0].matrix.datasize);
     87  if (DEBUG) fprintf (stderr, "read "OFF_T_FMT" bytes\n", image[0].image[0].matrix.datasize);
    8888  /* it it not obvious this condition should kill kapa, but ... */
    8989  if (image[0].image[0].matrix.datasize != header.datasize) { 
    90     fprintf (stderr, "error: expected %lld bytes, but got only %lld\n", (long long) header.datasize, (long long) image[0].image[0].matrix.datasize);
     90    fprintf (stderr, "error: expected "OFF_T_FMT" bytes, but got only "OFF_T_FMT"\n",  header.datasize, image[0].image[0].matrix.datasize);
    9191    return (FALSE);
    9292  }

  • trunk/Ohana/src/libautocode/def/autocode.c

    r27588 r28241  
    77
    88  if (size != $SIZE) {
    9     fprintf (stderr, "WARNING: mismatch in data types $STRUCT: %lld vs %lld\n", (long long) size, (long long) $SIZE);
     9    fprintf (stderr, "WARNING: mismatch in data types $STRUCT: "OFF_T_FMT" vs %d\n",  size, $SIZE);
    1010    return (FALSE);
    1111  }
    … …  
    3232
    3333  if ($SIZE > size) {
    34     fprintf (stderr, "ERROR: uncorrectable mismatch in data types $STRUCT: %lld vs %lld\n", (long long) size, (long long) $SIZE);
     34    fprintf (stderr, "ERROR: uncorrectable mismatch in data types $STRUCT: "OFF_T_FMT" vs %d\n",  size, $SIZE);
    3535    exit (1);
    3636  }

  • trunk/Ohana/src/libautocode/def/common.h

    r20936 r28241  
    2222  tmp = byte[X+3]; byte[X+3] = byte[X+4]; byte[X+4] = tmp;
    2323
    24 # ifdef linux
    25 # define BYTE_SWAP
     24# ifndef BYTE_SWAP
     25# ifndef NOT_BYTE_SWAP
     26# error "neither BYTE_SWAP not NOT_BYTE_SWAP is set"
    2627# endif
    27 
    28 # ifdef darwin_x86
    29 # define BYTE_SWAP
    30 # endif
    31 
    32 # ifdef sid
    33 # define BYTE_SWAP
    34 # endif
    35 
    36 # ifdef dec
    37 # define BYTE_SWAP
    3828# endif
    3929

  • 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);

  • trunk/Ohana/src/libfits/header/F_create_H.c

    r27435 r28241  
    2323  for (i = 0; i < header[0].Naxes; i++) {
    2424    snprintf (axis, 10, "NAXIS%d", i + 1);
    25     gfits_modify (header,  axis, "%lld", 1, (long long) header[0].Naxis[i]);
     25    gfits_modify (header,  axis, OFF_T_FMT, 1, header[0].Naxis[i]);
    2626  }
    2727

  • trunk/Ohana/src/libfits/header/F_modify.c

    r27435 r28241  
    5353  if (!strcmp (mode, "%d"))   snprintf (string, 81, "%-8s= %20d / %-s ",    field, va_arg (argp, int),                comment);
    5454  if (!strcmp (mode, "%ld"))  snprintf (string, 81, "%-8s= %20ld / %-s ",   field, va_arg (argp, long),               comment);
    55   if (!strcmp (mode, "%lld")) snprintf (string, 81, "%-8s= %20lld / %-s ",  field, va_arg (argp, long long),          comment);
     55  if (!strcmp (mode, OFF_T_FMT)) snprintf (string, 81, "%-8s= %20lld / %-s ",  field, va_arg (argp, long long),               comment);
    5656  if (!strcmp (mode, "%Ld"))  snprintf (string, 81, "%-8s= %20lld / %-s ",  field, va_arg (argp, long long),          comment);
    5757  if (!strcmp (mode, "%u"))   snprintf (string, 81, "%-8s= %20u / %-s ",    field, va_arg (argp, unsigned),           comment);
    … …  
    6767  if (!strcmp (mode, "%lg"))  snprintf (string, 81, "%-8s= %20.10G / %-s ", field, va_arg (argp, double),             comment);
    6868
     69  if (!strcmp (mode, "%jd"))  snprintf (string, 81, "%-8s= %20jd / %-s ",   field, va_arg (argp, intmax_t),           comment);
     70
    6971  /* string value.  Quotes must be at least 18 chars apart */
    7072  if (!strcmp (mode, "%s")) {

  • trunk/Ohana/src/libfits/header/F_print.c

    r27435 r28241  
    4848  if (!strcmp (mode, "%d"))  { snprintf (string, 81, "%-8s= %20d / %46s ",    field, va_arg (argp, int),                blank); }
    4949  if (!strcmp (mode, "%ld")) { snprintf (string, 81, "%-8s= %20ld / %46s ",   field, va_arg (argp, long),               blank); }
    50   if (!strcmp (mode, "%lld")){ snprintf (string, 81, "%-8s= %20lld / %46s ",  field, va_arg (argp, long long),          blank); }
     50  if (!strcmp (mode, OFF_T_FMT)){ snprintf (string, 81, "%-8s= %20lld / %46s ",  field, va_arg (argp, long long),          blank); }
    5151  if (!strcmp (mode, "%Ld")) { snprintf (string, 81, "%-8s= %20lld / %46s ",  field, va_arg (argp, long long),          blank); }
    5252  if (!strcmp (mode, "%u"))  { snprintf (string, 81, "%-8s= %20u / %46s ",    field, va_arg (argp, unsigned),           blank); }
    … …  
    6161  if (!strcmp (mode, "%g"))  { snprintf (string, 81, "%-8s= %20.10G / %46s ", field, va_arg (argp, double),             blank); }
    6262  if (!strcmp (mode, "%lg")) { snprintf (string, 81, "%-8s= %20.10G / %46s ", field, va_arg (argp, double),             blank); }
     63
     64  if (!strcmp (mode, "%jd")) { snprintf (string, 81, "%-8s= %20jd / %46s ",   field, va_arg (argp, intmax_t),           blank); }
    6365
    6466  /* string value.  Quotes must be at least 18 chars apart.  Longer lines will this should be fixed to allow arbitrary string lengths, up to 69 chars */

  • trunk/Ohana/src/libfits/header/F_read_H.c

    r27435 r28241  
    6969  gfits_scan (header,  "BZERO",  "%lf",  1, &header[0].bzero);
    7070                                       
    71   gfits_scan (header,  "NAXIS1", "%lld", 1, (long long *) &header[0].Naxis[0]);
    72   gfits_scan (header,  "NAXIS2", "%lld", 1, (long long *) &header[0].Naxis[1]);
    73   gfits_scan (header,  "NAXIS3", "%lld", 1, (long long *) &header[0].Naxis[2]);
    74   gfits_scan (header,  "NAXIS4", "%lld", 1, (long long *) &header[0].Naxis[3]);
    75   gfits_scan (header,  "NAXIS5", "%lld", 1, (long long *) &header[0].Naxis[4]);
    76   gfits_scan (header,  "NAXIS6", "%lld", 1, (long long *) &header[0].Naxis[5]);
    77   gfits_scan (header,  "NAXIS7", "%lld", 1, (long long *) &header[0].Naxis[6]);
    78   gfits_scan (header,  "NAXIS8", "%lld", 1, (long long *) &header[0].Naxis[7]);
    79   gfits_scan (header,  "NAXIS9", "%lld", 1, (long long *) &header[0].Naxis[8]);
    80   gfits_scan (header, "NAXIS10", "%lld", 1, (long long *) &header[0].Naxis[9]);
     71  gfits_scan (header,  "NAXIS1", OFF_T_FMT, 1, &header[0].Naxis[0]);
     72  gfits_scan (header,  "NAXIS2", OFF_T_FMT, 1, &header[0].Naxis[1]);
     73  gfits_scan (header,  "NAXIS3", OFF_T_FMT, 1, &header[0].Naxis[2]);
     74  gfits_scan (header,  "NAXIS4", OFF_T_FMT, 1, &header[0].Naxis[3]);
     75  gfits_scan (header,  "NAXIS5", OFF_T_FMT, 1, &header[0].Naxis[4]);
     76  gfits_scan (header,  "NAXIS6", OFF_T_FMT, 1, &header[0].Naxis[5]);
     77  gfits_scan (header,  "NAXIS7", OFF_T_FMT, 1, &header[0].Naxis[6]);
     78  gfits_scan (header,  "NAXIS8", OFF_T_FMT, 1, &header[0].Naxis[7]);
     79  gfits_scan (header,  "NAXIS9", OFF_T_FMT, 1, &header[0].Naxis[8]);
     80  gfits_scan (header, "NAXIS10", OFF_T_FMT, 1, &header[0].Naxis[9]);
    8181
    8282  if (!gfits_scan (header, "PCOUNT",  "%d", 1, &header[0].pcount)) {

  • trunk/Ohana/src/libfits/header/F_scan.c

    r27435 r28241  
    7676  if (!strcmp (mode, "%d"))   { *va_arg (argp, int *)                = value; return (TRUE); }
    7777  if (!strcmp (mode, "%ld"))  { *va_arg (argp, long *)               = value; return (TRUE); }
    78   if (!strcmp (mode, "%lld")) { *va_arg (argp, long long *)          = value; return (TRUE); }
     78  if (!strcmp (mode, OFF_T_FMT)) { *va_arg (argp, long long *)       = value; return (TRUE); }
    7979  if (!strcmp (mode, "%Ld"))  { *va_arg (argp, long long *)          = value; return (TRUE); }
    8080  if (!strcmp (mode, "%u"))   { *va_arg (argp, unsigned *)           = value; return (TRUE); }
    … …  
    8484  if (!strcmp (mode, "%hd"))  { *va_arg (argp, short *)              = value; return (TRUE); }
    8585
     86  // XXX is this safe for 64bit off_t and 32bit off_t?
     87  if (!strcmp (mode, "%jd"))  { *va_arg (argp, intmax_t *)           = value; return (TRUE); }
     88
    8689  /* no valid mode found */
    8790  return (FALSE);
    … …  
    219222  if (!strcmp (mode, "%d"))   { *va_arg (argp, int *)                = value; return (TRUE); }
    220223  if (!strcmp (mode, "%ld"))  { *va_arg (argp, long *)               = value; return (TRUE); }
    221   if (!strcmp (mode, "%lld")) { *va_arg (argp, long long *)          = value; return (TRUE); }
     224  if (!strcmp (mode, OFF_T_FMT)) { *va_arg (argp, long long *)       = value; return (TRUE); }
    222225  if (!strcmp (mode, "%Ld"))  { *va_arg (argp, long long *)          = value; return (TRUE); }
    223226  if (!strcmp (mode, "%u"))   { *va_arg (argp, unsigned *)           = value; return (TRUE); }

  • trunk/Ohana/src/libfits/include/gfitsio.h

    r27435 r28241  
    77# define GFITSIO
    88
    9 /* also defined in libautocode/def/common.h */
    10 /* what about lin64 ?? - 'linux' might be defined automatically by linux */
    119# ifndef BYTE_SWAP
    12 # ifdef linux
    13 # define BYTE_SWAP
     10# ifndef NOT_BYTE_SWAP
     11# error "neither BYTE_SWAP not NOT_BYTE_SWAP is set"
    1412# endif
    15 
    16 # ifdef sid
    17 # define BYTE_SWAP
    1813# endif
    19 
    20 # ifdef darwin_x86
    21 # define BYTE_SWAP
    22 # endif
    23 
    24 # ifdef dec
    25 # define BYTE_SWAP
    26 # endif
    27 # endif /* BYTE_SWAP */
    2814
    2915# ifndef NEWLINE

  • trunk/Ohana/src/libfits/matrix/F_add_M.c

    r27435 r28241  
    1313  if ((x + array[0].Naxis[0] > matrix[0].Naxis[0]) ||
    1414      (y + array[0].Naxis[1] > matrix[0].Naxis[1])) {
    15     fprintf (stderr, "can't add array here: (%lld,%lld) - (%lld,%lld) vs (%lld,%lld)\n",
    16              (long long) x,
    17              (long long) y,
    18              (long long) x + array[0].Naxis[0],
    19              (long long) y + array[0].Naxis[1],
    20              (long long) matrix[0].Naxis[0],
    21              (long long) matrix[0].Naxis[1]);
     15    fprintf (stderr, "can't add array here: ("OFF_T_FMT","OFF_T_FMT") - ("OFF_T_FMT","OFF_T_FMT") vs ("OFF_T_FMT","OFF_T_FMT")\n",
     16              x,
     17              y,
     18              x + array[0].Naxis[0],
     19              y + array[0].Naxis[1],
     20              matrix[0].Naxis[0],
     21              matrix[0].Naxis[1]);
    2222    return;
    2323  }

  • trunk/Ohana/src/libfits/matrix/F_compress_M.c

    r27435 r28241  
    7777    snprintf (zaxis, 10, "ZNAXIS%d", i + 1);
    7878    snprintf (naxis, 10, "NAXIS%d", i + 1);
    79     MOD_KEYWORD_REQUIRED (zaxis,  naxis,  "%lld", (long long *) &header->Naxis[i], (long long) header->Naxis[i]);
     79    MOD_KEYWORD_REQUIRED (zaxis,  naxis,  OFF_T_FMT,  &header->Naxis[i], header->Naxis[i]);
    8080  }   
    8181
    … …  
    203203  if (!gfits_varlength_column_define (ftable, &zdef, zcol)) ESCAPE;
    204204  gfits_delete (header, "TFIELDS", 1);
    205   snprintf (key, 10, "TTYPE%lld", (long long) zcol);
     205  snprintf (key, 10, "TTYPE"OFF_T_FMT, zcol);
    206206  gfits_delete (header, key, 1);
    207   snprintf (key, 10, "TFORM%lld", (long long) zcol);
     207  snprintf (key, 10, "TFORM"OFF_T_FMT, zcol);
    208208  gfits_delete (header, key, 1);
    209209

  • trunk/Ohana/src/libfits/matrix/F_insert_M.c

    r27435 r28241  
    1212  if ((x + array[0].Naxis[0] > matrix[0].Naxis[0]) ||
    1313      (y + array[0].Naxis[1] > matrix[0].Naxis[1])) {
    14     fprintf (stderr, "can't insert array here: (%lld,%lld) - (%lld,%lld) vs (%lld,%lld)\n",
    15              (long long) x,
    16              (long long) y,
    17              (long long) x + array[0].Naxis[0],
    18              (long long) y + array[0].Naxis[1],
    19              (long long) matrix[0].Naxis[0],
    20              (long long) matrix[0].Naxis[1]);
     14    fprintf (stderr, "can't insert array here: ("OFF_T_FMT","OFF_T_FMT") - ("OFF_T_FMT","OFF_T_FMT") vs ("OFF_T_FMT","OFF_T_FMT")\n",
     15              x,
     16              y,
     17              x + array[0].Naxis[0],
     18              y + array[0].Naxis[1],
     19              matrix[0].Naxis[0],
     20              matrix[0].Naxis[1]);
    2121    return;
    2222  }

  • trunk/Ohana/src/libfits/matrix/F_load_M.c

    r27435 r28241  
    9595  }
    9696  if (nbytes != Nbytes) {  /* this is a FITS error, but often the image is OK */
    97     fprintf (stderr, "incomplete block in FITS file: (%lld, %lld)\n", (long long) nbytes, (long long) Nbytes);
     97    fprintf (stderr, "incomplete block in FITS file: ("OFF_T_FMT", "OFF_T_FMT")\n",  nbytes, Nbytes);
    9898    return (TRUE);
    9999  }

  • trunk/Ohana/src/libfits/matrix/F_read_portion.c

    r27435 r28241  
    108108
    109109  if (nbytes < Nbytes - 2880) {  /* this is a bad FITS error: image is not OK */
    110     fprintf (stderr, "error reading in matrix data from FITS file %s (%lld < %lld - 2880)\n", filename, (long long) nbytes, (long long) Nbytes);
     110    fprintf (stderr, "error reading in matrix data from FITS file %s ("OFF_T_FMT" < "OFF_T_FMT" - 2880)\n", filename,  nbytes, Nbytes);
    111111    return (FALSE);
    112112  }
    113113  if (nbytes != Nbytes) {  /* this is a FITS error, but often the image is OK */
    114     fprintf (stderr, "incomplete block in %s: (%lld, %lld)\n", filename, (long long) nbytes, (long long) Nbytes);
     114    fprintf (stderr, "incomplete block in %s: ("OFF_T_FMT", "OFF_T_FMT")\n", filename,  nbytes, Nbytes);
    115115    return (TRUE);
    116116  }

  • trunk/Ohana/src/libfits/matrix/F_read_segment.c

    r27435 r28241  
    148148
    149149  if (nbytes < Nbytes - 2880) {  /* this is a bad FITS error: image is not OK */
    150     fprintf (stderr, "error reading in matrix data from FITS file (%lld < %lld - 2880)\n", (long long) nbytes, (long long) Nbytes);
     150    fprintf (stderr, "error reading in matrix data from FITS file ("OFF_T_FMT" < "OFF_T_FMT" - 2880)\n",  nbytes, Nbytes);
    151151    return (FALSE);
    152152  }
    153153  if (nbytes != Nbytes) {  /* this is a FITS error, but often the image is OK */
    154     fprintf (stderr, "incomplete block in FITS file: (%lld, %lld)\n", (long long) nbytes, (long long) Nbytes);
     154    fprintf (stderr, "incomplete block in FITS file: ("OFF_T_FMT", "OFF_T_FMT")\n",  nbytes, Nbytes);
    155155    return (TRUE);
    156156  }

  • trunk/Ohana/src/libfits/table/F_create_TH.c

    r27435 r28241  
    2727  for (i = 0; i < header[0].Naxes; i++) {
    2828    sprintf (axis, "NAXIS%d", i + 1);
    29     gfits_modify (header,  axis, "%lld", 1, (long long) header[0].Naxis[i]);
     29    gfits_modify (header,  axis, OFF_T_FMT, 1, header[0].Naxis[i]);
    3030  }
    3131 

  • trunk/Ohana/src/libfits/table/F_define_column.c

    r27435 r28241  
    1313  Nfields = 0;
    1414  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    15   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
     15  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Naxis1);
    1616  Nfields ++;
    1717  Naxis1 += Nbytes*Nval;
    … …  
    3535  /* update TFIELDS & NAXIS1 */
    3636  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
    37   gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
     37  gfits_modify (header, "NAXIS1",  OFF_T_FMT, 1, Naxis1);
    3838  header[0].Naxis[0] = Naxis1;
    3939
    … …  
    5353  Nfields = 0;
    5454  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    55   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Naxis1);
     55  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Naxis1);
    5656  Nstart = Naxis1 + 1;
    5757  Nfields ++;
    … …  
    7070
    7171  gfits_modify (header, "TFIELDS", "%d", 1, Nfields);
    72   gfits_modify (header, "NAXIS1",  "%lld", 1, (long long) Naxis1);
     72  gfits_modify (header, "NAXIS1",  OFF_T_FMT, 1, Naxis1);
    7373  header[0].Naxis[0] = Naxis1;
    7474

  • trunk/Ohana/src/libfits/table/F_get_column.c

    r27435 r28241  
    5151 
    5252  /* check existing table dimensions */
    53   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    54   gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     53  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     54  gfits_scan (header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    5555
    5656  /* scan columns to find insert point */
    … …  
    187187 
    188188  /* check existing table dimensions */
    189   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    190   gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     189  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     190  gfits_scan (header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    191191
    192192  /* scan columns to find insert point */
    … …  
    336336 
    337337  /* check existing table dimensions */
    338   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    339   gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     338  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     339  gfits_scan (header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    340340
    341341  /* scan columns to find insert point */

  • trunk/Ohana/src/libfits/table/F_read_T.c

    r27435 r28241  
    6464    perror (string);
    6565    if (Nread < gfits_data_min_size (table[0].header)) {
    66       fprintf (stderr, "error: fits read error in %s, read %lld, need %lld\n", __func__, (long long) Nread, (long long) gfits_data_min_size (table[0].header));
     66      fprintf (stderr, "error: fits read error in %s, read "OFF_T_FMT", need "OFF_T_FMT"\n", __func__,  Nread, gfits_data_min_size (table[0].header));
    6767      gfits_free_table  (table);
    6868      return (FALSE);
    … …  
    109109  /* modify structure and header to match actual read rows Ny */
    110110  table[0].header[0].Naxis[1] = Nrows;
    111   gfits_modify (table[0].header, "NAXIS2",  "%lld", 1, (long long) Nrows);
     111  gfits_modify (table[0].header, "NAXIS2",  OFF_T_FMT, 1, Nrows);
    112112  table[0].datasize = gfits_data_size (table[0].header);
    113113
    … …  
    185185    /* file pointer is at beginning of desired table data */
    186186    start = ftello (f);
    187     gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    188     gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     187
     188    gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     189    gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
     190
    189191    for (i = 0; i < Nrow; i++) {
    190192      if (row[i] > Ny) { return (FALSE); }

  • trunk/Ohana/src/libfits/table/F_read_TH.c

    r27435 r28241  
    7070  if (!status) return (FALSE);
    7171                                                           
    72   gfits_scan (Theader,  "NAXIS1", "%lld", 1, (long long *) &Theader[0].Naxis[0]);
    73   gfits_scan (Theader,  "NAXIS2", "%lld", 1, (long long *) &Theader[0].Naxis[1]);
    74   gfits_scan (Theader,  "NAXIS3", "%lld", 1, (long long *) &Theader[0].Naxis[2]);
    75   gfits_scan (Theader,  "NAXIS4", "%lld", 1, (long long *) &Theader[0].Naxis[3]);
    76   gfits_scan (Theader,  "NAXIS5", "%lld", 1, (long long *) &Theader[0].Naxis[4]);
    77   gfits_scan (Theader,  "NAXIS6", "%lld", 1, (long long *) &Theader[0].Naxis[5]);
    78   gfits_scan (Theader,  "NAXIS7", "%lld", 1, (long long *) &Theader[0].Naxis[6]);
    79   gfits_scan (Theader,  "NAXIS8", "%lld", 1, (long long *) &Theader[0].Naxis[7]);
    80   gfits_scan (Theader,  "NAXIS9", "%lld", 1, (long long *) &Theader[0].Naxis[8]);
    81   gfits_scan (Theader, "NAXIS10", "%lld", 1, (long long *) &Theader[0].Naxis[9]);
     72  gfits_scan (Theader,  "NAXIS1", OFF_T_FMT, 1, &Theader[0].Naxis[0]);
     73  gfits_scan (Theader,  "NAXIS2", OFF_T_FMT, 1, &Theader[0].Naxis[1]);
     74  gfits_scan (Theader,  "NAXIS3", OFF_T_FMT, 1, &Theader[0].Naxis[2]);
     75  gfits_scan (Theader,  "NAXIS4", OFF_T_FMT, 1, &Theader[0].Naxis[3]);
     76  gfits_scan (Theader,  "NAXIS5", OFF_T_FMT, 1, &Theader[0].Naxis[4]);
     77  gfits_scan (Theader,  "NAXIS6", OFF_T_FMT, 1, &Theader[0].Naxis[5]);
     78  gfits_scan (Theader,  "NAXIS7", OFF_T_FMT, 1, &Theader[0].Naxis[6]);
     79  gfits_scan (Theader,  "NAXIS8", OFF_T_FMT, 1, &Theader[0].Naxis[7]);
     80  gfits_scan (Theader,  "NAXIS9", OFF_T_FMT, 1, &Theader[0].Naxis[8]);
     81  gfits_scan (Theader, "NAXIS10", OFF_T_FMT, 1, &Theader[0].Naxis[9]);
    8282
    8383  return (TRUE);

  • trunk/Ohana/src/libfits/table/F_set_column.c

    r27435 r28241  
    4949 
    5050  /* check existing table dimensions */
    51   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    52   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     51  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     52  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    5353  if (Ny == 0) {
    5454    Ny = Nrow;
    5555    header[0].Naxis[1] = Ny;
    56     gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
     56    gfits_modify (header, "NAXIS2", OFF_T_FMT, 1, Ny);
    5757
    5858    nbytes = gfits_data_size (header);
    … …  
    181181 
    182182  /* check existing table dimensions */
    183   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    184   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     183  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     184  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    185185  if (Ny == 0) {
    186186    Ny = Nrow;
    187187    header[0].Naxis[1] = Ny;
    188     gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
     188    gfits_modify (header, "NAXIS2", OFF_T_FMT, 1, Ny);
    189189
    190190    nbytes = gfits_data_size (header);

  • trunk/Ohana/src/libfits/table/F_table_format.c

    r27435 r28241  
    130130  off_t i, Nx, Ny;
    131131
    132   gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    133   gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     132  gfits_scan (ftable[0].header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     133  gfits_scan (ftable[0].header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    134134 
    135135  if (start + Nkeep > Ny) return (FALSE);
    … …  
    158158  off_t i, N, Nx, Ny;
    159159
    160   gfits_scan (ftable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    161   gfits_scan (ftable[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     160  gfits_scan (ftable[0].header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     161  gfits_scan (ftable[0].header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    162162
    163163  /* make empty vtable from table */
    … …  
    191191  va_start (argp, table);
    192192
    193   gfits_scan (table[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     193  gfits_scan (table[0].header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
    194194  gfits_scan (table[0].header, "TFIELDS", "%d", 1, &Nfields);
    195195
    … …  
    236236  off = 0;
    237237
    238   gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    239   gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     238  gfits_scan (ftable[0].header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     239  gfits_scan (ftable[0].header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    240240  gfits_scan (ftable[0].header, "TFIELDS", "%d", 1, &Nfields);
    241241
    … …  
    320320  off = 0;
    321321
    322   gfits_scan (ftable[0].header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    323   gfits_scan (ftable[0].header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     322  gfits_scan (ftable[0].header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     323  gfits_scan (ftable[0].header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    324324  gfits_scan (ftable[0].header, "TFIELDS", "%d", 1, &Nfields);
    325325

  • trunk/Ohana/src/libfits/table/F_table_row.c

    r27435 r28241  
    1111  header = table[0].header;
    1212
    13   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    14   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     13  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     14  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    1515 
    1616  if (header[0].Naxis[1] != Ny) return (FALSE);
    … …  
    2323  Ny += Nrow;
    2424  header[0].Naxis[1] = Ny;
    25   gfits_modify (header, "NAXIS2",  "%lld", 1, (long long) Ny);
     25  gfits_modify (header, "NAXIS2",  OFF_T_FMT, 1, Ny);
    2626
    2727  nbytes = gfits_data_size (header);
    … …  
    4343  header = table[0].header;
    4444
    45   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    46   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     45  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     46  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    4747 
    4848  if (header[0].Naxis[1] != Ny) return (FALSE);
    … …  
    6464  Ny += Nrow;
    6565  header[0].Naxis[1] = Ny;
    66   gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
     66  gfits_modify (header, "NAXIS2", OFF_T_FMT, 1, Ny);
    6767
    6868  table[0].datasize = gfits_data_size (table[0].header);
    … …  
    8181  header = table[0].header;
    8282
    83   gfits_scan (header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    84   gfits_scan (header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     83  gfits_scan (header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     84  gfits_scan (header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    8585 
    8686  if (header[0].Naxis[1] != Ny) return (FALSE);
    … …  
    9797  Ny -= Nrow;
    9898  header[0].Naxis[1] = Ny;
    99   gfits_modify (header, "NAXIS2", "%lld", 1, (long long) Ny);
     99  gfits_modify (header, "NAXIS2", OFF_T_FMT, 1, Ny);
    100100
    101101  nbytes = gfits_data_size (header);

  • trunk/Ohana/src/libfits/table/F_table_varlength.c

    r27473 r28241  
    6464
    6565  // heap_start must be long long so file may be very large
    66   if (!gfits_scan (ftable->header, "THEAP", "%lld", 1, (long long *) &def->heap_start)) {
     66  if (!gfits_scan (ftable->header, "THEAP", OFF_T_FMT, 1, &def->heap_start)) {
    6767    def->heap_start = ftable->header->Naxis[0]*ftable->header->Naxis[1];
    6868  }

  • trunk/Ohana/src/libfits/table/F_write_T.c

    r27435 r28241  
    4040  Nrow = table[0].Nrow;
    4141  row = table[0].row;
    42   gfits_scan (table[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
    43   gfits_scan (table[0].header, "NAXIS2", "%lld", 1, (long long *) &Ny);
     42  gfits_scan (table[0].header, "NAXIS1", OFF_T_FMT, 1, &Nx);
     43  gfits_scan (table[0].header, "NAXIS2", OFF_T_FMT, 1, &Ny);
    4444
    4545  /* file pointer is at beginning of desired table data */
    … …  
    7979 
    8080  /* modify vtable to represent full disk table */
    81   gfits_modify (ftable[0].header, "NAXIS2", "%lld", 1, (long long) Ntotal);
     81  gfits_modify (ftable[0].header, "NAXIS2", OFF_T_FMT, 1, Ntotal);
    8282  ftable[0].header[0].Naxis[1] = Ntotal;
    8383

  • trunk/Ohana/src/libohana/Makefile

    r27435 r28241  
    11default: install
    22help:
    3         @echo "make options: install libohana clean dist"
     3        @echo "make options: install libohana clean dist test typetest"
    44
    55include ../../Makefile.System
    … …  
    1919TFLAGS        = $(FULL_CFLAGS) $(FULL_CPPFLAGS) $(FULL_LDFLAGS) -lohana -ltap_ohana
    2020
    21 install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.$(DLLTYPE)
     21install: $(DESTLIB)/libohana.a $(DESTLIB)/libohana.$(DLLTYPE) typetest
    2222libohana: $(LIB)/libohana.$(ARCH).a $(LIB)/libohana.$(ARCH).$(DLLTYPE)
    2323
    … …  
    4040$(SRC)/CommOps.$(ARCH).o         \
    4141$(SRC)/version.$(ARCH).o
     42
     43TYPETEST = \
     44$(TESTDIR)/typetest.$(ARCH)
     45
     46$(TYPETEST) : $(LIB)/libohana.$(ARCH).a
     47
     48typetest: $(TYPETEST)
     49        for i in $(TYPETEST); do $$i || exit 1; done
    4250
    4351TEST = \

  • trunk/Ohana/src/libohana/include/ohana.h

    r27484 r28241  
    9494};
    9595
     96/* note: in the Ohana tree, the byte order is determined by the ARCH variable
     97   if you have a small endian machine that is not listed here, the test
     98   program 'typestest' should fail */
     99# ifndef BYTE_SWAP
     100# ifdef linux
     101# define BYTE_SWAP
     102# endif
     103
     104# ifdef lin64
     105# define BYTE_SWAP
     106# endif
     107
     108# ifdef sid
     109# define BYTE_SWAP
     110# endif
     111
     112# ifdef darwin_x86
     113# define BYTE_SWAP
     114# endif
     115
     116# ifdef dec
     117# define BYTE_SWAP
     118# endif
     119# else
     120# define NOT_BYTE_SWAP
     121# endif /* BYTE_SWAP */
     122
    96123# ifndef NAN
    97124# ifndef BYTE_SWAP
    … …  
    103130    __attribute_used__ = { __nan_bytes };
    104131# define NAN    (__nan_union.__d)
     132# endif
     133
     134/* if your build crashes on OFF_T_MODE, you probably need to add your 64bit hardware to this list */
     135# ifdef _LARGEFILE_SOURCE
     136# define OFF_T_FMT "%jd"
     137# endif
     138# ifdef lin64
     139# define OFF_T_FMT "%jd"
     140# endif
     141# ifndef OFF_T_FMT
     142# define OFF_T_FMT "%ld"
     143# endif
     144
     145# ifndef isfinite
     146# define isfinite(A) (!isnan(A))
    105147# endif
    106148

  • trunk/Ohana/src/opihi/cmd.data/extract.c

    r27435 r28241  
    7070    if ((out[0].header.Naxis[1] != Ny) || (out[0].header.Naxis[0] != Nx)) {
    7171      gprint (GP_ERR, "matrix sizes mis-matched\n");
    72       gprint (GP_ERR, "%d x %d  vs  %lld x %lld\n", Nx, Ny,
    73               (long long) out[0].header.Naxis[0], (long long) out[0].header.Naxis[1]);
     72      gprint (GP_ERR, "%d x %d  vs  "OFF_T_FMT" x "OFF_T_FMT"\n", Nx, Ny,
     73               out[0].header.Naxis[0], out[0].header.Naxis[1]);
    7474      return (FALSE);
    7575    }

  • trunk/Ohana/src/opihi/cmd.data/matrix.c

    r27435 r28241  
    2323
    2424    if (bufB[0].matrix.Naxis[0] != bufC[0].matrix.Naxis[1]) {
    25       gprint (GP_ERR, "size mis-match in matrices: (%lld x %lld) * (%lld x %lld)\n",
    26               (long long) bufB[0].matrix.Naxis[0], (long long) bufB[0].matrix.Naxis[1],
    27               (long long) bufC[0].matrix.Naxis[0], (long long) bufC[0].matrix.Naxis[1]);
     25      gprint (GP_ERR, "size mis-match in matrices: ("OFF_T_FMT" x "OFF_T_FMT") * ("OFF_T_FMT" x "OFF_T_FMT")\n",
     26               bufB[0].matrix.Naxis[0], bufB[0].matrix.Naxis[1],
     27               bufC[0].matrix.Naxis[0], bufC[0].matrix.Naxis[1]);
    2828      return (FALSE);
    2929    }

  • trunk/Ohana/src/opihi/cmd.data/rd.c

    r27435 r28241  
    222222  buf[0].unsign = buf[0].header.unsign;
    223223
    224   gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n",
    225           (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
     224  gprint (GP_LOG, "read "OFF_T_FMT" bytes from %s into buffer %s\n",
     225          buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
    226226
    227227  blank = 0xffff;

  • trunk/Ohana/src/opihi/cmd.data/rdseg.c

    r27435 r28241  
    6262  buf[0].bzero  = buf[0].header.bzero;     /* store the original values */
    6363  buf[0].unsign = buf[0].header.unsign;
    64   gprint (GP_LOG, "read %lld bytes from %s into buffer %s\n", (long long) buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
     64  gprint (GP_LOG, "read "OFF_T_FMT" bytes from %s into buffer %s\n", buf[0].header.datasize + buf[0].matrix.datasize, argv[2], argv[1]);
    6565
    6666  gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank);

  • trunk/Ohana/src/opihi/cmd.data/rebin.c

    r27435 r28241  
    6363    }     
    6464  }
    65   if (VERBOSE) gprint (GP_LOG, "rebin %s to %s (%lld,%lld to %d,%d)\n", argv[1], argv[2], (long long) in[0].header.Naxis[0], (long long) in[0].header.Naxis[1], nx, ny);
     65  if (VERBOSE) gprint (GP_LOG, "rebin %s to %s ("OFF_T_FMT","OFF_T_FMT" to %d,%d)\n", argv[1], argv[2],  in[0].header.Naxis[0], in[0].header.Naxis[1], nx, ny);
    6666
    6767  Nx = in[0].header.Naxis[0];

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

    r27594 r28241  
    103103    catalog.Nsecfilt = 0;
    104104
    105     if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
     105    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i, skylist[0].Nregions);
    106106     
    107107    // an error exit status here is a significant error

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

    r27610 r28241  
    102102    catalog.Nsecfilt = 0;
    103103
    104     if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
     104    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i, skylist[0].Nregions);
    105105     
    106106    // an error exit status here is a significant error

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

    r27435 r28241  
    3737  }
    3838  dvo_catalog_unlock (&catalog1);
    39   gprint (GP_ERR, "read %lld stars from phot catalog file %s\n", (long long) catalog1.Naverage, filename);
     39  gprint (GP_ERR, "read "OFF_T_FMT" stars from phot catalog file %s\n", catalog1.Naverage, filename);
    4040
    4141  /* this is for loading from a text file, presumably hstgsc or usno

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

    r27435 r28241  
    6565
    6666  /* find expected number of stars */
    67   if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
     67  if (!gfits_scan (&header, "NSTARS", OFF_T_FMT, 1, &Nstars)) {
    6868    gprint (GP_ERR, "ERROR: can't get NSTARS from header\n");
    6969    gfits_free_header (&header);
    … …  
    7777    /* allocate space for stars */
    7878    gprint (GP_ERR, "reading from TEXT cmp file %s\n", argv[2]);
    79     if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
     79    if (!gfits_scan (&header, "NSTARS", OFF_T_FMT, 1, &Nstars)) {
    8080      gprint (GP_ERR, "ERROR: failed to find NSTARS\n");
    8181      exit (1);
    … …  
    139139  free (stars);
    140140  gfits_free_header (&header);
    141   gprint (GP_ERR, "loaded %lld objects\n", (long long) Nstars);
     141  gprint (GP_ERR, "loaded "OFF_T_FMT" objects\n", Nstars);
    142142  return (TRUE);
    143143}

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

    r27435 r28241  
    137137
    138138  /* load existing data from database */
    139   gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
     139  gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1, &Nimage);
    140140  ALLOCATE (pimage, RegImage, Nimage);
    141141  status = fread (pimage, sizeof(RegImage), Nimage, f);
    … …  
    143143
    144144  if (status != Nimage) {
    145     gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
     145    gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nimage, status);
    146146    gfits_free_header (&header);
    147147    free (pimage);

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

    r27435 r28241  
    174174    // the selection criteria
    175175  }
    176   gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
     176  gprint (GP_ERR, "using "OFF_T_FMT" possible regions\n", skylist[0].Nregions);
    177177
    178178  /* vectors to save data */

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

    r27435 r28241  
    185185  /* loop over regions, extract data for each region */
    186186  // XXX add interrupt checks
    187   gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
     187  gprint (GP_ERR, "using "OFF_T_FMT" possible regions\n", skylist[0].Nregions);
    188188  for (k = 0; k < skylist[0].Nregions; k++) {
    189189    /* lock, load, unlock catalog */

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

    r28203 r28241  
    159159      k = N1[i];
    160160      if (!QUIET) {
    161         gprint (GP_LOG, "star: %lld\n", (long long) i);
     161        gprint (GP_LOG, "star: "OFF_T_FMT"\n", i);
    162162        gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
    163163        gprint (GP_LOG, "%11.7f ", catalog.average[k].D);

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

    r27435 r28241  
    267267   
    268268    /* load existing data from database */
    269     gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
     269    gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1, &Nimage);
    270270    ALLOCATE (image, RegImage, Nimage);
    271271    status = fread (image, sizeof(RegImage), Nimage, f);
    … …  
    273273   
    274274    if (status != Nimage) {
    275       gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %d)\n", (long long) Nimage, status);
     275      gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs %d)\n", Nimage, status);
    276276      gfits_free_header (&header);
    277277      free (image);
    … …  
    304304  /* convert to internal format */
    305305  image = (RegImage *) table.buffer;
    306   gfits_scan (table.header, "NAXIS2", "%lld", 1, (long long *) &Nimage);
     306  gfits_scan (table.header, "NAXIS2", OFF_T_FMT, 1, &Nimage);
    307307  gfits_convert_RegImage (image, sizeof (RegImage), Nimage);
    308308

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

    r27435 r28241  
    106106
    107107  /* load existing data from database */
    108   gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
     108  gfits_scan (&header, "NIMAGES", OFF_T_FMT, 1, &Nimage);
    109109  ALLOCATE (pimage, RegImage, Nimage);
    110110  status = fread (pimage, sizeof(RegImage), Nimage, f);
    111111  fclose (f);
    112112  if (status != Nimage) {
    113     gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
     113    gprint (GP_ERR, "ERROR: header and data in dB don't match ("OFF_T_FMT" vs "OFF_T_FMT")\n",  Nimage, status);
    114114    gfits_free_header (&header);
    115115    free (pimage);
    … …  
    131131    obstime[strlen(obstime)-1] = 0;
    132132
    133     gprint (GP_LOG, "%5lld %6s %6s %2d %2d   ", (long long) i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type);
     133    gprint (GP_LOG, OFF_T_FMT" %6s %6s %2d %2d   ", i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type);
    134134    gprint (GP_LOG, "%s %s  ", pimage[i].pathname, pimage[i].filename);
    135135    gprint (GP_LOG, "%s %s %f %s\n", pimage[i].filter, pimage[i].instrument, pimage[i].exptime, obstime);

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

    r27594 r28241  
    120120    catalog.Nsecfilt = Nsecfilt;
    121121
    122     if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
     122    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i, skylist[0].Nregions);
    123123     
    124124    // an error exit status here is a significant error

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

    r27435 r28241  
    186186    catalog.Nsecfilt = Nsecfilt;
    187187
    188     if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
     188    if (VERBOSE) gprint (GP_ERR, "trying %s ("OFF_T_FMT" of "OFF_T_FMT")\n", catalog.filename,  i, skylist[0].Nregions);
    189189     
    190190    // an error exit status here is a significant error

  • trunk/Ohana/src/opihi/pcontrol/StartHost.c

    r27593 r28241  
    1414  if (VarConfig ("SHELL", "%s", shell)     == NULL) strcpy (shell, "pclient");
    1515
    16 #ifndef __APPLE__
    17   if (VerboseMode()) gprint (GP_ERR, "starting host within thread %lld\n", (long long) pthread_self());
    18 #endif
     16  if (VerboseMode()) gprint (GP_ERR, "starting host within thread\n");
     17
    1918  pid = rconnect (command, host[0].hostname, shell, stdio);
    2019  if (!pid) {     

  • trunk/Ohana/src/opihi/pcontrol/StopHosts.c

    r28158 r28241  
    128128  int i, result, waitstatus;
    129129
    130 #ifndef __APPLE__
    131   if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %lld\n", (long long) pthread_self());
    132 #endif
     130  if (VerboseMode()) gprint (GP_ERR, "harvesting within thread\n");
    133131  if (VerboseMode()) gprint (GP_ERR, "child process %d is down, wait for exit status\n", pid);
    134132 

  • trunk/Ohana/src/relastro/src/ImageOps.c

    r27581 r28241  
    165165  for (i = 0; VERBOSE2 && (i < Nimage); i++) {
    166166    name = GetPhotcodeNamebyCode (image[i].photcode);
    167     fprintf (stderr, "image %lld has %lld measures (%s, %s)\n", (long long) i, (long long) Nlist[i],
     167    fprintf (stderr, "image "OFF_T_FMT" has "OFF_T_FMT" measures (%s, %s)\n",  i, Nlist[i],
    168168             ohana_sec_to_date(image[i].tzero), name);
    169169  }

  • trunk/Ohana/src/relastro/src/UpdateChips.c

    r27581 r28241  
    3030
    3131    // FitChip does iterative, clipped fitting
    32     // fprintf (stderr, "image %lld : Nstars: %lld\n", (long long) i, (long long) Nraw);
     32    // fprintf (stderr, "image "OFF_T_FMT" : Nstars: "OFF_T_FMT"\n",  i, Nraw);
    3333    if (!FitChip (raw, ref, Nraw, &image[i].coords)) {
    34       fprintf (stderr, "reject fit for image %s (%lld) : Nstars: %lld\n", image[i].name, (long long) i, (long long) Nraw);
     34      fprintf (stderr, "reject fit for image %s ("OFF_T_FMT") : Nstars: "OFF_T_FMT"\n", image[i].name,  i, Nraw);
    3535      oldCoords = getCoords (i);
    3636      memcpy (&image[i].coords, oldCoords, sizeof(Coords));

  • trunk/Ohana/src/relastro/src/UpdateObjects.c

    r27588 r28241  
    8080  for (i = 0; i < Ncatalog; i++) {
    8181
    82     if (VERBOSE) fprintf (stderr, "astrometrize catalog %d : %lld ave, %lld meas\n", i, (long long) catalog[i].Naverage, (long long) catalog[i].Nmeasure);
     82    if (VERBOSE) fprintf (stderr, "astrometrize catalog %d : "OFF_T_FMT" ave, "OFF_T_FMT" meas\n", i,  catalog[i].Naverage, catalog[i].Nmeasure);
    8383
    8484    Nave = Npar = Npm = Nskip = 0;
    … …  
    189189          T[k] -= Tmean;
    190190          if (XVERB) {
    191             fprintf (stderr, "%lld %f %f %f  %f %f +/- %f %f\n", (long long) k, T[k], R[k], D[k], X[k], Y[k], dX[k], dY[k]);
     191            fprintf (stderr, OFF_T_FMT" %f %f %f  %f %f +/- %f %f\n", k, T[k], R[k], D[k], X[k], Y[k], dX[k], dY[k]);
    192192          }
    193193        }         
    … …  
    316316    NparSum += Npar;
    317317    NskipSum += Nskip;
    318     if (VERBOSE) fprintf (stderr, "catalog %lld : %lld ave, %lld pm, %lld par : Nskip %lld\n", (long long) i, (long long) Nave, (long long) Npm, (long long) Npar, (long long) Nskip);
     318    if (VERBOSE) fprintf (stderr, "catalog %d : "OFF_T_FMT" ave, "OFF_T_FMT" pm, "OFF_T_FMT" par : Nskip "OFF_T_FMT"\n",  i,  Nave,  Npm,  Npar, Nskip);
    319319  }
    320320
    321   fprintf (stderr, "fitted %lld objects (%lld ave, %lld pm, %lld par), skipped %lld\n", (long long) (NaveSum + NpmSum + NparSum), (long long) NaveSum, (long long) NpmSum, (long long) NparSum, (long long) NskipSum);
     321  fprintf (stderr, "fitted "OFF_T_FMT" objects ("OFF_T_FMT" ave, "OFF_T_FMT" pm, "OFF_T_FMT" par), skipped "OFF_T_FMT"\n",  (NaveSum + NpmSum + NparSum),  NaveSum,  NpmSum,  NparSum, NskipSum);
    322322  return (TRUE);
    323323}

  • trunk/Ohana/src/relastro/src/bcatalog.c

    r27435 r28241  
    104104
    105105  if (VERBOSE) {
    106     fprintf (stderr, "%lld: using %lld stars (%lld measures) for catalog\n", (long long) i, (long long) subcatalog[0].Naverage, (long long) subcatalog[0].Nmeasure);
     106    fprintf (stderr, OFF_T_FMT": using "OFF_T_FMT" stars ("OFF_T_FMT" measures) for catalog\n",  i,  subcatalog[0].Naverage, subcatalog[0].Nmeasure);
    107107   }
    108108  return (TRUE);

  • trunk/Ohana/src/relastro/src/high_speed_objects.c

    r28219 r28241  
    6161  memset (groupB, 0, catalog[0].Naverage*sizeof(int));
    6262
    63   fprintf (stderr, "checking %lld objects\n", (long long) catalog[0].Naverage);
     63  fprintf (stderr, "checking "OFF_T_FMT" objects\n", catalog[0].Naverage);
    6464  Nslow = 0;
    6565
    … …  
    142142        continue;
    143143      } else {
    144         // fprintf (stderr, "skip %lld (group A)\n", (long long) i);
     144        // fprintf (stderr, "skip "OFF_T_FMT" (group A)\n", i);
    145145      }
    146146    }
    … …  
    189189        continue;
    190190      } else {
    191         // fprintf (stderr, "skip %lld (group B)\n", (long long) i);
     191        // fprintf (stderr, "skip "OFF_T_FMT" (group B)\n", i);
    192192      }
    193193    }
    … …  
    197197    Nslow ++;
    198198  }
    199   fprintf (stderr, "%lld of %lld are slow or invalid; %lld in group A, %lld in group B\n", (long long) Nslow, (long long) catalog[0].Naverage, (long long) NgroupA, (long long) NgroupB);
     199  fprintf (stderr, OFF_T_FMT" of "OFF_T_FMT" are slow or invalid; "OFF_T_FMT" in group A, "OFF_T_FMT" in group B\n",  Nslow,  catalog[0].Naverage,  NgroupA, NgroupB);
    200200   
    201201  // double loop over unmarked objects (sorted in RA / X)

  • trunk/Ohana/src/relastro/src/select_images.c

    r27478 r28241  
    115115   
    116116    if (!FindMosaicForImage (timage, Ntimage, i)) {
    117       fprintf (stderr, "cannot find mosaic for %lld\n", (long long) i);
     117      fprintf (stderr, "cannot find mosaic for "OFF_T_FMT"\n", i);
    118118      continue;
    119119    }
    … …  
    190190  }
    191191     
    192   if (VERBOSE) fprintf (stderr, "found %lld images\n", (long long) nimage);
     192  if (VERBOSE) fprintf (stderr, "found "OFF_T_FMT" images\n", nimage);
    193193
    194194  REALLOCATE (image, Image, MAX (nimage, 1));

  • trunk/Ohana/src/relphot/src/GridOps.c

    r27435 r28241  
    703703  gfits_create_header (&header);
    704704  gfits_create_matrix (&header, &matrix);
    705   gfits_modify (&header, "NEXTEND", "%lld", 1, (long long) Nimage + 3);
     705  gfits_modify (&header, "NEXTEND", OFF_T_FMT, 1, Nimage + 3);
    706706  gfits_modify (&header, "FILTER", "%s", 1, photcode[0].name);
    707707  gfits_modify_alt (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");

  • trunk/Ohana/src/relphot/src/ImageOps.c

    r27586 r28241  
    200200    status = findCCD (idx, meas, cat, measure);
    201201    if (!status) {
    202       if (VERBOSE2) fprintf (stderr, "failed to determine CCD for %lld, %d\n", (long long) meas, cat);
     202      if (VERBOSE2) fprintf (stderr, "failed to determine CCD for "OFF_T_FMT", %d\n", meas, cat);
    203203      return;
    204204    }

  • trunk/Ohana/src/relphot/src/MosaicOps.c

    r28186 r28241  
    400400      mark = (N < IMAGE_TOOFEW) || (N < IMAGE_GOOD_FRACTION*Nlist[i]);
    401401      if (mark) {
    402         fprintf (stderr, "marked mosaic %s (%lld), (%lld < %d) || (%lld < %f*%lld)\n", image[imlist[i][0]].name, (long long) i, (long long) N, IMAGE_TOOFEW, (long long) N, IMAGE_GOOD_FRACTION, (long long) Nlist[i]);
     402        fprintf (stderr, "marked mosaic %s ("OFF_T_FMT"), ("OFF_T_FMT" < %d) || ("OFF_T_FMT" < %f*"OFF_T_FMT")\n", image[imlist[i][0]].name,  i,  N, IMAGE_TOOFEW,  N, IMAGE_GOOD_FRACTION, Nlist[i]);
    403403        mosaic[i].flags |= ID_IMAGE_FEW;
    404404        Nfew ++;
    … …  
    408408    }
    409409    liststats (list, dlist, N, &stats);
    410     if (PoorImages) fprintf (stderr, "Mmos: %f %f %d %lld\n", stats.mean, stats.sigma, stats.Nmeas, (long long) N);
     410    if (PoorImages) fprintf (stderr, "Mmos: %f %f %d "OFF_T_FMT"\n", stats.mean, stats.sigma, stats.Nmeas, N);
    411411    mosaic[i].Mcal  = stats.mean;
    412412    mosaic[i].dMcal = stats.sigma;
    … …  
    519519    n++;
    520520  }
    521   fprintf (stderr, "Nmosaic: %lld, n: %lld\n", (long long) Nmosaic, (long long) n);
     521  fprintf (stderr, "Nmosaic: "OFF_T_FMT", n: "OFF_T_FMT"\n",  Nmosaic, n);
    522522
    523523  liststats (list, dlist, n, &stats);
    … …  
    599599  }
    600600
    601   fprintf (stderr, "%lld mosaics marked poor\n", (long long) Nmark);
     601  fprintf (stderr, OFF_T_FMT" mosaics marked poor\n", Nmark);
    602602  initstats (STATMODE);
    603603  free (mlist);
    … …  
    643643    }
    644644 
    645     sprintf (string, "Mosaic %lld", (long long) i);
     645    sprintf (string, "Mosaic "OFF_T_FMT, i);
    646646    plot_defaults (&graphdata);
    647647    plot_list (&graphdata, xlist, ylist, N, string, NULL);

  • trunk/Ohana/src/relphot/src/StarOps.c

    r28185 r28241  
    502502  }
    503503  initstats (STATMODE);
    504   if (VERBOSE) fprintf (stderr, "%lld measures marked poor, %lld total\n", (long long) Ndel, (long long) Nave);
     504  if (VERBOSE) fprintf (stderr, OFF_T_FMT" measures marked poor, "OFF_T_FMT" total\n", Ndel, Nave);
    505505  free (ilist);
    506506  free (tlist);

  • trunk/Ohana/src/relphot/src/bcatalog.c

    r27435 r28241  
    77  off_t NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm;
    88  float mag;
     9  int Ncode, Ntime, Ndophot, Nmag, Nsigma, Nimag, Nfew;
    910
    1011  // XXX PhotNsec as a global is a bad idea; either get it from catalog
    … …  
    2021  ALLOCATE (subcatalog[0].measure, Measure, NMEASURE);
    2122  Nmeasure = Naverage = 0;
     23
     24  Ncode = Ntime = Ndophot = Nmag = Nsigma = Nimag = Nfew = 0;
    2225
    2326  /* exclude stars not in range or with too few measurements */
    … …  
    4649      /* select measurements by photcode */
    4750      ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[offset].photcode);
    48       if (ecode != photcode[0].code) continue;
     51      if (ecode != photcode[0].code) { Ncode ++; continue; }
    4952
    5053      /* select measurements by time */
    5154      if (TimeSelect) {
    52         if (catalog[0].measure[offset].t < TSTART) continue;
    53         if (catalog[0].measure[offset].t > TSTOP) continue;
     55        if (catalog[0].measure[offset].t < TSTART) { Ntime ++; continue; }
     56        if (catalog[0].measure[offset].t > TSTOP)  { Ntime ++; continue; }
    5457      }
    5558
    … …  
    5760      // XXX ignore this criterion for REF measurements?
    5861      // XXX chnage this to select by bitflags
    59       if (DophotSelect && ((catalog[0].measure[offset].photFlags >> 16) != DophotValue)) continue;
     62      if (DophotSelect && ((catalog[0].measure[offset].photFlags >> 16) != DophotValue)) { Ndophot ++; continue; }
    6063
    6164      /* select measurements by mag limit */
    6265      mag = PhotCat (&catalog[0].measure[offset]);
    63       if (mag > MAG_LIM) continue;
     66      if (mag > MAG_LIM) { Nmag ++; continue; }
    6467
    6568      /* select measurements by measurement error */
    66       if ((SIGMA_LIM > 0) && (catalog[0].measure[offset].dM > SIGMA_LIM)) continue;
     69      if ((SIGMA_LIM > 0) && (catalog[0].measure[offset].dM > SIGMA_LIM)) { Nsigma ++; continue; }
    6770
    6871      /* select measurements by mag limit */
    6972      if (ImagSelect) {
    7073        mag = PhotInst (&catalog[0].measure[offset]);
    71         if (mag < ImagMin) continue;
    72         if (mag > ImagMax) continue;
     74        if (mag < ImagMin) { Nimag ++; continue; }
     75        if (mag > ImagMax) { Nimag ++; continue; }
    7376      }
    7477
    … …  
    9497    if (Nm <= STAR_TOOFEW) { /* enough measurements in band? */
    9598      Nmeasure -= Nm;
     99      Nfew ++;
    96100      continue;
    97101    }
    … …  
    114118
    115119  if (VERBOSE) {
    116     fprintf (stderr, "%lld: using %lld stars (%lld measures) for catalog\n", (long long) i,
    117              (long long) subcatalog[0].Naverage, (long long) subcatalog[0].Nmeasure);
     120    fprintf (stderr, "using "OFF_T_FMT" stars ("OFF_T_FMT" measures) of "OFF_T_FMT" for catalog\n",
     121              subcatalog[0].Naverage,  subcatalog[0].Nmeasure,  i);
     122    fprintf (stderr, "rejections: %d code, %d time, %d dophot, %d mag, %d sigma, %d imag, %d few\n",
     123             Ncode, Ntime, Ndophot, Nmag, Nsigma, Nimag, Nfew);
    118124  }
    119125  return (TRUE);

  • trunk/Ohana/src/relphot/src/load_catalogs.c

    r20190 r28241  
    4747
    4848  fprintf (stderr, "using %d of %d stars (%d of %d measurements)\n", Nstar, Nstar_total, Nmeas, Nmeas_total);
     49  if (Nstar < 1) {
     50      Shutdown ("ERROR: no stars match the minimum requirements; exiting\n");
     51  }
    4952
    5053  // XXX consider only returning the populated catalogs

  • trunk/Ohana/src/relphot/src/load_images.c

    r27435 r28241  
    4747  vtable = &db[0].vtable;
    4848
    49   gfits_scan (vtable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
     49  gfits_scan (vtable[0].header, "NAXIS1", OFF_T_FMT, 1, &Nx);
    5050  for (i = 0; i < Nimage; i++) {
    5151    memcpy (vtable[0].buffer[i], &image[i], Nx);

  • trunk/Ohana/src/relphot/src/relphot_objects.c

    r27435 r28241  
    5555        for (k = 0; k < catalog.average[j].Nmeasure; k++) {
    5656          catalog.measure[m+k].dbFlags = 0;
     57          catalog.measure[m+k].Mcal = 0;
    5758        }
    5859      }

  • trunk/Ohana/src/relphot/src/select_images.c

    r27480 r28241  
    101101   
    102102    if (!FindMosaicForImage (timage, Ntimage, i)) {
    103       fprintf (stderr, "cannot find mosaic for %lld\n", (long long) i);
     103      fprintf (stderr, "cannot find mosaic for "OFF_T_FMT"\n", i);
    104104      continue;
    105105    }
    … …  
    175175  }
    176176     
    177   if (VERBOSE) fprintf (stderr, "found %lld images\n", (long long) nimage);
     177  if (VERBOSE) fprintf (stderr, "found "OFF_T_FMT" images\n", nimage);
    178178
    179179  REALLOCATE (image, Image, MAX (nimage, 1));

  • trunk/Ohana/src/relphot/src/setExclusions.c

    r27435 r28241  
    5050    }
    5151  }
    52   if (VERBOSE) fprintf (stderr, "%lld measurements marked by area\n",    (long long) Narea);
    53   if (VERBOSE) fprintf (stderr, "%lld measurements marked nocal\n",      (long long) Nnocal);
    54   if (VERBOSE) fprintf (stderr, "%lld measurements kept for analysis\n", (long long) Ngood);
     52  if (VERBOSE) fprintf (stderr, OFF_T_FMT" measurements marked by area\n",    Narea);
     53  if (VERBOSE) fprintf (stderr, OFF_T_FMT" measurements marked nocal\n",      Nnocal);
     54  if (VERBOSE) fprintf (stderr, OFF_T_FMT" measurements kept for analysis\n", Ngood);
    5555  return (TRUE);
    5656}

  • trunk/Ohana/src/relphot/src/setMrelFinal.c

    r27435 r28241  
    138138    }
    139139  }
    140   if (VERBOSE) fprintf (stderr, "pass %d, Ntot: %lld, Ntry: %lld, Nskip: %lld, Nkeep: %lld\n",
    141                         pass, (long long) Ntot, (long long) Ntry, (long long) Nskip, (long long) Nkeep);
     140  if (VERBOSE) fprintf (stderr, "pass %d, Ntot: "OFF_T_FMT", Ntry: "OFF_T_FMT", Nskip: "OFF_T_FMT", Nkeep: "OFF_T_FMT"\n",
     141                        pass, Ntot, Ntry, Nskip, Nkeep);
    142142}
    143143

  • trunk/Ohana/src/tools/src/ftable.c

    r27435 r28241  
    11# include <ohana.h>
    22# include <gfitsio.h>
     3# include "inttypes.h"
    34
    45char *print_table_row (char *row, Header *header);
    … …  
    9596  table.datasize = Nbytes;
    9697
    97   gfits_scan (table.header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    98   gfits_scan (table.header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     98  gfits_scan (table.header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     99  gfits_scan (table.header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    99100
    100101  /* print a column */
    … …  
    125126  char field[16], type[16], format[16], *line;
    126127
    127   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
     128  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
    128129  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    129130
    … …  
    209210    for (i = 0; i < Naxis; i++) {
    210211      sprintf (axisname, "NAXIS%d", i+1);
    211       status = gfits_scan (&header, axisname,  "%lld", 1, (long long *) &Nelem);
     212      status = gfits_scan (&header, axisname,  OFF_T_FMT, 1, &Nelem);
    212213      if (!status) {
    213214        fprintf (stderr, "missing %s\n", axisname);
    214215      }
    215       fprintf (stdout, " %7lld", (long long) Nelem);
     216      fprintf (stdout, " "OFF_T_FMT, Nelem);
    216217    }
    217218    fprintf (stdout, "\n");
    … …  
    294295
    295296  gfits_scan (header, "TFIELDS", "%d", 1, &Nfields);
    296   gfits_scan (header, "NAXIS1",  "%lld", 1, (long long *) &Nx);
    297   gfits_scan (header, "NAXIS2",  "%lld", 1, (long long *) &Ny);
     297  gfits_scan (header, "NAXIS1",  OFF_T_FMT, 1, &Nx);
     298  gfits_scan (header, "NAXIS2",  OFF_T_FMT, 1, &Ny);
    298299
    299300  if (Colname != (char *) NULL) {
    … …  
    358359          if (!strcmp (type, "int64_t")) {
    359360            memcpy (line, &data[i*Nv*Nb + Nb*j], Nb);
    360             fprintf (stdout, "%lld ", (long long) *(int64_t*)line);
     361            fprintf (stdout, "%" PRId64" ", *(int64_t*)line);
    361362          }
    362363          if (!strcmp (type, "float")) {

  • trunk/Ohana/src/uniphot/src/load_images.c

    r27790 r28241  
    2323  image = gfits_table_get_Image (&db[0].ftable, Nimage, &db[0].swapped);
    2424
    25   fprintf (stderr, "loaded %lld images\n", (long long) *Nimage);
     25  fprintf (stderr, "loaded "OFF_T_FMT" images\n", *Nimage);
    2626
    2727  return (image);

  • trunk/Ohana/src/uniphot/src/update_catalog_setphot.c

    r27790 r28241  
    9393
    9494  if (found) {
    95     fprintf (stderr, "found %lld matches\n", (long long) found);
     95    fprintf (stderr, "found "OFF_T_FMT" matches\n", found);
    9696  }
    9797}
Note: See TracChangeset for help on using the changeset viewer.