IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

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

big move: fits_ to gfits_; minor updates to relphot

Location:
trunk/Ohana/src/opihi/cmd.data
Files:
25 edited

Legend:

Unmodified
Added
Removed

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

    r2843 r7080  
    5555
    5656  if ((buf = SelectBuffer (argv[1], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    57   fits_free_matrix (&buf[0].matrix);
    58   fits_free_header (&buf[0].header);
     57  gfits_free_matrix (&buf[0].matrix);
     58  gfits_free_header (&buf[0].header);
    5959
    6060  buf[0].bitpix = 16;
    … …  
    7272  buf[0].header.Naxis[1] = atoi (argv[3]);
    7373
    74   fits_create_header (&buf[0].header);
    75   fits_create_matrix (&buf[0].header, &buf[0].matrix);
     74  gfits_create_header (&buf[0].header);
     75  gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    7676
    7777  return (TRUE);

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

    r5846 r7080  
    5858    if (IsImage) {
    5959      if (buf != NULL) {
    60         Z = fits_get_matrix_value (&buf[0].matrix, (int) X, (int) Y);
     60        Z = gfits_get_matrix_value (&buf[0].matrix, (int) X, (int) Y);
    6161      }
    6262      fprintf (GetOutfile(), "%s %f %f  %f\n", key, X, Y, Z);

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

    r2598 r7080  
    2828
    2929  /* I should encapsulate this in a create_default_buffer */
    30   fits_free_matrix (&buf[0].matrix);
    31   fits_free_header (&buf[0].header);
     30  gfits_free_matrix (&buf[0].matrix);
     31  gfits_free_header (&buf[0].header);
    3232  buf[0].header.bitpix = buf[0].bitpix = -32;
    3333  buf[0].header.unsign = buf[0].unsign = FALSE;
    … …  
    3737  buf[0].header.Naxis[0] = Nx;
    3838  buf[0].header.Naxis[1] = Ny;
    39   fits_create_header (&buf[0].header);
    40   fits_create_matrix (&buf[0].header, &buf[0].matrix);
     39  gfits_create_header (&buf[0].header);
     40  gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    4141
    4242  out = (float *) buf[0].matrix.buffer;

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

    r5850 r7080  
    33int dot (int argc, char **argv) {
    44 
    5   int N, Ngraph;
    65  Graphdata graphmode;
    76  float x, y;
    87
    9   /* choose the appropriate graphing window */
    10   Ngraph = -1;
    11   if ((N = get_argument (argc, argv, "-n"))) {
    12     remove_argument (N, &argc, argv);
    13     Ngraph = atof (argv[N]);
    14     remove_argument (N, &argc, argv);
    15   }
    16   if (!GetGraph (&graphmode, NULL, &Ngraph)) return (FALSE);
    17 
    18   /* evaluate various plotting options */
    19   if ((N = get_argument (argc, argv, "-lt"))) {
    20     remove_argument (N, &argc, argv);
    21     graphmode.ltype = atof(argv[N]);
    22     remove_argument (N, &argc, argv);
    23   }
    24   if ((N = get_argument (argc, argv, "-lw"))) {
    25     remove_argument (N, &argc, argv);
    26     graphmode.lweight = atof(argv[N]);
    27     remove_argument (N, &argc, argv);
    28   }
    29   if ((N = get_argument (argc, argv, "-pt"))) {
    30     remove_argument (N, &argc, argv);
    31     graphmode.ptype = atof(argv[N]);
    32     remove_argument (N, &argc, argv);
    33   }
    34   if ((N = get_argument (argc, argv, "+eb"))) {
    35     remove_argument (N, &argc, argv);
    36     graphmode.ebar = TRUE;
    37   }
    38   if ((N = get_argument (argc, argv, "-eb"))) {
    39     remove_argument (N, &argc, argv);
    40     graphmode.ebar = FALSE;
    41   }
    42   if ((N = get_argument (argc, argv, "-sz"))) {
    43     remove_argument (N, &argc, argv);
    44     graphmode.size = atof(argv[N]);
    45     remove_argument (N, &argc, argv);
    46   }
    47   if ((N = get_argument (argc, argv, "-c"))) {
    48     remove_argument (N, &argc, argv);
    49     graphmode.color = KapaColorByName (argv[N]);
    50     if (graphmode.color == -1) return (FALSE);
    51     remove_argument (N, &argc, argv);
    52   }
    53   graphmode.style = 2;
     8  if (!style_args (&graphmode, &argc, argv, -1)) return FALSE;
    549
    5510  if (argc != 3) {
    … …  
    6318  SetGraph (graphmode);
    6419
    65   /* set errorbar mode (these are NOT sticky) */
     20  /* set point style and errorbar mode (these are NOT sticky) */
     21  graphmode.style = 2;
    6622  graphmode.etype = 0;
    6723

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

    r2628 r7080  
    5353  if ((out = SelectBuffer (argv[2], OLDBUFFER, FALSE)) == NULL) {
    5454    if ((out = SelectBuffer (argv[2], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    55     fits_free_matrix (&out[0].matrix);
    56     fits_free_header (&out[0].header);
     55    gfits_free_matrix (&out[0].matrix);
     56    gfits_free_header (&out[0].header);
    5757
    5858    out[0].bitpix = in[0].bitpix;
    … …  
    6060    out[0].bscale = in[0].bscale;
    6161    out[0].bzero  = in[0].bzero;
    62     fits_copy_header (&in[0].header, &out[0].header);
    63     fits_modify (&out[0].header, "NAXIS1", "%d", 1, Nx);
    64     fits_modify (&out[0].header, "NAXIS2", "%d", 1, Ny);
     62    gfits_copy_header (&in[0].header, &out[0].header);
     63    gfits_modify (&out[0].header, "NAXIS1", "%d", 1, Nx);
     64    gfits_modify (&out[0].header, "NAXIS2", "%d", 1, Ny);
    6565    out[0].header.Naxis[0] = Nx;
    6666    out[0].header.Naxis[1] = Ny;
    67     fits_create_matrix (&out[0].header, &out[0].matrix);
     67    gfits_create_matrix (&out[0].header, &out[0].matrix);
    6868  } else {
    6969    if ((out[0].header.Naxis[1] != Ny) || (out[0].header.Naxis[0] != Nx)) {

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

    r4689 r7080  
    3232
    3333  /* free up output space */
    34   fits_free_matrix (&Ore[0].matrix);
    35   fits_free_header (&Ore[0].header);
    36   fits_free_matrix (&Oim[0].matrix);
    37   fits_free_header (&Oim[0].header);
     34  gfits_free_matrix (&Ore[0].matrix);
     35  gfits_free_header (&Ore[0].header);
     36  gfits_free_matrix (&Oim[0].matrix);
     37  gfits_free_header (&Oim[0].header);
    3838
    3939  /* get image dimensions, check value */
    … …  
    7474
    7575  /* fix up output headers (real) */
    76   fits_copy_header (&Ire[0].header, &Ore[0].header);
    77   fits_modify (&Ore[0].header, "NAXIS1", "%d", 1, Nx);
    78   fits_modify (&Ore[0].header, "NAXIS2", "%d", 1, Ny);
     76  gfits_copy_header (&Ire[0].header, &Ore[0].header);
     77  gfits_modify (&Ore[0].header, "NAXIS1", "%d", 1, Nx);
     78  gfits_modify (&Ore[0].header, "NAXIS2", "%d", 1, Ny);
    7979  Ore[0].header.Naxis[0] = Nx;
    8080  Ore[0].header.Naxis[1] = Ny;
    … …  
    8383  Ore[0].bscale = Ire[0].bscale;
    8484  Ore[0].bzero  = Ire[0].bzero;
    85   fits_create_matrix (&Ore[0].header, &Ore[0].matrix);
     85  gfits_create_matrix (&Ore[0].header, &Ore[0].matrix);
    8686
    8787  /* fix up output headers (imaginary) */
    88   fits_copy_header (&Ire[0].header, &Oim[0].header);
    89   fits_modify (&Oim[0].header, "NAXIS1", "%d", 1, Nx);
    90   fits_modify (&Oim[0].header, "NAXIS2", "%d", 1, Ny);
     88  gfits_copy_header (&Ire[0].header, &Oim[0].header);
     89  gfits_modify (&Oim[0].header, "NAXIS1", "%d", 1, Nx);
     90  gfits_modify (&Oim[0].header, "NAXIS2", "%d", 1, Ny);
    9191  Oim[0].header.Naxis[0] = Nx;
    9292  Oim[0].header.Naxis[1] = Ny;
    … …  
    9595  Oim[0].bscale = Ire[0].bscale;
    9696  Oim[0].bzero  = Ire[0].bzero;
    97   fits_create_matrix (&Oim[0].header, &Oim[0].matrix);
     97  gfits_create_matrix (&Oim[0].header, &Oim[0].matrix);
    9898
    9999  /* move data from working space to output buffers */

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

    r2938 r7080  
    5656  free (bf[0].header.buffer);  /* ALLOCATEd in SelectBuffer */
    5757  free (bf[0].matrix.buffer);  /* ALLOCATEd in SelectBuffer */
    58   fits_create_header (&bf[0].header);
    59   fits_create_matrix (&bf[0].header, &bf[0].matrix);
     58  gfits_create_header (&bf[0].header);
     59  gfits_create_matrix (&bf[0].header, &bf[0].matrix);
    6060
    6161  ALLOCATE (val, float, Nx*Ny);

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

    r2843 r7080  
    9292    switch (Wmode) {
    9393    case STRING:
    94       fits_modify (&buf[0].header, argv[2], "%s", 1, line);
     94      gfits_modify (&buf[0].header, argv[2], "%s", 1, line);
    9595      return (TRUE);
    9696    case FLOAT:
    9797      value = atof(line);
    98       fits_modify (&buf[0].header, argv[2], "%lf", 1, value);
     98      gfits_modify (&buf[0].header, argv[2], "%lf", 1, value);
    9999      return (TRUE);
    100100    case INT:
    101       fits_modify (&buf[0].header, argv[2], "%d", 1, atoi(line));
     101      gfits_modify (&buf[0].header, argv[2], "%d", 1, atoi(line));
    102102      return (TRUE);
    103103    case BOOLEAN:
    … …  
    107107      }
    108108      ivalue = !strcasecmp (line, "T");
    109       fits_modify (&buf[0].header, argv[2], "%t", 1, ivalue);
     109      gfits_modify (&buf[0].header, argv[2], "%t", 1, ivalue);
    110110      return (TRUE);
    111111    case KEYCOMMENT:
    112       fits_modify (&buf[0].header, argv[2], "%C", 1, line);
     112      gfits_modify (&buf[0].header, argv[2], "%C", 1, line);
    113113      return (TRUE);
    114114    case COMMENT:
    115       fits_modify (&buf[0].header, argv[2], "%S", 0, line);
     115      gfits_modify (&buf[0].header, argv[2], "%S", 0, line);
    116116      return (TRUE);
    117117    }
    … …  
    119119 
    120120  if (delete) {
    121     fits_delete (&buf[0].header, argv[2], -1);
     121    gfits_delete (&buf[0].header, argv[2], -1);
    122122    return (TRUE);
    123123  }
    … …  
    125125  /* grab the value in the given format, either a string or a digit */
    126126  if (asfloat) {
    127     status = fits_scan (&buf[0].header, argv[2], "%lf", 1, &value);
     127    status = gfits_scan (&buf[0].header, argv[2], "%lf", 1, &value);
    128128    if (!status) goto failure;
    129129    if (argc == 4)
    … …  
    135135
    136136  if (ascomment) {
    137     status = fits_scan (&buf[0].header, argv[2], "%C", 1, line);
     137    status = gfits_scan (&buf[0].header, argv[2], "%C", 1, line);
    138138    if (!status) goto failure;
    139139    if (argc == 4)
    … …  
    145145
    146146  /* not-specified */
    147   status = fits_scan (&buf[0].header, argv[2], "%s", 1, line);
     147  status = gfits_scan (&buf[0].header, argv[2], "%s", 1, line);
    148148  if (!status) goto failure;
    149149  if (argc == 4)

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

    r5850 r7080  
    33int line (int argc, char **argv) {
    44 
    5   int N, Npts, Ngraph;
     5  int N, Npts;
    66  Graphdata graphmode;
    77  Vector *vecx, *vecy, *dxm, *dxp, *dym, *dyp;
    88
    9   /* choose the appropriate graphing window */
    10   Ngraph = -1;
    11   if ((N = get_argument (argc, argv, "-n"))) {
    12     remove_argument (N, &argc, argv);
    13     Ngraph = atof (argv[N]);
    14     remove_argument (N, &argc, argv);
    15   }
    16   if (!GetGraph (&graphmode, NULL, &Ngraph)) return (FALSE);
    17 
    18   /* evaluate various plotting options */
    19   if ((N = get_argument (argc, argv, "-lt"))) {
    20     remove_argument (N, &argc, argv);
    21     graphmode.ltype = atof(argv[N]);
    22     remove_argument (N, &argc, argv);
    23   }
    24   if ((N = get_argument (argc, argv, "-lw"))) {
    25     remove_argument (N, &argc, argv);
    26     graphmode.lweight = atof(argv[N]);
    27     remove_argument (N, &argc, argv);
    28   }
    29   if ((N = get_argument (argc, argv, "-pt"))) {
    30     remove_argument (N, &argc, argv);
    31     graphmode.ptype = atof(argv[N]);
    32     remove_argument (N, &argc, argv);
    33   }
    34   if ((N = get_argument (argc, argv, "+eb"))) {
    35     remove_argument (N, &argc, argv);
    36     graphmode.ebar = TRUE;
    37   }
    38   if ((N = get_argument (argc, argv, "-eb"))) {
    39     remove_argument (N, &argc, argv);
    40     graphmode.ebar = FALSE;
    41   }
    42   if ((N = get_argument (argc, argv, "-sz"))) {
    43     remove_argument (N, &argc, argv);
    44     graphmode.size = atof(argv[N]);
    45     remove_argument (N, &argc, argv);
    46   }
    47   if ((N = get_argument (argc, argv, "-c"))) {
    48     remove_argument (N, &argc, argv);
    49     graphmode.color = KapaColorByName (argv[N]);
    50     if (graphmode.color == -1) return (FALSE);
    51     remove_argument (N, &argc, argv);
    52   }
    53   if ((N = get_argument (argc, argv, "-x"))) {
    54     remove_argument (N, &argc, argv);
    55     graphmode.style = atof(argv[N]);
    56     remove_argument (N, &argc, argv);
    57   }
     9  if (!style_args (&graphmode, &argc, argv, -1)) return FALSE;
    5810
    5911  /* decide on error bars */
    … …  
    8436    return (FALSE);
    8537  }
    86 
    87   /* set plotting options (these are sticky) */
    8838  SetGraph (graphmode);
    8939

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

    r2843 r7080  
    3636    bscale = buf[0].header.bscale;
    3737    unsign = buf[0].header.unsign;
    38     fits_free_header (&buf[0].header);
     38    gfits_free_header (&buf[0].header);
    3939   
    4040    strcpy (filename, buf[0].file);
    4141    strcpy (buf[0].file, "*");
    4242    strcat (buf[0].file, filename);
    43     status = fits_read_header (argv[2], &buf[0].header);
     43    status = gfits_read_header (argv[2], &buf[0].header);
    4444    buf[0].header.bitpix = bitpix;     
    4545    buf[0].header.bzero  = bzero;     
    4646    buf[0].header.bscale = bscale;     
    4747    buf[0].header.unsign = unsign;     
    48     fits_modify (&buf[0].header, "BITPIX", "%d",  1, bitpix);
    49     fits_modify (&buf[0].header, "BSCALE", "%lf", 1, bscale);
    50     fits_modify (&buf[0].header, "BZERO",  "%lf", 1, bzero);
    51     fits_modify (&buf[0].header, "UNSIGN", "%t",  1, unsign);
     48    gfits_modify (&buf[0].header, "BITPIX", "%d",  1, bitpix);
     49    gfits_modify (&buf[0].header, "BSCALE", "%lf", 1, bscale);
     50    gfits_modify (&buf[0].header, "BZERO",  "%lf", 1, bzero);
     51    gfits_modify (&buf[0].header, "UNSIGN", "%t",  1, unsign);
    5252   
    5353  } else {
    … …  
    5555    f = popen ("more", "w");
    5656   
    57     p = fits_header_field (&buf[0].header, "END", 1);
     57    p = gfits_header_field (&buf[0].header, "END", 1);
    5858    nlines = (p - buf[0].header.buffer) / 80;
    5959    nbytes = 81*nlines;

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

    r4702 r7080  
    1919
    2020  /* I should encapsulate this in a create_default_buffer */
    21   fits_free_matrix (&buf[0].matrix);
    22   fits_free_header (&buf[0].header);
     21  gfits_free_matrix (&buf[0].matrix);
     22  gfits_free_header (&buf[0].header);
    2323  buf[0].header.bitpix = buf[0].bitpix = -32;
    2424  buf[0].header.unsign = buf[0].unsign = FALSE;
    … …  
    2828  buf[0].header.Naxis[0] = Nx;
    2929  buf[0].header.Naxis[1] = Ny;
    30   fits_create_header (&buf[0].header);
    31   fits_create_matrix (&buf[0].header, &buf[0].matrix);
     30  gfits_create_header (&buf[0].header);
     31  gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    3232  return (TRUE);
    3333

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

    r3674 r7080  
    2626  if ((out = SelectBuffer (argv[2], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    2727
    28   fits_free_matrix (&out[0].matrix);
    29   fits_free_header (&out[0].header);
     28  gfits_free_matrix (&out[0].matrix);
     29  gfits_free_header (&out[0].header);
    3030
    3131  scale  = atof (argv[3]);
    … …  
    4141  out[0].bscale = in[0].bscale;
    4242  out[0].bzero  = in[0].bzero;
    43   fits_copy_header (&in[0].header, &out[0].header);
     43  gfits_copy_header (&in[0].header, &out[0].header);
    4444
    45   fits_modify (&out[0].header, "NAXIS1", "%d", 1, nx);
    46   fits_modify (&out[0].header, "NAXIS2", "%d", 1, ny);
     45  gfits_modify (&out[0].header, "NAXIS1", "%d", 1, nx);
     46  gfits_modify (&out[0].header, "NAXIS2", "%d", 1, ny);
    4747  out[0].header.Naxis[0] = nx;
    4848  out[0].header.Naxis[1] = ny;
    49   fits_create_matrix (&out[0].header, &out[0].matrix);
     49  gfits_create_matrix (&out[0].header, &out[0].matrix);
    5050
    5151  /* fix astrometric terms */
    52   status =  fits_scan (&out[0].header, "CDELT1", "%lf", 1, &dX);
    53   status &= fits_scan (&out[0].header, "CDELT2", "%lf", 1, &dY);
     52  status =  gfits_scan (&out[0].header, "CDELT1", "%lf", 1, &dX);
     53  status &= gfits_scan (&out[0].header, "CDELT2", "%lf", 1, &dY);
    5454  dX /= scale;
    5555  dY /= scale;
    5656  if (status) {
    57     fits_modify (&out[0].header, "CDELT1", "%lf", 1, dX);
    58     fits_modify (&out[0].header, "CDELT2", "%lf", 1, dY);
     57    gfits_modify (&out[0].header, "CDELT1", "%lf", 1, dX);
     58    gfits_modify (&out[0].header, "CDELT2", "%lf", 1, dY);
    5959  }
    60   status =  fits_scan (&out[0].header, "CRPIX1", "%lf", 1, &dX);
    61   status &= fits_scan (&out[0].header, "CRPIX2", "%lf", 1, &dY);
     60  status =  gfits_scan (&out[0].header, "CRPIX1", "%lf", 1, &dX);
     61  status &= gfits_scan (&out[0].header, "CRPIX2", "%lf", 1, &dY);
    6262  dX *= scale;
    6363  dY *= scale;
    6464  if (status) {
    65     fits_modify (&out[0].header, "CRPIX1", "%lf", 1, dX);
    66     fits_modify (&out[0].header, "CRPIX2", "%lf", 1, dY);
     65    gfits_modify (&out[0].header, "CRPIX1", "%lf", 1, dX);
     66    gfits_modify (&out[0].header, "CRPIX2", "%lf", 1, dY);
    6767  }
    6868

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

    r5850 r7080  
    33int plot (int argc, char **argv) {
    44 
    5   int N, Npts, Ngraph;
     5  int N, Npts;
    66  Graphdata graphmode;
    77  Vector *xvec, *yvec, *dxmvec, *dxpvec, *dymvec, *dypvec;
    88
    9   /* choose the appropriate graphing window */
    10   Ngraph = -1;
    11   if ((N = get_argument (argc, argv, "-n"))) {
    12     remove_argument (N, &argc, argv);
    13     Ngraph = atof (argv[N]);
    14     remove_argument (N, &argc, argv);
    15   }
    16   if (!GetGraph (&graphmode, NULL, &Ngraph)) return (FALSE);
    17 
    18   /* evaluate various plotting options */
    19   if ((N = get_argument (argc, argv, "-lt"))) {
    20     remove_argument (N, &argc, argv);
    21     graphmode.ltype = atof(argv[N]);
    22     remove_argument (N, &argc, argv);
    23   }
    24   if ((N = get_argument (argc, argv, "-lw"))) {
    25     remove_argument (N, &argc, argv);
    26     graphmode.lweight = atof(argv[N]);
    27     remove_argument (N, &argc, argv);
    28   }
    29   if ((N = get_argument (argc, argv, "-pt"))) {
    30     remove_argument (N, &argc, argv);
    31     graphmode.ptype = atof(argv[N]);
    32     remove_argument (N, &argc, argv);
    33   }
    34   if ((N = get_argument (argc, argv, "+eb"))) {
    35     remove_argument (N, &argc, argv);
    36     graphmode.ebar = TRUE;
    37   }
    38   if ((N = get_argument (argc, argv, "-eb"))) {
    39     remove_argument (N, &argc, argv);
    40     graphmode.ebar = FALSE;
    41   }
    42   if ((N = get_argument (argc, argv, "-sz"))) {
    43     remove_argument (N, &argc, argv);
    44     graphmode.size = atof(argv[N]);
    45     remove_argument (N, &argc, argv);
    46   }
    47   if ((N = get_argument (argc, argv, "-c"))) {
    48     remove_argument (N, &argc, argv);
    49     graphmode.color = KapaColorByName (argv[N]);
    50     if (graphmode.color == -1) return (FALSE);
    51     remove_argument (N, &argc, argv);
    52   }
    53   if ((N = get_argument (argc, argv, "-x"))) {
    54     remove_argument (N, &argc, argv);
    55     graphmode.style = atof(argv[N]);
    56     remove_argument (N, &argc, argv);
    57   }
     9  if (!style_args (&graphmode, &argc, argv, -1)) return FALSE;
    5810
    5911  /* decide on error bars */
    … …  
    8133
    8234  if (argc != 3) {
    83     fprintf (stderr, "USAGE: plot <x> <y>\n");
     35    fprintf (stderr, "USAGE: plot <x> <y> [style]\n");
    8436    return (FALSE);
    8537  }
    86 
    87   /* set plotting options (these are sticky) */
    8838  SetGraph (graphmode);
    8939
    … …  
    9242  if ((dymvec != NULL) && (dypvec == NULL)) dypvec = dymvec;
    9343  if ((dypvec != NULL) && (dymvec == NULL)) dymvec = dypvec;
    94   if (dypvec != NULL) graphmode.etype |= 0x01;
     44  if ((dypvec != NULL) || (dymvec != NULL)) graphmode.etype |= 0x01;
    9545  if ((dxmvec != NULL) && (dxpvec == NULL)) dxpvec = dxmvec;
    9646  if ((dxpvec != NULL) && (dxmvec == NULL)) dxmvec = dxpvec;
    97   if (dxpvec != NULL) graphmode.etype |= 0x02;
     47  if ((dxpvec != NULL) || (dxmvec != NULL)) graphmode.etype |= 0x02;
    9848 
    9949  /* find vectors */

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

    r4689 r7080  
    6161  /* find matrix, free old data */
    6262  if ((buf = SelectBuffer (argv[1], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    63   fits_free_matrix (&buf[0].matrix);
    64   fits_free_header (&buf[0].header);
     63  gfits_free_matrix (&buf[0].matrix);
     64  gfits_free_header (&buf[0].header);
    6565
    6666  /* save file name */
    … …  
    7373  if (extend) {
    7474    /* load in appropriate header */
    75     Nskip = fits_read_Xheader (argv[2], &buf[0].header, Nextend);
     75    Nskip = gfits_read_Xheader (argv[2], &buf[0].header, Nextend);
    7676    if (!Nskip) {
    7777      fprintf (stderr, "entry in %s not found\n", argv[2]);
    … …  
    113113    }
    114114    fseek (f, Nskip, SEEK_SET);
    115     status = fits_load_matrix (f, &buf[0].matrix, &buf[0].header);
     115    status = gfits_load_matrix (f, &buf[0].matrix, &buf[0].header);
    116116    fclose (f);
    117117  }
    … …  
    128128    done = FALSE;
    129129    for (i = 0; !done; i++) {
    130       Nskip = fits_read_Xheader (argv[2], &buf[0].header, i);
     130      Nskip = gfits_read_Xheader (argv[2], &buf[0].header, i);
    131131      if (!Nskip) {
    132132        fprintf (stderr, "extension %s in %s not found\n", ccdid, argv[2]);
    … …  
    135135        return (FALSE);
    136136      }
    137       if (!fits_scan (&buf[0].header, CCDKeyword, "%s", 1, ID)) {
     137      if (!gfits_scan (&buf[0].header, CCDKeyword, "%s", 1, ID)) {
    138138        fprintf (stderr, "%s not in header\n", CCDKeyword);
    139139        DeleteBuffer (buf);
    … …  
    145145      done = strnumcmp (ccdid, ID);
    146146
    147       if (!done) fits_free_header (&buf[0].header);
     147      if (!done) gfits_free_header (&buf[0].header);
    148148    }
    149149    free (CCDKeyword);
    … …  
    182182    }
    183183    fseek (f, Nskip, SEEK_SET);
    184     status = fits_load_matrix (f, &buf[0].matrix, &buf[0].header);
     184    status = gfits_load_matrix (f, &buf[0].matrix, &buf[0].header);
    185185    fclose (f);
    186186  }
    187187
    188188  if (!ccdsel && !extend) {
    189     status = fits_read_header (argv[2], &buf[0].header);
     189    status = gfits_read_header (argv[2], &buf[0].header);
    190190    if (JustHead) {
    191191      buf[0].header.Naxes = 0;
    … …  
    209209      buf[0].header.Naxis[2] = 0;
    210210      buf[0].header.Naxes = 2;
    211       fits_modify (&buf[0].header, "NAXIS", "%d", 1, 2);
    212       fits_delete (&buf[0].header, "NAXIS3", 1);
     211      gfits_modify (&buf[0].header, "NAXIS", "%d", 1, 2);
     212      gfits_delete (&buf[0].header, "NAXIS3", 1);
    213213    }
    214214    sprintf (region, "-1 -1 -1 -1 %d %d", (plane - 1), plane);
    215     status = fits_read_segment (argv[2], &buf[0].matrix, region);
     215    status = gfits_read_segment (argv[2], &buf[0].matrix, region);
    216216  }
    217217
    … …  
    236236
    237237  /** now - convert the matrix values to floats for internal use **/
    238   fits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, FT_UNSIGN_MODE);
     238  gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, FT_UNSIGN_MODE);
    239239 
    240240  return (TRUE);

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

    r2598 r7080  
    2828  /* find matrix, free old data */
    2929  if ((buf = SelectBuffer (argv[1], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    30   fits_free_matrix (&buf[0].matrix);
    31   fits_free_header (&buf[0].header);
     30  gfits_free_matrix (&buf[0].matrix);
     31  gfits_free_header (&buf[0].header);
    3232
    3333  /* save file name */
    … …  
    3636  free (filename);
    3737
    38   status = fits_read_header (argv[2], &buf[0].header);
     38  status = gfits_read_header (argv[2], &buf[0].header);
    3939  sprintf (region, "%d %d %d %d 0 1", x, nx + x, y, ny + y);
    40   status = fits_read_segment (argv[2], &buf[0].matrix, region);
    41   fits_modify (&buf[0].header, "NAXIS1", "%d", 1, nx);
    42   fits_modify (&buf[0].header, "NAXIS2", "%d", 1, ny);
     40  status = gfits_read_segment (argv[2], &buf[0].matrix, region);
     41  gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, nx);
     42  gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, ny);
    4343  buf[0].header.Naxis[0] = nx;
    4444  buf[0].header.Naxis[1] = ny;
    … …  
    6666
    6767  /** now - convert the matrix values to floats for internal use **/
    68   fits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, FT_UNSIGN_MODE);
     68  gfits_convert_format (&buf[0].header, &buf[0].matrix, -32, 1.0, 0.0, FT_UNSIGN_MODE);
    6969 
    7070  return (TRUE);

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

    r3459 r7080  
    171171
    172172    for (i = 0; i <= Nextend; i++) {
    173       if (!fits_load_header (f, &header)) return (FALSE);
    174       Nbytes = fits_matrix_size (&header);
     173      if (!gfits_load_header (f, &header)) return (FALSE);
     174      Nbytes = gfits_matrix_size (&header);
    175175      /* skip the prior data buffers */
    176176      if (i < Nextend) {
    177177        fseek (f, Nbytes, SEEK_CUR);
    178         fits_free_header (&header);
     178        gfits_free_header (&header);
    179179        continue;
    180180      }
    … …  
    183183      Nread = fread (table.buffer, sizeof (char), Nbytes, f);
    184184      if (Nread != Nbytes) {
    185         fits_free_table  (&table);
    186         fits_free_header (&header);
     185        gfits_free_table  (&table);
     186        gfits_free_header (&header);
    187187        return (FALSE);
    188188      }
    … …  
    190190    }
    191191  } else {
    192     if (!fits_fread_ftable (f, &table, extname)) return (FALSE);
     192    if (!gfits_fread_ftable (f, &table, extname)) return (FALSE);
    193193  }
    194194
    195195  /* identify table type (ascii / binary) */
    196196  Binary = FALSE;
    197   fits_scan (&header, "XTENSION", "%s", 1, type);
     197  gfits_scan (&header, "XTENSION", "%s", 1, type);
    198198  if (!strcmp (type, "BINTABLE")) {
    199199    Binary = TRUE;
    … …  
    214214    Nval = 0;
    215215    if (Binary) {
    216       if (!fits_get_bintable_column_type (&header, argv[i], type, &Nval)) return (FALSE);
    217       if (!fits_get_bintable_column (&header, &table, argv[i], &data)) return (FALSE);
     216      if (!gfits_get_bintable_column_type (&header, argv[i], type, &Nval)) return (FALSE);
     217      if (!gfits_get_bintable_column (&header, &table, argv[i], &data)) return (FALSE);
    218218    } else {
    219       if (!fits_get_table_column_type (&header, argv[i], type)) return (FALSE);
    220       if (!fits_get_table_column (&header, &table, argv[i], &data)) return (FALSE);
     219      if (!gfits_get_table_column_type (&header, argv[i], type)) return (FALSE);
     220      if (!gfits_get_table_column (&header, &table, argv[i], &data)) return (FALSE);
    221221    }
    222222    if (Nval == 0) return (FALSE);
    … …  
    276276    free (vec);
    277277  }
    278   fits_free_table (&table);
    279   fits_free_header (&header);
     278  gfits_free_table (&table);
     279  gfits_free_header (&header);
    280280  return (TRUE);
    281281}

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

    r4689 r7080  
    4040  if ((in  = SelectBuffer (argv[1], OLDBUFFER, TRUE)) == NULL) return (FALSE);
    4141  if ((out = SelectBuffer (argv[2], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    42   fits_free_matrix (&out[0].matrix);
    43   fits_free_header (&out[0].header);
     42  gfits_free_matrix (&out[0].matrix);
     43  gfits_free_header (&out[0].header);
    4444
    4545  scale  = atof (argv[3]);
    … …  
    7171  out[0].bscale = in[0].bscale;
    7272  out[0].bzero  = in[0].bzero;
    73   fits_copy_header (&in[0].header, &out[0].header);
    74   fits_modify (&out[0].header, "NAXIS1", "%d", 1, nx);
    75   fits_modify (&out[0].header, "NAXIS2", "%d", 1, ny);
    76 
    77   status =  fits_scan (&out[0].header, "CDELT1", "%lf", 1, &dX);
    78   status &= fits_scan (&out[0].header, "CDELT2", "%lf", 1, &dY);
     73  gfits_copy_header (&in[0].header, &out[0].header);
     74  gfits_modify (&out[0].header, "NAXIS1", "%d", 1, nx);
     75  gfits_modify (&out[0].header, "NAXIS2", "%d", 1, ny);
     76
     77  status =  gfits_scan (&out[0].header, "CDELT1", "%lf", 1, &dX);
     78  status &= gfits_scan (&out[0].header, "CDELT2", "%lf", 1, &dY);
    7979  if (scale > 0) {
    8080    dX *= scale;
    … …  
    8585  }   
    8686  if (status) {
    87     fits_modify (&out[0].header, "CDELT1", "%lf", 1, dX);
    88     fits_modify (&out[0].header, "CDELT2", "%lf", 1, dY);
    89   }
    90 
    91   status =  fits_scan (&out[0].header, "CRPIX1", "%lf", 1, &dX);
    92   status &= fits_scan (&out[0].header, "CRPIX2", "%lf", 1, &dY);
     87    gfits_modify (&out[0].header, "CDELT1", "%lf", 1, dX);
     88    gfits_modify (&out[0].header, "CDELT2", "%lf", 1, dY);
     89  }
     90
     91  status =  gfits_scan (&out[0].header, "CRPIX1", "%lf", 1, &dX);
     92  status &= gfits_scan (&out[0].header, "CRPIX2", "%lf", 1, &dY);
    9393  if (scale > 0) {
    9494    dX /= scale;
    … …  
    9999  }   
    100100  if (status) {
    101     fits_modify (&out[0].header, "CRPIX1", "%lf", 1, dX);
    102     fits_modify (&out[0].header, "CRPIX2", "%lf", 1, dY);
     101    gfits_modify (&out[0].header, "CRPIX1", "%lf", 1, dX);
     102    gfits_modify (&out[0].header, "CRPIX2", "%lf", 1, dY);
    103103  }
    104104
    105105  out[0].header.Naxis[0] = nx;
    106106  out[0].header.Naxis[1] = ny;
    107   fits_create_matrix (&out[0].header, &out[0].matrix);
     107  gfits_create_matrix (&out[0].header, &out[0].matrix);
    108108  temp[0] = 0;
    109109  if ((in[0].file[0] != '*') && (in[0].file[0] != '(')) {

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

    r2843 r7080  
    4141    buf[0].header.Naxis[0] = NY;
    4242    buf[0].header.Naxis[1] = NX;
    43     fits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
    44     fits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
    45     fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    46     fits_create_matrix (&buf[0].header, &buf[0].matrix);
     43    gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
     44    gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
     45    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     46    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    4747    out_buff = (float *)buf[0].matrix.buffer;
    4848    for (i = NX - 1; i > -1; i--) {
    … …  
    5252    }
    5353    /* fix reference pixel */
    54     fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
    55     fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     54    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
     55    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
    5656    X1 = Yo;
    5757    Y1 = NX - Xo;
    58     fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
    59     fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
    60    
    61     /* fix rotate matrix */
    62     fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
    63     fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
    64     fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
    65     fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     58    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
     59    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
     60   
     61    /* fix rotate matrix */
     62    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
     63    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
     64    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
     65    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
    6666    PC11 = pc21;
    6767    PC12 = pc22;
    6868    PC21 = -pc11;
    6969    PC22 = -pc12;
    70     fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
    71     fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
    72     fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
    73     fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
     70    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
     71    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
     72    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
     73    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
    7474
    7575    free (in_buff);
    … …  
    8080    buf[0].header.Naxis[0] = NY;
    8181    buf[0].header.Naxis[1] = NX;
    82     fits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
    83     fits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
    84     fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    85     fits_create_matrix (&buf[0].header, &buf[0].matrix);
     82    gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
     83    gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
     84    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     85    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    8686    out_buff = (float *)buf[0].matrix.buffer;
    8787    for (i = 0; i < NX; i++) {
    … …  
    9191    }
    9292    /* fix reference pixel */
    93     fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
    94     fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     93    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
     94    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
    9595    X1 = NY - Yo;
    9696    Y1 = Xo;
    9797    fprintf (stderr, "%f %f -> %f %f\n", Xo, Yo, X1, Y1);
    98     fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
    99     fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
    100    
    101     /* fix rotate matrix */
    102     fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
    103     fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
    104     fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
    105     fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     98    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
     99    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
     100   
     101    /* fix rotate matrix */
     102    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
     103    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
     104    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
     105    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
    106106    PC11 = -pc21;
    107107    PC12 = -pc22;
    … …  
    110110    fprintf (stderr, "%f %f  ->  %f %f\n", pc11, pc12, PC11, PC12);
    111111    fprintf (stderr, "%f %f  ->  %f %f\n", pc21, pc22, PC21, PC22);
    112     fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
    113     fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
    114     fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
    115     fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
     112    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
     113    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
     114    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
     115    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
    116116
    117117    free (in_buff);
    … …  
    120120
    121121  if (!strcasecmp (argv[2], "UPSIDE") || (atof (argv[2]) == -180) || (atof (argv[2]) == 180)) {
    122     fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    123     fits_create_matrix (&buf[0].header, &buf[0].matrix);
     122    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     123    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    124124    out_buff = (float *)buf[0].matrix.buffer;
    125125    for (j = NY - 1; j > -1; j--) {
    … …  
    129129    }
    130130    /* fix reference pixel */
    131     fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
    132     fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     131    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
     132    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
    133133    X1 = NX - Xo;
    134134    Y1 = NY - Yo;
    135     fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
    136     fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
    137    
    138     /* fix rotate matrix */
    139     fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
    140     fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
    141     fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
    142     fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     135    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
     136    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
     137   
     138    /* fix rotate matrix */
     139    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
     140    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
     141    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
     142    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
    143143    PC11 = -pc11;
    144144    PC12 = -pc12;
    145145    PC21 = -pc21;
    146146    PC22 = -pc22;
    147     fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
    148     fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
    149     fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
    150     fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
     147    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
     148    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
     149    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
     150    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
    151151
    152152    free (in_buff);
    … …  
    155155
    156156  if (!strcasecmp (argv[2], "FLIPY")) {
    157     fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    158     fits_create_matrix (&buf[0].header, &buf[0].matrix);
     157    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     158    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    159159    out_buff = (float *)buf[0].matrix.buffer;
    160160    for (j = NY - 1; j > -1; j--) {
    … …  
    164164    }
    165165    /* fix reference pixel */
    166     fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
    167     fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     166    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
     167    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
    168168    X1 = Xo;
    169169    Y1 = NY - Yo;
    170     fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
    171     fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
    172    
    173     /* fix rotate matrix */
    174     fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
    175     fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
    176     fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
    177     fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     170    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
     171    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
     172   
     173    /* fix rotate matrix */
     174    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
     175    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
     176    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
     177    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
    178178    PC11 = pc11;
    179179    PC12 = -pc12;
    180180    PC21 = pc21;
    181181    PC22 = -pc22;
    182     fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
    183     fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
    184     fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
    185     fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
     182    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
     183    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
     184    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
     185    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
    186186
    187187    free (in_buff);
    … …  
    190190
    191191  if (!strcasecmp (argv[2], "FLIPX")) {
    192     fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    193     fits_create_matrix (&buf[0].header, &buf[0].matrix);
     192    gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     193    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    194194    out_buff = (float *)buf[0].matrix.buffer;
    195195    for (j = 0; j < NY; j++) {
    … …  
    199199    }
    200200    /* fix reference pixel */
    201     fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
    202     fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     201    gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
     202    gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
    203203    X1 = NX - Xo;
    204204    Y1 = Yo;
    205     fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
    206     fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
    207    
    208     /* fix rotate matrix */
    209     fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
    210     fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
    211     fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
    212     fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     205    gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
     206    gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
     207   
     208    /* fix rotate matrix */
     209    gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
     210    gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
     211    gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
     212    gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
    213213    PC11 = -pc11;
    214214    PC12 = pc12;
    215215    PC21 = -pc21;
    216216    PC22 = pc22;
    217     fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
    218     fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
    219     fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
    220     fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
     217    gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
     218    gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
     219    gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
     220    gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
    221221
    222222    free (in_buff);
    … …  
    242242
    243243  /* fix reference pixel */
    244   fits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
    245   fits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
     244  gfits_scan (&buf[0].header, "CRPIX1", "%lf", 1, &Xo);
     245  gfits_scan (&buf[0].header, "CRPIX2", "%lf", 1, &Yo);
    246246  /*
    247247  X1 = (Xo - dX)*CosAngle - (Yo - dY)*SinAngle;
    … …  
    250250  X1 = Xo*CosAngle - Yo*SinAngle + dX;
    251251  Y1 =  Xo*SinAngle + Yo*CosAngle + dY;
    252   fits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
    253   fits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
     252  gfits_modify (&buf[0].header, "CRPIX1", "%lf", 1, X1);
     253  gfits_modify (&buf[0].header, "CRPIX2", "%lf", 1, Y1);
    254254
    255255  /* fix rotate matrix */
    256   fits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
    257   fits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
    258   fits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
    259   fits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
     256  gfits_scan (&buf[0].header, "PC001001", "%lf", 1, &pc11);
     257  gfits_scan (&buf[0].header, "PC001002", "%lf", 1, &pc12);
     258  gfits_scan (&buf[0].header, "PC002001", "%lf", 1, &pc21);
     259  gfits_scan (&buf[0].header, "PC002002", "%lf", 1, &pc22);
    260260  PC11 = pc11*CosAngle - pc21*SinAngle;
    261261  PC12 = pc12*CosAngle - pc22*SinAngle;
    262262  PC21 = pc21*CosAngle + pc11*SinAngle;
    263263  PC22 = pc22*CosAngle + pc12*SinAngle;
    264   fits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
    265   fits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
    266   fits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
    267   fits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
     264  gfits_modify (&buf[0].header, "PC001001", "%le", 1, PC11);
     265  gfits_modify (&buf[0].header, "PC001002", "%le", 1, PC12);
     266  gfits_modify (&buf[0].header, "PC002001", "%le", 1, PC21);
     267  gfits_modify (&buf[0].header, "PC002002", "%le", 1, PC22);
    268268
    269269  buf[0].header.Naxis[0] = Lx;
    270270  buf[0].header.Naxis[1] = Ly;
    271   fits_modify (&buf[0].header, "NAXIS1", "%d", 1, Lx);
    272   fits_modify (&buf[0].header, "NAXIS2", "%d", 1, Ly);
    273   fits_create_matrix (&buf[0].header, &buf[0].matrix);
    274   fits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     271  gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, Lx);
     272  gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, Ly);
     273  gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     274  gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    275275  out_buff = (float *)buf[0].matrix.buffer;
    276276  for (j = 0; j < Ly; j++) {

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

    r2598 r7080  
    3434
    3535  /* create an output matrix buffer with desired nx, ny */
    36   fits_free_matrix (&out[0].matrix);
    37   fits_free_header (&out[0].header);
     36  gfits_free_matrix (&out[0].matrix);
     37  gfits_free_header (&out[0].header);
    3838
    3939  out[0].bitpix = y1[0].bitpix;
    … …  
    4141  out[0].bscale = y1[0].bscale;
    4242  out[0].bzero  = y1[0].bzero;
    43   fits_copy_header (&y1[0].header, &out[0].header);
    44   fits_modify (&out[0].header, "NAXIS1", "%d", 1, nx);
    45   fits_modify (&out[0].header, "NAXIS2", "%d", 1, ny);
     43  gfits_copy_header (&y1[0].header, &out[0].header);
     44  gfits_modify (&out[0].header, "NAXIS1", "%d", 1, nx);
     45  gfits_modify (&out[0].header, "NAXIS2", "%d", 1, ny);
    4646
    4747  out[0].header.Naxis[0] = nx;
    4848  out[0].header.Naxis[1] = ny;
    49   fits_create_matrix (&out[0].header, &out[0].matrix);
     49  gfits_create_matrix (&out[0].header, &out[0].matrix);
    5050  if ((y1[0].file[0] != '*') && (y1[0].file[0] != '(')) {
    5151    sprintf (out[0].file, "*%s", y1[0].file);

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

    r2598 r7080  
    2626  out[0].bscale = in[0].bscale;
    2727  out[0].bzero  = in[0].bzero;
    28   fits_copy_matrix_info (&in[0].matrix, &out[0].matrix);
    29   fits_copy_header (&in[0].header, &out[0].header);
    30   fits_create_matrix (&out[0].header, &out[0].matrix);
     28  gfits_copy_matrix_info (&in[0].matrix, &out[0].matrix);
     29  gfits_copy_header (&in[0].header, &out[0].header);
     30  gfits_create_matrix (&out[0].header, &out[0].matrix);
    3131
    3232  xdir = FALSE;

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

    r5850 r7080  
    11# include "data.h"
    2 # define NCOLORS 9
    3 static char colors[9][10] = {"black", "white", "red", "orange", "yellow", "green", "blue", "indigo", "violet"};
    42
    53int style (int argc, char **argv) {
    64 
    7   int N, Ngraph;
    85  Graphdata graphmode;
    96
    10   Ngraph = -1;
    11   if ((N = get_argument (argc, argv, "-n"))) {
    12     remove_argument (N, &argc, argv);
    13     Ngraph = atof (argv[N]);
    14     remove_argument (N, &argc, argv);
    15   }
    16   if (!GetGraph (&graphmode, NULL, &Ngraph)) return (FALSE);
    17 
    18   if (argc == 1) {
    19     fprintf (stderr, "current style (%d): -x %d -c %s -pt %d -lt %d -lw %f -sz %f\n", Ngraph,
    20              graphmode.style, colors[graphmode.color], graphmode.ptype,
    21              graphmode.ltype, graphmode.lweight,
    22              graphmode.size);
    23     return (TRUE);
    24   }
    25 
    26   if ((N = get_argument (argc, argv, "-lt"))) {
    27     remove_argument (N, &argc, argv);
    28     graphmode.ltype = atof(argv[N]);
    29     remove_argument (N, &argc, argv);
    30   }
    31   if ((N = get_argument (argc, argv, "-lw"))) {
    32     remove_argument (N, &argc, argv);
    33     graphmode.lweight = atof(argv[N]);
    34     remove_argument (N, &argc, argv);
    35   }
    36   if ((N = get_argument (argc, argv, "-pt"))) {
    37     remove_argument (N, &argc, argv);
    38     graphmode.ptype = atof(argv[N]);
    39     remove_argument (N, &argc, argv);
    40   }
    41   if ((N = get_argument (argc, argv, "+eb"))) {
    42     remove_argument (N, &argc, argv);
    43     graphmode.ebar = TRUE;
    44   }
    45   if ((N = get_argument (argc, argv, "-eb"))) {
    46     remove_argument (N, &argc, argv);
    47     graphmode.ebar = FALSE;
    48   }
    49   if ((N = get_argument (argc, argv, "-sz"))) {
    50     remove_argument (N, &argc, argv);
    51     graphmode.size = atof(argv[N]);
    52     remove_argument (N, &argc, argv);
    53   }
    54   if ((N = get_argument (argc, argv, "-c"))) {
    55     remove_argument (N, &argc, argv);
    56     graphmode.color = KapaColorByName (argv[N]);
    57     if (graphmode.color == -1) return (FALSE);
    58     remove_argument (N, &argc, argv);
    59   }
    60   if ((N = get_argument (argc, argv, "-x"))) {
    61     remove_argument (N, &argc, argv);
    62     graphmode.style = atof(argv[N]);
    63     remove_argument (N, &argc, argv);
    64   }
    65 
    66   SetGraph (graphmode);
     7  if (!style_args (&graphmode, &argc, argv, -1)) return FALSE;
    678
    689  if (argc > 1) {
    … …  
    7011    return (FALSE);
    7112  }
     13  SetGraph (graphmode);
    7214
    7315  return (TRUE);
    74 
    7516}
    76 

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

    r2598 r7080  
    5353
    5454  if ((obuf = SelectBuffer (argv[2], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    55   fits_free_matrix (&obuf[0].matrix);
    56   fits_free_header (&obuf[0].header);
     55  gfits_free_matrix (&obuf[0].matrix);
     56  gfits_free_header (&obuf[0].header);
    5757
    5858  obuf[0].bitpix = ibuf[0].bitpix;
    … …  
    6262  /* strcpy (obuf[0].name, ibuf[0].name); */
    6363  strcpy (obuf[0].file, ibuf[0].file);
    64   fits_copy_header (&ibuf[0].header, &obuf[0].header);
    65   fits_modify (&obuf[0].header, "NAXIS1", "%d", 1, Nx);
    66   fits_modify (&obuf[0].header, "NAXIS2", "%d", 1, Ny);
     64  gfits_copy_header (&ibuf[0].header, &obuf[0].header);
     65  gfits_modify (&obuf[0].header, "NAXIS1", "%d", 1, Nx);
     66  gfits_modify (&obuf[0].header, "NAXIS2", "%d", 1, Ny);
    6767  obuf[0].header.Naxis[0] = Nx;
    6868  obuf[0].header.Naxis[1] = Ny;
    69   fits_create_matrix (&obuf[0].header, &obuf[0].matrix);
     69  gfits_create_matrix (&obuf[0].header, &obuf[0].matrix);
    7070
    7171  for (j = 0; j < ny; j++) {

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

    r2598 r7080  
    2020
    2121  /* U is Nx, Ny */
    22   fits_free_matrix (&Mu[0].matrix);
    23   fits_free_header (&Mu[0].header);
     22  gfits_free_matrix (&Mu[0].matrix);
     23  gfits_free_header (&Mu[0].header);
    2424  Mu[0].bitpix = Ma[0].bitpix;
    2525  Mu[0].unsign = Ma[0].unsign;
    2626  Mu[0].bscale = Ma[0].bscale;
    2727  Mu[0].bzero  = Ma[0].bzero;
    28   fits_copy_header (&Ma[0].header, &Mu[0].header);
    29   fits_create_matrix (&Mu[0].header, &Mu[0].matrix);
     28  gfits_copy_header (&Ma[0].header, &Mu[0].header);
     29  gfits_create_matrix (&Mu[0].header, &Mu[0].matrix);
    3030 
    3131  /* V is Nx, Nx */
    32   fits_free_matrix (&Mv[0].matrix);
    33   fits_free_header (&Mv[0].header);
     32  gfits_free_matrix (&Mv[0].matrix);
     33  gfits_free_header (&Mv[0].header);
    3434  Mv[0].bitpix = Ma[0].bitpix;
    3535  Mv[0].unsign = Ma[0].unsign;
    3636  Mv[0].bscale = Ma[0].bscale;
    3737  Mv[0].bzero  = Ma[0].bzero;
    38   fits_copy_header (&Ma[0].header, &Mv[0].header);
    39   fits_modify (&Mv[0].header, "NAXIS2", "%d", 1, Nx);
     38  gfits_copy_header (&Ma[0].header, &Mv[0].header);
     39  gfits_modify (&Mv[0].header, "NAXIS2", "%d", 1, Nx);
    4040  Mv[0].header.Naxis[1] = Nx;
    41   fits_create_matrix (&Mv[0].header, &Mv[0].matrix);
     41  gfits_create_matrix (&Mv[0].header, &Mv[0].matrix);
    4242
    4343  /* w is Nx */

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

    r2598 r7080  
    5050  free (bf[0].header.buffer);  /* ALLOCATEd in SelectBuffer */
    5151  free (bf[0].matrix.buffer);  /* ALLOCATEd in SelectBuffer */
    52   fits_create_header (&bf[0].header);
    53   fits_create_matrix (&bf[0].header, &bf[0].matrix);
     52  gfits_create_header (&bf[0].header);
     53  gfits_create_matrix (&bf[0].header, &bf[0].matrix);
    5454
    5555  ALLOCATE (val, float, Nx*Ny);

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

    r4689 r7080  
    8080  memcpy (temp_header.buffer, buf[0].header.buffer, temp_header.size);
    8181
    82   if (temp_header.Naxes) fits_convert_format (&temp_header, &temp_matrix, outBitpix, outScale, outZero, outUnsign);
     82  if (temp_header.Naxes) gfits_convert_format (&temp_header, &temp_matrix, outBitpix, outScale, outZero, outUnsign);
    8383
    8484  if (Extend) {
    … …  
    8888
    8989    /* assume failure means non-existent file */
    90     if (!fits_read_header (argv[2], &Xhead)) {
     90    if (!gfits_read_header (argv[2], &Xhead)) {
    9191
    9292      Xhead.simple = TRUE;
    … …  
    9999      Xhead.unsign = FALSE;
    100100     
    101       fits_create_header (&Xhead);
    102       fits_modify (&Xhead, "NEXTEND", "%d", 1, 0);
     101      gfits_create_header (&Xhead);
     102      gfits_modify (&Xhead, "NEXTEND", "%d", 1, 0);
    103103      f = fopen (argv[2], "w");
    104104      fclose (f);
    105105    }
    106106
    107     fits_modify (&Xhead, "EXTEND", "%t", 1, TRUE);
     107    gfits_modify (&Xhead, "EXTEND", "%t", 1, TRUE);
    108108
    109109    Nextend = 0;
    110     fits_scan (&Xhead, "NEXTEND", "%d", 1, &Nextend);
     110    gfits_scan (&Xhead, "NEXTEND", "%d", 1, &Nextend);
    111111    Nextend ++;
    112     fits_modify (&Xhead, "NEXTEND", "%d", 1, Nextend);
     112    gfits_modify (&Xhead, "NEXTEND", "%d", 1, Nextend);
    113113
    114114    /* write the main header to the start of the file */
    … …  
    149149    }
    150150    /* write the matrix buffer (automatically goes to end of file */
    151     if (!fits_write_matrix (argv[2], &temp_matrix)) {
     151    if (!gfits_write_matrix (argv[2], &temp_matrix)) {
    152152      fprintf (stderr, "failed to write file\n");
    153153      status = FALSE;
    … …  
    156156    status = TRUE;
    157157  done1:
    158     fits_free_header (&Xhead);
    159     fits_free_header (&temp_header);
    160     fits_free_matrix (&temp_matrix);
     158    gfits_free_header (&Xhead);
     159    gfits_free_header (&temp_header);
     160    gfits_free_matrix (&temp_matrix);
    161161    return (status);
    162162  }
    163163 
    164164  /* the actual write-to-disk goes here */
    165   if (!fits_write_header (argv[2], &temp_header)) {
     165  if (!gfits_write_header (argv[2], &temp_header)) {
    166166    fprintf (stderr, "failed to write header\n");
    167     fits_free_header (&temp_header);
    168     fits_free_matrix (&temp_matrix);
     167    gfits_free_header (&temp_header);
     168    gfits_free_matrix (&temp_matrix);
    169169    return (FALSE);
    170170  }
    171171 
    172   if (!fits_write_matrix (argv[2], &temp_matrix)) {
     172  if (!gfits_write_matrix (argv[2], &temp_matrix)) {
    173173    fprintf (stderr, "failed to write matrix\n");
    174     fits_free_header (&temp_header);
    175     fits_free_matrix (&temp_matrix);
     174    gfits_free_header (&temp_header);
     175    gfits_free_matrix (&temp_matrix);
    176176    return (FALSE);
    177177  }
    178178
    179   fits_free_header (&temp_header);
    180   fits_free_matrix (&temp_matrix);
     179  gfits_free_header (&temp_header);
     180  gfits_free_matrix (&temp_matrix);
    181181 
    182182  return (TRUE);
Note: See TracChangeset for help on using the changeset viewer.