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:
94 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

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

    r17282 r27435  
    44# define dSIN(A)   ((double) sin ((double)RAD_DEG*A))
    55
     6int HD_to_AZ(double *alt, double *az, double *rot, double ha, double dec, double lat);
     7int AZ_to_HD(double *ha, double *dec, double *rot, double alt, double az, double lat);
     8
    69double atan2 (double y, double x);
    710
    811int altaz (int argc, char **argv) {
    912 
     13  int i;
    1014  double alt, az, lat, rot;
    1115  double ha, dec;
    12   double sind, sinh, cosh;
    1316  char *latstr;
     17  Vector *hvec, *dvec, *avec, *zvec, *rvec;
     18  opihi_flt *Hv, *Dv, *Av, *Zv, *Rv;
    1419
    15   if (argc != 6) goto usage;
    16 
    17   if (!strcmp (argv[1], "-h")) goto radec;
    18   if (!strcmp (argv[1], "-c")) goto altaz;
    19 
    20  radec:
    21   /* ha/dec -> alt/az */
    22   ha  = atof (argv[2]);
    23   dec = atof (argv[3]);
     20  if (argc != 7) goto usage;
     21  if (strcasecmp (argv[4], "to")) goto usage;
    2422
    2523  latstr = get_variable ("LATITUDE");
    2624  if (latstr == (char *) NULL) {
    2725    gprint (GP_ERR, "please define $LATITUDE\n");
    28     return (FALSE);
     26    return FALSE;
    2927  }
    3028  lat = atof (latstr);
     29  gprint (GP_ERR, "using latitude of %f\n", lat);
    3130  free (latstr);
    32  
     31
     32  if (!strcmp (argv[1], "-az")) goto radec;
     33  if (!strcmp (argv[1], "-hd")) goto altaz;
     34
     35 radec:
     36  if (ISNUM(argv[2][0]) && ISNUM(argv[3][0])) {
     37    /* ha/dec -> alt/az */
     38    ha  = atof (argv[2]);
     39    dec = atof (argv[3]);
     40 
     41    HD_to_AZ (&alt, &az, &rot, ha, dec, lat);
     42
     43    set_variable (argv[5], alt);
     44    set_variable (argv[6], az);
     45    set_variable ("ROT", rot);
     46    return TRUE;
     47  }
     48
     49  /* find vectors */
     50  if ((hvec = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return FALSE;
     51  if ((dvec = SelectVector (argv[3], OLDVECTOR, TRUE)) == NULL) return FALSE;
     52  if ((avec = SelectVector (argv[5], ANYVECTOR, TRUE)) == NULL) return FALSE;
     53  if ((zvec = SelectVector (argv[6], ANYVECTOR, TRUE)) == NULL) return FALSE;
     54  if ((rvec = SelectVector ("ROT",   ANYVECTOR, TRUE)) == NULL) return FALSE;
     55
     56  if (hvec[0].Nelements != dvec[0].Nelements) {
     57    gprint (GP_ERR, "vectors %s and %s not the same length\n", argv[2], argv[3]);
     58    return FALSE;
     59  }
     60 
     61  // cast xvec or yvec to FLT if it is type INT
     62  CastVector (hvec, OPIHI_FLT);
     63  CastVector (dvec, OPIHI_FLT);
     64  ResetVector (avec, OPIHI_FLT, hvec[0].Nelements);
     65  ResetVector (zvec, OPIHI_FLT, hvec[0].Nelements);
     66  ResetVector (rvec, OPIHI_FLT, hvec[0].Nelements);
     67
     68  Hv = hvec[0].elements.Flt;
     69  Dv = dvec[0].elements.Flt;
     70  Av = avec[0].elements.Flt;
     71  Zv = zvec[0].elements.Flt;
     72  Rv = rvec[0].elements.Flt;
     73
     74  for (i = 0; i < hvec[0].Nelements; i++, Hv++, Dv++, Av++, Zv++, Rv++) {
     75    HD_to_AZ (Av, Zv, Rv, *Hv, *Dv, lat);
     76  }
     77  return TRUE;
     78 
     79 altaz:
     80  if (ISNUM(argv[2][0]) && ISNUM(argv[3][0])) {
     81    /* alt/az -> ha/dec */
     82    alt = atof (argv[2]);
     83    az  = atof (argv[3]);
     84
     85    AZ_to_HD (&ha, &dec, &rot, alt, az, lat);
     86
     87    set_variable (argv[5], ha);
     88    set_variable (argv[6], dec);
     89    set_variable ("ROT", rot);
     90    return TRUE;
     91  }
     92 
     93  /* find vectors */
     94  if ((avec = SelectVector (argv[2], OLDVECTOR, TRUE)) == NULL) return FALSE;
     95  if ((zvec = SelectVector (argv[3], OLDVECTOR, TRUE)) == NULL) return FALSE;
     96  if ((hvec = SelectVector (argv[5], ANYVECTOR, TRUE)) == NULL) return FALSE;
     97  if ((dvec = SelectVector (argv[6], ANYVECTOR, TRUE)) == NULL) return FALSE;
     98  if ((rvec = SelectVector ("ROT",   ANYVECTOR, TRUE)) == NULL) return FALSE;
     99
     100  if (avec[0].Nelements != zvec[0].Nelements) {
     101    gprint (GP_ERR, "vectors %s and %s not the same length\n", argv[2], argv[3]);
     102    return FALSE;
     103  }
     104 
     105  // cast xvec or yvec to FLT if it is type INT
     106  CastVector (avec, OPIHI_FLT);
     107  CastVector (zvec, OPIHI_FLT);
     108  ResetVector (hvec, OPIHI_FLT, avec[0].Nelements);
     109  ResetVector (dvec, OPIHI_FLT, avec[0].Nelements);
     110  ResetVector (rvec, OPIHI_FLT, avec[0].Nelements);
     111
     112  Hv = hvec[0].elements.Flt;
     113  Dv = dvec[0].elements.Flt;
     114  Av = avec[0].elements.Flt;
     115  Zv = zvec[0].elements.Flt;
     116  Rv = rvec[0].elements.Flt;
     117
     118  for (i = 0; i < hvec[0].Nelements; i++, Hv++, Dv++, Av++, Zv++, Rv++) {
     119    AZ_to_HD (Hv, Dv, Rv, *Av, *Zv, lat);
     120  }
     121  return TRUE;
     122 
     123 usage:
     124  gprint (GP_ERR, "USAGE: altaz -az (ha) (dec) to (alt) (az)\n");
     125  gprint (GP_ERR, "USAGE: altaz -hd (alt) (az) to (ha) (dec)\n");
     126  gprint (GP_ERR, "       -hd alt/az to ha/dec, -az ha/dec to alt/az\n");
     127  gprint (GP_ERR, "       returned values in variables or vectors provided\n");
     128  return FALSE;
     129}
     130
     131int HD_to_AZ(double *alt, double *az, double *rot, double ha, double dec, double lat) {
     132
     133  double sind, sinh, cosh;
     134
    33135  sind = dSIN (dec) * dSIN (lat) + dCOS (dec) * dCOS (ha) * dCOS (lat);
    34   alt  = DEG_RAD * asin (sind);
     136  *alt  = DEG_RAD * asin (sind);
    35137
    36138  sinh = - dCOS (dec) * dSIN (ha);
    37139  cosh =   dSIN (dec) * dCOS (lat) - dCOS (dec) * dCOS (ha) * dSIN (lat);
    38140
    39   az = DEG_RAD * atan2 (sinh, cosh);
    40   set_variable (argv[4], alt);
    41   set_variable (argv[5], az);
     141  *az = DEG_RAD * atan2 (sinh, cosh);
     142 
     143  sinh = -dCOS(*az) * dSIN(*alt) * dSIN(ha) * dSIN(lat) + dSIN(*az) * dSIN(*alt) * dCOS(ha) - dSIN(ha) * dCOS(*alt) * dCOS(lat);
     144  cosh = -dSIN(*az) * dSIN(ha) * dSIN(lat) - dCOS(*az) * dCOS(ha);
     145  *rot = -DEG_RAD * atan2 (sinh, cosh);
     146 
     147  return TRUE;
     148}
    42149
    43   sinh = -dCOS(az) * dSIN(alt) * dSIN(ha) * dSIN(lat) + dSIN(az) * dSIN(alt) * dCOS(ha) - dSIN(ha) * dCOS(alt) * dCOS(lat);
    44   cosh = -dSIN(az) * dSIN(ha) * dSIN(lat) - dCOS(az) * dCOS(ha);
    45   rot = -DEG_RAD * atan2 (sinh, cosh);
    46   set_variable ("ROT", rot);
     150int AZ_to_HD(double *ha, double *dec, double *rot, double alt, double az, double lat) {
    47151
    48   return (TRUE);
    49  
    50  altaz:
    51   /* alt/az -> ha/dec */
    52   alt = atof (argv[4]);
    53   az  = atof (argv[5]);
    54 
    55   latstr = get_variable ("LATITUDE");
    56   if (latstr == (char *) NULL) {
    57     gprint (GP_ERR, "please define $LATITUDE\n");
    58     return (FALSE);
    59   }
    60   lat = atof (latstr);
    61   free (latstr);
     152  double sind, sinh, cosh;
    62153
    63154  sind = dSIN (alt) * dSIN (lat) + dCOS (alt) * dCOS (az) * dCOS (lat);
    64   dec  = DEG_RAD * asin (sind);
     155  *dec  = DEG_RAD * asin (sind);
    65156
    66157  sinh = -dCOS (alt) * dSIN (az);
    67158  cosh =  dSIN (alt) * dCOS (lat) - dCOS (alt) * dCOS (az) * dSIN (lat);
    68159
    69   ha = DEG_RAD * atan2 (sinh, cosh);
    70   set_variable (argv[2], ha);
    71   set_variable (argv[3], dec);
     160  *ha = DEG_RAD * atan2 (sinh, cosh);
    72161
    73   sinh = -dCOS(az) * dSIN(alt) * dSIN(ha) * dSIN(lat) + dSIN(az) * dSIN(alt) * dCOS(ha) - dSIN(ha) * dCOS(alt) * dCOS(lat);
    74   cosh = -dSIN(az) * dSIN(ha) * dSIN(lat) - dCOS(az) * dCOS(ha);
    75   rot = -DEG_RAD * atan2 (sinh, cosh);
    76   set_variable ("ROT", rot);
     162  sinh = -dCOS(az) * dSIN(alt) * dSIN(*ha) * dSIN(lat) + dSIN(az) * dSIN(alt) * dCOS(*ha) - dSIN(*ha) * dCOS(alt) * dCOS(lat);
     163  cosh = -dSIN(az) * dSIN(*ha) * dSIN(lat) - dCOS(az) * dCOS(*ha);
     164  *rot = -DEG_RAD * atan2 (sinh, cosh);
    77165
    78   return (TRUE);
    79  
    80  usage:
    81   gprint (GP_ERR, "USAGE: altaz -h (ha) (dec) (alt) (az)\n");
    82   gprint (GP_ERR, "USAGE: altaz -c (ha) (dec) (alt) (az)\n");
    83   gprint (GP_ERR, "       -h alt/az to ha/dec, -c ha/dec to alt/az\n");
    84   gprint (GP_ERR, "       returned values in variables provided\n");
    85   return (FALSE);
    86 
     166  return TRUE;
    87167}
    88 

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

    r25757 r27435  
    33int elliprofile (int argc, char **argv) {
    44 
    5   int i, ix, iy, Nx, Ny, N, center;
     5  int i, ix, iy, Nx, Ny;
    66  float *in;
    7   double Rmaj, Rmin, phi, alpha, Io, ARatio;
     7  double Rmaj, Rmin, phi;
    88  double root1, root2, R, A1, A2, A3;
    99  double Sx, Sy, Sxy;
    10   double x, y, r, f, Xo, Yo;
     10  double x, y, Xo, Yo;
    1111  Buffer *buf;
    1212  Vector *rvec, *fvec;

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

    r25757 r27435  
    55int galprofiles (int argc, char **argv) {
    66 
    7   int i, j, Nx, Ny, N, Nsec, NELEMENTS;
     7  int i, Nx, Ny, N, Nsec, NELEMENTS;
    88  float *in;
    99  double theta, dtheta, x, y, Xo, Yo, r, Rmax, value;

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

    r25757 r27435  
    1212 
    1313  int i, Nbin;
    14   double Rmin, Rmax;
     14  double Rmax;
    1515  Vector *fvec, *rvec, *Fvec, *Rvec, *Avec;
    1616

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

    r25757 r27435  
    66int galradius (int argc, char **argv) {
    77 
    8   int i, j, Nx, Ny, N, Nsec, NELEMENTS, Rbin, Nout, above;
    9   double theta, dtheta, x, y, Xo, Yo, r, Rmax, Rmin, value;
     8  int i, j, N, Rbin, Nout, above;
     9  double Rmax, Rmin;
    1010  double Fmin, Fmax, dF, Fm, Fp, Fo, Rsum, Rnpt, Ro;
    1111  opihi_flt *flux, *radius, *values;
    12   Buffer *buf;
    13   Vector *fvec, *rvec, *tvec, *Fvec, *Rvec;
    14   char name[128];
     12  Vector *fvec, *rvec, *Fvec, *Rvec;
    1513
    1614  if (argc != 5) {

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

    r25757 r27435  
    44 
    55  int i, above;
    6   float *in;
    76  double Fsum, Asum, Area, R_90, rad_90, flux_90;
    87  Vector *rvec, *avec, *fvec, *Rvec, *Fvec, *Svec, *Avec;
    … …  
    4039  ResetVector (Avec, OPIHI_FLT, fvec[0].Nelements);
    4140
     41  R_90 = 0.1;
    4242  above = TRUE;
    4343  Fsum = 0.0;

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

    r20936 r27435  
    9797  opihi_flt *Dv = yvec[0].elements.Flt;
    9898
    99   for (i = 0; i < xvec[0].Nelements; i++, Av, Dv) {
     99  for (i = 0; i < xvec[0].Nelements; i++, Av++, Dv++) {
    100100    A = *Av;
    101101    D = *Dv;

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

    r25757 r27435  
    33int region (int argc, char **argv) {
    44 
    5   char string[256];
    65  double Ra, Dec, Radius;
    76  float dx, dy;

  • trunk/Ohana/src/opihi/cmd.basic/cd.c

    r25995 r27435  
    5151  }
    5252 
    53   if ((cwd = getcwd(NULL, 64)) == NULL) {
     53  if ((cwd = getcwd(NULL, 1024)) == NULL) {
    5454    gprint (GP_ERR, "error getting cwd\n");
    5555    if (var != NULL) free (var);

  • trunk/Ohana/src/opihi/cmd.basic/date.c

    r12332 r27435  
    4040      set_int_variable (varName, now.tv_sec - REFTIME);
    4141    } else {
    42       gprint (GP_ERR, "%d\n", now.tv_sec - REFTIME);
     42      gprint (GP_ERR, "%d\n", (int) now.tv_sec - REFTIME);
    4343    }
    4444  } else {

  • trunk/Ohana/src/opihi/cmd.basic/inthash.c

    r25965 r27435  
    33int inthash (int argc, char **argv) {
    44
    5   int i, N, modulus, value, input;
     5  int N, modulus, value, input;
    66  char *varName;
    77

  • trunk/Ohana/src/opihi/cmd.basic/test/for.sh

    r14176 r27435  
    169169 $PASS = 1
    170170
    171  if ($endmem - $startmem > 10)
     171 if ($endmem - $startmem > 80)
    172172   $PASS = 0
    173173   echo "growth: {$endmem-$startmem}"

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

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

    r19823 r27435  
    11# include "dvoshell.h"
    22
    3 void image_subset (Image *image, int Nimage, int **Subset, int *Nsubset,
     3void image_subset (Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset,
    44                   SkyRegionSelection *selection,
    55                   unsigned long int tzero, double trange, int TimeSelect)
    66{
    77
    8   int i, j, flipped, status, InPic;
    9   int *subset;
    10   int N, n, npts;
     8  int j, flipped, status, InPic;
     9  off_t i, n, *subset;
     10  int npts;
    1111  double r, d, X, Y, x[4], y[4], Rmin, Rmax, Rmid;
    1212  Graphdata graph;
    … …  
    4444
    4545  npts = 200;
    46   ALLOCATE (subset, int, npts);
    47   n = N = 0;
     46  ALLOCATE (subset, off_t, npts);
     47  n = 0;
    4848  for (i = 0; i < Nimage; i++) {
    4949    if (TimeSelect && ((image[i].tzero < tzero) || (image[i].tzero+image[i].trate*image[i].NY > tzero + trange))) continue;
    … …  
    114114    if (n > npts - 1) {
    115115      npts += 200;
    116       REALLOCATE (subset, int, npts);
     116      REALLOCATE (subset, off_t, npts);
    117117    }
    118118  }
    119119
    120   REALLOCATE (subset, int, MAX (n, 1));
     120  REALLOCATE (subset, off_t, MAX (n, 1));
    121121  *Subset = subset;
    122122  *Nsubset = n;

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

    r14590 r27435  
    33/* db image table */
    44static Image *image = NULL;
    5 static int *subset = NULL;
    6 static int Nimage = 0;
    7 static int Nsubset = 0;
     5static off_t *subset = NULL;
     6static off_t Nimage = 0;
     7static off_t Nsubset = 0;
    88static Coords mosaic;
    99

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

    r15752 r27435  
    11# include "dvoshell.h"
    22
    3 Image *LoadImages (int *nimage) {
     3Image *LoadImages (off_t *Nimage) {
    44
    55  int status;
    … …  
    2525    gprint (GP_ERR, "note: image catalog is empty\n");
    2626    ALLOCATE (image, Image, 1);
    27     *nimage = 1;
     27    *Nimage = 1;
    2828    return (image);
    2929  }
    … …  
    3737  }
    3838
    39   image = gfits_table_get_Image (&db.ftable, nimage, &db.swapped);
     39  image = gfits_table_get_Image (&db.ftable, Nimage, &db.swapped);
    4040  return (image);
    4141}

  • trunk/Ohana/src/opihi/dvo/Makefile

    r25757 r27435  
    2626$(SRC)/compare.$(ARCH).o                \
    2727$(SRC)/match_image.$(ARCH).o            \
    28 $(SRC)/photometry.$(ARCH).o             \
    2928$(SRC)/dvomisc.$(ARCH).o                \
    3029$(SRC)/region_list.$(ARCH).o            \
     30$(SRC)/photometry.$(ARCH).o             \
    3131$(SRC)/dbBooleanCond.$(ARCH).o          \
    3232$(SRC)/dbCheckStack.$(ARCH).o           \

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

    r19823 r27435  
    4444    NLINES += NDecLines[i];
    4545  }
    46   fseek (f, 5*2880 + 48*NLINES, SEEK_SET);
     46  fseeko (f, 5*2880 + 48*NLINES, SEEK_SET);
    4747     
    4848  done = FALSE;

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

    r24233 r27435  
    33int avextract (int argc, char **argv) {
    44 
    5   int i, j, n, m, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
     5  off_t i, j, n, m;
     6  int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
    67  int Nsecfilt, mode, VERBOSE;
    78  char **cstack, name[1024];
    … …  
    7980
    8081  /* create output storage vectors */
     82  Npts = 0;
     83  NPTS = 100;
    8184  ALLOCATE (values, dbValue, Nfields);
    8285  ALLOCATE (vec, Vector *, Nreturn);
    … …  
    9093    ResetVector (vec[i], fields[i].type, NPTS);
    9194  }
    92 
    93   Npts = 0;
    94   NPTS = 1;
    9595
    9696  // grab data from all selected sky regions
    … …  
    103103    catalog.Nsecfilt = 0;
    104104
    105     if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions);
     105    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
    106106     
    107107    // an error exit status here is a significant error

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

    r7917 r27435  
    88int badimages (int argc, char **argv) {
    99 
    10   int i, Nimage, entry, First, Cross;
     10  off_t i, Nimage;
     11  int entry, First, Cross;
    1112  float *ptr;
    1213  double nominal, big, small, value;
    … …  
    3839    ptr = &image[entry].coords.crpix1;
    3940    for (i = 0; i < 22; i++) {
    40       gprint (GP_LOG, "%2d: %g\n", i, ptr[i]);
     41      gprint (GP_LOG, "%2lld: %g\n", (long long) i, ptr[i]);
    4142    }
    4243    value = image[entry].coords.pc1_1*image[entry].coords.pc2_2 + image[entry].coords.pc1_2*image[entry].coords.pc2_1;
    … …  
    5758      value = image[i].coords.pc1_1*image[i].coords.pc2_2 + image[i].coords.pc1_2*image[i].coords.pc2_1;
    5859      if ((value > big) || (value < small)) {
    59         gprint (GP_LOG, "%5d %s: %d %g\n", i, image[i].name, image[i].tzero, value);
     60        gprint (GP_LOG, "%5lld %s: %d %g\n", (long long) i, image[i].name, image[i].tzero, value);
    6061      }
    6162    }
    … …  
    6465      ptr = &image[i].coords.crpix1;
    6566      if ((ptr[entry] > big) || (ptr[entry] < small)) {
    66         gprint (GP_LOG, "%5d %s: %d %g\n", i, image[i].name, image[i].tzero, ptr[entry]);
     67        gprint (GP_LOG, "%5lld %s: %d %g\n", (long long) i, image[i].name, image[i].tzero, ptr[entry]);
    6768      }
    6869    }

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

    r15509 r27435  
    55int calextract (int argc, char **argv) {
    66 
    7   int i, N, Nr, mode[2];
    8   int Nsecfilt, NSTAR;
     7  off_t i, Nr;
     8  int Nsecfilt, NSTAR, N, mode[2];
    99
    1010  PhotCode *code[2];

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

    r20936 r27435  
    66int calmextract (int argc, char **argv) {
    77 
    8   int i, k, N, Nr, mode[2];
    9   int NSTAR, Nstar, Nsecfilt;
     8  off_t i, k, Nr;
     9  int NSTAR, Nstar, Nsecfilt, N, mode[2];
    1010
    1111  Catalog catalog;
    … …  
    169169int ConcatMeasures (Vector *vec, PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int Nin, int param) {
    170170
    171   int i, Ns, N;
     171  off_t i, N;
     172  int Ns;
    172173  double *value;
    173174

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

    r20936 r27435  
    44 
    55  double *M1, *M2;
    6   int i, m, k, Npts, NPTS, N;
    7   int N1, N2, i1, i2, mode[4];
     6  off_t i, m, k, N1, N2, i1, i2;
     7  int Npts, NPTS, N;
     8  int mode[4];
    89  int Nsecfilt, KeepNulls;
    910  void *Signal;

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

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

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

    r20936 r27435  
    44 
    55  double *M1, *M3;
    6   int i, j, m, i1, i3, N1, N3, N;
     6  off_t i, j, m, N1, N3, i1, i3;
     7  int N;
    78  int Npts, NPTS, mode[3];
    89  int Nsecfilt, KeepNulls;

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

    r12840 r27435  
    44# define BLOCK 1000
    55
    6 CMPstars *cmpReadFits (FILE *f, int *nstars) {
     6CMPstars *cmpReadFits (FILE *f, off_t *nstars) {
    77
    8   int i, Nstars;
     8  off_t i, Nstars;
    99  Header theader;
    1010  FTable table;
    … …  
    4444}
    4545
    46 CMPstars *cmpReadText (FILE *f, int *nstars) {
     46CMPstars *cmpReadText (FILE *f, off_t *nstars) {
    4747
    48   int j, N, Nextra, Ninstar, Nskip, Nbytes, nbytes;
     48  off_t N;
     49  int j, Nextra, Ninstar, Nskip, Nbytes, nbytes;
    4950  int done;
    5051  char *buffer, *c, *c2;

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

    r13479 r27435  
    5656    return (FALSE);
    5757  }
    58   fseek (f, header.size, SEEK_SET);
     58  fseeko (f, header.datasize, SEEK_SET);
    5959
    6060  Noverlay = 0;

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

    r20936 r27435  
    66int cmpread (int argc, char **argv) {
    77 
    8   int i, field, Naxis, Nbytes, Nstars;
     8  off_t i, Nbytes, Nstars;
     9  int field, Naxis;
    910  double tR, tD;
    1011  float value;
    … …  
    6162    return (FALSE);
    6263  }
    63   fseek (f, header.size, SEEK_SET);
     64  fseeko (f, header.datasize, SEEK_SET);
    6465
    6566  /* find expected number of stars */
    66   if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
     67  if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
    6768    gprint (GP_ERR, "ERROR: can't get NSTARS from header\n");
    6869    gfits_free_header (&header);
    … …  
    7677    /* allocate space for stars */
    7778    gprint (GP_ERR, "reading from TEXT cmp file %s\n", argv[2]);
    78     if (!gfits_scan (&header, "NSTARS", "%d", 1, &Nstars)) {
     79    if (!gfits_scan (&header, "NSTARS", "%lld", 1, (long long *) &Nstars)) {
    7980      gprint (GP_ERR, "ERROR: failed to find NSTARS\n");
    8081      exit (1);
    … …  
    8485    gprint (GP_ERR, "reading from FITS cmp file %s\n", argv[2]);
    8586    Nbytes = gfits_data_size (&header);
    86     fseek (f, Nbytes, SEEK_CUR);
     87    fseeko (f, Nbytes, SEEK_CUR);
    8788    stars = cmpReadFits (f, &Nstars);
    8889  }
    … …  
    138139  free (stars);
    139140  gfits_free_header (&header);
    140   gprint (GP_ERR, "loaded %d objects\n", Nstars);
     141  gprint (GP_ERR, "loaded %lld objects\n", (long long) Nstars);
    141142  return (TRUE);
    142143}

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

    r20936 r27435  
    55              Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius) {
    66
    7   int i, j, first_j, Nmatch, NMATCH;
     7  off_t i, j, first_j, Nmatch, NMATCH;
    88  double dX, dY, dR;
    99

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

    r21508 r27435  
    4242dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, dbField *field) {
    4343
    44   int i, Nsec;
     44  off_t i;
     45  int Nsec;
    4546  dbValue value;
    4647

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

    r21508 r27435  
    5454
    5555/* return image.field based on the selection */
    56 dbValue dbExtractImages (Image *image, int Nimage, int N, dbField *field) {
     56dbValue dbExtractImages (Image *image, off_t Nimage, off_t N, dbField *field) {
    5757
    5858  double x, y;

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

    r20936 r27435  
    77 
    88  FILE *f;
    9   int i, Nimage, status, N, TimeSelect;
     9  off_t i, Nimage, status;
     10  int N, TimeSelect;
    1011  char DataBase[256];
    1112  time_t tzero, tend;
    … …  
    133134    return (FALSE);
    134135  }
    135   fseek (f, header.size, SEEK_SET);
     136  fseeko (f, header.datasize, SEEK_SET);
    136137
    137138  /* load existing data from database */
    138   gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
     139  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    139140  ALLOCATE (pimage, RegImage, Nimage);
    140141  status = fread (pimage, sizeof(RegImage), Nimage, f);
    … …  
    142143
    143144  if (status != Nimage) {
    144     gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
     145    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
    145146    gfits_free_header (&header);
    146147    free (pimage);

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

    r14590 r27435  
    1010# if (0)
    1111
    12   int i, m, k, N, kapa, SaveVectors;
    13   int Nsec, Nsecfilt, NPTS;
     12  int kapa, SaveVectors;
     13  int Nsec, Nsecfilt;
     14  off_t i, m, k, N, NPTS;
    1415  double Radius;
    1516  float dt1, dt2, dmt1, dmt2;

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

    r16040 r27435  
    11# include "dvoshell.h"
    22
    3 void cprecess (Average *average, int Naverage, double in_epoch, double out_epoch) {
     3void cprecess (Average *average, off_t Naverage, double in_epoch, double out_epoch) {
    44
    5   int i;
     5  off_t i;
    66  double T;
    77  double A, D, RA, DEC, zeta, z, theta;

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

    r7917 r27435  
    7373
    7474  /* write message to end of file */
    75   fseek (f, 0, SEEK_END);
     75  fseeko (f, 0LL, SEEK_END);
    7676  fprintf (f, "%s\n", message);
    7777

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

    r19823 r27435  
    1313  double RA0, RA1, DEC0, DEC1;
    1414  int i, j, NBigDec;
    15   int NLINES, done, NREGIONS, nregion;
     15  int done, NREGIONS, nregion;
     16  off_t NLINES;
    1617 
    1718  VarConfig ("GSCFILE", "%s", filename);
    … …  
    9192    NLINES += NDecLines[i];
    9293  }
    93   fseek (f, 5*2880 + 48*NLINES, SEEK_SET);
     94  fseeko (f, 5*2880 + 48*NLINES, SEEK_SET);
    9495 
    9596  /* should be in this section.  if not, there is a problem counting... */
    … …  
    140141        NLINES += NDecLines[i];
    141142      }
    142       fseek (f, 5*2880 + 48*NLINES, SEEK_SET);
     143      fseeko (f, 5*2880 + 48*NLINES, SEEK_SET);
    143144      done = FALSE;
    144145      j = 12;

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

    r20936 r27435  
    1010 
    1111  int *list, Nlist;
    12   int i, k, m, N, NP1, NP2, NP, Np, Npts, NPTS;
    13   int N1, N2, i1, i2, mode[4];
     12  off_t i, k, m, N1, N2, i1, i2;
     13  int N, NP1, NP2, NP, Np, Npts, NPTS;
     14  int mode[4];
    1415  int Nsecfilt, status;
    1516  void *oldsignal;
    … …  
    173174    // the selection criteria
    174175  }
    175   gprint (GP_ERR, "using %d possible regions\n", skylist[0].Nregions);
     176  gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
    176177
    177178  /* vectors to save data */

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

    r16810 r27435  
    2424 
    2525  int *hashcode;
    26   int i, j, k, m, N, done, Nfit;
     26  off_t i, j, k, m;
     27  int N, done, Nfit;
    2728  int Nsecfilt, status;
    2829  void *oldsignal;
    … …  
    184185  /* loop over regions, extract data for each region */
    185186  // XXX add interrupt checks
    186   gprint (GP_ERR, "using %d possible regions\n", skylist[0].Nregions);
     187  gprint (GP_ERR, "using %lld possible regions\n", (long long) skylist[0].Nregions);
    187188  for (k = 0; k < skylist[0].Nregions; k++) {
    188189    /* lock, load, unlock catalog */

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

    r27024 r27435  
    55int gimages (int argc, char **argv) {
    66 
    7   int i, j, N, Nimage, Nfound, *subset, Nsubset, status;
     7  off_t i, j, Nimage, *subset, Nsubset;
     8  int N, Nfound, status;
    89  double ra, dec, Ra, Dec, X, Y, Yo;
    910  double trange, t;
    … …  
    114115    {
    115116      Coords local;
    116       double Ro, Do, Xo, Yo, Xs, Ys, Xe, Ye, Radius;
     117      double Ro, Do, Xo, Yo, Xs, Ys, Radius;
    117118     
    118119      if (typehash == DistortImage) {

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

    r23664 r27435  
    1111  double Mcat, Mrel;
    1212  double *RA, *DEC;
    13   int i, j, k, m, N, *N1, Nsecfilt, NPTS, QUIET, FULL_OUTPUT, INST;
    14   int Nstars, found, GetMeasures, Nlo, Nhi;
     13  off_t i, Nstars, *N1;
     14  off_t j, k, m, N, Nlo, Nhi;
     15  int Nsecfilt, NPTS, QUIET, FULL_OUTPUT, INST;
     16  int found, GetMeasures;
    1517  int SaveVectors;
    1618  Vector *vec1, *vec2, *vec3, *vec4, *vec5, *vec6;
    … …  
    102104  ALLOCATE (RA, double, Nstars);
    103105  ALLOCATE (DEC, double, Nstars);
    104   ALLOCATE (N1, int, Nstars);
     106  ALLOCATE (N1, off_t, Nstars);
    105107
    106108  /* find star(s) in RA, DEC list -- use a dumb algorithm for now, improve later */
    … …  
    157159      k = N1[i];
    158160      if (!QUIET) {
    159         gprint (GP_LOG, "star: %d\n", k);
     161        gprint (GP_LOG, "star: %lld\n", (long long) k);
    160162        gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
    161163        gprint (GP_LOG, "%11.7f ", catalog.average[k].D);

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

    r20936 r27435  
    1111int images (int argc, char **argv) {
    1212
    13   int i, j, Nimage, status, InPic, leftside, *plist, TimeSelect, ByName;
     13  off_t i, Nimage;
     14  int j, status, InPic, leftside, *plist, TimeSelect, ByName;
    1415  int WITH_MOSAIC, SOLO_MOSAIC, HIDDEN;
    1516  time_t tzero, tend;

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

    r25757 r27435  
    11# include "dvoshell.h"
    22
     3// LARGEFILES: this function is currently limited to images with Nx,Ny each < 2^31
    34int imbox (int argc, char **argv) {
    45 
    5   int j, kapa, Nskip, status, InPic, flipped, N, haveNx, haveNy, Nx, Ny, SOLO_PHU, Npts, NPTS;
     6  off_t Nskip;
     7  int j, kapa, status, InPic, flipped, N, haveNx, haveNy, Nx, Ny, SOLO_PHU, Npts, NPTS;
    68  Vector Xvec, Yvec;
    79  double r, d, x[4], y[4], Rmin, Rmax, Rmid;
    … …  
    112114  skip:
    113115    Nskip = gfits_data_size (&header);
    114     fseek (f, Nskip, SEEK_CUR);
     116    fseeko (f, Nskip, SEEK_CUR);
    115117    gfits_free_header (&header);
    116118  }

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

    r20936 r27435  
    33int imdata (int argc, char **argv) {
    44 
    5   int i, j, k, I;
    6   int Nimage, N, NPTS, found, mode, TimeSelect;
    7   int n, Nregions, NREGIONS, TimeFormat;
    8   int *subset, Nsubset;
     5  off_t i, j, k, n, I;
     6  int N, NPTS, found, mode, TimeSelect, TimeFormat;
     7  off_t Nregions, NREGIONS;
     8  off_t *subset, Nsubset, Nimage;
    99  double trange;
    1010  time_t tzero, start, stop, TimeReference;

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

    r20936 r27435  
    55 
    66  long A, B;
    7   int i, kapa, N, Nimage, status, NPTS;
     7  off_t i, Nimage;
     8  int kapa, N, status, NPTS;
    89  double r, d, x, y, Rmin, Rmax;
    910  Vector Xvec, Yvec;

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

    r20936 r27435  
    33int imextract (int argc, char **argv) {
    44 
    5   // int *subset, Nsubset;  -- not sure if we need to use this or not...
    6 
    7   int i, j, n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
    8   int Nimage, VERBOSE;
     5  off_t i, j, Nimage;
     6  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
     7  int VERBOSE;
    98  char **cstack, name[1024];
    109  void *Signal;
    … …  
    7372
    7473  /* create output storage vectors */
     74  Npts = 0;
     75  NPTS = 100;
    7576  ALLOCATE (values, dbValue, Nfields);
    7677  ALLOCATE (vec, Vector *, Nreturn);
    … …  
    8485    ResetVector (vec[i], fields[i].type, NPTS);
    8586  }
    86 
    87   Npts = 0;
    88   NPTS = 1;
    8987
    9088  if ((image = LoadImages (&Nimage)) == NULL) goto escape;

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

    r17248 r27435  
    33int imlist (int argc, char **argv) {
    44 
    5   int i, j, N, Nimage, *subset, Nsubset, TimeSelect, RegionSelect, TimeFormat, NameSelect;
     5  off_t i, j, Nimage, *subset, Nsubset;
     6  int N, TimeSelect, RegionSelect, TimeFormat, NameSelect;
    67  int PhotcodeSelect;
    78  time_t tzero, TimeReference;
    … …  
    103104      XY_to_RD (&r, &d, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
    104105    }
    105     gprint (GP_LOG, "%3d %s %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n",
    106             i, image[i].name, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
     106    gprint (GP_LOG, "%3lld %s %8.4f %8.4f %f %5d %2d %4.2f %5.3f %5.3f\n",
     107            (long long) i, image[i].name, r, d, t, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal);
    107108  }
    108109

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

    r14590 r27435  
    66  double trange;
    77  int N, GreyScale;
    8   int i, j, Nimage, Nsubset, *subset;
     8  off_t i, j, Nimage, Nsubset, *subset;
    99  char bufname[64];
    1010  float *p;

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

    r20936 r27435  
    11# include "dvoshell.h"
    2 RegImage *load_imreg (char *DataBase, int *nimage);
     2RegImage *load_imreg (char *DataBase, off_t *nimage);
    33
    44# define NVALUE 22
    … …  
    88int imrough (int argc, char **argv) {
    99 
    10   int i, N, Nimage, TimeSelect;
     10  off_t i, Nimage;
     11  int N, TimeSelect;
    1112  int ModeSelect, TypeSelect, CCDSelect, FilterSelect, TimeFormat;
    1213  int type, value, mode, CCD, NVEC;
    … …  
    231232}
    232233
    233 RegImage *load_imreg (char *DataBase, int *nimage) {
    234 
    235   int Nimage, status;
     234RegImage *load_imreg (char *DataBase, off_t *nimage) {
     235
     236  off_t Nimage;
     237  int status;
    236238  char line[80];
    237239  FILE *f;
    … …  
    262264  if (!strcmp (line, "MDM Observatory")) {
    263265
    264     fseek (f, header.size, SEEK_SET);
     266    fseeko (f, header.datasize, SEEK_SET);
    265267   
    266268    /* load existing data from database */
    267     gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
     269    gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    268270    ALLOCATE (image, RegImage, Nimage);
    269271    status = fread (image, sizeof(RegImage), Nimage, f);
    … …  
    271273   
    272274    if (status != Nimage) {
    273       gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
     275      gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %d)\n", (long long) Nimage, status);
    274276      gfits_free_header (&header);
    275277      free (image);
    … …  
    302304  /* convert to internal format */
    303305  image = (RegImage *) table.buffer;
    304   gfits_scan (table.header, "NAXIS2", "%d", 1, &Nimage);
     306  gfits_scan (table.header, "NAXIS2", "%lld", 1, (long long *) &Nimage);
    305307  gfits_convert_RegImage (image, sizeof (RegImage), Nimage);
    306308

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

    r14590 r27435  
    77  Header header;
    88  RegImage *pimage;
    9   int i, Nimage, status, N, TimeSelect, SaveNames;
     9  off_t i, Nimage, status;
     10  int N, TimeSelect, SaveNames;
    1011  int ModeSelect, TypeSelect, CCDSelect, FilterSelect;
    1112  char *Filter, *obstime;
    … …  
    102103    return (FALSE);
    103104  }
    104   fseek (f, header.size, SEEK_SET);
     105  fseeko (f, header.datasize, SEEK_SET);
    105106
    106107  /* load existing data from database */
    107   gfits_scan (&header, "NIMAGES", "%d", 1, &Nimage);
     108  gfits_scan (&header, "NIMAGES", "%lld", 1, (long long *) &Nimage);
    108109  ALLOCATE (pimage, RegImage, Nimage);
    109110  status = fread (pimage, sizeof(RegImage), Nimage, f);
    110111  fclose (f);
    111112  if (status != Nimage) {
    112     gprint (GP_ERR, "ERROR: header and data in dB don't match (%d vs %d)\n", Nimage, status);
     113    gprint (GP_ERR, "ERROR: header and data in dB don't match (%lld vs %lld)\n", (long long) Nimage, (long long) status);
    113114    gfits_free_header (&header);
    114115    free (pimage);
    … …  
    130131    obstime[strlen(obstime)-1] = 0;
    131132
    132     gprint (GP_LOG, "%5d %6s %6s %2d %2d   ", i, get_type_name(pimage[i].type), get_mode_name(pimage[i].mode), pimage[i].ccd, pimage[i].type);
     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);
    133134    gprint (GP_LOG, "%s %s  ", pimage[i].pathname, pimage[i].filename);
    134135    gprint (GP_LOG, "%s %s %f %s\n", pimage[i].filter, pimage[i].instrument, pimage[i].exptime, obstime);

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

    r20936 r27435  
    33int imstats (int argc, char **argv) {
    44 
    5   int i, kapa, Nimage, N;
     5  off_t i, Nimage;
     6  int kapa, N;
    67  int Mcal, AutoLimits;
    78  double r, d;

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

    r20936 r27435  
    77  double *RA, *DEC;
    88  int kapa, TimeFormat;
    9   int Nstars, found, AutoLimits, ErrorBars, GalMag, AbsPhot, SaveVectors;
    10   int i, j, m, N, NPTS, *N1;
     9  int found, AutoLimits, ErrorBars, GalMag, AbsPhot, SaveVectors;
     10  off_t i, j, m, Nstars, *N1;
     11  int N, NPTS;
    1112  time_t TimeReference;
    1213  struct tm *timeptr;
    … …  
    8889  ALLOCATE (RA, double, Nstars);
    8990  ALLOCATE (DEC, double, Nstars);
    90   ALLOCATE (N1, int, Nstars);
     91  ALLOCATE (N1, off_t, Nstars);
    9192
    9293  /* find star(s) in RA, DEC list -- use a dumb algorithm for now, improve later */

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

    r20936 r27435  
    55  double Ra, Dec, Radius, Radius2, r;
    66  double *RA, *DEC;
    7   int Nstars, found, PhotCodeSelect;
    8   int i, j, k, m, N, NPTS, Nsecfilt, RELPHOT, *N1, TimeFormat;
     7  off_t i, j, k, m, Nstars, *N1;
     8  int found, PhotCodeSelect;
     9  int N, NPTS, Nsecfilt, RELPHOT, TimeFormat;
    910  time_t TimeReference;
    1011
    … …  
    7172  ALLOCATE (RA, double, Nstars);
    7273  ALLOCATE (DEC, double, Nstars);
    73   ALLOCATE (N1, int, Nstars);
     74  ALLOCATE (N1, off_t, Nstars);
    7475
    7576  /* find star(s) in RA, DEC list -- use a dumb algorithm for now, improve later */

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

    r12332 r27435  
    11# include "dvoshell.h"
    22
    3 int match_image (Image *image, int Nimage, unsigned int T, short int S) {
     3off_t match_image (Image *image, off_t Nimage, unsigned int T, short int S) {
    44
    5   int N, Nlo, Nhi, N1, N2;
     5  off_t N, Nlo, Nhi, N1, N2;
    66
    77  /* bracket first value of interest */
    … …  
    3737}
    3838
    39 int match_image_subset (Image *image, int *subset, int Nsubset, unsigned int T, short int S) {
     39off_t match_image_subset (Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S) {
    4040
    41   int N, Nlo, Nhi, N1, N2;
     41  off_t N, Nlo, Nhi, N1, N2;
    4242
    4343  /* bracket first value of interest */

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

    r26285 r27435  
    33int mextract (int argc, char **argv) {
    44 
    5   int i, j, k, m, n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
     5  off_t i, j, k, m; // used for counter averages and measures
     6  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
    67  int Nsecfilt, VERBOSE, loadImages, mosaicMode;
    78  char **cstack, name[1024];
    … …  
    119120    catalog.Nsecfilt = Nsecfilt;
    120121
    121     if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions);
     122    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
    122123     
    123124    // an error exit status here is a significant error

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

    r24233 r27435  
    33int mmextract (int argc, char **argv) {
    44 
    5   int i, j, k, m, n, N, Npts, NPTS, last, next, state;
     5  off_t i, j, k, m;
     6  int n, N, Npts, NPTS, last, next, state;
    67  int Nfields, Nreturn, Nreturn_base, Ncstack1, Ncstack2, Nstack1, Nstack2;
    78  int Nwhere, Iwhere, Nmatch, Imatch, NTABLE, Nt1, Nt2, n1, n2;
    … …  
    185186    catalog.Nsecfilt = Nsecfilt;
    186187
    187     if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions);
     188    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
    188189     
    189190    // an error exit status here is a significant error

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

    r21508 r27435  
    55 
    66  FILE *f;
    7   int i, j, kapa, Narg, Npts, NPTS, status, VERBOSE;
     7  off_t i, j;
     8  int kapa, Narg, Npts, NPTS, status, VERBOSE;
    89  int Nsecfilt, Nsec, Nloaded;
    910  double Mz, Mr, mag;

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

    r25757 r27435  
    336336int ListPhotSelections () {
    337337
    338   gprint (GP_ERR, "TimeSelect: %d, %d - %d\n",      TimeSelect, tzero, tend);
     338  gprint (GP_ERR, "TimeSelect: %d, %s - %s\n",      TimeSelect, ctime(&tzero), ctime(&tend));
    339339  gprint (GP_ERR, "MagSelect: %d, %f - %f\n",       MagSelect, MagMax, MagMin);
    340340  gprint (GP_ERR, "TypeSelect: %d, %d\n",           TypeSelect, TypeValue);
    … …  
    555555
    556556/* extract a list of measure parameters from the specified average entry based on the pre-set selections */
    557 double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
    558 
    559   int i, Nlist, NLIST;
     557double *ExtractMeasures (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) {
     558
     559  off_t i, Nlist, NLIST;
    560560  double M, *list;
    561561 
    … …  
    585585double ExtractAverages (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param) {
    586586
    587   int i;
     587  off_t i;
    588588  double value;
    589589
    … …  
    714714
    715715  double frac;
    716   int k, Nc, Nt;
     716  int Nc, Nt;
     717  off_t k;
    717718 
    718719  Nt = Nc = 0;
    … …  
    730731int DetermineTypeCode (Average *average, Measure *measure, int code) {
    731732
    732   int k, N, Nt[3];
     733  off_t k;
     734  int N, Nt[3];
    733735 
    734736  Nt[0] = Nt[1] = Nt[2] = 0;
    … …  
    788790int TestAverage (PhotCode *code, Average *average, SecFilt *secfilt, Measure *measure) {
    789791
    790   int i, Nm, Type, Select;
     792  off_t i, Nm;
     793  int Type, Select;
    791794  double fwhm, typefrac, dM, Xm;
    792795
    … …  
    937940
    938941
    939 double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n) {
     942double *ExtractMagnitudes (PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n) {
    940943 
    941944  double *M, mag;
    942   int N;
     945  off_t N;
    943946
    944947  if ((mode == MAG_AVE) || (mode == MAG_REF)) {
    … …  
    960963
    961964/* extract delta-mag pairs applying specified selections */
    962 double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) {
    963 
    964   int i, j, A1, A2, N1, N2, Np, Nlist, NLIST;
     965double *ExtractDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) {
     966
     967  int A1, A2;
     968  off_t i, j, N1, N2, Np, Nlist, NLIST;
    965969  double *M1, *M2, *list;
    966970
    … …  
    10091013/* extract a list of delta-measure-mags from the specified average entry based on the
    10101014   pre-set selections - does not return self-matched measurements */
    1011 double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist) {
    1012 
    1013   int i, j, Np0, Np1, Nlist, NLIST;
     1015double *ExtractMeasuresDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist) {
     1016
     1017  int Np0, Np1;
     1018  off_t i, j, Nlist, NLIST;
    10141019  double *list, M1, M2;
    10151020 
    … …  
    10561061
    10571062/* extract a measurement list matching the number of dmag entries */
    1058 double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
    1059 
    1060   int A1, A2, N1;
     1063double *ExtractByDMag (PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) {
     1064
     1065  off_t N1;
     1066  int A1, A2;
    10611067  double *list;
    10621068
    … …  
    10801086 
    10811087/* extract a list of delta-measure-mags from the specified average entry based on the pre-set selections */
    1082 double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param) {
    1083 
    1084   int i, j, n, Nlist, NLIST;
     1088double *ExtractMeasuresByDMag (PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param) {
     1089
     1090  off_t i, j, n, Nlist, NLIST;
    10851091  double *list, M1, M2;
    10861092 

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

    r21508 r27435  
    77 
    88  FILE *f;
    9   int i, j, k, m, kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect, Nloaded;
     9  off_t i, j, k, m;
     10  int kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect, Nloaded;
    1011  double Mz, Mr, mag;
    1112  double Radius, Rmin, Rmax, R, D, trange;

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

    r20936 r27435  
    8989    return (FALSE);
    9090  }
    91   fseek (f, header.size, SEEK_SET);
     91  fseeko (f, header.datasize, SEEK_SET);
    9292
    9393  /* set up storage buffers */

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

    r27262 r27435  
    66
    77  int WITH_MOSAIC, SOLO_MOSAIC;
    8   int i, N, Nimage, status, TimeSelect, ByName, xs, ys;
     8  off_t i, Nimage;
     9  int N, status, TimeSelect, ByName, xs, ys;
    910  time_t tzero, tend;
    1011  double pixscale, dX, dY, Npts, r, d, Xi, Yi, Xs, Ys, x[2], y[2], trange, RaCenter, DecCenter;

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

    r19823 r27435  
    33int subpix (int argc, char **argv) {
    44 
    5   int i, j, I, Nlo, Nhi, Nentry, Nstars, Nimage, Nmeasure;
    6   int *index, *entry;
    7   int Nmin, Nsub, NSUB, status;
    8   int TimeFormat;
     5  off_t Nlo, Nhi, *entry, Nentry;
     6  off_t j, i, I, *index, Nstars, Nimage, Nmeasure;
     7  off_t Nmin, Nsub, NSUB;
     8  int status, TimeFormat;
    99  time_t Timage, TimeReference;
    1010  double X, Y, Mabs, t;
    … …  
    5454  ALLOCATE (RA, double, Nstars);
    5555  ALLOCATE (DEC, double, Nstars);
    56   ALLOCATE (index, int, Nstars);
     56  ALLOCATE (index, off_t, Nstars);
    5757  for (i = 0; i < Nstars; i++) {
    5858    RA[i] = catalog.average[i].R;
    … …  
    6565  Nlo = bracket (DEC, Nstars, FALSE, Dec - Radius);
    6666  Nhi = bracket (DEC, Nstars, TRUE,  Dec + Radius);
    67   ALLOCATE (entry, int, MAX (Nhi - Nlo, 1));
     67  ALLOCATE (entry, off_t, MAX (Nhi - Nlo, 1));
    6868  Nentry = 0;
    6969
    … …  
    111111  Nsub = 0;
    112112  NSUB = 100;
    113   ALLOCATE (index, int, NSUB);
     113  ALLOCATE (index, off_t, NSUB);
    114114
    115115  /* load all images, extract those touching Ra, Dec */
    … …  
    125125    if (Nsub == NSUB - 1) {
    126126      NSUB += 100;
    127       REALLOCATE (index, int, NSUB);
     127      REALLOCATE (index, off_t, NSUB);
    128128    }
    129129  }

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

    r26891 r27435  
    7777/* in fft.c */
    7878void fft1D (float *dataRe, float *dataIm, int N, int Nbit, int forward);
    79 int fftND (float *dataRe, float *dataIm, int Ndim, int *Nsize, int forward);
     79int fftND (float *dataRe, float *dataIm, int Ndim, off_t *Nsize, int forward);
    8080void dfft1D (double *dataRe, double *dataIm, int N, int Nbit, int forward);
    8181int dfftND (double *dataRe, double *dataIm, int Ndim, int *Nsize, int forward);

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

    r21153 r27435  
    3636int SendLabel (char *string, int Xgraph, int mode);
    3737
    38 int SendGraphMessage (int device, char *format, ...);
    39 int SendGraphCommand (int device, int length, char *format, ...);
     38int SendGraphMessage (int device, char *format, ...) OHANA_FORMAT(printf, 2, 3);
     39int SendGraphCommand (int device, int length, char *format, ...) OHANA_FORMAT(printf, 3, 4);
    4040int SendGraphCommandV (int device, int length, char *format, va_list argp);
    4141

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

    r26285 r27435  
    260260double        DetermineTypefrac     PROTO((Average *average, Measure *measure, PhotCode *code));
    261261double        ExtractAverages       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int param));
    262 double       *ExtractByDMag         PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
    263 double       *ExtractDMag           PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
    264 double       *ExtractMagnitudes     PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *n));
    265 double       *ExtractMeasures       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
    266 double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, int *nlist, int param));
    267 double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, int *nlist));
     262double       *ExtractByDMag         PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
     263double       *ExtractDMag           PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist));
     264double       *ExtractMagnitudes     PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *n));
     265double       *ExtractMeasures       PROTO((PhotCode *code, int mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
     266double       *ExtractMeasuresByDMag PROTO((PhotCode **code, int *mode, int use_first, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist, int param));
     267double       *ExtractMeasuresDMag   PROTO((PhotCode **code, int *mode, Average *average, SecFilt *secfilt, Measure *measure, off_t *nlist));
    268268void          FreeImageSelection    PROTO((void));
    269269void          FreeImageSelection    PROTO((void));
    … …  
    280280void          FreeDVO               PROTO((void));
    281281int           InitPhotcodes         PROTO((void));
    282 Image        *LoadImages            PROTO((int *Nimage));
     282Image        *LoadImages            PROTO((off_t *Nimage));
    283283Image        *MatchImage            PROTO((unsigned int time, short int source));
    284284Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
    … …  
    300300int           TestPhotSelections    PROTO((PhotCode **code, int *mode, int param));
    301301void          compare               PROTO((Catalog *catlog1, Catalog *catlog2, Vector *rvec,  Vector *dvec,  Vector *mvec, Vector *drvec, Vector *ddvec, Vector *dmvec, double radius));
    302 void          cprecess              PROTO((Average *average, int Naverage, double in_epoch, double out_epoch));
    303 void          image_subset          PROTO((Image *image, int Nimage, int **Subset, int *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect));
    304 int           match_image           PROTO((Image *image, int Nimage, unsigned int T, short int S));
    305 int           match_image_subset    PROTO((Image *image, int *subset, int Nsubset, unsigned int T, short int S));
     302void          cprecess              PROTO((Average *average, off_t Naverage, double in_epoch, double out_epoch));
     303void          image_subset          PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect));
     304off_t         match_image           PROTO((Image *image, off_t Nimage, unsigned int T, short int S));
     305off_t         match_image_subset    PROTO((Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S));
    306306void          print_value           PROTO((double value, short int ival));
    307 void          sort_image_subset     PROTO((Image *image, int *subset, int N));
    308 void          sort_images           PROTO((Image *image, int N));
    309 void          sortave               PROTO((Average *ave, int N));
    310 CMPstars     *cmpReadFits           PROTO((FILE *f, int *nstars));
    311 CMPstars     *cmpReadText           PROTO((FILE *f, int *nstars));
     307CMPstars     *cmpReadFits           PROTO((FILE *f, off_t *nstars));
     308CMPstars     *cmpReadText           PROTO((FILE *f, off_t *nstars));
    312309int           RD_to_XYpic           PROTO((double *x, double *y, double r, double d, Coords *coords, double Rmin, double Rmax, double Rmid, int *leftside));
    313310
    … …  
    334331dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
    335332dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, dbField *field));
    336 dbValue      dbExtractImages        PROTO((Image *image, int Nimage, int N, dbField *field));
     333dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
    337334
    338335void         dbInitField            PROTO((dbField *field));

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

    r23530 r27435  
    269269int CheckJobsGetState (void);
    270270
    271 // void *CheckTasksThread (void *data);
    272 // void *CheckJobsThread (void *data);
    273 
    274271void CheckControllerSetState (int state);
    275272int CheckControllerGetState (void);
    … …  
    287284void CheckInputs (void);
    288285
    289 void ClientThreadLock (void);
    290 void ClientThreadUnlock (void);
    291 void CommandThreadLock (void);
    292 void CommandThreadUnlock (void);
    293 void ControlThreadLock (void);
    294 void ControlThreadUnlock (void);
    295 void JobTaskThreadLock (void);
    296 void JobTaskThreadUnlock (void);
     286void ClientLock (void);
     287void ClientUnlock (void);
     288void CommandLock (void);
     289void CommandUnlock (void);
     290void ControlLock (const char *func);
     291void ControlUnlock (const char *func);
     292void JobTaskLock (void);
     293void JobTaskUnlock (void);
    297294
    298295int InitPassword (void);

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

    r27255 r27435  
    153153
    154154char         *memstr                    PROTO((char *m1, char *m2, int n));
    155 int           write_fmt                 PROTO((int fd, char *format, ...));
     155int           write_fmt                 PROTO((int fd, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
    156156char         *opihi_version             PROTO((void));
    157157char         *strip_version             PROTO((char *input));
    … …  
    167167FILE         *gprintGetFile             PROTO((gpDest dest));
    168168char         *gprintGetName             PROTO((gpDest dest));
    169 int           gprint                    PROTO((gpDest dest, char *format, ...));
     169int           gprint                    PROTO((gpDest dest, char *format, ...)) OHANA_FORMAT(printf, 2, 3);
    170170int           gwrite                    PROTO((char *buffer, int size, int N, gpDest dest));
    171 int           gprint_syserror           PROTO((gpDest dest, int myError, char *format, ...));
     171int           gprint_syserror           PROTO((gpDest dest, int myError, char *format, ...)) OHANA_FORMAT(printf, 3, 4);
    172172int           gprintv                   PROTO((gpDest dest, char *format, va_list argp));
    173173

  • trunk/Ohana/src/opihi/lib.data/fft.c

    r20936 r27435  
    7272// This requires 2(Nx*Ny*...) mem copies, but the fft operations are likely to happen in
    7373// cache.
    74 int fftND (float *x, float *y, int Ndim, int *Nsize, int forward) {
     74int fftND (float *x, float *y, int Ndim, off_t *Nsize, int forward) {
    7575
    7676  int i, nIndex, minor, major, iDim;

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

    r17903 r27435  
    8383  return (buffers[i]);
    8484
    85  error:
     85error:
    8686  if (verbose) gprint (GP_ERR, "invalid matrix %s\n", name);
    8787  return (NULL);
    … …  
    238238    gprint (GP_LOG, "    N       name                      file     X     Y    bytes BP  U   bzero     bscale  \n");
    239239    for (i = 0; i < Nbuffers; i++) {
    240       gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d %3d %1d %10.4e %10.4e\n",
    241                i, buffers[i][0].name, buffers[i][0].file,
    242                buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1],
    243                buffers[i][0].header.size + buffers[i][0].matrix.size, buffers[i][0].bitpix,
    244                buffers[i][0].unsign, buffers[i][0].bzero, buffers[i][0].bscale);
     240      gprint (GP_LOG, "%5d %10s %25s %5lld %5lld %10lld %3d %1d %10.4e %10.4e\n",
     241              i, buffers[i][0].name, buffers[i][0].file,
     242              (long long) buffers[i][0].header.Naxis[0], (long long) buffers[i][0].header.Naxis[1],
     243              (long long) buffers[i][0].header.datasize + buffers[i][0].matrix.datasize, buffers[i][0].bitpix,
     244              buffers[i][0].unsign, buffers[i][0].bzero, buffers[i][0].bscale);
    245245    }
    246246    return (TRUE);
    … …  
    249249  gprint (GP_LOG, "    N       name                      file     X     Y    bytes\n");
    250250  for (i = 0; i < Nbuffers; i++) {
    251     gprint (GP_LOG, "%5d %10s %25s %5d %5d %10d\n",
    252              i, buffers[i][0].name, buffers[i][0].file,
    253              buffers[i][0].header.Naxis[0], buffers[i][0].header.Naxis[1],
    254              buffers[i][0].header.size + buffers[i][0].matrix.size);
    255   }
    256   return (TRUE);
    257 }
     251    gprint (GP_LOG, "%5d %10s %25s %5lld %5lld %10lld\n",
     252            i, buffers[i][0].name, buffers[i][0].file,
     253            (long long) buffers[i][0].header.Naxis[0], (long long) buffers[i][0].header.Naxis[1],
     254            (long long) buffers[i][0].header.datasize + buffers[i][0].matrix.datasize);
     255  }
     256  return (TRUE);
     257}

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

    r27255 r27435  
    352352  // there are two strerror_r implementations; choose the right one:
    353353#if ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE)
    354   errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
    355 #else
    356354  strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
    357355  errorMsg = errorBuf;
     356#else
     357  errorMsg = strerror_r (myError, errorBuf, MAX_ERROR_LENGTH);
    358358#endif
    359359
    … …  
    362362  va_end (argp);
    363363
    364   gprintv (dest, "%s\n", errorMsg);
     364  gprint (dest, "%s\n", errorMsg);
    365365  return TRUE;
    366366}

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

    r26995 r27435  
    3232  /* here we can perform the security handshaking */
    3333  VarConfig ("PASSWORD", "%s", PASSWORD);
    34   SendCommand (server, strlen(PASSWORD), PASSWORD);
     34  SendCommand (server, strlen(PASSWORD), "%s", PASSWORD);
    3535 
    3636  return;
    … …  
    8282        if (server) {
    8383          // send the command to the server instead
    84           if (!SendMessage (server, outline)) {
     84          if (!SendMessage (server, "%s", outline)) {
    8585            switch (errno) {
    8686              case EPIPE:

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

    r26891 r27435  
    11351135  /* copy all but the matrix */
    11361136
    1137   matrix2[0].unsign = matrix1[0].unsign;
    1138   matrix2[0].bitpix = matrix1[0].bitpix;
    1139   matrix2[0].size   = matrix1[0].size;
    1140   matrix2[0].bzero  = matrix1[0].bzero;
    1141   matrix2[0].bscale = matrix1[0].bscale;
    1142   matrix2[0].Naxes  = matrix1[0].Naxes;
    1143   for (i = 0; i < FT_MAX_NAXES; i++)
     1137  matrix2[0].unsign   = matrix1[0].unsign;
     1138  matrix2[0].bitpix   = matrix1[0].bitpix;
     1139  matrix2[0].datasize = matrix1[0].datasize;
     1140  matrix2[0].bzero    = matrix1[0].bzero;
     1141  matrix2[0].bscale   = matrix1[0].bscale;
     1142  matrix2[0].Naxes    = matrix1[0].Naxes;
     1143  for (i = 0; i < FT_MAX_NAXES; i++) {
    11441144    matrix2[0].Naxis[i] = matrix1[0].Naxis[i];
    1145 
     1145  }
    11461146
    11471147  return (TRUE);

  • trunk/Ohana/src/opihi/pantasks/JobOps.c

    r23563 r27435  
    7373
    7474  int i;
    75   int status;
    76   char command[1024];
    77   IOBuffer buffer;
    7875
    7976  gprint (GP_LOG, "\n");

  • trunk/Ohana/src/opihi/pantasks/ListenClients.c

    r23530 r27435  
    7070 
    7171  int i, Ncurrent, Nmax, status, Nread;
    72   char *line, log_stdout[128], log_stderr[128];
     72  char *line;
    7373  fd_set fdSet;
    7474  struct timeval timeout;

  • trunk/Ohana/src/opihi/pantasks/status_server.c

    r26948 r27435  
    11# include "pantasks.h"
     2
     3int status_scheduler(void);
    24
    35int status_server (int argc, char **argv) {
    … …  
    103105}
    104106
    105 int status_scheduler() {
     107int status_scheduler(void) {
    106108 
    107109  gprint (GP_LOG, "\n");

  • trunk/Ohana/src/opihi/pantasks/thread_locks.c

    r23530 r27435  
    44static pthread_mutex_t ClientMutex = PTHREAD_MUTEX_INITIALIZER;
    55
    6 void ClientLock () {
     6void ClientLock (void) {
    77  pthread_mutex_lock (&ClientMutex);
    88}
    99
    10 void ClientUnlock () {
     10void ClientUnlock (void) {
    1111  pthread_mutex_unlock (&ClientMutex);
    1212}
    … …  
    1515static pthread_mutex_t CommandMutex = PTHREAD_MUTEX_INITIALIZER;
    1616
    17 void CommandLock () {
     17void CommandLock (void) {
    1818  //  fprintf (stderr, "command lock\n");
    1919  pthread_mutex_lock (&CommandMutex);
    2020}
    2121
    22 void CommandUnlock () {
     22void CommandUnlock (void) {
    2323  //  fprintf (stderr, "command unlock\n");
    2424  pthread_mutex_unlock (&CommandMutex);
    … …  
    2828static pthread_mutex_t ControlMutex = PTHREAD_MUTEX_INITIALIZER;
    2929
    30 void ControlLock (char *func) {
     30void ControlLock (const char *func) {
    3131  // fprintf (stderr, "control lock %s\n", func);
    3232  pthread_mutex_lock (&ControlMutex);
    3333}
    3434
    35 void ControlUnlock (char *func) {
     35void ControlUnlock (const char *func) {
    3636  // fprintf (stderr, "control unlock %s\n", func);
    3737  pthread_mutex_unlock (&ControlMutex);
    … …  
    4141static pthread_mutex_t JobTaskMutex = PTHREAD_MUTEX_INITIALIZER;
    4242
    43 void JobTaskLock () {
     43void JobTaskLock (void) {
    4444  //  fprintf (stderr, "jobtask lock\n");
    4545  pthread_mutex_lock (&JobTaskMutex);
    4646}
    4747
    48 void JobTaskUnlock () {
     48void JobTaskUnlock (void) {
    4949  //  fprintf (stderr, "jobtask unlock\n");
    5050  pthread_mutex_unlock (&JobTaskMutex);

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

    r17476 r27435  
    6363  }
    6464  if (status ==  0) {
    65     gprint (GP_ERR, "pclient read returns 0 for %s\n", command);
     65    gprint (GP_ERR, "pclient read returns 0 for %s\n", response);
    6666    return (PCLIENT_DOWN);
    6767  }

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

    r25872 r27435  
    1414  if (VarConfig ("SHELL", "%s", shell)     == NULL) strcpy (shell, "pclient");
    1515
    16   if (VerboseMode()) gprint (GP_ERR, "starting host within thread %d\n", pthread_self());
     16  if (VerboseMode()) gprint (GP_ERR, "starting host within thread %lld\n", (long long) pthread_self());
    1717
    1818  pid = rconnect (command, host[0].hostname, shell, stdio);

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

    r25872 r27435  
    121121  int i, result, waitstatus;
    122122
    123   if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %p\n", pthread_self());
     123  if (VerboseMode()) gprint (GP_ERR, "harvesting within thread %lld\n", (long long) pthread_self());
    124124  if (VerboseMode()) gprint (GP_ERR, "child process %d is down, wait for exit status\n", pid);
    125125 
Note: See TracChangeset for help on using the changeset viewer.