IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 9275


Ignore:
Timestamp:
Oct 4, 2006, 4:29:10 PM (20 years ago)
Author:
eugene
Message:

cleanup the CreateBuffer function and use, fix buffer init

Location:
trunk/Ohana/src/opihi
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/cmd.astro/imfit.c

    r7917 r9275  
    138138    free (out[0].header.buffer);
    139139    free (out[0].matrix.buffer);
     140
    140141    strcpy (out[0].file, "(empty)");
    141     out[0].header.bitpix = -32;
    142     out[0].header.bscale = 1.0;
    143     out[0].header.bzero  = 0.0;
    144     out[0].header.unsign = FALSE;
    145     out[0].header.Naxes = 2;
    146     out[0].header.Naxis[0] = 2*nx;
    147     out[0].header.Naxis[1] = 2*ny;
    148     CreateBuffer (out);
     142    CreateBuffer (out, 2*nx, 2*ny, -32, 0.0, 1.0);
    149143
    150144    /* four panels: 1) raw image. 2) fit  3) raw - fit   4) ?? */

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

    r7917 r9275  
    11# include "data.h"
    2 
    3 int imcreate (int argc, char **argv);
    42
    53int create (int argc, char **argv) {
    … …  
    86  float start, end, delta;
    97  Vector *vec;
    10  
    11   if ((N = get_argument (argc, argv, "-image"))) {
    12     remove_argument (N, &argc, argv);
    13     return (imcreate (argc, argv));
    14   }
    158 
    169  if ((argc != 5) && (argc != 4)) {
    … …  
    4336  return (TRUE);
    4437}
    45 
    46 
    47 int imcreate (int argc, char **argv) {
    48  
    49   Buffer *buf;
    50 
    51   if (argc != 4) {
    52     gprint (GP_ERR, "USAGE: create -image buffer Nx Ny\n");
    53     return (FALSE);
    54   }
    55 
    56   if ((buf = SelectBuffer (argv[1], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    57   gfits_free_matrix (&buf[0].matrix);
    58   gfits_free_header (&buf[0].header);
    59 
    60   buf[0].bitpix = 16;
    61   buf[0].unsign = FALSE;
    62   buf[0].bscale = 1.0;
    63   buf[0].bzero  = 0x8000;
    64 
    65   buf[0].header.bitpix = -32;
    66   buf[0].header.unsign = FALSE;
    67   buf[0].header.bscale = 1.0;
    68   buf[0].header.bzero  = 0.0;
    69 
    70   buf[0].header.Naxes = 2;
    71   buf[0].header.Naxis[0] = atoi (argv[2]);
    72   buf[0].header.Naxis[1] = atoi (argv[3]);
    73 
    74   gfits_create_header (&buf[0].header);
    75   gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    76 
    77   return (TRUE);
    78 
    79 }

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

    r8873 r9275  
    2424  }
    2525
    26   buf[0].matrix.Naxis[0] = Nx;
    27   buf[0].matrix.Naxis[1] = Ny;
    28 
    29   /* I should encapsulate this in a create_default_buffer */
    3026  gfits_free_matrix (&buf[0].matrix);
    3127  gfits_free_header (&buf[0].header);
    32   buf[0].header.bitpix = buf[0].bitpix = -32;
    33   buf[0].header.unsign = buf[0].unsign = FALSE;
    34   buf[0].header.bscale = buf[0].bscale = 1.0;
    35   buf[0].header.bzero  = buf[0].bzero  = 0.0;
    36   buf[0].header.Naxes = 2;
    37   buf[0].header.Naxis[0] = Nx;
    38   buf[0].header.Naxis[1] = Ny;
    39   gfits_create_header (&buf[0].header);
    40   gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     28  CreateBuffer (buf, Nx, Ny, -32, 0.0, 1.0);
    4129
    4230  out = (float *) buf[0].matrix.buffer;

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

    r7917 r9275  
    4040  Ny = (Ymax - Ymin) / dY + 1;
    4141 
    42   /* these steps are a standard 'createbuffer', define? */
    43   bf[0].bitpix = -32;
    44   bf[0].unsign = FALSE;
    45   bf[0].bscale = 1.0;
    46   bf[0].bzero  = 0.0;
     42  gfits_free_matrix (&bf[0].matrix);
     43  gfits_free_header (&bf[0].header);
     44  CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0);
    4745  strcpy (bf[0].file, "(empty)");
    48 
    49   bf[0].header.bitpix = bf[0].bitpix;
    50   bf[0].header.bscale = bf[0].bscale;
    51   bf[0].header.bzero  = bf[0].bzero;
    52   bf[0].header.unsign = bf[0].unsign;
    53   bf[0].header.Naxes = 2;
    54   bf[0].header.Naxis[0] = Nx;
    55   bf[0].header.Naxis[1] = Ny;
    56   free (bf[0].header.buffer);  /* ALLOCATEd in SelectBuffer */
    57   free (bf[0].matrix.buffer);  /* ALLOCATEd in SelectBuffer */
    58   gfits_create_header (&bf[0].header);
    59   gfits_create_matrix (&bf[0].header, &bf[0].matrix);
    6046
    6147  ALLOCATE (val, float, Nx*Ny);

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

    r7917 r9275  
    1515  Ny = atof (argv[3]);
    1616
    17   buf[0].matrix.Naxis[0] = Nx;
    18   buf[0].matrix.Naxis[1] = Ny;
    19 
    2017  /* I should encapsulate this in a create_default_buffer */
    2118  gfits_free_matrix (&buf[0].matrix);
    2219  gfits_free_header (&buf[0].header);
    23   buf[0].header.bitpix = buf[0].bitpix = -32;
    24   buf[0].header.unsign = buf[0].unsign = FALSE;
    25   buf[0].header.bscale = buf[0].bscale = 1.0;
    26   buf[0].header.bzero  = buf[0].bzero  = 0.0;
    27   buf[0].header.Naxes = 2;
    28   buf[0].header.Naxis[0] = Nx;
    29   buf[0].header.Naxis[1] = Ny;
    30   gfits_create_header (&buf[0].header);
    31   gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     20  CreateBuffer (buf, Nx, Ny, -32, 1.0, 0.0);
    3221  return (TRUE);
    33 
    3422}
    35 
    36 

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

    r7917 r9275  
    3434  Ny = (Ymax - Ymin) / dY + 1;
    3535 
    36   /* these steps are a standard 'createbuffer', define? */
    37   bf[0].bitpix = -32;
    38   bf[0].unsign = FALSE;
    39   bf[0].bscale = 1.0;
    40   bf[0].bzero  = 0.0;
     36  gfits_free_matrix (&bf[0].matrix);
     37  gfits_free_header (&bf[0].header);
     38  CreateBuffer (bf, Nx, Ny, -32, 0.0, 1.0);
    4139  strcpy (bf[0].file, "(empty)");
    42 
    43   bf[0].header.bitpix = bf[0].bitpix;
    44   bf[0].header.bscale = bf[0].bscale;
    45   bf[0].header.bzero  = bf[0].bzero;
    46   bf[0].header.unsign = bf[0].unsign;
    47   bf[0].header.Naxes = 2;
    48   bf[0].header.Naxis[0] = Nx;
    49   bf[0].header.Naxis[1] = Ny;
    50   free (bf[0].header.buffer);  /* ALLOCATEd in SelectBuffer */
    51   free (bf[0].matrix.buffer);  /* ALLOCATEd in SelectBuffer */
    52   gfits_create_header (&bf[0].header);
    53   gfits_create_matrix (&bf[0].header, &bf[0].matrix);
    5440
    5541  ALLOCATE (val, float, Nx*Ny);

  • trunk/Ohana/src/opihi/dimm/camera.c

    r7917 r9275  
    107107    gfits_free_matrix (&buf[0].matrix);
    108108    gfits_free_header (&buf[0].header);
    109     buf[0].header.bitpix = buf[0].bitpix = 16;
    110     buf[0].header.unsign = buf[0].unsign = FALSE;
    111     buf[0].header.bscale = buf[0].bscale = 1.0;
    112     buf[0].header.bzero  = buf[0].bzero  = 0.0;
    113     buf[0].header.Naxes = 2;
    114     buf[0].header.Naxis[0] = dx;
    115     buf[0].header.Naxis[1] = dy;
    116     gfits_create_header (&buf[0].header);
    117     gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     109    CreateBuffer (buf, dx, dy, -32, 0.0, 1.0);
     110    strcpy (buf[0].file, "(empty)");
    118111
    119112    ReadOut (x, y, dx, dy, 1, buf[0].matrix.buffer);

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

    r8455 r9275  
    138138  /* output is a named buffer */
    139139  if ((buf = SelectBuffer (argv[1], ANYVECTOR, TRUE)) == NULL) goto usage;
    140   buf[0].matrix.Naxis[0] = NP;
    141   buf[0].matrix.Naxis[1] = NP;
    142 
    143   /* I should encapsulate this in a create_default_buffer */
     140
    144141  gfits_free_matrix (&buf[0].matrix);
    145142  gfits_free_header (&buf[0].header);
    146   buf[0].header.bitpix = buf[0].bitpix = -32;
    147   buf[0].header.unsign = buf[0].unsign = FALSE;
    148   buf[0].header.bscale = buf[0].bscale = 1.0;
    149   buf[0].header.bzero  = buf[0].bzero  = 0.0;
    150   buf[0].header.Naxes = 2;
    151   buf[0].header.Naxis[0] = NP;
    152   buf[0].header.Naxis[1] = NP;
    153   gfits_create_header (&buf[0].header);
    154   gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     143  CreateBuffer (buf, NP, NP, -32, 0.0, 1.0);
     144  strcpy (buf[0].file, "(empty)");
     145
    155146  out = (float *) buf[0].matrix.buffer;
    156147  /* we set a default flag value of -1 */

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

    r7917 r9275  
    7575  Ny = 180/pixscale;
    7676
    77   buf[0].matrix.Naxis[0] = Nx;
    78   buf[0].matrix.Naxis[1] = Ny;
    79 
    80   /* I should encapsulate this in a create_default_buffer */
    8177  gfits_free_matrix (&buf[0].matrix);
    8278  gfits_free_header (&buf[0].header);
    83   buf[0].header.bitpix = buf[0].bitpix = -32;
    84   buf[0].header.unsign = buf[0].unsign = FALSE;
    85   buf[0].header.bscale = buf[0].bscale = 1.0;
    86   buf[0].header.bzero  = buf[0].bzero  = 0.0;
    87   buf[0].header.Naxes = 2;
    88   buf[0].header.Naxis[0] = Nx;
    89   buf[0].header.Naxis[1] = Ny;
    90   gfits_create_header (&buf[0].header);
    91   gfits_create_matrix (&buf[0].header, &buf[0].matrix);
     79  CreateBuffer (buf, Nx, Ny, -32, 0.0, 1.0);
     80  strcpy (buf[0].file, "(empty)");
    9281
    9382  coords.crval1 = 180;

  • trunk/Ohana/src/opihi/include/dvomath.h

    r8134 r9275  
    105105int           IsBufferPtr           PROTO((Buffer *buf));
    106106int           PrintBuffers          PROTO((int Long));
    107 int           CreateBuffer          PROTO((Buffer *buf));
     107int           CreateBuffer          PROTO((Buffer *buf, int Nx, int Ny, int bitpix, float bzero, float bscale));
    108108Buffer       *SelectBuffer          PROTO((char *name, int mode, int verbose));
    109109void          dump_buffers          PROTO((int n));  /* deprecated? */

  • trunk/Ohana/src/opihi/lib.shell/BufferOps.c

    r7917 r9275  
    6969}
    7070
    71 int CreateBuffer (Buffer *buf) {
     71int CreateBuffer (Buffer *buf, int Nx, int Ny, int bitpix, float bzero, float bscale) {
    7272
    7373  /* store the default output values */
    74   buf[0].bitpix = buf[0].header.bitpix;
    75   buf[0].unsign = buf[0].header.unsign;
    76   buf[0].bzero  = buf[0].header.bzero;
    77   buf[0].bscale = buf[0].header.bscale;
    78  
     74  gfits_init_header (&buf[0].header);
     75
    7976  /* assign the necessary internal values */
    8077  buf[0].header.bitpix   = -32;
    … …  
    8279  buf[0].header.bzero    = 0;
    8380  buf[0].header.bscale   = 1;
     81 
     82  buf[0].header.Naxes = 2;
     83  buf[0].header.Naxis[0] = Nx;
     84  buf[0].header.Naxis[1] = Ny;
     85
     86  buf[0].bitpix = bitpix;
     87  buf[0].unsign = FALSE;
     88  buf[0].bzero  = bzero;
     89  buf[0].bscale = bscale;
    8490 
    8591  /* make some test of the validity of the values */
Note: See TracChangeset for help on using the changeset viewer.