IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 2803


Ignore:
Timestamp:
Dec 23, 2004, 7:48:29 AM (22 years ago)
Author:
eugene
Message:

moved typename/modename to libohana, minor fixes to solve -Wall -Werror problems

Location:
trunk/Ohana/src/imregister
Files:
61 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/imregister/Makefile

    r2767 r2803  
    2121INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    2222LIBS    =       -L$(LLIB) -lFITS -lohana -lm
    23 # CFLAGS        =       $(INCS) -Wall -Wunused
     23# CFLAGS        =       $(INCS) -Wall -Werror
    2424CFLAGS  =       $(INCS)
    2525LFLAGS  =       $(LIBS)

  • trunk/Ohana/src/imregister/base/ConfigFilter.c

    r82 r2803  
    6464int MatchFilterList (char *line) {
    6565
    66   char *p, tmp[31];
     66  char *p;
    6767  int i, blank;
    6868

  • trunk/Ohana/src/imregister/base/misc.c

    r2771 r2803  
    105105  int mode;
    106106
     107  mode = FORMAT_DATE;
     108
    107109  p1 = line;
    108110  tmp = strtod (p1, &p2);
    … …  
    123125      mode = FORMAT_JD;
    124126    }
    125   } else {
    126     mode = FORMAT_DATE;
    127127  }
    128128  return (mode);
    … …  
    404404  int status, cmode;
    405405  struct stat filestat;
    406   char line [256];
     406  char line[256];
    407407
    408408  status = stat (filename, &filestat);
    … …  
    419419  }
    420420}
    421 
    422421
    423422int get_filter_arguments (int *argc, char **argv, int **Filt, int *Nfilt) {
    … …  
    459458 
    460459   
    461 int get_version (int argc, char **argv, char *version) {
     460void get_version (int argc, char **argv, char *version) {
    462461
    463462  int N;

  • trunk/Ohana/src/imregister/base/parse_time.c

    r2770 r2803  
    7575  for (c = strchr (line, 0x2d); c != (char *) NULL; c = strchr (line, 0x2d)) { *c = ' '; }
    7676
     77  Nf = 0;
    7778  switch (mode) {
    7879  case 1:

  • trunk/Ohana/src/imregister/base/sort.c

    r70 r2803  
     1# include <string.h>
    12
    23void sort (float *value, int N) {

  • trunk/Ohana/src/imregister/detrend/altpath.c

    r124 r2803  
    55 
    66  int i, j, n, found, status;
    7   int Nimage, Nlist, Ncurrent, Nadd, Nremove;
    8   int *list, *current, *curfound, *add, *remove;
     7  int Nimage, Nlist;
     8  int *list, *current;
    99  char *dBPath, infile[256], outfile[256], line[1024];
    1010  DetReg *image;
    … …  
    106106
    107107  fprintf (stderr, "unknown altpath mode: %d\n", output.Altpath);
     108  return (TRUE);
    108109}
    109110

  • trunk/Ohana/src/imregister/detrend/args.detregister.c

    r3 r2803  
    1616  /* define time range */
    1717  descriptor[0].TimeSelect = FALSE;
    18   if (N = get_argument (argc, argv, "-time")) {
     18  if ((N = get_argument (argc, argv, "-time"))) {
    1919    remove_argument (N, &argc, argv);
    2020    if (!str_to_time (argv[N], &descriptor[0].tstart)) {
    … …  
    3333  /* set optional label */
    3434  descriptor[0].label = strcreate ("detrend");
    35   if (N = get_argument (argc, argv, "-label")) {
     35  if ((N = get_argument (argc, argv, "-label"))) {
    3636    remove_argument (N, &argc, argv);
    3737    descriptor[0].label = strcreate (argv[N]);
    … …  
    4141  /* set optional label */
    4242  descriptor[0].imageID = strcreate ("test");
    43   if (N = get_argument (argc, argv, "-ID")) {
     43  if ((N = get_argument (argc, argv, "-ID"))) {
    4444    remove_argument (N, &argc, argv);
    4545    descriptor[0].imageID = strcreate (argv[N]);
    … …  
    4949  /* set optional order */
    5050  descriptor[0].order = 0;
    51   if (N = get_argument (argc, argv, "-order")) {
     51  if ((N = get_argument (argc, argv, "-order"))) {
    5252    remove_argument (N, &argc, argv);
    5353    descriptor[0].order = atoi (argv[N]);
    … …  
    5656 
    5757  /* define image type */
    58   descriptor[0].type = T_NONE;
    59   if (N = get_argument (argc, argv, "-type")) {
     58  descriptor[0].type = T_UNDEF;
     59  if ((N = get_argument (argc, argv, "-type"))) {
    6060    remove_argument (N, &argc, argv);
    61     for (i = 0; i < NTYPE; i++) {
    62       if (!strncasecmp (argv[N], typename[i], strlen(typename[i]))) {
    63         descriptor[0].type = i;
    64       }
    65     }
    66     if (descriptor[0].type == T_NONE) {
     61    descriptor[0].type = get_image_type (argv[N]);
     62    if (descriptor[0].type == T_UNDEF) {
    6763      fprintf (stderr, "ERROR: invalid image type %s\n", argv[N]);
    6864      exit (1);
    … …  
    7369  /* define ccd number */
    7470  descriptor[0].CCDSelect = FALSE;
    75   if (N = get_argument (argc, argv, "-ccd")) {
     71  if ((N = get_argument (argc, argv, "-ccd"))) {
    7672    remove_argument (N, &argc, argv);
    7773    descriptor[0].CCD = -1;
    … …  
    9288  descriptor[0].Exptime = 0.0;
    9389  descriptor[0].ExptimeSelect = FALSE;
    94   if (N = get_argument (argc, argv, "-exptime")) {
     90  if ((N = get_argument (argc, argv, "-exptime"))) {
    9591    remove_argument (N, &argc, argv);
    9692    descriptor[0].Exptime = atof (argv[N]);
    … …  
    10197  /* define filter */
    10298  descriptor[0].filter = FILTER_NONE;
    103   if (N = get_argument (argc, argv, "-filter")) {
     99  if ((N = get_argument (argc, argv, "-filter"))) {
    104100    remove_argument (N, &argc, argv);
    105101    for (i = 0; (i < NFILTER) && (descriptor[0].filter == FILTER_NONE); i++) {
    … …  
    122118    exit (1);
    123119  }
    124  
     120  return (TRUE);
    125121}

  • trunk/Ohana/src/imregister/detrend/args.detsearch.c

    r2450 r2803  
    66
    77  int i, N;
    8   int MosaicSelect, ImageSelect, RangeSelect, bad, Recipe, Ncrit;
     8  int MosaicSelect, ImageSelect, bad, Recipe, Ncrit;
    99  char *ImageFile, *ImageMode, *ImageExtend;
    10   Header header;
    11   char line[256];
    1210  Criteria base, *crit;
    13   int Ntimes, Nfilt, *filt;
     11  int *filt;
    1412  unsigned long *tstart, *tstop;
    1513
    16   if (N = get_argument (argc, argv, "-h")) { usage (); }
    17   if (N = get_argument (argc, argv, "--help")) { usage (); }
     14  if ((N = get_argument (argc, argv, "-h"))) { usage (); }
     15  if ((N = get_argument (argc, argv, "--help"))) { usage (); }
    1816  bzero (&base, sizeof (Criteria));
    1917
    … …  
    2321  ConfigFilter ();
    2422
     23  ImageFile = ImageMode = ImageExtend = NULL;
     24
    2525  /* mosaic-based selection */
    2626  MosaicSelect = FALSE;
    27   if (N = get_argument (argc, argv, "-mosaic")) {
     27  if ((N = get_argument (argc, argv, "-mosaic"))) {
    2828    remove_argument (N, &argc, argv);
    2929    ImageFile = strcreate (argv[N]);
    … …  
    4545  /* image-based selection */
    4646  ImageSelect = FALSE;
    47   if (N = get_argument (argc, argv, "-image")) {
     47  if ((N = get_argument (argc, argv, "-image"))) {
    4848    remove_argument (N, &argc, argv);
    4949    ImageFile = strcreate (argv[N]);
    … …  
    6868  /* define image type */
    6969  base.TypeSelect = FALSE;
    70   base.Type = T_NONE;
    71   if (N = get_argument (argc, argv, "-type")) {
    72     remove_argument (N, &argc, argv);
    73     for (i = 0; (i < NTYPE) && (base.Type == T_NONE); i++) {
    74       if (!strncasecmp (argv[N], typename[i], strlen(typename[i]))) {
    75         base.Type = i;
    76       }
    77     }
    78     if (base.Type == T_NONE) {
     70  base.Type = T_UNDEF;
     71  if ((N = get_argument (argc, argv, "-type"))) {
     72    remove_argument (N, &argc, argv);
     73    base.Type = get_image_type (argv[N]);
     74    if (base.Type == T_UNDEF) {
    7975      fprintf (stderr, "ERROR: invalid image type %s\n", argv[N]);
    8076      exit (1);
    … …  
    8783  /* image mode (mef, splt, etc) */
    8884  base.ModeSelect = FALSE;
    89   base.Mode = M_NONE;
    90   if (N = get_argument (argc, argv, "-mode")) {
    91     remove_argument (N, &argc, argv);
    92     for (i = 0; (i < NMODE) && (base.Mode == M_NONE); i++) {
    93       if (!strncasecmp (argv[N], modename[i], strlen(argv[N]))) base.Mode = i;
    94     }
    95     if (base.Mode == M_NONE) {
     85  base.Mode = M_UNDEF;
     86  if ((N = get_argument (argc, argv, "-mode"))) {
     87    remove_argument (N, &argc, argv);
     88    base.Mode = get_image_mode (argv[N]);
     89    if (base.Mode == M_UNDEF) {
    9690      fprintf (stderr, "ERROR: invalid image mode %s\n", argv[N]);
    9791      exit (1);
    … …  
    10498  tstart = tstop = (unsigned long *) NULL;
    10599  base.TimeSelect = base.tstart = base.tstop = 0;
    106   if (N = get_argument (argc, argv, "-time")) {
     100  if ((N = get_argument (argc, argv, "-time"))) {
    107101    remove_argument (N, &argc, argv);
    108102    bad  = get_argument (argc, argv, "-trange");
    … …  
    131125  /* define ccd number */
    132126  base.CCDSelect = FALSE;
    133   if (N = get_argument (argc, argv, "-ccd")) {
     127  if ((N = get_argument (argc, argv, "-ccd"))) {
    134128    base.CCD = -1;
    135129    remove_argument (N, &argc, argv);
    … …  
    149143  /* define exposure time */
    150144  base.ExptimeSelect = FALSE;
    151   if (N = get_argument (argc, argv, "-exptime")) {
     145  if ((N = get_argument (argc, argv, "-exptime"))) {
    152146    remove_argument (N, &argc, argv);
    153147    base.Exptime = atof (argv[N]);
    … …  
    158152  /* varients on the standard selection */
    159153  base.EntrySelect = FALSE;
    160   if (N = get_argument (argc, argv, "-entry")) {
     154  if ((N = get_argument (argc, argv, "-entry"))) {
    161155    remove_argument (N, &argc, argv);
    162156    base.Entry = atoi (argv[N]);
    … …  
    165159  }
    166160  base.MatchNumber = -1;
    167   if (N = get_argument (argc, argv, "-match")) {
     161  if ((N = get_argument (argc, argv, "-match"))) {
    168162    remove_argument (N, &argc, argv);
    169163    base.MatchNumber = atoi (argv[N]);
    … …  
    171165  }
    172166  base.LabelSelect = FALSE;
    173   if (N = get_argument (argc, argv, "-label")) {
     167  if ((N = get_argument (argc, argv, "-label"))) {
    174168    remove_argument (N, &argc, argv);
    175169    base.Label = strcreate (argv[N]);
    … …  
    178172  }
    179173  base.NameSelect = FALSE;
    180   if (N = get_argument (argc, argv, "-name")) {
     174  if ((N = get_argument (argc, argv, "-name"))) {
    181175    remove_argument (N, &argc, argv);
    182176    base.Name = strcreate (argv[N]);
    … …  
    187181  /* these options affect the output mode */
    188182  output.Close = FALSE;
    189   if (N = get_argument (argc, argv, "-close")) {
     183  if ((N = get_argument (argc, argv, "-close"))) {
    190184    if (!base.TimeSelect && !ImageSelect && !MosaicSelect) {       
    191185      fprintf (stderr, "ERROR: syntax error in -close requires one of: -time -trange -image -mosaic\n");
    … …  
    196190  }
    197191  output.TimeMode = START;
    198   if (N = get_argument (argc, argv, "-tstop")) {
     192  if ((N = get_argument (argc, argv, "-tstop"))) {
    199193    remove_argument (N, &argc, argv);
    200194    output.TimeMode = STOP;
    201195  }
    202   if (N = get_argument (argc, argv, "-treg")) {
     196  if ((N = get_argument (argc, argv, "-treg"))) {
    203197    remove_argument (N, &argc, argv);
    204198    output.TimeMode = REG;
    205199  }
    206200  output.ElixirSmart = FALSE;
    207   if (N = get_argument (argc, argv, "-ve")) {
     201  if ((N = get_argument (argc, argv, "-ve"))) {
    208202    remove_argument (N, &argc, argv);
    209203    output.ElixirSmart = TRUE;
    210204  }
    211205  output.verbose = TRUE;
    212   if (N = get_argument (argc, argv, "-quiet")) {
     206  if ((N = get_argument (argc, argv, "-quiet"))) {
    213207    remove_argument (N, &argc, argv);
    214208    output.verbose = FALSE;
    215209  }
    216210  output.table = (char *) NULL;
    217   if (N = get_argument (argc, argv, "-fits")) {
     211  if ((N = get_argument (argc, argv, "-fits"))) {
    218212    remove_argument (N, &argc, argv);
    219213    output.table = strcreate (argv[N]);
    … …  
    221215  }
    222216  output.bintable = (char *) NULL;
    223   if (N = get_argument (argc, argv, "-binfits")) {
     217  if ((N = get_argument (argc, argv, "-binfits"))) {
    224218    remove_argument (N, &argc, argv);
    225219    output.bintable = strcreate (argv[N]);
    … …  
    227221  }
    228222  output.Criteria = FALSE;
    229   if (N = get_argument (argc, argv, "-criteria")) {
     223  if ((N = get_argument (argc, argv, "-criteria"))) {
    230224    output.Criteria = TRUE;
    231225    remove_argument (N, &argc, argv);
    232226  }
    233227  output.Chipname = FALSE;
    234   if (N = get_argument (argc, argv, "-chipname")) {
     228  if ((N = get_argument (argc, argv, "-chipname"))) {
    235229    output.Chipname = TRUE;
    236230    remove_argument (N, &argc, argv);
    … …  
    239233  /* these options modify behavior */
    240234  output.Select = FALSE;
    241   if (N = get_argument (argc, argv, "-select")) {
     235  if ((N = get_argument (argc, argv, "-select"))) {
    242236    remove_argument (N, &argc, argv);
    243237    output.Select = TRUE;
    … …  
    246240  /* these options modify behavior */
    247241  Recipe = FALSE;
    248   if (N = get_argument (argc, argv, "-recipe")) {
     242  if ((N = get_argument (argc, argv, "-recipe"))) {
    249243    remove_argument (N, &argc, argv);
    250244    Recipe = TRUE;
    251     if (base.Type != T_NONE) {
     245    if (base.Type != T_UNDEF) {
    252246      fprintf (stderr, "-recipe and -type cannot be combined\n");
    253247      exit (1);
    … …  
    257251  /* options which alter the database */
    258252  output.Delete = FALSE;
    259   if (N = get_argument (argc, argv, "-del")) {
     253  if ((N = get_argument (argc, argv, "-del"))) {
    260254    remove_argument (N, &argc, argv);
    261255    output.Delete = TRUE;
    262256  }
    263   if (N = get_argument (argc, argv, "-delete")) {
     257  if ((N = get_argument (argc, argv, "-delete"))) {
    264258    remove_argument (N, &argc, argv);
    265259    output.Delete = TRUE;
    … …  
    267261 
    268262  output.Altpath = NONE;
    269   if (N = get_argument (argc, argv, "-altpath")) {
     263  if ((N = get_argument (argc, argv, "-altpath"))) {
    270264    if (output.Delete) {
    271265      fprintf (stderr, "can't combine -delete and -altpath flags\n");
    … …  
    284278
    285279  output.Modify = FALSE;
    286   if (N = get_argument (argc, argv, "-modify")) {
     280  if ((N = get_argument (argc, argv, "-modify"))) {
    287281    if (output.Delete) {
    288282      fprintf (stderr, "can't combine -delete and -modify flags\n");
    … …  
    318312  if ((base.Type == T_DARK) || (base.Type == T_BIAS) || (base.Type == T_MASK)) {
    319313    if (base.FilterSelect) {
    320       fprintf (stderr, "ERROR: filter invalid with type %s\n", typename[base.Type]);
     314      fprintf (stderr, "ERROR: filter invalid with type %s\n", get_type_name(base.Type));
    321315      exit (1);
    322316    }
    … …  
    324318  /*
    325319  if ((base.Type != T_DARK) && base.ExptimeSelect) {
    326     fprintf (stderr, "ERROR: exptime invalid with type %s\n", typename[base.Type]);
     320    fprintf (stderr, "ERROR: exptime invalid with type %s\n", get_type_name(base.Type));
    327321    exit (1);
    328322  }
    … …  
    340334
    341335  /* set up criteria based on image, mosaic, or base (all mutually exclusive) */
     336  crit = NULL;
    342337  if (ImageSelect) 
    343338    crit = ImageCriteria (base, ImageFile, ImageExtend, ImageMode, &Ncrit);

  • trunk/Ohana/src/imregister/detrend/criteria.c

    r23 r2803  
    1111  match.image = -1;
    1212
     13  crit = 0;
    1314  close = FALSE;
    1415  for (i = 0; (i < Ncriteria) && (match.state == MATCH_NONE); i++) {

  • trunk/Ohana/src/imregister/detrend/db.c

    r6 r2803  
    181181
    182182  ConvertStruct ((char *) new, sizeof (DetReg), Nnew, "detreg");
    183   fits_vadd_rows (&vtable, new, Nnew, sizeof(DetReg));
     183  fits_vadd_rows (&vtable, (char *) new, Nnew, sizeof(DetReg));
    184184
    185185  /* write subset to file */
    … …  
    209209int close_db () {
    210210  if (dbstate == LCK_UNLOCK) return (TRUE);
     211  if (dbstate == LCK_EMPTY) return (TRUE);
    211212  fclearlockfile (dBFile, f, lockstate, &dbstate);
    212213  return (TRUE);

  • trunk/Ohana/src/imregister/detrend/delete.c

    r3 r2803  
    44int DeleteSubset (Match *match, int Nmatch) {
    55
    6   int i, j, status;
     6  int i, j;
    77  int *keep, Ndel, Nimage, Nsubset;
    88  DetReg *image, *subset;

  • trunk/Ohana/src/imregister/detrend/entry.c

    r21 r2803  
    3535  struct stat statbuf;
    3636
    37 
    3837  filter_basename = filterhash[newdata[0].filter];
    3938  dBPath = get_dBPath ();
    4039
    4140  if (newdata[0].type == T_FLAT) {
    42     sprintf (path, "%s/%s", typename[newdata[0].type], filter_basename);
     41    sprintf (path, "%s/%s", get_type_name(newdata[0].type), filter_basename);
    4342  } else {
    44     sprintf (path, "%s", typename[newdata[0].type]);
     43    sprintf (path, "%s", get_type_name(newdata[0].type));
    4544  }   
    4645  sprintf (fullpath, "%s/%s", dBPath, path);
    … …  
    6463  case T_BIAS:
    6564  case T_MASK:
    66     sprintf (rootname, "%s.%s.%d.%02d", ID, typename[newdata[0].type], (int)newdata[0].exptime, newdata[0].ccd);
     65    sprintf (rootname, "%s.%s.%d.%02d", ID, get_type_name(newdata[0].type), (int)newdata[0].exptime, newdata[0].ccd);
    6766    break;
    6867  default:
    69     sprintf (rootname, "%s.%s.%s.%02d", ID, typename[newdata[0].type], filter_basename, newdata[0].ccd);
     68    sprintf (rootname, "%s.%s.%s.%02d", ID, get_type_name(newdata[0].type), filter_basename, newdata[0].ccd);
    7069  }
    7170

  • trunk/Ohana/src/imregister/detrend/imdef.c

    r2450 r2803  
    1515
    1616  /* first decide on image TYPE */
    17   if (descriptor[0].type == T_NONE) {
     17  if (descriptor[0].type == T_UNDEF) {
    1818    if (!fits_scan (&header, ImagetypeKeyword, "%s", 1, line)) {
    1919      fprintf (stderr, "ERROR: failure to read %s from header\n", ImagetypeKeyword);
    2020      exit (1);
    2121    }
    22     for (i = 0; i < NTYPE; i++) {
    23       if (!strcasecmp (line, typename[i])) {
    24         descriptor[0].type = i;
    25       }
    26     }
    27     if (descriptor[0].type == T_NONE) {
     22    descriptor[0].type = get_image_type (line);
     23    if (descriptor[0].type == T_UNDEF) {
    2824      fprintf (stderr, "ERROR: invalid image type %s\n", line);
    2925      exit (1);
    … …  
    129125  /* set the exposure time, if needed */
    130126  if (descriptor[0].ExptimeSelect && (descriptor[0].type != T_DARK)) {
    131     fprintf (stderr, "exposure time is not allowed for type %s\n", typename[descriptor[0].type]);
     127    fprintf (stderr, "exposure time is not allowed for type %s\n", get_type_name(descriptor[0].type));
    132128    exit (1);
    133129  }

  • trunk/Ohana/src/imregister/detrend/modify.c

    r63 r2803  
    88  DetReg *image;
    99 
     10  value = M_UNDEF;
    1011  image = get_images (&Nimage);
     12
    1113  ALLOCATE (list, int, Nimage);
    1214  if (!strcasecmp (output.ModifyEntry, "mode")) {
    13     for (i = 0; i < NMODE; i++) {
    14       if (!strncasecmp (output.ModifyValue, modename[i], strlen(modename[i]))) {
    15         value = i;
    16         goto valid_mode;
    17       }
     15    value = get_image_mode (output.ModifyValue);
     16    if (value == M_UNDEF) {
     17      fprintf (stderr, "ERROR: invalid image mode %s\n", output.ModifyValue);
     18      exit (1);
    1819    }
    19     fprintf (stderr, "ERROR: invalid image mode %s\n", output.ModifyValue);
    20     exit (1);
    2120  }
    2221  if (!strcasecmp (output.ModifyEntry, "order")) {
    2322    value = atoi (output.ModifyValue);
    2423  }
    25  valid_mode:
    2624
    2725  /* list matched images */

  • trunk/Ohana/src/imregister/detrend/output.c

    r2450 r2803  
    2727int DumpFitsBintable (char *filename, DetReg *image, Match *match, int Nmatch) {
    2828
    29   int i, j, Nx;
     29  int i, j;
    3030  Header header, theader;
    3131  Matrix matrix;
    … …  
    4242  }
    4343  ConvertStruct ((char *) subset, sizeof (DetReg), Nmatch, "detreg");
    44   fits_add_rows (&table, subset, Nmatch, sizeof (DetReg));
     44  fits_add_rows (&table, (char *) subset, Nmatch, sizeof (DetReg));
    4545
    4646  fits_write_header  (filename, &header);
    … …  
    144144    stopstr  = sec_to_date (newdata[0].tstop);
    145145    regstr   = sec_to_date (newdata[0].treg);
    146     typestr  = typename[newdata[0].type];
    147     modestr  = modename[newdata[0].mode];
     146    typestr  = get_type_name(newdata[0].type);
     147    modestr  = get_mode_name(newdata[0].mode);
    148148    filtstr  = filterhash[newdata[0].filter];
    149149
    … …  
    215215    }
    216216
    217     typestr = typename[MIN (MAX (detdata[i].type, 0), NTYPE - 1)];
    218     modestr = modename[MIN (MAX (detdata[i].mode, 0), NMODE - 1)];
     217    typestr = get_type_name(detdata[i].type);
     218    modestr = get_mode_name(detdata[i].mode);
    219219    filtstr = filterhash[MIN (MAX (detdata[i].filter, 0), NFILTER - 1)];
    220220
    … …  
    269269   
    270270    fprintf (stdout, "%19s %19s %7s %6s %s %6.1f\n",
    271              start, stop, typename[criteria[i].Type], filterhash[criteria[i].Filter],
     271             start, stop, get_type_name(criteria[i].Type), filterhash[criteria[i].Filter],
    272272             ccds[criteria[i].CCD], criteria[i].Exptime);
    273273

  • trunk/Ohana/src/imregister/detrend/recipe.c

    r70 r2803  
    44Criteria *ExpandRecipe (Criteria *base, int *Ncrit) {
    55
    6   int i, j, N, Ns, NS;
     6  int i, N, Ns, NS;
    77  Criteria *crit;
    88  int Nbase;
    99 
    1010  Nbase = *Ncrit;
    11   Ns = 0;
     11  NS = Ns = 0;
    1212  ALLOCATE (crit, Criteria, 1);
    1313
    … …  
    2222      crit[Ns] = base[N];
    2323      crit[Ns].TypeSelect = TRUE;
    24       crit[Ns].Type = T_NONE;
    25      
    26       for (j = 0; j < NTYPE; j++) {
    27         if (!strcasecmp (typename[j], RecipeType[i])) {
    28           crit[Ns].Type = j;
    29         }
    30       }
    31       if (crit[Ns].Type == T_NONE) {
     24      crit[Ns].Type = get_image_type (RecipeType[i]);
     25      if (crit[Ns].Type == T_UNDEF) {
    3226        fprintf (stderr, "ERROR: invalid image type %s\n", RecipeType[i]);
    3327        exit (1);

  • trunk/Ohana/src/imregister/imreg/ConfigPID.c

    r74 r2803  
    44static char *PIDMaster = (char *) NULL;
    55
    6 ConfigPID (char *pidfile) {
     6int ConfigPID (char *pidfile) {
    77
    88  pid_t pid;
    … …  
    5050  fprintf (stderr, "  remove %s if elixir has died unexpectedly\n", pidfile);
    5151  Shutdown (1);
     52  return (FALSE);
    5253}
    5354

  • trunk/Ohana/src/imregister/imreg/args.imregister.c

    r91 r2803  
    1111
    1212  SingleIsSplit = FALSE;
    13   if (N = get_argument (argc, argv, "-split")) {
     13  if ((N = get_argument (argc, argv, "-split"))) {
    1414    remove_argument (N, &argc, argv);
    1515    SingleIsSplit = TRUE;
    … …  
    1717
    1818  NoReg = FALSE;
    19   if (N = get_argument (argc, argv, "-noreg")) {
     19  if ((N = get_argument (argc, argv, "-noreg"))) {
    2020    remove_argument (N, &argc, argv);
    2121    NoReg = TRUE;
    … …  
    2323
    2424  output.verbose = FALSE;
    25   if (N = get_argument (argc, argv, "-v")) {
     25  if ((N = get_argument (argc, argv, "-v"))) {
    2626    remove_argument (N, &argc, argv);
    2727    output.verbose = TRUE;
    … …  
    2929
    3030  NeedType = FALSE;
    31   if (N = get_argument (argc, argv, "-needtype")) {
     31  if ((N = get_argument (argc, argv, "-needtype"))) {
    3232    remove_argument (N, &argc, argv);
    3333    NeedType = TRUE;
    … …  
    7373
    7474    /* check for daemon mode */
    75     if (N = get_argument (argc, argv, "-daemon")) {
     75    if ((N = get_argument (argc, argv, "-daemon"))) {
    7676      remove_argument (N, &argc, argv);
    7777      CLIENT = FALSE;
    … …  
    8282
    8383      LOOP_DELAY = 60;
    84       if (N = get_argument (argc, argv, "-delay")) {
     84      if ((N = get_argument (argc, argv, "-delay"))) {
    8585        remove_argument (N, &argc, argv);
    8686        LOOP_DELAY = atof(argv[N]);

  • trunk/Ohana/src/imregister/imreg/args.imsearch.c

    r74 r2803  
    1313
    1414  /* set timezone (set static in misc.c) */
    15   if (N = get_argument (argc, argv, "-tz")) {
     15  if ((N = get_argument (argc, argv, "-tz"))) {
    1616    remove_argument (N, &argc, argv);
    1717    dt = atof (argv[N]);
    … …  
    3030  criteria.TypeSelect = FALSE;
    3131  criteria.Type = T_UNDEF;
    32   if (N = get_argument (argc, argv, "-type")) {
    33     remove_argument (N, &argc, argv);
    34     for (i = 0; (i < NTYPE) && (criteria.Type == T_UNDEF); i++) {
    35       if (!strncasecmp (argv[N], typename[i], strlen(argv[N]))) criteria.Type = i;
    36     }
     32  if ((N = get_argument (argc, argv, "-type"))) {
     33    remove_argument (N, &argc, argv);
     34    criteria.Type = get_image_type (argv[N]);
    3735    if (criteria.Type == T_UNDEF) {
    3836      fprintf (stderr, "ERROR: invalid image type %s\n", argv[N]);
    … …  
    4139    remove_argument (N, &argc, argv);
    4240    criteria.TypeSelect = TRUE;
    43   }
    44  
    45   /* exposure time */
    46   criteria.ExptimeSelect = FALSE;
    47   if (N = get_argument (argc, argv, "-etime")) {
    48     remove_argument (N, &argc, argv);
    49     criteria.Exptime = atof (argv[N]);
    50     remove_argument (N, &argc, argv);
    51     criteria.ExptimeSelect = TRUE;
    5241  }
    5342 
    5443  /* image mode (split, mef, single) */
    5544  criteria.ModeSelect = FALSE;
    56   criteria.Mode = M_NONE;
    57   if (N = get_argument (argc, argv, "-mode")) {
    58     remove_argument (N, &argc, argv);
    59     for (i = 0; (i < NMODE) && (criteria.Mode == M_NONE); i++) {
    60       if (!strncasecmp (argv[N], modename[i], strlen(argv[N]))) criteria.Mode = i;
    61     }
    62     if (criteria.Mode == M_NONE) {
     45  criteria.Mode = M_UNDEF;
     46  if ((N = get_argument (argc, argv, "-mode"))) {
     47    remove_argument (N, &argc, argv);
     48    criteria.Mode = get_image_mode (argv[N]);
     49    if (criteria.Mode == M_UNDEF) {
    6350      fprintf (stderr, "ERROR: invalid image mode %s\n", argv[N]);
    6451      exit (1);
    … …  
    6855  }
    6956
     57  /* exposure time */
     58  criteria.ExptimeSelect = FALSE;
     59  if ((N = get_argument (argc, argv, "-etime"))) {
     60    remove_argument (N, &argc, argv);
     61    criteria.Exptime = atof (argv[N]);
     62    remove_argument (N, &argc, argv);
     63    criteria.ExptimeSelect = TRUE;
     64  }
     65 
    7066  /* ccd number */
    7167  criteria.CCDSelect = FALSE;
    72   if (N = get_argument (argc, argv, "-ccd")) {
     68  if ((N = get_argument (argc, argv, "-ccd"))) {
    7369    remove_argument (N, &argc, argv);
    7470    criteria.CCD = -1;
    … …  
    8783  }
    8884  /* select CCD seq number */
    89   if (N = get_argument (argc, argv, "-ccdn")) {
     85  if ((N = get_argument (argc, argv, "-ccdn"))) {
    9086    remove_argument (N, &argc, argv);
    9187    criteria.CCD = atoi (argv[N]);
    … …  
    9692  /* filter name */
    9793  criteria.FilterSelect = FALSE;
    98   if (N = get_argument (argc, argv, "-filter")) {
     94  if ((N = get_argument (argc, argv, "-filter"))) {
    9995    remove_argument (N, &argc, argv);
    10096    criteria.Filter = strcreate (argv[N]);
    … …  
    108104  /* string in image name */
    109105  criteria.NameSelect = FALSE;
    110   if (N = get_argument (argc, argv, "-name")) {
     106  if ((N = get_argument (argc, argv, "-name"))) {
    111107    remove_argument (N, &argc, argv);
    112108    criteria.Name = strcreate (argv[N]);
    … …  
    117113  /* processed state */
    118114  criteria.ProcSelect = FALSE;
    119   if (N = get_argument (argc, argv, "-proc")) {
     115  if ((N = get_argument (argc, argv, "-proc"))) {
    120116    criteria.ProcSelect = TRUE;
    121117    remove_argument (N, &argc, argv);
    … …  
    132128
    133129  criteria.DistSelect = FALSE;
    134   if (N = get_argument (argc, argv, "-dist")) {
     130  if ((N = get_argument (argc, argv, "-dist"))) {
    135131    criteria.DistSelect = TRUE;
    136132    remove_argument (N, &argc, argv);
    … …  
    147143
    148144  /*** command-line options which modify the output list */
    149   if (N = get_argument (argc, argv, "-treg")) {
     145  if ((N = get_argument (argc, argv, "-treg"))) {
    150146    remove_argument (N, &argc, argv);
    151147    SetOutputMode ("RegTimeMode");
    152148  }
    153   if (N = get_argument (argc, argv, "-seq")) {
     149  if ((N = get_argument (argc, argv, "-seq"))) {
    154150    remove_argument (N, &argc, argv);
    155151    SetOutputMode ("CCDSeq");
    156152  }
    157   if (N = get_argument (argc, argv, "-pt")) {
     153  if ((N = get_argument (argc, argv, "-pt"))) {
    158154    remove_argument (N, &argc, argv);
    159155    SetOutputMode ("PTstyle");
    160156  }
    161157  output.table = (char *) NULL;
    162   if (N = get_argument (argc, argv, "-table")) {
     158  if ((N = get_argument (argc, argv, "-table"))) {
    163159    remove_argument (N, &argc, argv);
    164160    output.table = strcreate (argv[N]);
    … …  
    166162  }
    167163  output.cadctable = (char *) NULL;
    168   if (N = get_argument (argc, argv, "-cadctable")) {
     164  if ((N = get_argument (argc, argv, "-cadctable"))) {
    169165    remove_argument (N, &argc, argv);
    170166    output.cadctable = strcreate (argv[N]);
    … …  
    172168  }
    173169  output.bintable = (char *) NULL;
    174   if (N = get_argument (argc, argv, "-bintable")) {
     170  if ((N = get_argument (argc, argv, "-bintable"))) {
    175171    remove_argument (N, &argc, argv);
    176172    output.bintable = strcreate (argv[N]);
    … …  
    187183  output.unique = FALSE;
    188184
    189   if (N = get_argument (argc, argv, "-delete")) {
     185  if ((N = get_argument (argc, argv, "-delete"))) {
    190186    remove_argument (N, &argc, argv);
    191187    output.delete = TRUE;
    192188  }
    193189
    194   if (N = get_argument (argc, argv, "-unique")) {
     190  if ((N = get_argument (argc, argv, "-unique"))) {
    195191    remove_argument (N, &argc, argv);
    196192    output.unique = TRUE;
    197193  }
    198194
    199   if (N = get_argument (argc, argv, "-modify")) {
     195  if ((N = get_argument (argc, argv, "-modify"))) {
    200196    if (output.delete) {
    201197      fprintf (stderr, "can't specify more than one modifier at a time\n");
    … …  
    251247      output.modify_type = TRUE;
    252248      remove_argument (N, &argc, argv);
    253       output.type == T_UNDEF;
    254       for (i = 0; (i < NTYPE) && (output.type == T_UNDEF); i++) {
    255         if (!strncasecmp (argv[N], typename[i], strlen(argv[N]))) output.type = i;
    256       }
     249      output.type = get_image_type (argv[N]);
    257250      if (output.type == T_UNDEF) {
    258251        fprintf (stderr, "ERROR: invalid image type %s\n", argv[N]);

  • trunk/Ohana/src/imregister/imreg/cadc.c

    r2451 r2803  
    1818  double left, right, center, outer, top, bottom;
    1919  double iqx, iqy, iqr, iqf, iqo;
    20   FILE *p;
    2120
    2221  /* set REFCCD for use in GetREFIQ */
    … …  
    155154int *GetUniqueObsID (RegImage *image, int *index, int *entry, int Nindex, int *Nmatch) {
    156155 
    157   int i, j, k, m, N, NMATCH, REFCCD;
     156  int i, j, N, NMATCH;
    158157  int *match;
    159158
    … …  
    185184int GetREFCCD (RegImage *image, int *index, int *entry, int Nindex, int start) {
    186185 
    187   int i, j, k, m, N, NMATCH;
     186  int i, N, NMATCH;
    188187  int *match;
    189188

  • trunk/Ohana/src/imregister/imreg/db.c

    r2454 r2803  
    2929
    3030  int Nbytes;
     31  char *data;
    3132
    3233  /* assign pointers to new data block */
    … …  
    4142
    4243  /* add padding space to buffer */
    43   REALLOCATE ((char *) image, char, Nbytes);
     44  data = (char *) image;
     45  REALLOCATE (data, char, Nbytes);
     46  image = (RegImage *) data;
     47
    4448  table.buffer = (char *) image;
    4549  table.size = Nbytes;
    … …  
    163167
    164168  ConvertStruct ((char *) new, sizeof (RegImage), Nnew, "regimage");
    165   fits_vadd_rows (&vtable, new, Nnew, sizeof(RegImage));
     169  fits_vadd_rows (&vtable, (char *) new, Nnew, sizeof(RegImage));
    166170
    167171  /* write subset to file */
    … …  
    197201int close_db () {
    198202
     203  if (dbstate == LCK_EMPTY) return (TRUE);
     204
    199205  fits_free_header (&header);
    200206  fits_free_matrix (&matrix);
    … …  
    208214
    209215int close_lock_db () {
     216
     217  if (dbstate == LCK_EMPTY) return (TRUE);
    210218
    211219  fits_free_header (&header);

  • trunk/Ohana/src/imregister/imreg/iminfo.c

    r74 r2803  
    6464  fits_scan (&header, ImagetypeKeyword,  "%s", 1, &Imagetype);
    6565
    66   image[0].type = T_NONE;
    67   if (!strcasecmp (Imagetype, "OBJECT")) {
    68     image[0].type = T_OBJECT;
    69   }
    70   if (!strcasecmp (Imagetype, "DARK")) {
    71     image[0].type = T_DARK;
    72   }
    73   if (!strcasecmp (Imagetype, "BIAS")) {
    74     image[0].type = T_BIAS;
    75   }
    76   if (!strcasecmp (Imagetype, "FLAT")) {
    77     image[0].type = T_FLAT;
    78   }
    79   if (!strcasecmp (Imagetype, "SKYFLAT")) {
    80     image[0].type = T_FLAT;
    81   }
    82   if (NeedType && (image[0].type == T_NONE)) {
     66  /* grab the image type : if not defined, set to 'none' */
     67  image[0].type = get_image_type (Imagetype);
     68  if (NeedType && (image[0].type == T_UNDEF)) {
    8369    fprintf (stderr, "ERROR: skipping unknown image type\n");
    8470    exit (1);
     71  } else {
     72    image[0].type = T_NONE;
    8573  }
    8674

  • trunk/Ohana/src/imregister/imreg/imregclient.c

    r74 r2803  
    77  RegImage *image;
    88  char *TempDB;
    9   int i, Nentry, Nslice, status;
     9  int i, Nentry, Nslice, status, tmpint;
    1010  float *dtime;
    1111
    … …  
    1313  sprintf (TempDB, "%s.bfr", ImageDB);
    1414
     15  Nentry = 0;
    1516  image = iminfo (fitsfile);
    1617 
    … …  
    3637      exit (1);
    3738    }
    38     status = fscanf (f, "%d %f %f", &image[0].ccd, &image[0].sky, &image[0].fwhm);
     39    status = fscanf (f, "%d %f %f", &tmpint, &image[0].sky, &image[0].fwhm);
     40    image[0].ccd = tmpint;
    3941    fclose (f);
    4042    Nentry = 1;
    … …  
    5355    for (i = 0; i < Nentry; i++) {
    5456      image[i] = image[0];
    55       status = fscanf (f, "%d %f %f", &image[i].ccd, &image[i].sky, &image[i].fwhm);
     57      status = fscanf (f, "%d %f %f", &tmpint, &image[i].sky, &image[i].fwhm);
     58      image[i].ccd = tmpint;
    5659      if (image[i].ccd == Nslice) continue;
    5760      image[i].obstime += *dtime*image[i].ccd;

  • trunk/Ohana/src/imregister/imreg/match.c

    r26 r2803  
    1515  ALLOCATE (match, int, NMATCH);
    1616
     17  Nname = 0;
    1718  if (criteria.NameSelect) Nname = strlen (criteria.Name);
    1819 

  • trunk/Ohana/src/imregister/imreg/modify.c

    r74 r2803  
    99  int Nimage;
    1010  RegImage *image;
     11
     12  Nold = 0;
     13  tmppath = NULL;
    1114
    1215  image = get_images (&Nimage);

  • trunk/Ohana/src/imregister/imreg/output.c

    r2452 r2803  
    143143    obsstr   = sec_to_date (subset[0].obstime);
    144144    regstr   = sec_to_date (subset[0].regtime);
    145     typestr  = typename[(int)subset[0].type];
    146     modestr  = modename[(int)subset[0].mode];
     145    typestr  = get_type_name(subset[0].type);
     146    modestr  = get_mode_name(subset[0].mode);
    147147    ccdstr   = ccds[(int)subset[0].ccd];
    148148
    … …  
    185185    i = match[j];
    186186
    187     modestr = ((image[i].mode < 0) || (image[i].mode >= NMODE)) ? modename[0] : modename[(int)image[i].mode];
    188     typestr = ((image[i].type < 0) || (image[i].type >= NTYPE)) ? typename[0] : typename[(int)image[i].type];
     187    modestr = get_mode_name (image[i].mode);
     188    typestr = get_type_name (image[i].type);
    189189    timestr = RegTimeMode ? sec_to_date (image[i].regtime) : sec_to_date (image[i].obstime);
    190190

  • trunk/Ohana/src/imregister/imreg/unique.c

    r69 r2803  
    88  int N, NMATCH;
    99  int *match, *entry;
    10   int reject;
    1110  RegImage *image;
    1211  char idxline[128];

  • trunk/Ohana/src/imregister/include/detrend.h

    r2453 r2803  
    109109Criteria *ExpandRecipe (Criteria *base, int *Ncrit);
    110110
     111int escape (int mode, char *message);
     112int DumpFitsBintable (char *filename, DetReg *image, Match *match, int Nmatch);
     113int cmp_crit (Criteria *crit, DetReg *image);
     114int set_crit (Criteria *crit, DetReg *image);
     115int ckpathname (char *newpath);
     116int PrintCriteria ();
     117int SetAltpath (Match *match, int Nmatch);
     118

  • trunk/Ohana/src/imregister/include/imreg.h

    r2453 r2803  
    106106MosaicLayout *CreateMegaCam ();
    107107int GetREFCCD (RegImage *image, int *index, int *entry, int Nindex, int start);
     108
     109int imregclient (char *fitsfile, char *statfile, char *datfile);
     110void SIG_DIE (int sig);
     111void SIG_PIPE (int sig);
     112void SetSignals ();
     113void KillProcess (char *pidfile);
     114void StatusProcess (char *pidfile);
     115int close_lock_db ();
     116int ConfigPID (char *pidfile);
     117int print_db_status (char *message);
     118int escape (int mode, char *message);
     119
     120int LoadPID (char *file, pid_t *pid, char *username, char *machine);
     121int Shutdown (int status);
     122void RemovePID ();
     123int rconnect (char *hostname, char *command, int *rsock, int *wsock);
     124
     125int InitFifo (Fifo *fifo, int Nalloc, int Nextra);
     126int FlushFifo (Fifo *fifo);
     127int ShiftFifo (Fifo *fifo);
     128int ReadtoFifo (Fifo *fifo, int sock);
     129void FreeFifo (Fifo *fifo);
     130int SockScan (char *string, Fifo *fifo, int sock);
     131int memstr (char *m1, char *m2, int n);
     132
     133int *unique_entries (int *subset, int *Nmatch);

  • trunk/Ohana/src/imregister/include/imregister.h

    r2772 r2803  
    44# include <time.h>
    55# include <ctype.h>
     6# include <stdlib.h>
    67
    78/* config variables from very old versions - remove?
    … …  
    8586void sort (float *value, int N);
    8687void dsort (double *value, int N);
     88void sortstr (char **S, int *X, int N);
     89void sortpair (int *X, int *Y, int N);
    8790
    8891void ConfigCamera ();
    … …  
    9699double get_fwhm (char *filename);
    97100
    98 int get_version (int argc, char **argv, char *version);
     101void get_version (int argc, char **argv, char *version);
    99102int set_db (char *filename);
     103void warn_scan (Header *header, char *field, char *format, int N, void *var);
    100104
     105void clean_spaces (char *line);
    101106
    102107/* where is this defined ?? */
    103108char *basename (char *);
    104 
    105 # define T_UNDEF -1
    106 # define NTYPE 11
    107 enum {T_NONE, T_OBJECT, T_DARK, T_BIAS, T_FLAT, T_MASK, T_FRINGE, T_SCATTER, T_MODES, T_FRINGEPTS, T_ANY};
    108 static char typename[NTYPE][32] = {"none", "object", "dark", "bias", "flat", "mask", "fringe", "scatter", "modes", "frpts", "any"};
    109 static char typecode[NTYPE]     = {'x',    'o',      'd',    'b',    'f',    'm',    'r',      's',       'M',     'F'};
    110 
    111 # define M_UNDEF -1
    112 # define NMODE 7
    113 enum {M_NONE, M_MEF, M_SPLIT, M_SINGLE, M_CUBE, M_SLICE, M_MODES};
    114 static char modename[NMODE][32] = {"none", "MEF", "SPLIT", "SINGLE", "CUBE", "SLICE", "MODES"};

  • trunk/Ohana/src/imregister/include/photreg.h

    r2488 r2803  
    4646void set_timezone (double dt);
    4747void DumpCADCTable (char *filename, PhotPars *image, int *match, int Nmatch);
     48void getImageData (char *Image, char *ImageCCD, char *ImageMode);
     49void set_Binary_name (char *name);
     50void set_ASCII_name (char *string);
     51int load_old_db ();
     52int escape (int mode, char *message);

  • trunk/Ohana/src/imregister/include/spreg.h

    r2769 r2803  
    141141MosaicLayout *CreateMegaCam ();
    142142int GetREFCCD (Spectrum *spectrum, int *index, int *entry, int Nindex, int start);
     143
     144void showinfo (Spectrum *spec);
     145int escape (int mode, char *message);
     146int set_spectra (Spectrum *new, int Nnew);
     147Spectrum *get_spectra (int *N);
     148
     149int fits_scan_nchar (Header *header, int size, char *field, int N,...);
     150void warn_scan_nchar (Header *header, int size, char *field, int N, void *var);
     151
     152int *unique_entries (int *subset, int *Nmatch);

  • trunk/Ohana/src/imregister/photreg/args.photreg.c

    r2454 r2803  
    88  int *list, Nlist;
    99  int N, required, Ntimes;
    10   double dtime;
    1110  unsigned long *tstart, *tstop;
    1211  PhotCode *photcode, *depcode;
    … …  
    1413  ConfigInit (&argc, argv);
    1514
     15  photcode = NULL;
    1616  output.modify = TRUE;
    1717  required = 0x0;
    … …  
    2929  /* set the required database */
    3030  output.db = strcreate ("phot");
    31   if (N = get_argument (argc, argv, "-trans")) {
     31  if ((N = get_argument (argc, argv, "-trans"))) {
    3232    remove_argument (N, &argc, argv);
    3333    output.db = strcreate ("trans");
    … …  
    3636  /*** optional fields ***/
    3737  strcpy (newdata[0].label, "elixir");
    38   if (N = get_argument (argc, argv, "-label")) {
     38  if ((N = get_argument (argc, argv, "-label"))) {
    3939    remove_argument (N, &argc, argv);
    4040    strcpy (newdata[0].label, argv[N]);
    … …  
    4343
    4444  newdata[0].Nmeas = 1;
    45   if (N = get_argument (argc, argv, "-Nmeas")) {
     45  if ((N = get_argument (argc, argv, "-Nmeas"))) {
    4646    remove_argument (N, &argc, argv);
    4747    newdata[0].Nmeas = atoi (argv[N]);
    … …  
    5050
    5151  newdata[0].Ntime = 1;
    52   if (N = get_argument (argc, argv, "-Ntime")) {
     52  if ((N = get_argument (argc, argv, "-Ntime"))) {
    5353    remove_argument (N, &argc, argv);
    5454    newdata[0].Ntime = atoi (argv[N]);
    … …  
    5757
    5858  output.offset = FALSE;
    59   if (N = get_argument (argc, argv, "-offset")) {
     59  if ((N = get_argument (argc, argv, "-offset"))) {
    6060    remove_argument (N, &argc, argv);
    6161    output.offset = TRUE;
    … …  
    7070
    7171  /* observed zero point */
    72   if (N = get_argument (argc, argv, "-zp")) {
     72  if ((N = get_argument (argc, argv, "-zp"))) {
    7373    remove_argument (N, &argc, argv);
    7474    newdata[0].ZP = atof (argv[N]);
    … …  
    7878
    7979  /* error on observed zero point */
    80   if (N = get_argument (argc, argv, "-dzp")) {
     80  if ((N = get_argument (argc, argv, "-dzp"))) {
    8181    remove_argument (N, &argc, argv);
    8282    newdata[0].dZP = atof (argv[N]);
    … …  
    8686
    8787  /* photcode system */
    88   if (N = get_argument (argc, argv, "-photcode")) {
     88  if ((N = get_argument (argc, argv, "-photcode"))) {
    8989    remove_argument (N, &argc, argv);
    9090    if ((photcode = GetPhotcodebyName (argv[N])) == NULL) {
    … …  
    120120  newdata[0].ZPo      = 0.001*photcode[0].C + 0.001*depcode[0].C;
    121121  if (output.offset) newdata[0].ZP += newdata[0].ZPo;
     122  return (TRUE);
    122123}
    123124

  • trunk/Ohana/src/imregister/photreg/args.photsearch.c

    r126 r2803  
    2323
    2424  criteria.PhotCodeSelect = FALSE;
    25   if (N = get_argument (argc, argv, "-photcode")) {
     25  if ((N = get_argument (argc, argv, "-photcode"))) {
    2626    remove_argument (N, &argc, argv);
    27     if ((criteria.photcode = GetPhotcodeCodebyName (argv[N])) == NULL) {
     27    if ((criteria.photcode = GetPhotcodeCodebyName (argv[N])) == 0) {
    2828      fprintf (stderr, "ERROR: photcode not found in table\n");
    2929      exit (1);
    … …  
    3434
    3535  criteria.LabelSelect = FALSE;
    36   if (N = get_argument (argc, argv, "-label")) {
     36  if ((N = get_argument (argc, argv, "-label"))) {
    3737    remove_argument (N, &argc, argv);
    3838    criteria.Label = strcreate (argv[N]);
    … …  
    4242
    4343  output.delete = FALSE;
    44   if (N = get_argument (argc, argv, "-delete")) {
     44  if ((N = get_argument (argc, argv, "-delete"))) {
    4545    remove_argument (N, &argc, argv);
    4646    output.delete = TRUE;
    … …  
    4848
    4949  output.equiv = FALSE;
    50   if (N = get_argument (argc, argv, "-equiv")) {
     50  if ((N = get_argument (argc, argv, "-equiv"))) {
    5151    remove_argument (N, &argc, argv);
    5252    output.equiv = TRUE;
    … …  
    5454
    5555  output.offset = FALSE;
    56   if (N = get_argument (argc, argv, "-offset")) {
     56  if ((N = get_argument (argc, argv, "-offset"))) {
    5757    remove_argument (N, &argc, argv);
    5858    output.offset = TRUE;
    … …  
    6060
    6161  output.table = (char *) NULL;
    62   if (N = get_argument (argc, argv, "-table")) {
     62  if ((N = get_argument (argc, argv, "-table"))) {
    6363    remove_argument (N, &argc, argv);
    6464    output.table = strcreate (argv[N]);
    … …  
    6767
    6868  output.bintable = (char *) NULL;
    69   if (N = get_argument (argc, argv, "-bintable")) {
     69  if ((N = get_argument (argc, argv, "-bintable"))) {
    7070    remove_argument (N, &argc, argv);
    7171    output.bintable = strcreate (argv[N]);
    … …  
    7474
    7575  output.verbose = FALSE;
    76   if (N = get_argument (argc, argv, "-v")) {
     76  if ((N = get_argument (argc, argv, "-v"))) {
    7777    remove_argument (N, &argc, argv);
    7878    output.verbose = TRUE;
    … …  
    8080
    8181  output.convert = FALSE;
    82   if (N = get_argument (argc, argv, "-convert")) {
     82  if ((N = get_argument (argc, argv, "-convert"))) {
    8383    remove_argument (N, &argc, argv);
    8484    output.convert = TRUE;
    … …  
    8989  }
    9090
    91   if (N = get_argument (argc, argv, "-image")) {
     91  if ((N = get_argument (argc, argv, "-image"))) {
    9292    remove_argument (N, &argc, argv);
    9393    if (argc < N + 3) {
    … …  
    102102
    103103  output.db = strcreate ("phot");
    104   if (N = get_argument (argc, argv, "-trans")) {
     104  if ((N = get_argument (argc, argv, "-trans"))) {
    105105    remove_argument (N, &argc, argv);
    106106    output.db = strcreate ("trans");
    … …  
    123123    criteria.photcode = equiv;
    124124  }
     125  return (TRUE);
    125126}

  • trunk/Ohana/src/imregister/photreg/db.c

    r90 r2803  
    7070
    7171  /* add padding space to buffer */
    72   REALLOCATE ((char *) image, char, Nbytes);
    7372  table.buffer = (char *) image;
     73  REALLOCATE (table.buffer, char, Nbytes);
     74  image = (PhotPars *) table.buffer;
    7475  table.size = Nbytes;
    7576
    … …  
    245246
    246247  ConvertStruct ((char *) new, sizeof (PhotPars), Nnew, "photpars");
    247   fits_vadd_rows (&vtable, new, Nnew, sizeof(PhotPars));
     248  fits_vadd_rows (&vtable, (char *) new, Nnew, sizeof(PhotPars));
    248249
    249250  /* write subset to file */
    … …  
    290291  fd = fileno (f);
    291292  fprintf (stderr, "db: %s, fd: %d\n", dBFile, fd);
     293  return (TRUE);
    292294}
    293295

  • trunk/Ohana/src/imregister/photreg/define.c

    r126 r2803  
    44static char *BinaryName = (char *) NULL;
    55
    6 int set_Binary_name (char *name) {
     6void set_Binary_name (char *name) {
    77  BinaryName = name;
    88}

  • trunk/Ohana/src/imregister/photreg/getImageData.c

    r2454 r2803  
    22# include "photreg.h"
    33
    4 getImageData (char *Image, char *ImageCCD, char *ImageMode) {
     4void getImageData (char *Image, char *ImageCCD, char *ImageMode) {
    55
    66  Header header;
    … …  
    6666  }
    6767  criteria.PhotCodeSelect = TRUE;
    68 
     68  return;
    6969}

  • trunk/Ohana/src/imregister/photreg/output.c

    r2454 r2803  
    66static char *ASCIIName = (char *) NULL;
    77
    8 set_ASCII_name (char *string) {
     8void set_ASCII_name (char *string) {
    99  ASCIIName = string;
    1010}
    … …  
    5050  }
    5151  ConvertStruct ((char *) subset, sizeof (PhotPars), Nmatch, "photpars");
    52   fits_add_rows (&table, subset, Nmatch, sizeof (PhotPars));
     52  fits_add_rows (&table, (char *) subset, Nmatch, sizeof (PhotPars));
    5353
    5454  fits_write_header  (filename, &header);
    … …  
    155155              newdata[0].K, newdata[0].X, startstr, stopstr,
    156156              c1, c2, newdata[0].Nmeas, newdata[0].Ntime, code, photsys, newdata[0].label);
    157     if (!fits_add_rows (&table, line, 1, strlen(line))) escape (IGNORE, (FILE *) NULL, (char *) NULL, NULL, "error writing dataline");
     157    if (!fits_add_rows (&table, line, 1, strlen(line))) escape (IGNORE, "error writing dataline");
    158158
    159159    free (line);

  • trunk/Ohana/src/imregister/spreg/ConfigInit.c

    r2488 r2803  
    66void ConfigInit (int *argc, char **argv) {
    77
    8   int i, NDB;
    9   char *config, *file, ElixirBase[80];
     8  char *config, *file;
    109
    1110  /*** load configuration info ***/

  • trunk/Ohana/src/imregister/spreg/args.spregister.c

    r2768 r2803  
    99
    1010  NoReg = FALSE;
    11   if (N = get_argument (argc, argv, "-noreg")) {
     11  if ((N = get_argument (argc, argv, "-noreg"))) {
    1212    remove_argument (N, &argc, argv);
    1313    NoReg = TRUE;
    … …  
    1515
    1616  DUMP = FALSE;
    17   if (N = get_argument (argc, argv, "-dump")) {
     17  if ((N = get_argument (argc, argv, "-dump"))) {
    1818    remove_argument (N, &argc, argv);
    1919    DUMP = TRUE;
    … …  
    2121
    2222  output.verbose = FALSE;
    23   if (N = get_argument (argc, argv, "-v")) {
     23  if ((N = get_argument (argc, argv, "-v"))) {
    2424    remove_argument (N, &argc, argv);
    2525    output.verbose = TRUE;
    … …  
    2727
    2828  NeedType = FALSE;
    29   if (N = get_argument (argc, argv, "-needtype")) {
     29  if ((N = get_argument (argc, argv, "-needtype"))) {
    3030    remove_argument (N, &argc, argv);
    3131    NeedType = TRUE;

  • trunk/Ohana/src/imregister/spreg/args.spsearch.c

    r2488 r2803  
    66
    77  double dt;
    8   int N, i;
     8  int N;
    99
    1010  ConfigInit (&argc, argv); /* load elixir config data */
    1111
    1212  /* set timezone (set static in misc.c) */
    13   if (N = get_argument (argc, argv, "-tz")) {
     13  if ((N = get_argument (argc, argv, "-tz"))) {
    1414    remove_argument (N, &argc, argv);
    1515    dt = atof (argv[N]);
    … …  
    2727  /* exposure time */
    2828  criteria.ExptimeSelect = FALSE;
    29   if (N = get_argument (argc, argv, "-etime")) {
     29  if ((N = get_argument (argc, argv, "-etime"))) {
    3030    remove_argument (N, &argc, argv);
    3131    criteria.Exptime = atof (argv[N]);
    … …  
    4141  criteria.ModeSelect = FALSE;
    4242  /*
    43   criteria.Mode = M_NONE;
    44   if (N = get_argument (argc, argv, "-mode")) {
     43  criteria.Mode = M_UNDEF;
     44  if ((N = get_argument (argc, argv, "-mode"))) {
    4545    remove_argument (N, &argc, argv);
    46     for (i = 0; (i < NMODE) && (criteria.Mode == M_NONE); i++) {
    47       if (!strncasecmp (argv[N], modename[i], strlen(argv[N]))) criteria.Mode = i;
    48     }
    49     if (criteria.Mode == M_NONE) {
     46    criteria.Mode = get_image_mode (argv[N]);
     47    if (criteria.Mode == M_UNDEF) {
    5048      fprintf (stderr, "ERROR: invalid image mode %s\n", argv[N]);
    5149      exit (1);
    … …  
    5856  /* string in image name */
    5957  criteria.FilenameSelect = FALSE;
    60   if (N = get_argument (argc, argv, "-filename")) {
     58  if ((N = get_argument (argc, argv, "-filename"))) {
    6159    remove_argument (N, &argc, argv);
    6260    criteria.Filename = strcreate (argv[N]);
    … …  
    6765  /* string in image name */
    6866  criteria.ObjectSelect = FALSE;
    69   if (N = get_argument (argc, argv, "-object")) {
     67  if ((N = get_argument (argc, argv, "-object"))) {
    7068    remove_argument (N, &argc, argv);
    7169    criteria.Object = strcreate (argv[N]);
    … …  
    7674  /* string in image name */
    7775  criteria.TelescopeSelect = FALSE;
    78   if (N = get_argument (argc, argv, "-tel")) {
     76  if ((N = get_argument (argc, argv, "-tel"))) {
    7977    remove_argument (N, &argc, argv);
    8078    criteria.Telescope = strcreate (argv[N]);
    … …  
    8583  /* string in image name */
    8684  criteria.InstrumentSelect = FALSE;
    87   if (N = get_argument (argc, argv, "-inst")) {
     85  if ((N = get_argument (argc, argv, "-inst"))) {
    8886    remove_argument (N, &argc, argv);
    8987    criteria.Instrument = strcreate (argv[N]);
    … …  
    9391
    9492  /*** command-line options which modify the output list */
    95   if (N = get_argument (argc, argv, "-treg")) {
     93  if ((N = get_argument (argc, argv, "-treg"))) {
    9694    remove_argument (N, &argc, argv);
    9795    SetOutputMode ("RegTimeMode");
    9896  }
    9997  output.table = (char *) NULL;
    100   if (N = get_argument (argc, argv, "-table")) {
     98  if ((N = get_argument (argc, argv, "-table"))) {
    10199    remove_argument (N, &argc, argv);
    102100    output.table = strcreate (argv[N]);
    … …  
    104102  }
    105103  output.bintable = (char *) NULL;
    106   if (N = get_argument (argc, argv, "-bintable")) {
     104  if ((N = get_argument (argc, argv, "-bintable"))) {
    107105    remove_argument (N, &argc, argv);
    108106    output.bintable = strcreate (argv[N]);
    … …  
    116114  output.unique = FALSE;
    117115
    118   if (N = get_argument (argc, argv, "-delete")) {
     116  if ((N = get_argument (argc, argv, "-delete"))) {
    119117    remove_argument (N, &argc, argv);
    120118    output.delete = TRUE;
    121119  }
    122120
    123   if (N = get_argument (argc, argv, "-unique")) {
     121  if ((N = get_argument (argc, argv, "-unique"))) {
    124122    remove_argument (N, &argc, argv);
    125123    output.unique = TRUE;
    126124  }
    127125
    128   if (N = get_argument (argc, argv, "-modify")) {
     126  if ((N = get_argument (argc, argv, "-modify"))) {
    129127    if (output.delete) {
    130128      fprintf (stderr, "can't specify more than one modifier at a time\n");

  • trunk/Ohana/src/imregister/spreg/db.c

    r2768 r2803  
    242242
    243243  /* add padding space to buffer */
    244   REALLOCATE ((char *) spectrum, char, Nbytes);
    245244  table.buffer = (char *) spectrum;
     245  REALLOCATE (table.buffer, char, Nbytes);
     246  spectrum = (Spectrum *) table.buffer;
    246247  table.size = Nbytes;
    247248

  • trunk/Ohana/src/imregister/spreg/match.c

    r2488 r2803  
    1515  NMATCH = 1000;
    1616  ALLOCATE (match, int, NMATCH);
     17
     18  Nfilename = Nobject = Ntelescope = Ninstrument = 0;
    1719
    1820  if (criteria.FilenameSelect) Nfilename     = strlen (criteria.Filename);

  • trunk/Ohana/src/imregister/spreg/modify.c

    r2488 r2803  
    66  int i, j, Nold;
    77  char *tmppath;
    8   char *ext, *root, *path;
    98  int Nspectrum;
    109  Spectrum *spectrum;
     10
     11  Nold = 0;
     12  tmppath = NULL;
    1113
    1214  spectrum = get_spectra (&Nspectrum);

  • trunk/Ohana/src/imregister/spreg/output.c

    r2768 r2803  
    4141void DumpFitsBintable (char *filename, Spectrum *spectrum, int *match, int Nmatch) {
    4242
    43   int i, j, Nx;
     43  int i, j;
    4444  Header header, theader;
    4545  Matrix matrix;
    … …  
    5656  }
    5757  ConvertStruct ((char *) subset, sizeof (Spectrum), Nmatch, "spectrum");
    58   fits_add_rows (&table, subset, Nmatch, sizeof (Spectrum));
     58  fits_add_rows (&table, (char *) subset, Nmatch, sizeof (Spectrum));
    5959
    6060  fits_write_header  (filename, &header);
    … …  
    6868 
    6969  int i;
    70   char *obsstr, *regstr, *line, dummy[64];
    71   char *modestr, *typestr, *ccdstr, *datestr;
     70  char *obsstr, *regstr, *line, dummy[64], *datestr;
    7271  unsigned long tsecond;
    7372  Header header, theader;

  • trunk/Ohana/src/imregister/spreg/spinfo.c

    r2768 r2803  
    66  Spectrum *spectrum;
    77  Header header;
    8   int Naxes, Nextend;
    9   char Imagetype[80], line[80];
     8  char line[80];
    109  struct timeval now;
    1110  char *name, *cwd, *tempname;
    1211  double tmp;
    13   float *dtime;
    1412
    1513  ALLOCATE (spectrum, Spectrum, 1);
    … …  
    5957  warn_scan_nchar (&header, 16, TelescopeKeyword, 1, spectrum[0].telescope);
    6058
    61   clean_spaces (&spectrum[0].objname);
    62   clean_spaces (&spectrum[0].instrument);
    63   clean_spaces (&spectrum[0].telescope);
     59  clean_spaces (spectrum[0].objname);
     60  clean_spaces (spectrum[0].instrument);
     61  clean_spaces (spectrum[0].telescope);
    6462
    6563  warn_scan (&header, ExptimeKeyword,    "%f", 1, &spectrum[0].exptime);

  • trunk/Ohana/src/imregister/spreg/unique.c

    r2488 r2803  
    55int *unique_entries (int *subset, int *Nmatch) {
    66
    7   int i, j, k, m, Nspectrum, Nsubset;
     7  int i, j, m, Nspectrum, Nsubset;
    88  int N, NMATCH;
    99  int *match, *entry;
    10   int reject;
    1110  Spectrum *spectrum;
    1211  char idxline[128];

  • trunk/Ohana/src/imregister/src/cameraconfig.c

    r90 r2803  
    1 # include <ohana.h>
    2 static char *version = "cameraconfig $Revision: 1.1 $";
    3 
    4 main (int argc, char **argv) {
     1# include "imregister.h"
     2static char *version = "cameraconfig $Revision: 1.2 $";
     3
     4void usage ();
     5
     6int main (int argc, char **argv) {
    57
    68  int i, Nccd, Nx, Ny, mosaic_x, mosaic_y, N, use_biassec;
    … …  
    810  char *config, *file;
    911  char CameraConfig[256];
    10   char field[64], name[64], line[256], keyword[64];
     12  char field[64], line[256], keyword[64];
    1113  char ID[64], *IDsel;
    1214  double x, y, Xo, Yo, theta;
    … …  
    1618  char datasec[64], biassec[64];
    1719
     20  bzero (ID, 64);
    1821  get_version (argc, argv, version);
    1922
    … …  
    4750
    4851  /* command line options */
    49   if (N = get_argument (argc, argv, "-h")) usage ();
     52  if ((N = get_argument (argc, argv, "-h"))) usage ();
    5053
    5154  /* command line options */
    5255  NCCD = FALSE;
    53   if (N = get_argument (argc, argv, "-Nccd")) {
     56  if ((N = get_argument (argc, argv, "-Nccd"))) {
    5457    remove_argument (N, &argc, argv);
    5558    NCCD = TRUE;
    … …  
    5760
    5861  AXES = FALSE;
    59   if (N = get_argument (argc, argv, "-axes")) {
     62  if ((N = get_argument (argc, argv, "-axes"))) {
    6063    remove_argument (N, &argc, argv);
    6164    AXES = TRUE;
    … …  
    6366
    6467  AXIS0 = FALSE;
    65   if (N = get_argument (argc, argv, "-axis0")) {
     68  if ((N = get_argument (argc, argv, "-axis0"))) {
    6669    remove_argument (N, &argc, argv);
    6770    AXIS0 = TRUE;
    … …  
    6972
    7073  AXIS1 = FALSE;
    71   if (N = get_argument (argc, argv, "-axis1")) {
     74  if ((N = get_argument (argc, argv, "-axis1"))) {
    7275    remove_argument (N, &argc, argv);
    7376    AXIS1 = TRUE;
    … …  
    7578
    7679  MOSAIC_X = FALSE;
    77   if (N = get_argument (argc, argv, "-mosaicx")) {
     80  if ((N = get_argument (argc, argv, "-mosaicx"))) {
    7881    remove_argument (N, &argc, argv);
    7982    MOSAIC_X = TRUE;
    8083  }
    8184  MOSAIC_Y = FALSE;
    82   if (N = get_argument (argc, argv, "-mosaicy")) {
     85  if ((N = get_argument (argc, argv, "-mosaicy"))) {
    8386    remove_argument (N, &argc, argv);
    8487    MOSAIC_Y = TRUE;
    … …  
    8689
    8790  CCDS = FALSE;
    88   if (N = get_argument (argc, argv, "-ccds")) {
     91  if ((N = get_argument (argc, argv, "-ccds"))) {
    8992    remove_argument (N, &argc, argv);
    9093    CCDS = TRUE;
    … …  
    9295
    9396  CCDN = FALSE;
    94   if (N = get_argument (argc, argv, "-ccdn")) {
     97  if ((N = get_argument (argc, argv, "-ccdn"))) {
    9598    remove_argument (N, &argc, argv);
    9699    CCDN = TRUE;
    … …  
    98101
    99102  SEQ = FALSE;
    100   if (N = get_argument (argc, argv, "-seq")) {
     103  if ((N = get_argument (argc, argv, "-seq"))) {
    101104    remove_argument (N, &argc, argv);
    102105    SEQ = TRUE;
    … …  
    104107
    105108  XOFF = FALSE;
    106   if (N = get_argument (argc, argv, "-xoff")) {
     109  if ((N = get_argument (argc, argv, "-xoff"))) {
    107110    remove_argument (N, &argc, argv);
    108111    XOFF = TRUE;
    … …  
    110113
    111114  YOFF = FALSE;
    112   if (N = get_argument (argc, argv, "-yoff")) {
     115  if ((N = get_argument (argc, argv, "-yoff"))) {
    113116    remove_argument (N, &argc, argv);
    114117    YOFF = TRUE;
    … …  
    116119
    117120  XO = FALSE;
    118   if (N = get_argument (argc, argv, "-Xo")) {
     121  if ((N = get_argument (argc, argv, "-Xo"))) {
    119122    remove_argument (N, &argc, argv);
    120123    XO = TRUE;
    … …  
    122125
    123126  YO = FALSE;
    124   if (N = get_argument (argc, argv, "-Yo")) {
     127  if ((N = get_argument (argc, argv, "-Yo"))) {
    125128    remove_argument (N, &argc, argv);
    126129    YO = TRUE;
    … …  
    128131
    129132  THETA = FALSE;
    130   if (N = get_argument (argc, argv, "-theta")) {
     133  if ((N = get_argument (argc, argv, "-theta"))) {
    131134    remove_argument (N, &argc, argv);
    132135    THETA = TRUE;
    … …  
    134137
    135138  XFLIP = FALSE;
    136   if (N = get_argument (argc, argv, "-xflip")) {
     139  if ((N = get_argument (argc, argv, "-xflip"))) {
    137140    remove_argument (N, &argc, argv);
    138141    XFLIP = TRUE;
    … …  
    140143
    141144  YFLIP = FALSE;
    142   if (N = get_argument (argc, argv, "-yflip")) {
     145  if ((N = get_argument (argc, argv, "-yflip"))) {
    143146    remove_argument (N, &argc, argv);
    144147    YFLIP = TRUE;
    … …  
    146149
    147150  DATASEC = FALSE;
    148   if (N = get_argument (argc, argv, "-datasec")) {
     151  if ((N = get_argument (argc, argv, "-datasec"))) {
    149152    remove_argument (N, &argc, argv);
    150153    DATASEC = TRUE;
    151154  }
    152155  BIASSEC = FALSE;
    153   if (N = get_argument (argc, argv, "-biassec")) {
     156  if ((N = get_argument (argc, argv, "-biassec"))) {
    154157    remove_argument (N, &argc, argv);
    155158    BIASSEC = TRUE;
    156159  }
    157160  USE_BIASSEC = FALSE;
    158   if (N = get_argument (argc, argv, "-usebiassec")) {
     161  if ((N = get_argument (argc, argv, "-usebiassec"))) {
    159162    remove_argument (N, &argc, argv);
    160163    USE_BIASSEC = TRUE;
    … …  
    162165
    163166  GetID = FALSE;
    164   if (N = get_argument (argc, argv, "-ID")) {
     167  IDsel = 0;
     168  if ((N = get_argument (argc, argv, "-ID"))) {
    165169    GetID = TRUE;
    166170    remove_argument (N, &argc, argv);
     171    IDsel = strcreate (argv[N]);
     172    remove_argument (N, &argc, argv);
     173  }
     174
     175  GetN = FALSE;
     176  Nsel = 0;
     177  if ((N = get_argument (argc, argv, "-N"))) {
     178    GetN = TRUE;
     179    remove_argument (N, &argc, argv);
    167180    Nsel = atoi (argv[N]);
    168     remove_argument (N, &argc, argv);
    169   }
    170 
    171   GetN = FALSE;
    172   if (N = get_argument (argc, argv, "-N")) {
    173     GetN = TRUE;
    174     remove_argument (N, &argc, argv);
    175     IDsel = strcreate (argv[N]);
    176181    remove_argument (N, &argc, argv);
    177182  }
    … …  
    208213            ID, &x, &y, &dx, &dy, datasec, biassec, &Xo, &Yo, &theta);
    209214
    210     if (GetID && (Nsel == i)) fprintf (stdout, "%s\n", ID);
    211     if (GetN  && strnumcmp (IDsel, ID)) fprintf (stdout, "%d\n", i);
     215    if (GetN  && (Nsel == i)) fprintf (stdout, "%d\n", i);
     216    if (GetID && strnumcmp (IDsel, ID)) fprintf (stdout, "%s\n", ID);
    212217    if (SEQ)     fprintf (stdout, "%d ", i);
    213218    if (CCDS)    fprintf (stdout, "%s ", ID);
    … …  
    231236}
    232237
    233 usage () {
     238void usage () {
    234239
    235240  fprintf (stderr, "cameraconfig [option] : lookup camera parameters\n");

  • trunk/Ohana/src/imregister/src/convertimreg.c

    r3 r2803  
    11# include "imregister.h"
    22# include "imreg.h"
    3 static char *version = "convertimreg $Revision: 3.0 $";
     3static char *version = "convertimreg $Revision: 3.1 $";
    44
    55int main (int argc, char **argv) {
    … …  
    2222 
    2323  /* load old-style pseudo-FITS table db */
     24  lockstate = LCK_SOFT;
    2425
    2526  /* lock database (soft) */
    26   f = fsetlockfile (argv[1], 300.0, LCK_SOFT, &dbstate);
     27  f = fsetlockfile (argv[1], 300.0, lockstate, &dbstate);
    2728  if (f == (FILE *) NULL) {
    2829    fprintf (stderr, "ERROR: can't open db\n");
    … …  
    5455
    5556  DumpFitsBintable (argv[2], pimage, match, Nimage);
     57  exit (0);
    5658}

  • trunk/Ohana/src/imregister/src/detsearch.c

    r75 r2803  
    11# include "imregister.h"
    22# include "detrend.h"
    3 static char *version = "detsearch $Revision: 3.1 $";
     3static char *version = "detsearch $Revision: 3.2 $";
    44
    55int main (int argc, char **argv) {
    … …  
    1818  if (!status) {
    1919    close_db ();
     20    fprintf (stderr, "database missing or empty\n");
    2021    exit (0);
    2122  }
    … …  
    2930    match = UniqueSubset (match, &Nmatch);
    3031    if (Nmatch == 0) {
    31       if (output.verbose) fprintf (stderr, "ERROR: can't find any valid detrend files (%s %s %d)\n", typename[criteria[0].Type], filtername[criteria[0].Filter], criteria[0].CCD);
     32      if (output.verbose) fprintf (stderr, "ERROR: can't find any valid detrend files (%s %s %d)\n", get_type_name(criteria[0].Type), filtername[criteria[0].Filter], criteria[0].CCD);
    3233      close_db ();
    3334      exit (1);

  • trunk/Ohana/src/imregister/src/filtnames.c

    r90 r2803  
    1 # include <ohana.h>
    2 static char *version = "filtnames $Revision: 1.1 $";
     1# include "imregister.h"
     2static char *version = "filtnames $Revision: 1.2 $";
    33
    44typedef struct {
    … …  
    77} FiltCode;
    88
    9 main (int argc, char **argv) {
     9int main (int argc, char **argv) {
    1010
    1111  int i, code, Ncode, Nmatch, Nfield, N, Select, CalibrationData;
    … …  
    3636  /* image type (dark, flat, bias, etc) */
    3737  Select = TRUE;
    38   if (N = get_argument (argc, argv, "-all")) {
     38  if ((N = get_argument (argc, argv, "-all"))) {
    3939    remove_argument (N, &argc, argv);
    4040    Select = FALSE;
    … …  
    4343  /* image type (dark, flat, bias, etc) */
    4444  CalibrationData = FALSE;
    45   if (N = get_argument (argc, argv, "-cal")) {
     45  if ((N = get_argument (argc, argv, "-cal"))) {
    4646    remove_argument (N, &argc, argv);
    4747    CalibrationData = TRUE;

  • trunk/Ohana/src/imregister/src/imphotmerge.c

    r127 r2803  
    22
    33Image *LoadImageTable (FILE *f, Header *header, int *nimage);
    4 static char *version = "imphotcopy $Revision: 1.1 $";
     4static char *version = "imphotcopy $Revision: 1.2 $";
    55
    6 main (int argc, char **argv) {
     6int main (int argc, char **argv) {
    77 
    88  Header header, theader;
    … …  
    3535  /* select by image photcode */
    3636  PhotCodeSelect = FALSE;
    37   if (N = get_argument (argc, argv, "-photcode")) {
     37  PHOTCODE = 0;
     38  if ((N = get_argument (argc, argv, "-photcode"))) {
    3839    remove_argument (N, &argc, argv);
    3940    if (!(PHOTCODE = GetPhotcodeCodebyName (argv[N]))) {
    … …  
    4748  /* string in image name */
    4849  NameSelect = (char *) NULL;
    49   if (N = get_argument (argc, argv, "-name")) {
     50  NameSelectLength = 0;
     51  if ((N = get_argument (argc, argv, "-name"))) {
    5052    remove_argument (N, &argc, argv);
    5153    NameSelect = strcreate (argv[N]);
    … …  
    5557
    5658  FitsOutput = (char *) NULL;
    57   if (N = get_argument (argc, argv, "-fits")) {
     59  if ((N = get_argument (argc, argv, "-fits"))) {
    5860    remove_argument (N, &argc, argv);
    5961    FitsOutput = strcreate (argv[N]);
    … …  
    6264
    6365  VERBOSE = FALSE;
    64   if (N = get_argument (argc, argv, "-v")) {
     66  if ((N = get_argument (argc, argv, "-v"))) {
    6567    remove_argument (N, &argc, argv);
    6668    VERBOSE = TRUE;

  • trunk/Ohana/src/imregister/src/imphotsearch.c

    r2455 r2803  
    22
    33static char PhotError[] = "unknown";
    4 static char *version = "imphotsearch $Revision: 1.3 $";
    5 
    6 main (int argc, char **argv) {
     4static char *version = "imphotsearch $Revision: 1.4 $";
     5
     6int DumpFitsTable (char *filename, Image *image, int Nentry, int *index, int Nkeep);
     7
     8int main (int argc, char **argv) {
    79 
    810  FILE *f;
    … …  
    1214  int Nimage, nimage, *index, Ntimes;
    1315  unsigned long *tstart, *tstop;
    14   int VERBOSE, FORCE_READ, PHOTCODE, dbstate, lockstate;
     16  int VERBOSE, FORCE_READ, PHOTCODE, dbstate;
    1517  Image *image;
    1618  int PhotCodeSelect, Nin;
    … …  
    3840  /* select by image photcode */
    3941  PhotCodeSelect = FALSE;
    40   if (N = get_argument (argc, argv, "-photcode")) {
     42  PHOTCODE = 0;
     43  if ((N = get_argument (argc, argv, "-photcode"))) {
    4144    remove_argument (N, &argc, argv);
    4245    if (!(PHOTCODE = GetPhotcodeCodebyName (argv[N]))) {
    … …  
    5053  /* string in image name */
    5154  NameSelect = (char *) NULL;
    52   if (N = get_argument (argc, argv, "-name")) {
     55  NameSelectLength = 0;
     56  if ((N = get_argument (argc, argv, "-name"))) {
    5357    remove_argument (N, &argc, argv);
    5458    NameSelect = strcreate (argv[N]);
    … …  
    5963  /* string in image name */
    6064  CodeSelect = FALSE;
    61   if (N = get_argument (argc, argv, "-code")) {
     65  Code = 0;
     66  if ((N = get_argument (argc, argv, "-code"))) {
    6267    CodeSelect = TRUE;
    6368    remove_argument (N, &argc, argv);
    … …  
    6772
    6873  FitsOutput = (char *) NULL;
    69   if (N = get_argument (argc, argv, "-fits")) {
     74  if ((N = get_argument (argc, argv, "-fits"))) {
    7075    remove_argument (N, &argc, argv);
    7176    FitsOutput = strcreate (argv[N]);
    … …  
    7479
    7580  VERBOSE = FALSE;
    76   if (N = get_argument (argc, argv, "-v")) {
     81  if ((N = get_argument (argc, argv, "-v"))) {
    7782    remove_argument (N, &argc, argv);
    7883    VERBOSE = TRUE;
    … …  
    8085
    8186  FORCE_READ = FALSE;
    82   if (N = get_argument (argc, argv, "-force")) {
     87  if ((N = get_argument (argc, argv, "-force"))) {
    8388    remove_argument (N, &argc, argv);
    8489    FORCE_READ = TRUE;
    … …  
    131136    exit (1);
    132137  }
    133   fclearlockfile (dBFile, f, lockstate, &dbstate);
     138  fclearlockfile (dBFile, f, LCK_SOFT, &dbstate);
    134139
    135140  /* allocate space for reference lists */
    … …  
    176181}
    177182
    178 DumpFitsTable (char *filename, Image *image, int Nentry, int *index, int Nkeep) {
     183int DumpFitsTable (char *filename, Image *image, int Nentry, int *index, int Nkeep) {
    179184 
    180185  Header header, theader;

  • trunk/Ohana/src/imregister/src/imphotset.c

    r127 r2803  
    22
    33static char PhotError[] = "unknown";
    4 static char *version = "imphotset $Revision: 1.1 $";
     4static char *version = "imphotset $Revision: 1.2 $";
    55
    66Image *LoadImageTable (FILE *f, Header *header, int *nimage);
    77
    8 main (int argc, char **argv) {
     8int main (int argc, char **argv) {
    99 
    1010  Header header;
    … …  
    4242  /* select by image photcode */
    4343  PhotCodeSelect = FALSE;
    44   if (N = get_argument (argc, argv, "-photcode")) {
     44  photcode = NULL;
     45  if ((N = get_argument (argc, argv, "-photcode"))) {
    4546    remove_argument (N, &argc, argv);
    4647    if ((photcode = GetPhotcodebyName (argv[N])) == NULL) {
    … …  
    5455  /* select by image name */
    5556  NameSelect = (char *) NULL;
    56   if (N = get_argument (argc, argv, "-name")) {
     57  NameSelectLength = 0;
     58  if ((N = get_argument (argc, argv, "-name"))) {
    5759    remove_argument (N, &argc, argv);
    5860    NameSelect = strcreate (argv[N]);
    … …  
    6365  /* desired action */
    6466  ModifyFlag = FALSE;
    65   if (N = get_argument (argc, argv, "-flag")) {
     67  ModifyValue = ModifyEntry = NULL;
     68  if ((N = get_argument (argc, argv, "-flag"))) {
    6669    remove_argument (N, &argc, argv);
    6770    ModifyEntry = strcreate (argv[N]);
    … …  
    7376
    7477  VERBOSE = FALSE;
    75   if (N = get_argument (argc, argv, "-v")) {
     78  if ((N = get_argument (argc, argv, "-v"))) {
    7679    remove_argument (N, &argc, argv);
    7780    VERBOSE = TRUE;

  • trunk/Ohana/src/imregister/src/imregister.c

    r75 r2803  
    11# include "imregister.h"
    22# include "imreg.h"
    3 static char *version = "imregister $Revision: 3.2 $";
     3static char *version = "imregister $Revision: 3.3 $";
    44
    55int main (int argc, char **argv) {
    … …  
    1212  args (argc, argv);
    1313  image = iminfo (argv[1]);
     14
     15  Nnew = 0;
     16  pimage = NULL;
    1417
    1518  /* define new entries (pimage, Nnew) */

  • trunk/Ohana/src/imregister/src/imsearch.c

    r70 r2803  
    11# include "imregister.h"
    22# include "imreg.h"
    3 static char *version = "imsearch $Revision: 3.1 $";
     3static char *version = "imsearch $Revision: 3.2 $";
    44
    55int main (int argc, char **argv) {
    … …  
    1616  if (!status) {
    1717    close_db ();
     18    fprintf (stderr, "database missing or empty\n");
    1819    exit (0);
    1920  }

  • trunk/Ohana/src/imregister/src/imstatreg.c

    r98 r2803  
    11# include "imregister.h"
    22# include "imreg.h"
    3 static char *version = "imstatreg $Revision: 3.6 $";
     3static char *version = "imstatreg $Revision: 3.7 $";
    44
    55int main (int argc, char **argv) {
    66 
    77  RegImage *image;
    8   float *dtime;
    9   int i, *match, Nmatch, status, child, Nentry;
    10   char *TempDB, *LogFile, *ccdname;
     8  int *match, Nmatch, status, child, Nentry;
     9  char *TempDB, *LogFile;
    1110  FILE *f;
    1211
    … …  
    2524
    2625  /* fork in background */
    27   if (child = fork ()) {
     26  if ((child = fork ())) {
    2827    if (child == -1) {
    2928      fprintf (stderr, "error forking imstatreg -daemon \n");

  • trunk/Ohana/src/imregister/src/photcode.c

    r3 r2803  
    11# include "imregister.h"
    2 static char *version = "photcode $Revision: 3.0 $";
     2static char *version = "photcode $Revision: 3.1 $";
    33
    44int main (int argc, char **argv) {
    55
    66  Header header;
    7   char detector[80], filter[80], FilterList[256], *ID;
     7  char detector[80], filter[80], *ID;
    88  int i, ccd, VERBOSE, N, Nfilter;
    9   char *photname;
    109
    1110  get_version (argc, argv, version);
    … …  
    1514
    1615  VERBOSE = TRUE;
    17   if (N = get_argument (argc, argv, "-quiet")) {
     16  if ((N = get_argument (argc, argv, "-quiet"))) {
    1817    remove_argument (N, &argc, argv);
    1918    VERBOSE = FALSE;

  • trunk/Ohana/src/imregister/src/photreg.c

    r90 r2803  
    11# include "imregister.h"
    22# include "photreg.h"
    3 static char *version = "photreg $Revision: 1.1 $";
     3static char *version = "photreg $Revision: 1.2 $";
    44
    5 main (int argc, char **argv) {
     5int main (int argc, char **argv) {
    66 
    77  int status;

  • trunk/Ohana/src/imregister/src/photsearch.c

    r90 r2803  
    11# include "imregister.h"
    22# include "photreg.h"
    3 static char *version = "photsearch $Revision: 1.1 $";
     3static char *version = "photsearch $Revision: 1.2 $";
    44
    5 main (int argc, char **argv) {
     5int main (int argc, char **argv) {
    66
    77  int status, Nmatch;
    … …  
    2424
    2525  OutputSubset (match, Nmatch);
     26  exit (0);
    2627}

  • trunk/Ohana/src/imregister/src/spregister.c

    r2769 r2803  
    11# include "imregister.h"
    22# include "spreg.h"
    3 static char *version = "spregister $Revision: 1.2 $";
     3static char *version = "spregister $Revision: 1.3 $";
    44
    55int main (int argc, char **argv) {
    66 
    77  Spectrum *spectrum, *pspectrum;
    8   int i, status, Nnew;
    9   float *dtime;
     8  int status, Nnew;
    109
    1110  get_version (argc, argv, version);
    … …  
    2625  }
    2726  append_db (pspectrum, Nnew);
     27  exit (0);
    2828}
    2929
Note: See TracChangeset for help on using the changeset viewer.