IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4849


Ignore:
Timestamp:
Aug 20, 2005, 6:15:05 AM (21 years ago)
Author:
eugene
Message:

replacing Fread with fits_convert for autocode structures

Location:
trunk/Ohana/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r2803 r4849  
    11# include "imregister.h"
    22# include "imreg.h"
    3 static char *version = "convertimreg $Revision: 3.1 $";
     3static char *version = "convertimreg $Revision: 3.2 $";
    44
    55int main (int argc, char **argv) {
    … …  
    1818  if (argc != 3) {
    1919    fprintf (stderr, "USAGE: convertregdb (input) (output)\n");
     20    fprintf (stderr, "       convert old pseudo-FITS table imreg db to FITS table\n");
    2021    exit (1);
    2122  }
    … …  
    4243  fits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
    4344  ALLOCATE (pimage, RegImage, Nimage);
    44   status = Fread (pimage, sizeof(RegImage), Nimage, f, "regimage");
     45  status = fread (pimage, sizeof(RegImage), Nimage, f);
    4546  if (status != Nimage) {
    4647    fprintf (stderr, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
    … …  
    4950  }
    5051  fclearlockfile (argv[1], f, lockstate, &dbstate);
     52  fits_convert_RegImage (regimage, sizeof (RegImage), Nregimage);
    5153
    5254  /* create complete subset */

  • trunk/Ohana/src/markstar/src/aregion.c

    r4844 r4849  
    8383     
    8484  done = FALSE;
    85   Fread (buffer, 1, 48*NDecLines[NBigDec], f);
     85  fread (buffer, 1, 48*NDecLines[NBigDec], f);
    8686  for (i = 0; !done && (i < NDecLines[NBigDec]); i++) {
    8787    strncpy (temp, &buffer[i*48], 48);

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

    r4689 r4849  
    101101    return (FALSE);
    102102  }
     103  fprintf (stderr, "  this function is not well-defined.  re-work and re-code\n");
     104  return (FALSE);
    103105 
    104106  /* identify selection */
    … …  
    136138  fits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
    137139  ALLOCATE (pimage, RegImage, Nimage);
    138   status = Fread (pimage, sizeof(RegImage), Nimage, f, "regimage");
     140  status = fread (pimage, sizeof(RegImage), Nimage, f);
    139141  fclose (f);
    140142
    … …  
    145147    return (FALSE);
    146148  }
     149  fits_convert_RegImage (pimage, sizeof (RegImage), Nimage);
    147150
    148151  N = 0;

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

    r4689 r4849  
    265265    fits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
    266266    ALLOCATE (image, RegImage, Nimage);
    267     status = Fread (image, sizeof(RegImage), Nimage, f, "regimage");
     267    status = fread (image, sizeof(RegImage), Nimage, f);
    268268    fclose (f);
    269269   
    … …  
    274274      return ((RegImage *) NULL);
    275275    }
     276    fits_convert_RegImage (image, sizeof (RegImage), Nimage);
    276277
    277278    *nimage = Nimage;
    … …  
    300301  image = (RegImage *) table.buffer;
    301302  fits_scan (table.header, "NAXIS2", "%d", 1, &Nimage);
    302   ConvertStruct ((char *) image, sizeof (RegImage), Nimage, "regimage");
     303  fits_convert_RegImage (image, sizeof (RegImage), Nimage);
    303304
    304305  fits_free_header (&header);

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

    r4689 r4849  
    107107  fits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
    108108  ALLOCATE (pimage, RegImage, Nimage);
    109   status = Fread (pimage, sizeof(RegImage), Nimage, f, "regimage");
     109  status = fread (pimage, sizeof(RegImage), Nimage, f);
    110110  fclose (f);
    111 
    112111  if (status != Nimage) {
    113112    fprintf (stderr, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
    … …  
    116115    return (FALSE);
    117116  }
     117  fits_convert_RegImage (pimage, sizeof (RegImage), Nimage);
    118118
    119119  /* print out all data */
Note: See TracChangeset for help on using the changeset viewer.