IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 24, 2010, 11:22:25 AM (16 years ago)
Author:
eugene
Message:

large update merging in changes for Ohana to support large files

Location:
trunk/Ohana
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

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

    r14590 r27435  
    4747    gprint (GP_ERR, "failed to set interactive timout\n");
    4848    gprint (GP_ERR, "%s\n", mysql_error (connection));
    49     free (query);
    5049    return (FALSE);
    5150  }
    … …  
    5756    gprint (GP_ERR, "failed to set wait timout\n");
    5857    gprint (GP_ERR, "%s\n", mysql_error (connection));
    59     free (query);
    6058    return (FALSE);
    6159  }
    … …  
    7169    gprint (GP_ERR, "failed to get timout\n");
    7270    gprint (GP_ERR, "%s\n", mysql_error (connection));
    73     free (query);
    7471    return (FALSE);
    7572  }
    … …  
    8481    gprint (GP_ERR, "failed to get timout\n");
    8582    gprint (GP_ERR, "%s\n", mysql_error (connection));
    86     free (query);
    8783    return (FALSE);
    8884  }

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

    r26884 r27435  
    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  %d x %d\n", Nx, Ny,
    73                out[0].header.Naxis[0], out[0].header.Naxis[1]);
     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]);
    7474      return (FALSE);
    7575    }

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

    r7917 r27435  
    107107      }
    108108      ivalue = !strcasecmp (line, "T");
    109       gfits_modify (&buf[0].header, argv[2], "%t", 1, ivalue);
     109      gfits_modify_alt (&buf[0].header, argv[2], "%t", 1, ivalue);
    110110      return (TRUE);
    111111    case KEYCOMMENT:
    112       gfits_modify (&buf[0].header, argv[2], "%C", 1, line);
     112      gfits_modify_alt (&buf[0].header, argv[2], "%C", 1, line);
    113113      return (TRUE);
    114114    case COMMENT:
    115       gfits_modify (&buf[0].header, argv[2], "%S", 0, line);
     115      gfits_modify_alt (&buf[0].header, argv[2], "%S", 0, line);
    116116      return (TRUE);
    117117    }
    … …  
    135135
    136136  if (ascomment) {
    137     status = gfits_scan (&buf[0].header, argv[2], "%C", 1, line);
     137    status = gfits_scan_alt (&buf[0].header, argv[2], "%C", 1, line);
    138138    if (!status) goto failure;
    139139    if (argc == 4)

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

    r7917 r27435  
    4949    gfits_modify (&buf[0].header, "BSCALE", "%lf", 1, bscale);
    5050    gfits_modify (&buf[0].header, "BZERO",  "%lf", 1, bzero);
    51     gfits_modify (&buf[0].header, "UNSIGN", "%t",  1, unsign);
     51    gfits_modify_alt (&buf[0].header, "UNSIGN", "%t",  1, unsign);
    5252   
    5353  } else {

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

    r26891 r27435  
    2323
    2424    if (bufB[0].matrix.Naxis[0] != bufC[0].matrix.Naxis[1]) {
    25       gprint (GP_ERR, "size mis-match in matrices: (%d x %d) * (%d x %d)\n",
    26               bufB[0].matrix.Naxis[0], bufB[0].matrix.Naxis[1],
    27               bufC[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]);
    2828      return (FALSE);
    2929    }

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

    r20652 r27435  
    153153    buf[0].header.Naxes = 0;
    154154    ALLOCATE (buf[0].matrix.buffer, char, 1);
    155     buf[0].matrix.size = 0;
     155    buf[0].matrix.datasize = 0;
    156156    buf[0].bitpix = 16;
    157157    buf[0].bzero = 0;
    … …  
    222222  buf[0].unsign = buf[0].header.unsign;
    223223
    224   gprint (GP_LOG, "read %d bytes from %s into buffer %s\n",
    225            buf[0].header.size + buf[0].matrix.size, argv[2], argv[1]);
     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]);
    226226
    227227  blank = 0xffff;

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

    r20652 r27435  
    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 %d bytes from %s into buffer %s\n",
    65            buf[0].header.size + buf[0].matrix.size, argv[2], argv[1]);
     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]);
    6665
    6766  gfits_scan (&buf[0].header, "BLANK", "%d", 1, &blank);

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

    r20936 r27435  
    5757    return (FALSE);
    5858  }
    59   fseek (f, 0, SEEK_SET);
     59  fseeko (f, 0LL, SEEK_SET);
    6060
    6161  Nvec = (argc - 1) / 2;
    … …  
    159159int read_table_vectors (int argc, char **argv, char *extname) {
    160160
    161   int i, j, k, N, Nbytes, Nextend, Ny, Binary, vecType;
     161  off_t Nbytes;
     162  int i, j, k, N, Nextend, Ny, Binary, vecType;
    162163  char type[16], ID[80], *CCDKeyword;
    163164  FTable table;
    … …  
    184185
    185186  if (f == NULL) ESCAPE ("file not found");
    186   fseek (f, 0, SEEK_SET);
     187  fseeko (f, 0LL, SEEK_SET);
    187188  table.header = &header;
    188189
    … …  
    193194    if (!gfits_load_header (f, &header)) ESCAPE ("error reading primary header for file");
    194195    Nbytes = gfits_data_size (&header);
    195     fseek (f, Nbytes, SEEK_CUR);
     196    fseeko (f, Nbytes, SEEK_CUR);
    196197    gfits_free_header (&header);
    197198
    … …  
    200201      Nbytes = gfits_data_size (&header);
    201202      /* skip the prior data buffers */
    202       fseek (f, Nbytes, SEEK_CUR);
     203      fseeko (f, Nbytes, SEEK_CUR);
    203204      gfits_free_header (&header);
    204205    }
    … …  
    215216
    216217    while (1) {
    217       if (!gfits_load_header (f, &header)) ESCAPE ("extensio not found in file");
     218      if (!gfits_load_header (f, &header)) ESCAPE ("extension not found in file");
    218219      Nbytes = gfits_data_size (&header);
    219220
    220221      if (!gfits_scan (&header, CCDKeyword, "%s", 1, ID)) {
    221         fseek (f, Nbytes, SEEK_CUR);
     222        fseeko (f, Nbytes, SEEK_CUR);
    222223        gfits_free_header (&header);
    223224        continue;
    224225      }
    225226      if (strcmp (ID, extname)) {
    226         fseek (f, Nbytes, SEEK_CUR);
     227        fseeko (f, Nbytes, SEEK_CUR);
    227228        gfits_free_header (&header);
    228229        continue;

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

    r21064 r27435  
    6363    }     
    6464  }
    65   if (VERBOSE) gprint (GP_LOG, "rebin %s to %s (%d,%d to %d,%d)\n", argv[1], argv[2], in[0].header.Naxis[0], in[0].header.Naxis[1], nx, ny);
     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);
    6666
    6767  Nx = in[0].header.Naxis[0];

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

    r25757 r27435  
    33int relocate (int argc, char **argv) {
    44
    5   char *end;
    65  int x, y;
    76  int N, kapa;

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

    r25584 r27435  
    4343    gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
    4444    gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
    45     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     45    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    4646    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    4747    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    8282    gfits_modify (&buf[0].header, "NAXIS1", "%d", 1, NY);
    8383    gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, NX);
    84     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     84    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    8585    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    8686    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    120120
    121121  if (!strcasecmp (argv[2], "UPSIDE") || (atof (argv[2]) == -180) || (atof (argv[2]) == 180)) {
    122     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     122    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    123123    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    124124    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    155155
    156156  if (!strcasecmp (argv[2], "FLIPY")) {
    157     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     157    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    158158    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    159159    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    190190
    191191  if (!strcasecmp (argv[2], "FLIPX")) {
    192     gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     192    gfits_print_alt (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
    193193    gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    194194    out_buff = (float *)buf[0].matrix.buffer;
    … …  
    272272  gfits_modify (&buf[0].header, "NAXIS2", "%d", 1, Ly);
    273273  gfits_create_matrix (&buf[0].header, &buf[0].matrix);
    274   gfits_print  (&buf[0].header, "HISTORY", "%S", 1, "WARNING: rotated image!");
     274  gfits_print_alt (&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/test/dimendown.sh

    r16056 r27435  
    4242 $startmem = $word:1
    4343
    44  for i 0 1000
     44 for i 0 10000
    4545  dimendown timg val
    4646  dimendown timg xc -x
    … …  
    5353 $PASS = 1
    5454
    55  if ($endmem - $startmem > 10)
     55 if ($endmem - $startmem > 128)
    5656   $PASS = 0
    5757   echo "growth: {$endmem-$startmem}"

  • trunk/Ohana/src/opihi/cmd.data/test/integrate.sh

    r16056 r27435  
    4040 $PASS = 1
    4141
    42  if ($endmem - $startmem > 10)
     42 if ($endmem - $startmem > 128)
    4343   $PASS = 0
    4444   echo "growth: {$endmem-$startmem}"

  • trunk/Ohana/src/opihi/cmd.data/test/interpolate.sh

    r16056 r27435  
    4141 $PASS = 1
    4242
    43  if ($endmem - $startmem > 10)
     43 if ($endmem - $startmem > 128)
    4444   $PASS = 0
    4545   echo "growth: {$endmem-$startmem}"

  • trunk/Ohana/src/opihi/cmd.data/test/periodogram.sh

    r16465 r27435  
    136136 $PASS = 1
    137137
    138  if ($endmem - $startmem > 10)
     138 if ($endmem - $startmem > 180)
    139139   $PASS = 0
    140140   echo "growth: {$endmem-$startmem}"

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

    r20652 r27435  
    7575  /* save the (float) version, write out a temporary buffer */
    7676  temp_matrix = buf[0].matrix;
    77   ALLOCATE (temp_matrix.buffer, char, MAX(1, temp_matrix.size));
    78   memcpy (temp_matrix.buffer, buf[0].matrix.buffer, temp_matrix.size);
     77  ALLOCATE (temp_matrix.buffer, char, MAX(1, temp_matrix.datasize));
     78  memcpy (temp_matrix.buffer, buf[0].matrix.buffer, temp_matrix.datasize);
    7979  temp_header = buf[0].header;
    80   ALLOCATE (temp_header.buffer, char, MAX(1, temp_header.size));
    81   memcpy (temp_header.buffer, buf[0].header.buffer, temp_header.size);
     80  ALLOCATE (temp_header.buffer, char, MAX(1, temp_header.datasize));
     81  memcpy (temp_header.buffer, buf[0].header.buffer, temp_header.datasize);
    8282
    8383  if (temp_header.Naxes) {
    … …  
    8888    gfits_modify (&temp_header, "BSCALE", "%lf", 1, outScale);
    8989    gfits_modify (&temp_header, "BZERO",  "%lf", 1, outZero);
    90     gfits_modify (&temp_header, "UNSIGN", "%t", 1, outUnsign);
     90    gfits_modify_alt (&temp_header, "UNSIGN", "%t", 1, outUnsign);
    9191  }
    9292
    … …  
    9494    Header Xhead;
    9595    FILE *f;
     96    off_t nbytes;
    9697    int status, Nextend;
    9798
    … …  
    109110    }
    110111
    111     gfits_modify (&Xhead, "EXTEND", "%t", 1, TRUE);
     112    gfits_modify_alt (&Xhead, "EXTEND", "%t", 1, TRUE);
    112113
    113114    Nextend = 0;
    … …  
    125126   
    126127    /* position to begining of file to write header */
    127     fseek (f, 0, SEEK_SET);
    128     status = fwrite (Xhead.buffer, 1, Xhead.size, f);
    129     if (status != Xhead.size) {
     128    fseeko (f, 0LL, SEEK_SET);
     129    nbytes = fwrite (Xhead.buffer, 1, Xhead.datasize, f);
     130    if (nbytes != Xhead.datasize) {
    130131      gprint (GP_ERR, "ERROR: failed writing data to image header\n");
    131132      status = FALSE;
    … …  
    144145
    145146    /* position to end of file to write new extend */
    146     fseek (f, 0, SEEK_END);
    147     status = fwrite (temp_header.buffer, 1, temp_header.size, f);
     147    fseeko (f, 0LL, SEEK_END);
     148    nbytes = fwrite (temp_header.buffer, 1, temp_header.datasize, f);
    148149    fclose (f);
    149     if (status != temp_header.size) {
     150    if (nbytes != temp_header.datasize) {
    150151      gprint (GP_ERR, "failed to write file\n");
    151152      status = FALSE;
Note: See TracChangeset for help on using the changeset viewer.