IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 26, 2012, 11:46:01 AM (14 years ago)
Author:
eugene
Message:

updates for pedantic gcc, mods to relphot average mags to handle GPC1 stacks

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

Legend:

Unmodified
Added
Removed

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

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

    r25757 r34088  
    3030
    3131  status = fRD_to_XY (&x, &y, r, d, &graphmode.coords);
    32 
     32  if (!status) return TRUE;
     33 
    3334  if (!KapaPrepPlot (kapa, 1, &graphmode)) return (FALSE);
    3435  KapaPlotVector (kapa, 1, &x, "x");

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

    r30971 r34088  
    2323  graphmode.etype = 0;
    2424
     25  // need to plot to edge of picture..
    2526  status = fRD_to_XY (&x[0], &y[0], r[0], d[0], &graphmode.coords);
     27  if (!status) {
     28    return FALSE;
     29  }
    2630  status = fRD_to_XY (&x[1], &y[1], r[1], d[1], &graphmode.coords);
     31  if (!status) {
     32    return FALSE;
     33  }
    2734 
    2835  if (!KapaPrepPlot (kapa, 2, &graphmode)) return (FALSE);

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

    r21061 r34088  
    6868int fixcols (int argc, char **argv) {
    6969 
    70   int ix, iy, Nx, Ny, Nvect, start, stop;
     70  int ix, iy, Nx, Nvect, start, stop;
    7171  float *Vin, *vect, *meds, median, stdev, sigma, Nsigma, value;
    7272  Buffer *in;
    … …  
    8484
    8585  Nx = in[0].matrix.Naxis[0];
    86   Ny = in[0].matrix.Naxis[1];
     86  // Ny = in[0].matrix.Naxis[1];
    8787
    8888  ALLOCATE (meds, float, Nx);

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

    r33700 r34088  
    33int fiximage (int argc, char **argv) {
    44
    5   int ix, iy, N;
     5  int ix, iy;
    66  Buffer *in, *ct, *mask;
    77
    8   int VERBOSE = FALSE;
    9   if ((N = get_argument (argc, argv, "-v"))) {
    10     VERBOSE = TRUE;
    11     remove_argument (N, &argc, argv);
    12   }
     8  // int VERBOSE = FALSE;
     9  // if ((N = get_argument (argc, argv, "-v"))) {
     10  //   VERBOSE = TRUE;
     11  //   remove_argument (N, &argc, argv);
     12  // }
    1313
    1414  if (argc != 4) {

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

    r13479 r34088  
    55  char key[20];
    66  int i, N, Npix, Nborder, Nspot;
    7   double X, Y, Z, ZP, RA, DEC, max;
     7  double X, Y, ZP, RA, DEC, max;
    88  int kapa;
    99  char *name;
    … …  
    5858    KiiCursorRead (kapa, &X, &Y, &ZP, &RA, &DEC, key);
    5959    if (!strcasecmp (key, "Q")) break;
    60     Z = get_aperture_stats (&buf[0].matrix, (int)(X+0.5), (int)(Y+0.5), Npix, Nborder, max);
     60    get_aperture_stats (&buf[0].matrix, (int)(X+0.5), (int)(Y+0.5), Npix, Nborder, max);
    6161  }
    6262  KiiCursorOff (kapa);

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

    r19823 r34088  
    44 
    55  int i, n, Ncurve;
    6   int nx, ny;
    76  double L, V, Vo, dV, Bo, dB;
    87  double xo, yo;
    … …  
    2928
    3029  if ((buf = SelectBuffer (argv[1], OLDBUFFER, TRUE)) == NULL) return (FALSE);
    31   nx = buf[0].matrix.Naxis[0];
    32   ny = buf[0].matrix.Naxis[1];
     30  // int nx = buf[0].matrix.Naxis[0];
     31  // int ny = buf[0].matrix.Naxis[1];
    3332
    3433  /* we expect the input image to have units of velocity, lattitude, and longitude */

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

    r20936 r34088  
    33int imfit (int argc, char **argv) {
    44
    5   int i, j, N, Npts, Save, VERBOSE, ShapeVariation;
     5  int i, j, N, Npts, Save, VERBOSE;
    66  int sx, sy, nx, ny, Nx, Ny;
    77  float chisq, ochisq, dchisq, Gain, RDnoise, SatThreshold;
    … …  
    1616  }
    1717
    18   ShapeVariation = FALSE;
    19   if ((N = get_argument (argc, argv, "-shapes"))) {
    20     remove_argument (N, &argc, argv);
    21     ShapeVariation = TRUE;
    22   }
     18  // int ShapeVariation = FALSE;
     19  // if ((N = get_argument (argc, argv, "-shapes"))) {
     20  //   remove_argument (N, &argc, argv);
     21  //   ShapeVariation = TRUE;
     22  // }
    2323
    2424  SatThreshold = 0xffff;

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

    r12840 r34088  
    33int imsub (int argc, char **argv) {
    44
    5   int i, j, N, VERBOSE;
     5  int i, j, N;
    66  int sx, sy, nx, ny, Nx, Ny;
    77  float value;
    … …  
    99  Buffer *buf;
    1010
    11   VERBOSE = FALSE;
    12   if ((N = get_argument (argc, argv, "-v"))) {
    13     remove_argument (N, &argc, argv);
    14     VERBOSE = TRUE;
    15   }
     11  // int VERBOSE = FALSE;
     12  // if ((N = get_argument (argc, argv, "-v"))) {
     13  //   remove_argument (N, &argc, argv);
     14  //   VERBOSE = TRUE;
     15  // }
    1616
    1717  /* set fitting function */

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

    r33963 r34088  
    6767  int i, j;
    6868
    69   double gain;
    70   char *string = get_variable ("GAIN");
    71   if (string == (char *) NULL) {
    72     if (VERBOSE) gprint (GP_ERR, "assuming a value of 1.0\n");
    73     gain = 1.0;
    74   } else {
    75     gain = atof (string);
    76   }
     69  // double gain;
     70  // char *string = get_variable ("GAIN");
     71  // if (string == (char *) NULL) {
     72  //   if (VERBOSE) gprint (GP_ERR, "assuming a value of 1.0\n");
     73  //   gain = 1.0;
     74  // } else {
     75  //   gain = atof (string);
     76  // }
    7777
    7878  float *data = (float *) matrix->buffer;

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

    r16006 r34088  
    66  int i, j, k, I0, I1, J0, J1, I, J, n, N;
    77  int nx, ny, Nx, Ny, NX, NY, Ignore;
    8   float Mv, Nv, Mv2, value, min, max, IgnoreValue;
     8  float value, min, max, IgnoreValue;
    99  float *In, *Out, *ip;
    1010  float fx, fy;
    … …  
    7171  ALLOCATE (temp, float, 2*nx*ny);
    7272
    73   Nv = Mv = Mv2 = 0.0;
     73  // float Mv = Mv2 = 0.0;
    7474
    7575  for (j = 0; j < Ny; j++) {

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

    r13479 r34088  
    5252    for (i = 0; i < Nline; i++) {
    5353      /* we are now using all entries on the *.obj line */
    54       status = sscanf (&buffer[i*CHAR_LINE], "%d %f %f",  &type, &overlay[Noverlay].x, &overlay[Noverlay].y);
     54      status = sscanf (&buffer[i*CHAR_LINE], "%d %f %f",  &type, &overlay[Noverlay].x, &
     55overlay[Noverlay].y);
     56      if (status != 3) continue;
    5557      if (Objtype && (Objtype != type)) continue;
    5658      overlay[Noverlay].type = KII_OVERLAY_BOX;

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

    r13479 r34088  
    88int outline (int argc, char **argv) {
    99 
    10   int i, j, k, Npar, BigChange, ABigChange;
     10  int i, j, k, BigChange, ABigChange;
    1111  float Io, *in, ochisq, dchi, chisq, chisq_p, chisq_m, dp, tmp_par;
    1212  float curve, frac;
    … …  
    1414
    1515  if (argc != 9) {
    16     gprint (GP_ERR, "USAGE: outline x y dx dy dxy Io (buffer) Npar\n");
     16    gprint (GP_ERR, "USAGE: outline x y dx dy dxy Io (buffer)\n");
    1717    return (FALSE);
    1818  }
    … …  
    2626  par[4] = atof(argv[5]);
    2727  Io = atof(argv[6]);
    28   Npar = atof (argv[8]);
     28  // int Npar = atof (argv[8]);
    2929
    3030  dpar[0] = 10;

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

    r19823 r34088  
    88  double L, dL, Lo, V, Vo, dV, Bo, dB, Do, dD;
    99  double xo, yo, Xo, Yo;
    10   double sl, cl, wo, Ro, Rs, wr, r, fr, d, min;
     10  double sl, cl, wo, Ro, Rs, wr, r, d, min;
    1111  double R[100], T[100], W[100];
    1212  FILE *f;
    … …  
    9999      }
    100100      r = (wr - W[n]) *  (R[n-1] - R[n]) / (W[n-1] - W[n]) + R[n];
    101       fr = (Ro/r);
     101      // fr = (Ro/r);
    102102      if (r < fabs(Rs)) { /* can't be on rotation curve */
    103103        continue;

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

    r20936 r34088  
    33int spec (int argc, char **argv) {
    44
    5   int i, j, Xo, X1, y1, y2, Nx, Ny;
     5  int i, j, Xo, X1, y1, y2, Nx;
    66  int Nlong, Ngap, Nrow, N, Nring;
    77  float *buffer, *V;
    … …  
    4545  if ((buf = SelectBuffer (argv[1], OLDBUFFER, TRUE)) == NULL) return (FALSE);
    4646  Nx = buf[0].matrix.Naxis[0];
    47   Ny = buf[0].matrix.Naxis[1];
     47  // int Ny = buf[0].matrix.Naxis[1];
    4848
    4949  Xo = atof (argv[2]);

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

    r26891 r34088  
    44
    55  int x, y, N, dx, Nborder;
    6   double Z, max;
     6  double max;
    77  Buffer *buf;
    88
    … …  
    3636  }
    3737
    38   Z = get_aperture_stats (&buf[0].matrix, x, y, dx, Nborder, max);
     38  get_aperture_stats (&buf[0].matrix, x, y, dx, Nborder, max);
    3939 
    4040  return (TRUE);

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

    r7917 r34088  
    55  int i, j, Nx, Ny;
    66  Coords coords_in, coords_out;
    7   double scale_in, scale_out;
    87  int X, Y;
    98  double x, y, r, d, dx, dy;
    … …  
    3029  }
    3130 
    32   scale_in = sqrt(fabs(coords_in.cdelt1*coords_in.cdelt2*(coords_in.pc1_1*coords_in.pc2_2 - coords_in.pc1_2*coords_in.pc2_1)));
    33   scale_out = sqrt(fabs(coords_out.cdelt1*coords_out.cdelt2*(coords_out.pc1_1*coords_out.pc2_2 - coords_out.pc1_2*coords_out.pc2_1)));
     31  // double scale_in = sqrt(fabs(coords_in.cdelt1*coords_in.cdelt2*(coords_in.pc1_1*coords_in.pc2_2 - coords_in.pc1_2*coords_in.pc2_1)));
     32  // double scale_out = sqrt(fabs(coords_out.cdelt1*coords_out.cdelt2*(coords_out.pc1_1*coords_out.pc2_2 - coords_out.pc1_2*coords_out.pc2_1)));
    3433
    3534  Vin  = (float *) in[0].matrix.buffer;

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

    r31160 r34088  
    55int densify (int argc, char **argv) {
    66
    7   int i, Nx, Ny, Xb, Yb, Normalize, N, Xpix, Ypix, good, UseGraph;
     7  int i, Nx, Ny, Xb, Yb, N, Xpix, Ypix, good, UseGraph;
    88  double Xmin, Xmax, dX, Ymin, Ymax, dY;
    99  float *val;
    … …  
    1212  opihi_flt *x, *y;
    1313
    14   Normalize = TRUE;
    15   if ((N = get_argument (argc, argv, "-raw"))) {
    16     remove_argument (N, &argc, argv);
    17     Normalize = FALSE;
    18   }
     14  // int Normalize = TRUE;
     15  // if ((N = get_argument (argc, argv, "-raw"))) {
     16  //   remove_argument (N, &argc, argv);
     17  //   Normalize = FALSE;
     18  // }
    1919
    2020  UseGraph = FALSE;

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

    r20936 r34088  
    3434 
    3535  int i, Npts;
    36   double mean, sigma;
    3736  Vector *vec;
    3837
    … …  
    4241
    4342  Npts = atoi (argv[2]);
    44   mean = atof (argv[3]);
    45   sigma = atof (argv[4]);
     43  // mean = atof (argv[3]);
     44  // sigma = atof (argv[4]);
    4645
    4746  ResetVector (vec, OPIHI_FLT, Npts);

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

    r27435 r34088  
    4141    strcpy (buf[0].file, "*");
    4242    strcat (buf[0].file, filename);
     43
    4344    status = gfits_read_header (argv[2], &buf[0].header);
     45    if (!status) {
     46      gprint (GP_ERR, "failed to read header for %s\n", argv[2]);
     47      return FALSE;
     48    }
    4449    buf[0].header.bitpix = bitpix;     
    4550    buf[0].header.bzero  = bzero;     

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

    r13479 r34088  
    33int load (int argc, char **argv) {
    44 
    5   int i, N, n, ISCEL;
     5  int i, N, ISCEL;
    66  int kapa, Noverlay, NOVERLAY;
    77  char *c, type[10], string[128], line[1024];
    … …  
    5959
    6060  dx = dy = 0;
    61   for (n = 0; scan_line (f, line) != EOF;) {
     61  while (scan_line (f, line) != EOF) {
    6262    c = strchr (line, '#');
    6363    if (c != (char *) NULL)

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

    r20936 r34088  
    3737
    3838    for (j = 0; (*ip < *xp) && (j < yv[0].Nelements); j++);
    39     *op = j;
     39    *op = *yp;
    4040  }     
    4141

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

    r27435 r34088  
    33int rotate (int argc, char **argv) {
    44 
    5   int i, j, NX, NY, X, Y, Lx, Ly, N, newCenter;
     5  int i, j, NX, NY, X, Y, Lx, Ly, N;
    66  float *in_buff, *out_buff, *c;
    77  double angle, CosAngle, SinAngle, Xo, Yo, dX, dY, fx, fy, x, y, X1, Y1;
    … …  
    1212  Yo = 0;
    1313  if ((N = get_argument (argc, argv, "-center"))) {
    14     newCenter = TRUE;
    1514    remove_argument (N, &argc, argv);
    1615    Xo  = atof(argv[N]);
    … …  
    1918    remove_argument (N, &argc, argv);
    2019  }
    21   else
    22     newCenter  = FALSE;
    2320
    2421  if (argc != 3) {

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

    r9726 r34088  
    33int shift (int argc, char **argv) {
    44 
    5   int i, j, N, ROLL;
     5  int i, j;
    66  int nx, ny, dx, dy, DXin, DXot, DYin, DYot;
    77  float *Vin, *Vot;
    … …  
    99  Buffer *in, *out;
    1010
    11   ROLL = FALSE;
    12   if ((N = get_argument (argc, argv, "-roll"))) {
    13     remove_argument (N, &argc, argv);
    14     ROLL = TRUE;
    15   }
     11  // int ROLL = FALSE;
     12  // if ((N = get_argument (argc, argv, "-roll"))) {
     13  //   remove_argument (N, &argc, argv);
     14  //   ROLL = TRUE;
     15  // }
    1616
    1717  if (argc != 5) {

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

    r16119 r34088  
    55 
    66  int i, j, I, J;
    7   int nx, ny, Nx, Ny, xdir;
     7  int nx, ny, Nx, Ny;
    88  float rx, ry, x, y;
    99  float *Tx1, *Tx2, *Txc, *Ty1, *Ty2, *Tyc, *V, *V1, *V2;
    … …  
    1919  if ((out = SelectBuffer (argv[3], ANYBUFFER, TRUE)) == NULL) return (FALSE);
    2020
    21   xdir = FALSE;
    22   if (!strcmp (argv[4], "x")) xdir = TRUE;
     21  // xdir = FALSE;
     22  // if (!strcmp (argv[4], "x")) xdir = TRUE;
    2323
    2424  nx = atoi (argv[5]);

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

    r17903 r34088  
    44int spline_construct_cmd (int argc, char **argv) {
    55 
    6   int i, j, Nx, Ny, xdir;
     6  int i, j, Nx, Ny;
    77  float *Tx, *Ty, *Ty2, *V;
    88  Buffer *in, *out;
    … …  
    3131  gfits_create_matrix (&out[0].header, &out[0].matrix);
    3232
    33   xdir = FALSE;
    34   if (!strcmp (argv[3], "x")) xdir = TRUE;
     33  // int xdir = FALSE;
     34  // if (!strcmp (argv[3], "x")) xdir = TRUE;
    3535  /* ideally, the resulting image should carry this info (in header?) */
    3636

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

    r33963 r34088  
    55  off_t i, j, n, m;
    66  int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
    7   int Nsecfilt, mode, VERBOSE, needMeasures;
     7  int Nsecfilt, VERBOSE, needMeasures;
    88  char **cstack, name[1024];
    99  void *Signal;
    … …  
    2525  skylist = NULL;
    2626  selection = NULL;
    27 
    28   mode = MAG_AVE;
    2927
    3028  if ((N = get_argument (argc, argv, "-h"))) goto help;

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

    r27435 r34088  
    66 
    77  off_t i, Nr;
    8   int Nsecfilt, NSTAR, N, mode[2];
     8  int N, mode[2];
    99
    1010  PhotCode *code[2];
    … …  
    2424  /* load photcode information */
    2525  if (!InitPhotcodes ()) return (FALSE);
    26   Nsecfilt = GetPhotcodeNsecfilt ();
    2726
    2827  /* command line arguments */
    … …  
    4140  /* one unique value per star */
    4241  N = 0;
    43   NSTAR = 1;
    4442  ALLOCATE (vec, Vector *, NVEC);
    4543  if ((vec[Nd]  = SelectVector ("cal:dmag",     ANYVECTOR, TRUE)) == NULL) goto escape;
    … …  
    7472
    7573    # if (0)
     74    int NSTAR = 1;
     75    int Nsecfilt = GetPhotcodeNsecfilt ();
    7676    /* extract values, assign to vectors */
    7777    for (i = 0; i < catalog.Naverage; i++) {

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

    r27435 r34088  
    77 
    88  off_t i, k, Nr;
    9   int NSTAR, Nstar, Nsecfilt, N, mode[2];
     9  int NSTAR, N, mode[2];
    1010
    1111  Catalog catalog;
    … …  
    2525  /* load photcode information */
    2626  if (!InitPhotcodes ()) goto escape;
    27   Nsecfilt = GetPhotcodeNsecfilt ();
    2827
    2928  /* command line arguments */
    … …  
    6160
    6261  N = 0;
    63   Nstar = 0;
    6462  NSTAR = 100;
    6563  for (k = 0; k < NVEC; k++) {
    … …  
    8785
    8886    # if (0)
     87    int Nstar = 0;
     88    int Nsecfilt = GetPhotcodeNsecfilt ();
     89
    8990    /* extract values, assign to vectors */
    9091    for (i = 0; i < catalog.Naverage; i++) {

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

    r27435 r34088  
    88  int mode[4];
    99  int Nsecfilt, KeepNulls;
    10   void *Signal;
    1110
    1211  Catalog catalog;
    … …  
    6362
    6463  // grab data from all selected sky regions
    65   Signal = signal (SIGINT, handle_interrupt);
     64  signal (SIGINT, handle_interrupt);
    6665  interrupt = FALSE;
    6766

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

    r27435 r34088  
    88  int Npts, NPTS, mode[3];
    99  int Nsecfilt, KeepNulls;
    10   void *Signal;
    1110
    1211  PhotCode *code[3];
    … …  
    6160
    6261  // grab data from all selected sky regions
    63   Signal = signal (SIGINT, handle_interrupt);
     62  // void *Signal = signal (SIGINT, handle_interrupt);
     63  signal (SIGINT, handle_interrupt);
    6464  interrupt = FALSE;
    6565

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

    r27435 r34088  
    66int cmpload (int argc, char **argv) {
    77 
    8   int i, Noverlay, NOVERLAY, Nstar, N, Nin, Nextra, Objtype, type;
     8  int i, Noverlay, NOVERLAY, Nstar, N, Nextra, Objtype, type;
    99  int doneread, done, Nskip, Nbytes, nbytes, Ninstar;
    1010  char *c, *c2, *name;
    … …  
    6363 
    6464  /* load in stars by blocks of 1000 */
    65   Nin = 0;
    6665  ALLOCATE (buffer, char, (BLOCK*BYTES_STAR) + 1);
    6766  buffer[BLOCK*BYTES_STAR] = 0;

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

    r28241 r34088  
    2626  off_t i, j, k, m;
    2727  int N, done, Nfit;
    28   int Nsecfilt, status;
     28  int status;
    2929  void *oldsignal;
    3030  char name[64], line[1024], key[20];
    … …  
    4141  KapaSection magSection, resSection;
    4242
    43   Catalog catalog, outcat;
     43  Catalog catalog;
    4444  SkyList *skylist;
    4545  SkyRegionSelection *selection;
    … …  
    5757  catalog.secfilt = NULL;
    5858
    59   outcat.average = NULL;
    60   outcat.measure = NULL;
    61   outcat.secfilt = NULL;
     59  // outcat.average = NULL;
     60  // outcat.measure = NULL;
     61  // outcat.secfilt = NULL;
    6262
    6363  SEDtable = NULL;
    … …  
    8080  /* load photcode information */
    8181  if (!InitPhotcodes ()) goto escape;
    82   Nsecfilt = GetPhotcodeNsecfilt ();
    8382
    8483  /* interpret command-line options */

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

    r33662 r34088  
    88  SkyTable *sky;
    99  SkyList *skylist;
    10   void *Signal;
    1110
    1211  int ShowHost = FALSE;
    … …  
    4342
    4443  // prepare to handle interrupt signals
    45   Signal = signal (SIGINT, handle_interrupt);
     44  signal (SIGINT, handle_interrupt);
    4645  interrupt = FALSE;
    4746

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

    r33963 r34088  
    1515  if (!strncmp(argv[1], "purge-temp", MAX(strlen(argv[1]), 3))) {
    1616    glob_t pglob;
     17    int ALL_PID = FALSE;
    1718    int PID = getpid();
    1819    int N;
    … …  
    2021      remove_argument (N, &argc, argv);
    2122      PID = atoi(argv[N]);
     23      remove_argument (N, &argc, argv);
     24    }
     25
     26    if ((N = get_argument (argc, argv, "-all-pid"))) {
     27      remove_argument (N, &argc, argv);
     28      ALL_PID = TRUE;
    2229      remove_argument (N, &argc, argv);
    2330    }
    … …  
    6067      pglob.gl_offs = 0;
    6168      char name[DVO_MAX_PATH];
    62       snprintf (name, DVO_MAX_PATH, "%s/dvo.results.%05d.*.fits", table->hosts[i].pathname, PID);
     69      if (ALL_PID) {
     70        snprintf (name, DVO_MAX_PATH, "%s/dvo.results.*.*.fits", table->hosts[i].pathname);
     71      } else {
     72        snprintf (name, DVO_MAX_PATH, "%s/dvo.results.%05d.*.fits", table->hosts[i].pathname, PID);
     73      }
    6374      if (VERBOSE) gprint (GP_ERR, "checking %s\n", name);
    6475      glob (name, 0, NULL, &pglob);

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

    r31635 r34088  
    1313  off_t i, Nimage, Nmosaic;
    1414  int j, status, InPic, leftside, *plist, TimeSelect, ByName;
    15   int WITH_MOSAIC, SOLO_MOSAIC, HIDDEN;
     15  int WITH_MOSAIC, SOLO_MOSAIC;
    1616  time_t tzero, tend;
    1717  int N, NPTS, n, npts, Npts, kapa, *foundMosaic;
    … …  
    4242  }
    4343
    44   HIDDEN = FALSE;
    45   if ((N = get_argument (argc, argv, "-hidden"))) {
    46     remove_argument (N, &argc, argv);
    47     HIDDEN = TRUE;
    48   }
     44  // int HIDDEN = FALSE;
     45  // if ((N = get_argument (argc, argv, "-hidden"))) {
     46  //   remove_argument (N, &argc, argv);
     47  //   HIDDEN = TRUE;
     48  // }
    4949
    5050  photcode = NULL;

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

    r31635 r34088  
    1515  Vector *vec;
    1616  SkyRegionSelection *selection;
    17   void *Signal;
    1817
    1918  // parse skyregion options
    … …  
    130129
    131130  // prepare to handle interrupt signals
    132   Signal = signal (SIGINT, handle_interrupt);
     131  signal (SIGINT, handle_interrupt);
    133132  interrupt = FALSE;
    134133

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

    r31635 r34088  
    55  off_t i, j, Nimage;
    66  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
    7   int VERBOSE;
    87  char **cstack, name[1024];
    98  void *Signal;
    … …  
    2726  if ((N = get_argument (argc, argv, "--help"))) goto help;
    2827
    29   VERBOSE = FALSE;
    30   if ((N = get_argument (argc, argv, "-v"))) {
    31     remove_argument (N, &argc, argv);
    32     VERBOSE = TRUE;
    33   }
     28  // int VERBOSE = FALSE;
     29  // if ((N = get_argument (argc, argv, "-v"))) {
     30  //   remove_argument (N, &argc, argv);
     31  //   VERBOSE = TRUE;
     32  // }
    3433
    3534  if (!InitPhotcodes ()) goto escape;

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

    r31635 r34088  
    44 
    55  off_t i, j, Nimage, *subset, Nsubset;
    6   int N, TimeSelect, RegionSelect, TimeFormat, NameSelect;
     6  int N, TimeSelect, TimeFormat, NameSelect;
    77  int PhotcodeSelect;
    88  time_t tzero, TimeReference;
    … …  
    3838  }
    3939
    40   RegionSelect = FALSE;
    41   if ((N = get_argument (argc, argv, "-region"))) {
    42     remove_argument (N, &argc, argv);
    43     RegionSelect = TRUE;
    44   }
     40  // int RegionSelect = FALSE;
     41  // if ((N = get_argument (argc, argv, "-region"))) {
     42  //   remove_argument (N, &argc, argv);
     43  //   RegionSelect = TRUE;
     44  // }
    4545
    4646  PhotcodeValue = NULL;

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

    r31635 r34088  
    99  char bufname[64];
    1010  float *p;
    11   double fx, fy, x, y;
     11  double x, y;
    1212  Image *image;
    1313  Buffer *buf;
    … …  
    5858
    5959  if (GreyScale && Nsubset) {
    60     fx = image[subset[0]].NX / 100;
    61     fy = image[subset[0]].NY / 200;
     60    // double fx = image[subset[0]].NX / 100;
     61    // double fy = image[subset[0]].NY / 200;
    6262    p = (float *) buf[0].matrix.buffer;
    6363    for (y = 0; y < 200; y+=1.0) {

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

    r27435 r34088  
    77  double *RA, *DEC;
    88  int kapa, TimeFormat;
    9   int found, AutoLimits, ErrorBars, GalMag, AbsPhot, SaveVectors;
     9  int found, AutoLimits, ErrorBars, SaveVectors;
    1010  off_t i, j, m, Nstars, *N1;
    1111  int N, NPTS;
    … …  
    3939  }
    4040
    41   AbsPhot = FALSE;
    42   if ((N = get_argument (argc, argv, "-abs"))) {
    43     remove_argument (N, &argc, argv);
    44     AbsPhot = TRUE;
    45   }
     41  // int AbsPhot = FALSE;
     42  // if ((N = get_argument (argc, argv, "-abs"))) {
     43  //   remove_argument (N, &argc, argv);
     44  //   AbsPhot = TRUE;
     45  // }
    4646
    47   GalMag = FALSE;
    48   if ((N = get_argument (argc, argv, "-gal"))) {
    49     gprint (GP_ERR, "galaxy magnitudes currently disabled\n");
    50     return (FALSE);
    51   }
     47  // int GalMag = FALSE;
     48  // if ((N = get_argument (argc, argv, "-gal"))) {
     49  //   gprint (GP_ERR, "galaxy magnitudes currently disabled\n");
     50  //   return (FALSE);
     51  // }
    5252
    5353  ErrorBars = FALSE;

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

    r31450 r34088  
    55int objectcoverage (int argc, char **argv) {
    66
    7   void *Signal;
    87  int ShowDensity;
    9   int N, status, TimeSelect, xs, ys;
    10   time_t tzero, tend;
    11   double pixscale, r, d, Xs, Ys, trange, RaCenter, DecCenter;
     8  int N, status, xs, ys;
     9  double pixscale, r, d, Xs, Ys, RaCenter, DecCenter;
    1210  char projection[16];
    1311  float *V;
    … …  
    7775  }
    7876
    79   TimeSelect = FALSE;
    80   if ((N = get_argument (argc, argv, "-time"))) {
    81     remove_argument (N, &argc, argv);
    82     if (!ohana_str_to_time (argv[N], &tzero)) {
    83       gprint (GP_ERR, "syntax error\n");
    84       return (FALSE);
    85     }
    86     remove_argument (N, &argc, argv);
    87     if (!ohana_str_to_dtime (argv[N], &trange)) {
    88       gprint (GP_ERR, "syntax error\n");
    89       return (FALSE);
    90     }
    91     remove_argument (N, &argc, argv);
    92     if (trange < 0) {
    93       trange = fabs (trange);
    94       tzero -= trange;
    95     }
    96     TimeSelect = TRUE;
    97   }
    98   if ((N = get_argument (argc, argv, "-trange"))) {
    99     remove_argument (N, &argc, argv);
    100     if (!ohana_str_to_time (argv[N], &tzero)) {
    101       gprint (GP_ERR, "syntax error\n");
    102       return (FALSE);
    103     }
    104     remove_argument (N, &argc, argv);
    105     if (!ohana_str_to_time (argv[N], &tend)) {
    106       gprint (GP_ERR, "syntax error\n");
    107       return (FALSE);
    108     }
    109     remove_argument (N, &argc, argv);
    110     trange = tend - tzero;
    111     if (trange < 0) {
    112       trange = fabs (trange);
    113       tzero -= trange;
    114     }
    115     TimeSelect = TRUE;
    116   }
     77  // double trange;
     78  // time_t tzero, tend;
     79  // int TimeSelect = FALSE;
     80  // if ((N = get_argument (argc, argv, "-time"))) {
     81  //   remove_argument (N, &argc, argv);
     82  //   if (!ohana_str_to_time (argv[N], &tzero)) {
     83  //     gprint (GP_ERR, "syntax error\n");
     84  //     return (FALSE);
     85  //   }
     86  //   remove_argument (N, &argc, argv);
     87  //   if (!ohana_str_to_dtime (argv[N], &trange)) {
     88  //     gprint (GP_ERR, "syntax error\n");
     89  //     return (FALSE);
     90  //   }
     91  //   remove_argument (N, &argc, argv);
     92  //   if (trange < 0) {
     93  //     trange = fabs (trange);
     94  //     tzero -= trange;
     95  //   }
     96  //   TimeSelect = TRUE;
     97  // }
     98  // if ((N = get_argument (argc, argv, "-trange"))) {
     99  //   remove_argument (N, &argc, argv);
     100  //   if (!ohana_str_to_time (argv[N], &tzero)) {
     101  //     gprint (GP_ERR, "syntax error\n");
     102  //     return (FALSE);
     103  //   }
     104  //   remove_argument (N, &argc, argv);
     105  //   if (!ohana_str_to_time (argv[N], &tend)) {
     106  //     gprint (GP_ERR, "syntax error\n");
     107  //     return (FALSE);
     108  //   }
     109  //   remove_argument (N, &argc, argv);
     110  //   trange = tend - tzero;
     111  //   if (trange < 0) {
     112  //     trange = fabs (trange);
     113  //     tzero -= trange;
     114  //   }
     115  //   TimeSelect = TRUE;
     116  // }
    117117 
    118118  if (argc != 3) {
    … …  
    178178  Nsecfilt = GetPhotcodeNsecfilt();
    179179  // grab data from all selected sky regions
    180   Signal = signal (SIGINT, handle_interrupt);
     180  signal (SIGINT, handle_interrupt);
    181181  interrupt = FALSE;
    182182

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

    r27435 r34088  
    44int paverage (int argc, char **argv) {
    55 
    6   FILE *f;
    76  off_t i, j;
    87  int kapa, Narg, Npts, NPTS, status, VERBOSE;
    … …  
    1211  unsigned IDclip, IDchoice, LimExclude;
    1312  float *Xvec, *Yvec, *Zvec;
    14   void *Signal;
    1513
    1614  PhotCode *photcode;
    … …  
    2725  if (!style_args (&graphmode, &argc, argv, &kapa)) return FALSE;
    2826
    29   f = (FILE *) NULL;
    3027  Mz = 17.0;
    3128  Mr = -5.0;
    … …  
    10299
    103100  // prepare to handle interrupt signals
    104   Signal = signal (SIGINT, handle_interrupt);
     101  signal (SIGINT, handle_interrupt);
    105102  interrupt = FALSE;
    106103

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

    r27435 r34088  
    66int pmeasure (int argc, char **argv) {
    77 
    8   FILE *f;
    98  off_t i, j, k, m;
    109  int kapa, Narg, Npts, NPTS, status, VERBOSE, TimeSelect, Nloaded;
    … …  
    1716  float *Xvec, *Yvec, *Zvec;
    1817  time_t tzero, tend;
    19   void *Signal;
    2018
    2119  SkyTable *sky;
    … …  
    2725  if (!style_args (&graphmode, &argc, argv, &kapa)) return FALSE;
    2826
    29   f = (FILE *) NULL;
    3027  Mz = 17.0;
    3128  Mr = -5.0;
    … …  
    175172
    176173  // prepare to handle interrupt signals
    177   Signal = signal (SIGINT, handle_interrupt);
     174  signal (SIGINT, handle_interrupt);
    178175  interrupt = FALSE;
    179176

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

    r27435 r34088  
    1212  Header header;
    1313  Coords coords;
    14   int i, j, kapa, Nstars, nstars, Nbytes, nbytes, Npts, N;
     14  int i, j, kapa, Nstars, nstars, Nbytes, nbytes, N;
    1515  Graphdata graphmode;
    1616
    … …  
    150150  graphmode.size = -1;
    151151  graphmode.etype = 0;
    152   Npts = Xvec.Nelements;
    153152
    154153  PlotVectorTriplet (kapa, &Xvec, &Yvec, &Zvec, &graphmode);

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

    r30612 r34088  
    1414  SkyList *skylist;
    1515  SkyRegion **regions;
    16   void *Signal;
    1716
    1817  VERBOSE = FALSE;
    … …  
    6261
    6362  // prepare to handle interrupt signals
    64   Signal = signal (SIGINT, handle_interrupt);
     63  signal (SIGINT, handle_interrupt);
    6564  interrupt = FALSE;
    6665

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

    r29938 r34088  
    125125                    opihi_flt *zs, opihi_flt *zp, opihi_flt *sk) {
    126126
    127   double Ra2, Ri2, Ro2, rad2;
     127  double Ro2, rad2;
    128128  int i, j, Npts, Nsky;
    129129  int Xs, Xe, Ys, Ye, off, Xc, Yc;
    … …  
    132132 
    133133  /* define circular boundaries */
    134   Ra2 = SQ(Raper);
    135   Ri2 = SQ(Rinner);
    136134  Ro2 = SQ(Router);
    137135
    … …  
    145143/* this sample uses a circular aperture */
    146144# if (0)
     145  double Ri2 = SQ(Rinner);
    147146  Nsky = 0; 
    148147  for (j = Ys; j < Ye; j++) {

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

    r20936 r34088  
    1414int svdcmp (float *a, opihi_flt *w, float *v, int Nx, int Ny) {
    1515
    16   int flag, i, its, j, jj, k, l, nm, status;
     16  int flag, i, its, j, jj, k, l, nm;
    1717  float c, f, h, s, x, y, z;
    1818  float anorm=0.0, g = 0.0, scale = 0.0;
    … …  
    111111  }
    112112
    113   status = 1;
     113  // int status = 1;
    114114  for (k = Nx - 1; k >= 0; k--) {
    115115    for (its = 0; its < 30; its++) {
    … …  
    152152        break;
    153153      }
    154       if (its == 29) status = 0;
     154      // if (its == 29) status = 0;
    155155      x = w[l];
    156156      nm = k-1;

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

    r16890 r34088  
    44StackVar *convert_to_RPN (int argc, char **argv, int *nstack) {
    55 
    6   int type, Nx, Ny;
     6  int type;
    77  int i, j, Nstack, Nop_stack, NSTACK;
    88  StackVar *stack, *op_stack;
    … …  
    1717  }
    1818 
    19   Nx = Ny = Nstack = Nop_stack = 0;
     19  Nstack = Nop_stack = 0;
    2020  for (i = 0; i < argc; i++) {
    2121   

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

    r20936 r34088  
    1212int evaluate_stack (StackVar *stack, int *Nstack) {
    1313 
    14   int i, j, Nvar, Nout, status;
     14  int i, j, status;
    1515  char line[512]; // this is only used to report an error
    1616  StackVar tmp_stack;
    17   Nout = Nvar = 0;
    1817
    1918  status = TRUE;

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

    r31667 r34088  
    44int opihi (int argc, char **argv) {
    55
    6   int Nbad, status;
     6  int Nbad;
    77  char *line, *prompt, *history;
    88  pid_t ppid;
    … …  
    3939    stripwhite (line);
    4040    if (*line) {
    41       status = multicommand (line);
     41      multicommand (line);
    4242      add_history (line);
    4343

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

    r32632 r34088  
    6363int CheckControllerJob (Job *job) {
    6464  struct timeval start, stop;
    65   float dtime;
    6665
    6766  gettimeofday (&start, (void *) NULL);
    6867  CheckControllerJobStatus (job);
    6968  gettimeofday (&stop, (void *) NULL);
    70   dtime = DTIME (stop, start);
    71   /* if (VerboseMode()) gprint (GP_ERR, "check job status %f\n", dtime); */
     69  // float dtime = DTIME (stop, start);
     70  // if (VerboseMode()) gprint (GP_ERR, "check job status %f\n", dtime);
    7271
    7372  if ((job[0].state == JOB_EXIT) || (job[0].state == JOB_CRASH)) {
    … …  
    7574    GetJobOutput ("stdout", job[0].pid, &job[0].stdout_buff, job[0].stdout_size);
    7675    gettimeofday (&stop, (void *) NULL);
    77     dtime = DTIME (stop, start);
     76    // float dtime = DTIME (stop, start);
    7877    /* if (VerboseMode()) gprint (GP_ERR, "get stdout %f\n", dtime); */
    7978
    … …  
    8180    GetJobOutput ("stderr", job[0].pid, &job[0].stderr_buff, job[0].stderr_size);
    8281    gettimeofday (&stop, (void *) NULL);
    83     dtime = DTIME (stop, start);
     82    // float dtime = DTIME (stop, start);
    8483    /* if (VerboseMode()) gprint (GP_ERR, "get stderr %f\n", dtime); */
    8584
    … …  
    8786    DeleteControllerJob (job);
    8887    gettimeofday (&stop, (void *) NULL);
    89     dtime = DTIME (stop, start);
     88    // float dtime = DTIME (stop, start);
    9089    /* if (VerboseMode()) gprint (GP_ERR, "delete job %f\n", dtime); */
    9190  } 
    … …  
    578577int QuitController () {
    579578
    580   int status;
    581579  char cmd[128];
    582580  IOBuffer buffer;
    … …  
    586584  sprintf (cmd, "quit");
    587585  InitIOBuffer (&buffer, 0x100);
    588   status = ControllerCommand (cmd, NULL, &buffer);
     586  ControllerCommand (cmd, NULL, &buffer);
    589587  FreeIOBuffer (&buffer);
    590588

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

    r31666 r34088  
    44int client_shell (int argc, char **argv) {
    55
    6   int Nbad, status;
     6  int Nbad;
    77  char *line, *prompt, *history;
    88  pid_t ppid;
    … …  
    4141
    4242    if (*line) {
    43         status = multicommand (line);
     43      // status = multicommand (line); do something different if false?
     44        multicommand (line);
    4445        add_history (line);
    4546        append_history (1, history);

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

    r32632 r34088  
    55
    66  int hash;
    7   int ThisList, status;
     7  int ThisList;
    88  char *input, *outline;
    99  Task *task;
    … …  
    8282      case TASK_NPENDING:
    8383      case TASK_ACTIVE:
    84         status = command (input, &outline, TRUE);
     84        // status = command(); do something with this info?
     85        command (input, &outline, TRUE);
    8586        if (outline != NULL) free (outline);
    86         /* what to do if command is invalid?
    87            if (!status) return (FALSE); */
    8887        break;
    8988

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

    r25872 r34088  
    4040int CheckHostResponse (Host *host) {
    4141 
    42   IOBuffer *buffer;
    43 
    4442  /* we only check IDLE hosts without jobs */
    4543  ASSERT (host, "missing host");
    46   buffer = &host[0].comms_buffer;
    4744
    4845  // XXX check on the value of the response? (OK)

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

    r28158 r34088  
    6262void *CheckSystem_Threaded (void *data) {
    6363
    64   int Njobchecks, Nhostchecks, Nlivechecks, Ndonejobs;
    65 
    66   Nlivechecks = 0;
     64  int Njobchecks, Nhostchecks, Ndonejobs;
    6765
    6866  gprintInit ();

  • trunk/Ohana/src/opihi/pcontrol/Makefile

    r33662 r34088  
    1313LIBS1         = -lkapa -lFITS -lohana
    1414LIBS2         = -lbasiccmd -lshell -ldata
    15 FULL_CFLAGS   = $(BASE_CFLAGS) -Wall -Werror
     15FULL_CFLAGS   = $(BASE_CFLAGS)
    1616FULL_CPPFLAGS = $(BASE_CPPFLAGS)
    1717FULL_LDFLAGS  = $(LIBS1) $(LIBS2) $(BASE_LDFLAGS)
Note: See TracChangeset for help on using the changeset viewer.