Index: trunk/Ohana/src/imregister/include/spreg.h
===================================================================
--- trunk/Ohana/src/imregister/include/spreg.h	(revision 3491)
+++ trunk/Ohana/src/imregister/include/spreg.h	(revision 3509)
@@ -1,27 +1,3 @@
 # include <signal.h>
-
-/*** fits_db test APIs ***/
-typedef struct {
-  FILE  *f;
-  char  *extname;
-  int    dbstate;
-  int    lockstat;
-  Header header;
-  Matrix matrix;
-  Header theader;
-  FTable ftable;
-} DB;
-
-DB *fits_db_init ();
-DB *fits_db_lock (DB *db, char *filename);
-int fits_db_load (DB *db);
-int fits_db_save (DB *db);
-int fits_db_free (DB *db);
-int fits_db_update (DB *db, VTable *vtable);
-int fits_db_close (DB *db);
-int fits_db_print_status (DB *db, char *message);
-int fits_db_escape (DB *db, char *message);
-
-/**** move to fitsio.h ***/
 
 enum {
@@ -42,32 +18,4 @@
   SPSTATE_N
 };
-
-/* structure for Image Registration Database */
-typedef struct {
-  float ra, dec;
-  float exptime;
-  float airmass;
-
-  float Ws, We, dW;
-
-  int  Nspec;
-
-  unsigned long int obstime;
-  unsigned long int regtime;
-
-  char mode;                       /* MEF, SINGLE, SPLIT */
-  char state;                      /* MEF, SINGLE, SPLIT */
-  char flag;                       /* image status flags */
-  char extra[13];
-
-  char pathname[64];
-  char filename[32];
-  char extname[16];
-
-  char instrument[16];
-  char telescope[16];
-  char objname[16];
-
-} Spectrum;  /* 328 bytes / image */
 
 struct {
@@ -132,37 +80,23 @@
 
 int args (int argc, char **argv);
-Spectrum *get_spectrums (int *N);
-int set_spectrums (Spectrum *new, int Nnew);
-int load_db ();
-int save_db ();
-int update_db (int *match, int Nmatch);
-int append_db (Spectrum *new, int Nnew);
-int create_db ();
-int close_db ();
-void DeleteSubset (int *match, int Nmatch);
-Spectrum *spinfo (char *filename);
-int *match_criteria (int *Nmatch);
-int *match_spectrums (Spectrum *subset, int Nsubset, int *Nmatch);
-void ModifySubset (int *match, int Nmatch);
+int *match_criteria (Spectrum *spectrum, int Nspectrum, int *Nmatch);
+int *unique_entries (Spectrum *spectrum, int Nspectrum, int *subset, int *Nmatch);
+
+void ModifySubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch);
+void DeleteSubset (FITS_DB *db, Spectrum *spectrum, int Nspectrum, int *match, int Nmatch);
+void OutputSubset (Spectrum *spectrum, int Nspectrum, int *match, int Nmatch);
+
 void SetOutputMode (char *mode);
-void OutputSubset (int *match, int Nmatch);
 void DumpFitsBintable (char *filename, Spectrum *spectrum, int *match, int Nmatch);
 void DumpFitsTable (char *filename, Spectrum *spectrum, int *match, int Nmatch);
 int PrintSubset (Spectrum *spectrum, int *match, int Nmatch);
 int dump_data (Spectrum *spectrum, int Nspectrum);
+
+Spectrum *spinfo (char *filename);
+int *match_spectrums (Spectrum *subset, int Nsubset, int *Nmatch);
 int SubmitSpectrums (Spectrum *spectrum);
 int load_probes (char *filename, unsigned long tzero, int *wantprobe, double *values, int Nprobe);
 int define_table (Header *header, Matrix *matrix, Header *theader, FTable *table);
 void set_timezone (double dt);
-
-void DumpCADCTable (char *filename, Spectrum *spectrum, int *match, int Nmatch);
-int *GetObsIDSubset (Spectrum *spectrum, int start, int *index, int *entry, int Nindex, int *Nsubset);
-int *GetUniqueObsID (Spectrum *spectrum, int *index, int *entry, int Nindex, int *Nmatch);
-void GetObsIDIndex (Spectrum *spectrum, int *match, int Nmatch, int **Index, int **Entry);
-double SigmaClipList (double *list, int N);
-double MosaicIQStats (Spectrum *spectrum, int *match, int Nmatch, MosaicRegion *region);
-MosaicLayout *CreateCFH12K ();
-MosaicLayout *CreateMegaCam ();
-int GetREFCCD (Spectrum *spectrum, int *index, int *entry, int Nindex, int start);
 
 void showinfo (Spectrum *spec);
@@ -173,4 +107,2 @@
 int fits_scan_nchar (Header *header, int size, char *field, int N,...);
 void warn_scan_nchar (Header *header, int size, char *field, int N, void *var);
-
-int *unique_entries (int *subset, int *Nmatch);