IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3534


Ignore:
Timestamp:
Mar 28, 2005, 1:41:14 PM (21 years ago)
Author:
eugene
Message:

cleanup spreg

Location:
trunk/Ohana/src/imregister
Files:
1 added
4 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/imregister/Makefile

    r3516 r3534  
    6363
    6464SPOBJ  = \
    65 $(SPREG)/delete.$(ARCH).o \
    66 $(SPREG)/define.$(ARCH).o \
    67 $(SPREG)/match.$(ARCH).o  \
    68 $(SPREG)/modify.$(ARCH).o \
    69 $(SPREG)/output.$(ARCH).o \
    70 $(SPREG)/unique.$(ARCH).o \
    71 $(SPREG)/ConfigInit.$(ARCH).o    \
    72 $(SPREG)/spinfo.$(ARCH).o \
    73 $(SPREG)/fits_scan_nchar.$(ARCH).o \
    74 $(SPREG)/showinfo.$(ARCH).o  \
    75 $(BASEDIR)/misc.$(ARCH).o        \
    76 $(BASEDIR)/version.$(ARCH).o        \
    77 $(BASEDIR)/parse_time.$(ARCH).o  \
    78 $(BASEDIR)/sort.$(ARCH).o
     65$(SPREG)/delete.$(ARCH).o   \
     66$(SPREG)/match.$(ARCH).o    \
     67$(SPREG)/modify.$(ARCH).o   \
     68$(SPREG)/output.$(ARCH).o   \
     69$(SPREG)/unique.$(ARCH).o   \
     70$(SPREG)/spinfo.$(ARCH).o   \
     71$(SPREG)/showinfo.$(ARCH).o \
     72$(SPREG)/ConfigInit.$(ARCH).o
    7973
    8074PHOTOBJ  = \
    … …  
    114108$(BASEDIR)/version.$(ARCH).o      \
    115109$(BASEDIR)/parse_time.$(ARCH).o   \
     110$(BASEDIR)/fits_scan_nchar.$(ARCH).o \
    116111$(BASEDIR)/sort.$(ARCH).o
    117112
    … …  
    124119PS = $(PHOTREG)/args.photsearch.$(ARCH).o  $(PHOTOBJ) $(BASEOBJ)
    125120PR = $(PHOTREG)/args.photreg.$(ARCH).o     $(PHOTOBJ) $(BASEOBJ)
    126 SR = $(SPREG)/args.spregister.$(ARCH).o    $(SPOBJ)   
    127 SS = $(SPREG)/args.spsearch.$(ARCH).o      $(SPOBJ) 
     121SR = $(SPREG)/args.spregister.$(ARCH).o    $(SPOBJ)   $(BASEOBJ)
     122SS = $(SPREG)/args.spsearch.$(ARCH).o      $(SPOBJ)   $(BASEOBJ)
    128123
    129124$(SR) : $(INC)/spreg.h $(INC)/imregister.h

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

    r3509 r3534  
    446446  return;
    447447}
    448 
    449 void warn_scan (Header *header, char *field, char *format, int N, void *var) {
    450   if (!fits_scan (header, field, format, N, var)) {
    451     fprintf (stderr, "WARNING: %s not found in header\n", field);
    452   }
    453 }
    454 

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

    r3509 r3534  
    101101void get_version (int argc, char **argv, char *version);
    102102int set_db (char *filename);
     103
    103104void warn_scan (Header *header, char *field, char *format, int N, void *var);
     105int fits_scan_nchar (Header *header, int size, char *field, int N,...);
     106void warn_scan_nchar (Header *header, int size, char *field, int N, void *var);
    104107
    105108void clean_spaces (char *line);

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

    r3509 r3534  
    9696int *match_spectrums (Spectrum *subset, int Nsubset, int *Nmatch);
    9797int SubmitSpectrums (Spectrum *spectrum);
    98 int load_probes (char *filename, unsigned long tzero, int *wantprobe, double *values, int Nprobe);
    99 int define_table (Header *header, Matrix *matrix, Header *theader, FTable *table);
    10098void set_timezone (double dt);
    10199
    … …  
    105103Spectrum *get_spectra (int *N);
    106104
    107 int fits_scan_nchar (Header *header, int size, char *field, int N,...);
    108 void warn_scan_nchar (Header *header, int size, char *field, int N, void *var);
     105void ConfigInitSpec (int *argc, char **argv);

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

    r2803 r3534  
    44int success;
    55
    6 void ConfigInit (int *argc, char **argv) {
     6void ConfigInitSpec (int *argc, char **argv) {
    77
    88  char *config, *file;
    … …  
    5454
    5555}
    56 
    57 void WarnConfig (char *config, char *key, char * mode, int N, void *var) {
    58   if (!ScanConfig (config, key, mode, N, var)) {
    59     fprintf (stderr, "missing config variable %s\n", key);
    60     success = FALSE;
    61   }
    62 }

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

    r2803 r3534  
    66  int N;
    77
    8   ConfigInit (&argc, argv); /* load elixir config data */
     8  ConfigInitSpec (&argc, argv); /* load elixir config data */
    99
    1010  NoReg = FALSE;

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

    r2803 r3534  
    88  int N;
    99
    10   ConfigInit (&argc, argv); /* load elixir config data */
     10  ConfigInitSpec (&argc, argv); /* load elixir config data */
    1111
    1212  /* set timezone (set static in misc.c) */
Note: See TracChangeset for help on using the changeset viewer.