[gnuastro-commits] master e74eb25 093/125: Changed name of Header program to Fits

[Mohammad Akhlaghi]

branch: master
commit e74eb2508af5298fcd4f4832bdef7e1a1d7134f4
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>

    Changed name of Header program to Fits
    
    The name of the Header program has been changed to Fits for operations that
    are only related to FITS files: header keywords and extensions. Until now
    only header keywords were viewed manipulated, but it will be improved to
    also view/manipulate FITS extensions. Each file format has its own
    definition for what FITS calls "header"s and "extension"s.
    
    Thus, we can't have an easy to maintain program to do these things on
    different file formats, rather, its better to explicitly have programs to
    work on file format specific operations.
    
    Previously the other programs would only work with FITS files, but thanks
    to `gal_data_t', the programs won't be immediately using FITS files any
    more. There are wrappers to read input in different formats. This has not
    been fully implemented yet in all the programs, but will be done soon in
    all the programs.
---
 Makefile.am                                      |   6 +-
 bin/{header => fits}/Makefile.am                 |  10 +-
 bin/{header => fits}/args.h                      |   4 +-
 bin/{header/astheader.conf => fits/astfits.conf} |   0
 bin/{header => fits}/authors-cite.h              |   4 +-
 bin/{header/header.h => fits/extension.c}        |  14 +-
 bin/{header/header.h => fits/extension.h}        |  12 +-
 bin/{header/header.h => fits/fits.c}             |  23 ++-
 bin/{header/header.h => fits/fits.h}             |  12 +-
 bin/{header => fits}/header.c                    |   8 +-
 bin/{header => fits}/header.h                    |   6 +-
 bin/{header => fits}/main.c                      |  12 +-
 bin/{header => fits}/main.h                      |  10 +-
 bin/{header => fits}/ui.c                        |  26 ++-
 bin/{header => fits}/ui.h                        |   8 +-
 configure.ac                                     |  46 ++---
 doc/Makefile.am                                  |  18 +-
 tests/Makefile.am                                | 226 ++++++++++++++---------
 tests/{header => fits}/delete.sh                 |   4 +-
 tests/{header => fits}/print.sh                  |   4 +-
 tests/{header => fits}/update.sh                 |   4 +-
 tests/{header => fits}/write.sh                  |   8 +-
 tests/prepconf.sh                                |   2 +-
 tmpfs-config-make                                |   2 +-
 24 files changed, 263 insertions(+), 206 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a177de3..8ace4b2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,8 +62,8 @@ endif
 if COND_CROP
   MAYBE_CROP = bin/crop
 endif
-if COND_HEADER
-  MAYBE_HEADER = bin/header
+if COND_FITS
+  MAYBE_FITS = bin/fits
 endif
 if COND_MKCATALOG
   MAYBE_MKCATALOG = bin/mkcatalog
@@ -109,7 +109,7 @@ endif
 ## having an uncommented `MAYBE_TEMPLATE' as a value in `SUBDIRS'.
 SUBDIRS = bootstrapped/lib $(MAYBE_GNULIBCHECK) lib $(MAYBE_ARITHMETIC) \
   $(MAYBE_CONVERTT) $(MAYBE_CONVOLVE) $(MAYBE_COSMICCAL) $(MAYBE_CROP)  \
-  $(MAYBE_HEADER) $(MAYBE_MKCATALOG) $(MAYBE_MKNOISE) $(MAYBE_MKPROF)   \
+  $(MAYBE_FITS) $(MAYBE_MKCATALOG) $(MAYBE_MKNOISE) $(MAYBE_MKPROF)     \
   $(MAYBE_NOISECHISEL) $(MAYBE_STATISTICS) $(MAYBE_SUBTRACTSKY)         \
   $(MAYBE_TABLE) $(MAYBE_TEMPLATE) $(MAYBE_WARP) doc tests
 
diff --git a/bin/header/Makefile.am b/bin/fits/Makefile.am
similarity index 85%
rename from bin/header/Makefile.am
rename to bin/fits/Makefile.am
index 57a34b7..3bb2dfd 100644
--- a/bin/header/Makefile.am
+++ b/bin/fits/Makefile.am
@@ -26,15 +26,15 @@ AM_CPPFLAGS = -I\$(top_srcdir)/bootstrapped/lib
 
 
 ## Program definition (name, linking, sources and headers)
-bin_PROGRAMS = astheader
+bin_PROGRAMS = astfits
 
-astheader_LDADD = -lgnuastro
+astfits_LDADD = -lgnuastro
 
-astheader_SOURCES = main.c ui.c header.c
+astfits_SOURCES = main.c ui.c extension.c fits.c header.c
 
-EXTRA_DIST = main.h authors-cite.h args.h ui.h header.h
+EXTRA_DIST = main.h authors-cite.h args.h ui.h extension.c fits.c header.h
 
 
 ## The configuration file (distribute and install).
 ## NOTE: the man page is created in doc/Makefile.am
-dist_sysconf_DATA = astheader.conf
+dist_sysconf_DATA = astfits.conf
diff --git a/bin/header/args.h b/bin/fits/args.h
similarity index 97%
rename from bin/header/args.h
rename to bin/fits/args.h
index 614f4cb..cdf1774 100644
--- a/bin/header/args.h
+++ b/bin/fits/args.h
@@ -1,6 +1,6 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
diff --git a/bin/header/astheader.conf b/bin/fits/astfits.conf
similarity index 100%
rename from bin/header/astheader.conf
rename to bin/fits/astfits.conf
diff --git a/bin/header/authors-cite.h b/bin/fits/authors-cite.h
similarity index 92%
rename from bin/header/authors-cite.h
rename to bin/fits/authors-cite.h
index 3ab492d..2a674a1 100644
--- a/bin/header/authors-cite.h
+++ b/bin/fits/authors-cite.h
@@ -1,6 +1,6 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
diff --git a/bin/header/header.h b/bin/fits/extension.c
similarity index 77%
copy from bin/header/header.h
copy to bin/fits/extension.c
index 709845f..1e5deb0 100644
--- a/bin/header/header.h
+++ b/bin/fits/extension.c
@@ -1,11 +1,11 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2017, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -20,10 +20,4 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
 **********************************************************************/
-#ifndef HEADER_H
-#define HEADER_H
-
-int
-header(struct headerparams *p);
-
-#endif
+#include <config.h>
diff --git a/bin/header/header.h b/bin/fits/extension.h
similarity index 77%
copy from bin/header/header.h
copy to bin/fits/extension.h
index 709845f..7aace69 100644
--- a/bin/header/header.h
+++ b/bin/fits/extension.h
@@ -1,11 +1,11 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2017, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -20,10 +20,10 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
 **********************************************************************/
-#ifndef HEADER_H
-#define HEADER_H
+#ifndef EXTENSION_H
+#define EXTENSION_H
 
 int
-header(struct headerparams *p);
+extension(struct fitsparams *p);
 
 #endif
diff --git a/bin/header/header.h b/bin/fits/fits.c
similarity index 73%
copy from bin/header/header.h
copy to bin/fits/fits.c
index 709845f..483bd3e 100644
--- a/bin/header/header.h
+++ b/bin/fits/fits.c
@@ -1,11 +1,11 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2017, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -20,10 +20,17 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
 **********************************************************************/
-#ifndef HEADER_H
-#define HEADER_H
+#include <config.h>
 
-int
-header(struct headerparams *p);
 
-#endif
+#include "main.h"
+
+#include "header.h"
+
+int
+fits(struct fitsparams *p)
+{
+  int r;
+  r=header(p);
+  return r;
+}
diff --git a/bin/header/header.h b/bin/fits/fits.h
similarity index 78%
copy from bin/header/header.h
copy to bin/fits/fits.h
index 709845f..dbcf2fc 100644
--- a/bin/header/header.h
+++ b/bin/fits/fits.h
@@ -1,11 +1,11 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
 Contributing author(s):
-Copyright (C) 2015, Free Software Foundation, Inc.
+Copyright (C) 2017, Free Software Foundation, Inc.
 
 Gnuastro is free software: you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -20,10 +20,10 @@ General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Gnuastro. If not, see <http://www.gnu.org/licenses/>.
 **********************************************************************/
-#ifndef HEADER_H
-#define HEADER_H
+#ifndef FITS_H
+#define FITS_H
 
 int
-header(struct headerparams *p);
+fits(struct fitsparams *p);
 
 #endif
diff --git a/bin/header/header.c b/bin/fits/header.c
similarity index 96%
rename from bin/header/header.c
rename to bin/fits/header.c
index 95797c7..04fa158 100644
--- a/bin/header/header.c
+++ b/bin/fits/header.c
@@ -1,6 +1,6 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
@@ -36,7 +36,7 @@ along with Gnuastro. If not, see 
<http://www.gnu.org/licenses/>.
 
 
 int
-haserror(struct headerparams *p, int actionid, char *string, int status)
+haserror(struct fitsparams *p, int actionid, char *string, int status)
 {
   char action[20];
   int r=EXIT_SUCCESS;
@@ -153,7 +153,7 @@ writeupdatekeys(fitsfile *fptr, struct gal_fits_key_ll 
**keylist,
 
 
 int
-header(struct headerparams *p)
+header(struct fitsparams *p)
 {
   size_t i=0;
   int r=EXIT_SUCCESS;
diff --git a/bin/header/header.h b/bin/fits/header.h
similarity index 86%
rename from bin/header/header.h
rename to bin/fits/header.h
index 709845f..2c0cd0a 100644
--- a/bin/header/header.h
+++ b/bin/fits/header.h
@@ -1,6 +1,6 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
@@ -24,6 +24,6 @@ along with Gnuastro. If not, see 
<http://www.gnu.org/licenses/>.
 #define HEADER_H
 
 int
-header(struct headerparams *p);
+header(struct fitsparams *p);
 
 #endif
diff --git a/bin/header/main.c b/bin/fits/main.c
similarity index 81%
rename from bin/header/main.c
rename to bin/fits/main.c
index 6197358..a944b64 100644
--- a/bin/header/main.c
+++ b/bin/fits/main.c
@@ -1,6 +1,6 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
@@ -29,14 +29,14 @@ along with Gnuastro. If not, see 
<http://www.gnu.org/licenses/>.
 
 #include "main.h"
 
-#include "ui.h"                 /* needs main.h.                  */
-#include "header.h"             /* needs main.h.                  */
+#include "ui.h"
+#include "fits.h"
 
 int
 main (int argc, char *argv[])
 {
   int r;
-  struct headerparams p={{0}, 0};
+  struct fitsparams p={{0}, 0};
 
   /* Get the starting time. */
   time(&p.rawtime);
@@ -45,7 +45,7 @@ main (int argc, char *argv[])
   ui_read_check_inputs_setup(argc, argv, &p);
 
   /* Run MakeProfiles */
-  r=header(&p);
+  r=fits(&p);
 
   /* Free all non-freed allocations. */
   ui_free_and_report(&p);
diff --git a/bin/header/main.h b/bin/fits/main.h
similarity index 90%
rename from bin/header/main.h
rename to bin/fits/main.h
index 2450637..5f656bb 100644
--- a/bin/header/main.h
+++ b/bin/fits/main.h
@@ -1,6 +1,6 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
@@ -28,8 +28,8 @@ along with Gnuastro. If not, see 
<http://www.gnu.org/licenses/>.
 #include <options.h>
 
 /* Progarm name macros: */
-#define PROGRAM_NAME  "Header"        /* Program full name.       */
-#define PROGRAM_EXEC  "astheader"     /* Program executable name. */
+#define PROGRAM_NAME  "Fits"        /* Program full name.       */
+#define PROGRAM_EXEC  "astfits"     /* Program executable name. */
 #define PROGRAM_STRING PROGRAM_NAME" (" PACKAGE_NAME ") " PACKAGE_VERSION
 
 
@@ -38,7 +38,7 @@ along with Gnuastro. If not, see 
<http://www.gnu.org/licenses/>.
 
 
 
-struct headerparams
+struct fitsparams
 {
   /* Common parameters */
   struct gal_options_common_params  cp;  /* Common parameters.        */
diff --git a/bin/header/ui.c b/bin/fits/ui.c
similarity index 94%
rename from bin/header/ui.c
rename to bin/fits/ui.c
index 7c1f4c0..202ddaf 100644
--- a/bin/header/ui.c
+++ b/bin/fits/ui.c
@@ -1,6 +1,6 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
@@ -60,10 +60,8 @@ static char
 args_doc[] = "ASTRdata";
 
 const char
-doc[] = GAL_STRINGS_TOP_HELP_INFO PROGRAM_NAME" print the header "
-  "information in any astronomical data file header. It can also "
-  "manipulate (add, remove or modify) any of the existing keywords in "
-  "a data header. \n"
+doc[] = GAL_STRINGS_TOP_HELP_INFO PROGRAM_NAME" view and manipulate (add, "
+  "delete, or modify) FITS extensions and header keywords. \n"
   GAL_STRINGS_MORE_HELP_INFO
   /* After the list of options: */
   "\v"
@@ -92,7 +90,7 @@ doc[] = GAL_STRINGS_TOP_HELP_INFO PROGRAM_NAME" print the 
header "
 /*********    Initialize & Parse command-line    **************/
 /**************************************************************/
 static void
-ui_initialize_options(struct headerparams *p,
+ui_initialize_options(struct fitsparams *p,
                       struct argp_option *program_options,
                       struct argp_option *gal_commonopts_options)
 {
@@ -116,7 +114,7 @@ ui_initialize_options(struct headerparams *p,
 error_t
 parse_opt(int key, char *arg, struct argp_state *state)
 {
-  struct headerparams *p = state->input;
+  struct fitsparams *p = state->input;
 
   /* Pass `gal_options_common_params' into the child parser.  */
   state->child_inputs[0] = &p->cp;
@@ -185,7 +183,7 @@ parse_opt(int key, char *arg, struct argp_state *state)
 /* Read and check ONLY the options. When arguments are involved, do the
    check in `ui_check_options_and_arguments'. */
 static void
-ui_read_check_only_options(struct headerparams *p)
+ui_read_check_only_options(struct fitsparams *p)
 {
   /* See if the user just wants to view the header or actually do
      something. */
@@ -201,7 +199,7 @@ ui_read_check_only_options(struct headerparams *p)
 
 
 static void
-ui_check_options_and_arguments(struct headerparams *p)
+ui_check_options_and_arguments(struct fitsparams *p)
 {
   /* Make sure an input file name was given and if it was a FITS file, that
      a HDU is also given. */
@@ -241,7 +239,7 @@ ui_check_options_and_arguments(struct headerparams *p)
 /*****************       Preparations      ********************/
 /**************************************************************/
 static void
-ui_setup_rename(struct headerparams *p)
+ui_setup_rename(struct fitsparams *p)
 {
   char *c;
   struct gal_linkedlist_stll *tmp;
@@ -403,7 +401,7 @@ ui_fill_fits_headerll(struct gal_linkedlist_stll *input,
 
 
 static void
-ui_preparations(struct headerparams *p)
+ui_preparations(struct fitsparams *p)
 {
   char *ffname;
   int status=0, iomode;
@@ -448,7 +446,7 @@ ui_preparations(struct headerparams *p)
 /**************************************************************/
 
 void
-ui_read_check_inputs_setup(int argc, char *argv[], struct headerparams *p)
+ui_read_check_inputs_setup(int argc, char *argv[], struct fitsparams *p)
 {
   struct gal_options_common_params *cp=&p->cp;
 
@@ -521,7 +519,7 @@ ui_read_check_inputs_setup(int argc, char *argv[], struct 
headerparams *p)
 /************      Free allocated, report         *************/
 /**************************************************************/
 void
-ui_free_and_report(struct headerparams *p)
+ui_free_and_report(struct fitsparams *p)
 {
   int status=0;
 
diff --git a/bin/header/ui.h b/bin/fits/ui.h
similarity index 88%
rename from bin/header/ui.h
rename to bin/fits/ui.h
index 109e1ff..8f0d0a5 100644
--- a/bin/header/ui.h
+++ b/bin/fits/ui.h
@@ -1,6 +1,6 @@
 /*********************************************************************
-Header - View and manipulate a data file header
-Header is part of GNU Astronomy Utilities (Gnuastro) package.
+Fits - View and manipulate FITS extensions and/or headers.
+Fits is part of GNU Astronomy Utilities (Gnuastro) package.
 
 Original author:
      Mohammad Akhlaghi <address@hidden>
@@ -57,9 +57,9 @@ enum option_keys_enum
 
 void
 ui_read_check_inputs_setup(int argc, char *argv[],
-                           struct headerparams *p);
+                           struct fitsparams *p);
 
 void
-ui_free_and_report(struct headerparams *p);
+ui_free_and_report(struct fitsparams *p);
 
 #endif
diff --git a/configure.ac b/configure.ac
index 7ebb75b..3182db2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,79 +444,79 @@ AC_MSG_RESULT($binoptprint)
 ayes=false
 AC_ARG_ENABLE([arithmetic],
               [AS_HELP_STRING([--enable-arithmetic],
-                    [Install ImageArithmetic and other enabled packages.])],
+                    [Install Arithmetic and other enabled programs.])],
              [AS_IF([test "x$enable_arithmetic" != xno],
                      [enable_arithmetic=yes; ayes=true])],
               [enable_arithmetic=notset])
 AC_ARG_ENABLE([convertt],
               [AS_HELP_STRING([--enable-convertt],
-                    [Install ConvertType and other enabled packages.])],
+                    [Install ConvertType and other enabled programs.])],
              [AS_IF([test "x$enable_convertt" != xno],
                      [enable_convertt=yes; ayes=true])],
               [enable_convertt=notset])
 AC_ARG_ENABLE([convolve],
               [AS_HELP_STRING([--enable-convolve],
-                    [Install Convolve and other enabled packages.])],
+                    [Install Convolve and other enabled programs.])],
              [AS_IF([test "x$enable_convolve" != xno],
                      [enable_cognvolve=yes; ayes=true])],
               [enable_convolve=notset])
 AC_ARG_ENABLE([cosmiccal],
               [AS_HELP_STRING([--enable-cosmiccal],
-                    [Install CosmicCalculator and other enabled packages.])],
+                    [Install CosmicCalculator and other enabled programs.])],
              [AS_IF([test "x$enable_cosmiccal" != xno],
                      [enable_cosmiccal=yes; ayes=true])],
               [enable_cosmiccal=notset])
 AC_ARG_ENABLE([crop],
               [AS_HELP_STRING([--enable-crop],
-                    [Install Crop and other enabled packages.])],
+                    [Install Crop and other enabled programs.])],
              [AS_IF([test "x$enable_crop" != xno],
                      [enable_crop=yes; ayes=true])],
               [enable_crop=notset])
-AC_ARG_ENABLE([header],
-              [AS_HELP_STRING([--enable-header],
-                    [Install Header and other enabled packages.])],
-             [AS_IF([test "x$enable_header" != xno],
-                     [enable_header=yes; ayes=true])],
-              [enable_header=notset])
+AC_ARG_ENABLE([fits],
+              [AS_HELP_STRING([--enable-fits],
+                    [Install Fits and other enabled programs.])],
+             [AS_IF([test "x$enable_Fits" != xno],
+                     [enable_fits=yes; ayes=true])],
+              [enable_fits=notset])
 AC_ARG_ENABLE([mkcatalog],
               [AS_HELP_STRING([--enable-mkcatalog],
-                    [Install MakeCatalog and other enabled packages.])],
+                    [Install MakeCatalog and other enabled programs.])],
              [AS_IF([test "x$enable_mkcatalog" != xno],
                      [enable_mkcatalog=yes; ayes=true])],
               [enable_mkcatalog=notset])
 AC_ARG_ENABLE([mknoise],
               [AS_HELP_STRING([--enable-mknoise],
-                    [Install MakeNoise and other enabled packages.])],
+                    [Install MakeNoise and other enabled programs.])],
              [AS_IF([test "x$enable_mknoise" != xno],
                      [enable_mknoise=yes; ayes=true])],
               [enable_mknoise=notset])
 AC_ARG_ENABLE([mkprof],
               [AS_HELP_STRING([--enable-mkprof],
-                    [Install MakeProfile and other enabled packages.])],
+                    [Install MakeProfile and other enabled programs.])],
              [AS_IF([test "x$enable_mkprof" != xno],
                      [enable_mkprof=yes; ayes=true])],
               [enable_mkprof=notset])
 AC_ARG_ENABLE([noisechisel],
               [AS_HELP_STRING([--enable-noisechisel],
-                    [Install NoiseChisel and other enabled packages.])],
+                    [Install NoiseChisel and other enabled programs.])],
              [AS_IF([test "x$enable_noisechisel" != xno],
                      [enable_noisechisel=yes; ayes=true])],
               [enable_noisechisel=notset])
 AC_ARG_ENABLE([statistics],
               [AS_HELP_STRING([--enable-statistics],
-                    [Install Statistics and other enabled packages.])],
+                    [Install Statistics and other enabled programs.])],
              [AS_IF([test "x$enable_statistics" != xno],
                      [enable_statistics=yes; ayes=true])],
               [enable_statistics=notset])
 AC_ARG_ENABLE([subtractsky],
               [AS_HELP_STRING([--enable-subtractsky],
-                    [Install SubtractSky and other enabled packages.])],
+                    [Install SubtractSky and other enabled programs.])],
              [AS_IF([test "x$enable_subtractsky" != xno],
                      [enable_subtractsky=yes; ayes=true])],
               [enable_subtractsky=notset])
 AC_ARG_ENABLE([table],
               [AS_HELP_STRING([--enable-table],
-                    [Install Table and other enabled packages.])],
+                    [Install Table and other enabled programs.])],
              [AS_IF([test "x$enable_table" != xno],
                      [enable_table=yes; ayes=true])],
               [enable_table=notset])
@@ -528,7 +528,7 @@ AC_ARG_ENABLE([table],
 #              [enable_TEMPLATE=notset])
 AC_ARG_ENABLE([warp],
               [AS_HELP_STRING([--enable-warp],
-                    [Install Warp and other enabled packages.])],
+                    [Install Warp and other enabled programs.])],
              [AS_IF([test "x$enable_warp" != xno],
                      [enable_warp=yes; ayes=true])],
               [enable_warp=notset])
@@ -551,7 +551,7 @@ AS_IF([test $ayes = true ],
        AS_IF([test $enable_convolve = notset], [enable_convolve=no])
        AS_IF([test $enable_cosmiccal = notset], [enable_cosmiccal=no])
        AS_IF([test $enable_crop = notset], [enable_crop=no])
-       AS_IF([test $enable_header = notset], [enable_header=no])
+       AS_IF([test $enable_fits = notset], [enable_fits=no])
        AS_IF([test $enable_arithmetic = notset], [enable_arithmetic=no])
        AS_IF([test $enable_mkcatalog = notset], [enable_mkcatalog=no])
        AS_IF([test $enable_mknoise = notset], [enable_mknoise=no])
@@ -568,7 +568,7 @@ AS_IF([test $ayes = true ],
        AS_IF([test $enable_convolve = notset], [enable_convolve=yes])
        AS_IF([test $enable_cosmiccal = notset], [enable_cosmiccal=yes])
        AS_IF([test $enable_crop = notset], [enable_crop=yes])
-       AS_IF([test $enable_header = notset], [enable_header=yes])
+       AS_IF([test $enable_fits = notset], [enable_fits=yes])
        AS_IF([test $enable_arithmetic = notset], [enable_arithmetic=yes])
        AS_IF([test $enable_mkcatalog = notset], [enable_mkcatalog=yes])
        AS_IF([test $enable_mknoise = notset], [enable_mknoise=yes])
@@ -592,7 +592,7 @@ AM_CONDITIONAL([COND_CONVERTT], [test $enable_convertt = 
yes])
 AM_CONDITIONAL([COND_CONVOLVE], [test $enable_convolve = yes])
 AM_CONDITIONAL([COND_COSMICCAL], [test $enable_cosmiccal = yes])
 AM_CONDITIONAL([COND_CROP], [test $enable_crop = yes])
-AM_CONDITIONAL([COND_HEADER], [test $enable_header = yes])
+AM_CONDITIONAL([COND_FITS], [test $enable_fits = yes])
 AM_CONDITIONAL([COND_MKCATALOG], [test $enable_mkcatalog = yes])
 AM_CONDITIONAL([COND_MKNOISE], [test $enable_mknoise = yes])
 AM_CONDITIONAL([COND_MKPROF], [test $enable_mkprof = yes])
@@ -615,10 +615,10 @@ AC_CONFIG_FILES([Makefile
                  lib/Makefile
                 tests/Makefile
                  bin/crop/Makefile
+                 bin/fits/Makefile
                  bin/warp/Makefile
                  bin/table/Makefile
                  bin/mkprof/Makefile
-                 bin/header/Makefile
                  bin/mknoise/Makefile
                  bin/convertt/Makefile
                  bin/convolve/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 65cdc85..f75c829 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -96,8 +96,8 @@ endif
 if COND_CROP
   MAYBE_CROP_MAN = man/astcrop.1
 endif
-if COND_HEADER
-  MAYBE_HEADER_MAN = man/astheader.1
+if COND_FITS
+  MAYBE_FITS_MAN = man/astfits.1
 endif
 if COND_MKCATALOG
   MAYBE_MKCATALOG_MAN = man/astmkcatalog.1
@@ -126,10 +126,10 @@ endif
 #if COND_TEMPLATE
 #  MAYBE_TEMPLATE_MAN = man/astTEMPLATE.1
 #endif
-dist_man_MANS = $(MAYBE_ARITHMETIC_MAN) $(MAYBE_CONVERTT_MAN)           \
-  $(MAYBE_CONVOLVE_MAN) $(MAYBE_COSMICCAL_MAN) $(MAYBE_CROP_MAN)        \
-  $(MAYBE_HEADER_MAN) $(MAYBE_IMGWARP_MAN) $(MAYBE_MKCATALOG_MAN)       \
-  $(MAYBE_MKNOISE_MAN) $(MAYBE_MKPROF_MAN) $(MAYBE_NOISECHISEL_MAN)     \
+dist_man_MANS = $(MAYBE_ARITHMETIC_MAN) $(MAYBE_CONVERTT_MAN)          \
+  $(MAYBE_CONVOLVE_MAN) $(MAYBE_COSMICCAL_MAN) $(MAYBE_CROP_MAN)       \
+  $(MAYBE_FITS_MAN) $(MAYBE_WARP_MAN) $(MAYBE_MKCATALOG_MAN)           \
+  $(MAYBE_MKNOISE_MAN) $(MAYBE_MKPROF_MAN) $(MAYBE_NOISECHISEL_MAN)    \
   $(MAYBE_STATISTICS_MAN) $(MAYBE_SUBTRACTSKY_MAN) $(MAYBE_TABLE_MAN)
 
 
@@ -168,9 +168,9 @@ man/astcrop.1: $(top_srcdir)/bin/crop/args.h  $(ALLMANSDEP)
        $(MAYBE_HELP2MAN) -n "crop regions of a dataset"                   \
                          --libtool $(toputildir)/crop/astcrop
 
-man/astheader.1: $(top_srcdir)/bin/header/args.h  $(ALLMANSDEP)
+man/astfits.1: $(top_srcdir)/bin/fits/args.h  $(ALLMANSDEP)
        $(MAYBE_HELP2MAN) -n "view and manipulate FITS headers"            \
-                         --libtool $(toputildir)/header/astheader
+                         --libtool $(toputildir)/fits/astfits
 
 man/astmkcatalog.1: $(top_srcdir)/bin/mkcatalog/args.h  $(ALLMANSDEP)
        $(MAYBE_HELP2MAN) -n "Make a catalog from labeled input images"    \
@@ -205,5 +205,5 @@ man/asttable.1: $(top_srcdir)/bin/table/args.h  
$(ALLMANSDEP)
                          $(toputildir)/TEMPLATE/astTEMPLATE
 
 man/astwarp.1: $(top_srcdir)/bin/warp/args.h  $(ALLMANSDEP)
-       $(MAYBE_HELP2MAN) -n "warp (transform) input image"                \
+       $(MAYBE_HELP2MAN) -n "warp (transform) input dataset"              \
                          --libtool $(toputildir)/warp/astwarp
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4f000b4..263d17c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -22,14 +22,148 @@
 
 
 
-# Translate conditions that came from `./configure' into variables that can
-# be used here.
+## Translate conditions that came from `./configure' into variables that can
+## be used here. This includes the programs and teh dependencies of the
+## checks.
+##
+## Dependency structure
+## ====================
+##
+## The tests depend on each other. One way to fix this is to call them in
+## the order that their dependence is satisfied. But that is prone to
+## errors and a lot of problem. The user also not want to build all the
+## programs. Also, Make allows us to work with multiple threads (with
+## `-jN') and in that case, it is vital to define the dependencies.
+##
+## The output of all the tests that should be used (is recognized by
+## Automake and will not mess the system) is the name of the test file
+## appended by a `.log'. It contains the output of the program on standard
+## output and error. THIS IS IMPORTANT: So even if the program fails, the
+## .log file is created. The check if the input for a test exists or not
+## should be checked in the test that depends on it, it can't be done here
+## in the Makefile.
 if COND_HASGHOSTSCRIPT
   MAYBE_HASGHOSTSCRIPT = "yes"
 endif
 if COND_HASLIBJPEG
   MAYBE_HASLIBJPEG = "yes"
 endif
+if COND_ARITHMETIC
+  MAYBE_ARITHMETIC_TESTS = arithmetic/snimage.sh arithmetic/onlynumbers.sh \
+  arithmetic/where.sh arithmetic/or.sh
+
+  arithmetic/onlynumbers.sh: prepconf.sh.log
+  arithmetic/snimage.sh: noisechisel/noisechisel.sh.log
+  arithmetic/where.sh: noisechisel/noisechisel.sh.log
+  arithmetic/or.sh: noisechisel/noisechisel.sh.log
+endif
+if COND_CONVERTT
+  MAYBE_CONVERTT_TESTS = convertt/fitstotxt.sh convertt/fitstojpeg.sh  \
+  convertt/blankch.sh convertt/jpegtotxt.sh convertt/fitstojpegcmyk.sh \
+  convertt/jpegtofits.sh convertt/fitstopdf.sh
+
+  convertt/fitstotxt.sh: mkprof/mosaic1.sh.log
+  convertt/fitstojpeg.sh: mkprof/mosaic1.sh.log
+  convertt/blankch.sh: mkprof/mosaic1.sh.log
+  convertt/jpegtotxt.sh: convertt/fitstojpeg.sh.log
+  convertt/fitstojpegcmyk.sh: mkprof/mosaic1.sh.log
+  convertt/jpegtofits.sh: convertt/blankch.sh.log
+  convertt/fitstopdf.sh: crop/section.sh.log
+endif
+if COND_CONVOLVE
+  MAYBE_CONVOLVE_TESTS = convolve/spatial.sh convolve/frequency.sh
+
+  convolve/spatial.sh: mkprof/mosaic1.sh.log
+  convolve/frequency.sh: mkprof/mosaic1.sh.log
+endif
+if COND_COSMICCAL
+  MAYBE_COSMICCAL_TESTS = cosmiccal/simpletest.sh
+
+  cosmiccal/simpletest.sh: prepconf.sh.log
+endif
+if COND_CROP
+  MAYBE_CROP_TESTS = crop/imgcat.sh crop/wcscat.sh crop/xcyc.sh                
\
+  crop/xcycnoblank.sh crop/section.sh crop/radec.sh crop/imgpolygon.sh \
+  crop/imgoutpolygon.sh crop/wcspolygon.sh
+
+  crop/imgcat.sh: mkprof/mosaic1.sh.log
+  crop/wcscat.sh: mkprof/mosaic1.sh.log mkprof/mosaic2.sh.log     \
+                  mkprof/mosaic3.sh.log mkprof/mosaic4.sh.log
+  crop/xcyc.sh: mkprof/mosaic1.sh.log
+  crop/xcycnoblank.sh: mkprof/mosaic1.sh.log
+  crop/section.sh: mkprof/mosaic1.sh.log
+  crop/radec.sh: mkprof/mosaic1.sh.log mkprof/mosaic2.sh.log      \
+                 mkprof/mosaic3.sh.log mkprof/mosaic4.sh.log
+  crop/imgpolygon.sh: mkprof/mosaic1.sh.log
+  crop/imgoutpolygon.sh: mkprof/mosaic1.sh.log
+  crop/wcspolygon.sh: mkprof/mosaic1.sh.log mkprof/mosaic2.sh.log \
+                      mkprof/mosaic3.sh.log mkprof/mosaic4.sh.log
+endif
+if COND_FITS
+  MAYBE_FITS_TESTS = fits/write.sh fits/print.sh fits/update.sh        \
+  fits/delete.sh
+
+  fits/write.sh: mkprof/mosaic1.sh.log
+  fits/print.sh: fits/write.sh.log
+  fits/update.sh: fits/write.sh.log
+  fits/delete.sh: fits/write.sh.log
+endif
+if COND_MKCATALOG
+  MAYBE_MKCATALOG_TESTS = mkcatalog/simple.sh mkcatalog/aperturephot.sh
+
+  mkcatalog/simple.sh: noisechisel/noisechisel.sh.log
+  mkcatalog/aperturephot.sh: noisechisel/noisechisel.sh.log          \
+                             mkprof/clearcanvas.sh
+endif
+if COND_MKNOISE
+  MAYBE_MKNOISE_TESTS = mknoise/addnoise.sh
+
+  mknoise/addnoise.sh: warp/warp_scale.sh.log
+endif
+if COND_MKPROF
+  MAYBE_MKPROF_TESTS = mkprof/mosaic1.sh mkprof/mosaic2.sh     \
+  mkprof/mosaic3.sh mkprof/mosaic4.sh mkprof/radeccat.sh       \
+  mkprof/ellipticalmasks.sh mkprof/clearcanvas.sh
+
+  mkprof/mosaic1.sh: prepconf.sh.log
+  mkprof/mosaic2.sh: prepconf.sh.log
+  mkprof/mosaic3.sh: prepconf.sh.log
+  mkprof/mosaic4.sh: prepconf.sh.log
+  mkprof/radeccat.sh: prepconf.sh.log
+  mkprof/ellipticalmasks.sh: mknoise/addnoise.sh.log
+  mkprof/clearcanvas.sh: mknoise/addnoise.sh.log
+endif
+if COND_NOISECHISEL
+  MAYBE_NOISECHISEL_TESTS = noisechisel/noisechisel.sh
+
+  noisechisel/noisechisel.sh: mknoise/addnoise.sh.log
+endif
+if COND_STATISTICS
+  MAYBE_STATISTICS_TESTS = statistics/basicstats.sh
+
+  statistics/basicstats.sh: mknoise/addnoise.sh.log
+endif
+if COND_SUBTRACTSKY
+  MAYBE_SUBTRACTSKY_TESTS = subtractsky/subtractsky.sh
+
+  subtractsky/subtractsky.sh: mknoise/addnoise.sh.log
+endif
+if COND_TABLE
+  MAYBE_TABLE_TESTS = table/txt-to-fits-binary.sh              \
+  table/fits-binary-to-txt.sh table/txt-to-fits-ascii.sh       \
+  table/fits-ascii-to-txt.sh
+
+  table/txt-to-fits-binary.sh: prepconf.sh.log
+  table/fits-binary-to-txt.sh: table/txt-to-fits-binary.sh.log
+  table/txt-to-fits-ascii.sh: prepconf.sh.log
+  table/fits-ascii-to-txt.sh: table/txt-to-fits-ascii.sh.log
+endif
+if COND_WARP
+  MAYBE_WARP_TESTS = warp/warp_scale.sh warp/homographic.sh
+
+  warp/warp_scale.sh: convolve/spatial.sh.log
+  warp/homographic.sh: convolve/spatial.sh.log
+endif
 
 
 
@@ -64,22 +198,12 @@ multithread_SOURCES = lib/multithread.c
 
 
 # The actual test scripts that are run:
-TESTS = $(check_PROGRAMS) prepconf.sh mkprof/mosaic1.sh mkprof/mosaic2.sh  \
-  mkprof/mosaic3.sh mkprof/mosaic4.sh mkprof/radeccat.sh crop/imgcat.sh    \
-  crop/wcscat.sh crop/xcyc.sh crop/xcycnoblank.sh crop/section.sh          \
-  crop/radec.sh crop/imgpolygon.sh crop/imgoutpolygon.sh                   \
-  crop/wcspolygon.sh convertt/fitstotxt.sh convertt/fitstojpeg.sh          \
-  convertt/blankch.sh convertt/jpegtotxt.sh convertt/fitstojpegcmyk.sh     \
-  convertt/jpegtofits.sh convertt/fitstopdf.sh convolve/spatial.sh         \
-  convolve/frequency.sh warp/warp_scale.sh warp/homographic.sh             \
-  mknoise/addnoise.sh mkprof/ellipticalmasks.sh mkprof/clearcanvas.sh      \
-  header/write.sh header/print.sh header/update.sh header/delete.sh        \
-  statistics/basicstats.sh subtractsky/subtractsky.sh                      \
-  noisechisel/noisechisel.sh mkcatalog/simple.sh mkcatalog/aperturephot.sh \
-  arithmetic/snimage.sh arithmetic/onlynumbers.sh arithmetic/where.sh      \
-  arithmetic/or.sh cosmiccal/simpletest.sh table/txt-to-fits-binary.sh     \
-  table/fits-binary-to-txt.sh table/txt-to-fits-ascii.sh                   \
-  table/fits-ascii-to-txt.sh
+TESTS = prepconf.sh $(check_PROGRAMS) $(MAYBE_ARITHMETIC_TESTS)                
   \
+  $(MAYBE_CONVERTT_TESTS) $(MAYBE_CONVOLVE_TESTS) $(MAYBE_COSMICCAL_TESTS) \
+  $(MAYBE_CROP_TESTS) $(MAYBE_FITS_TESTS) $(MAYBE_MKCATALOG_TESTS)        \
+  $(MAYBE_MKNOISE_TESTS) $(MAYBE_MKPROF_TESTS) $(MAYBE_NOISECHISEL_TESTS)  \
+  $(MAYBE_STATISTICS_TESTS) $(MAYBE_SUBTRACTSKY_TESTS)                    \
+  $(MAYBE_TABLE_TESTS) $(MAYBE_WARP_TESTS)
 
 
 
@@ -107,69 +231,3 @@ CLEANFILES = *.log *.txt *.jpg *.fits *.pdf *.eps
 # that was built by the `prepconf.sh' scripot. See "Extending Automake
 # rules", and the "What Gets Cleaned" sections of the Automake manual.
 clean-local:; rm -rf .gnuastro
-
-
-
-
-
-## Dependency structure
-## ====================
-##
-## When run with `-jN' option, the tests can be run in parallel, so we need
-## to define their dependencies on each other here. The output of all the
-## tests that should be used (is recognized by Automake and will not mess
-## the system) is the name of the test file appended by a `.log'. It
-## contains the output of the program on standard output and error. THIS IS
-## IMPORTANT: So even if the program fails, the .log file is created. The
-## check if the input for a test exists or not should be checked in the
-## test that depends on it, it can't be done here in the Makefile.
-mkprof/mosaic1.sh: prepconf.sh.log
-mkprof/mosaic2.sh: prepconf.sh.log
-mkprof/mosaic3.sh: prepconf.sh.log
-mkprof/mosaic4.sh: prepconf.sh.log
-mkprof/radeccat.sh: prepconf.sh.log
-table/txt-to-fits-binary.sh: prepconf.sh.log
-table/fits-binary-to-txt.sh: table/txt-to-fits-binary.sh.log
-table/txt-to-fits-ascii.sh: prepconf.sh.log
-table/fits-ascii-to-txt.sh: table/txt-to-fits-ascii.sh.log
-crop/imgcat.sh: mkprof/mosaic1.sh.log
-crop/wcscat.sh: mkprof/mosaic1.sh.log mkprof/mosaic2.sh.log     \
-                   mkprof/mosaic3.sh.log mkprof/mosaic4.sh.log
-crop/xcyc.sh: mkprof/mosaic1.sh.log
-crop/xcycnoblank.sh: mkprof/mosaic1.sh.log
-crop/section.sh: mkprof/mosaic1.sh.log
-crop/radec.sh: mkprof/mosaic1.sh.log mkprof/mosaic2.sh.log      \
-                  mkprof/mosaic3.sh.log mkprof/mosaic4.sh.log
-crop/imgpolygon.sh: mkprof/mosaic1.sh.log
-crop/imgoutpolygon.sh: mkprof/mosaic1.sh.log
-crop/wcspolygon.sh: mkprof/mosaic1.sh.log mkprof/mosaic2.sh.log \
-                       mkprof/mosaic3.sh.log mkprof/mosaic4.sh.log
-convertt/fitstotxt.sh: mkprof/mosaic1.sh.log
-convertt/fitstojpeg.sh: mkprof/mosaic1.sh.log
-convertt/blankch.sh: mkprof/mosaic1.sh.log
-convertt/jpegtotxt.sh: convertt/fitstojpeg.sh.log
-convertt/fitstojpegcmyk.sh: mkprof/mosaic1.sh.log
-convertt/jpegtofits.sh: convertt/blankch.sh.log
-convertt/fitstopdf.sh: crop/section.sh.log
-convolve/spatial.sh: mkprof/mosaic1.sh.log
-convolve/frequency.sh: mkprof/mosaic1.sh.log
-warp/warp_scale.sh: convolve/spatial.sh.log
-warp/homographic.sh: convolve/spatial.sh.log
-mknoise/addnoise.sh: warp/warp_scale.sh.log
-mkprof/ellipticalmasks.sh: mknoise/addnoise.sh.log
-mkprof/clearcanvas.sh: mknoise/addnoise.sh.log
-header/write.sh: mkprof/mosaic1.sh.log
-header/print.sh: header/write.sh.log
-header/update.sh: header/write.sh.log
-header/delete.sh: header/write.sh.log
-statistics/basicstats.sh: mknoise/addnoise.sh.log
-subtractsky/subtractsky.sh: mknoise/addnoise.sh.log
-noisechisel/noisechisel.sh: mknoise/addnoise.sh.log
-mkcatalog/simple.sh: noisechisel/noisechisel.sh.log
-mkcatalog/aperturephot.sh: noisechisel/noisechisel.sh.log          \
-                           mkprof/clearcanvas.sh
-arithmetic/snimage.sh: noisechisel/noisechisel.sh.log
-arithmetic/where.sh: noisechisel/noisechisel.sh.log
-arithmetic/or.sh: noisechisel/noisechisel.sh.log
-arithmetic/onlynumbers.sh: prepconf.sh.log
-cosmiccal/simpletest.sh: prepconf.sh.log
diff --git a/tests/header/delete.sh b/tests/fits/delete.sh
similarity index 97%
rename from tests/header/delete.sh
rename to tests/fits/delete.sh
index b39f0a4..60fe2cd 100755
--- a/tests/header/delete.sh
+++ b/tests/fits/delete.sh
@@ -22,8 +22,8 @@
 # Set the variabels (The executable is in the build tree). Do the
 # basic checks to see if the executable is made or if the defaults
 # file exists (basicchecks.sh is in the source tree).
-prog=header
-img=headertest.fits
+prog=fits
+img=fitstest.fits
 execname=../bin/$prog/ast$prog
 
 
diff --git a/tests/header/print.sh b/tests/fits/print.sh
similarity index 97%
rename from tests/header/print.sh
rename to tests/fits/print.sh
index 108ede6..40d99e6 100755
--- a/tests/header/print.sh
+++ b/tests/fits/print.sh
@@ -22,8 +22,8 @@
 # Set the variabels (The executable is in the build tree). Do the
 # basic checks to see if the executable is made or if the defaults
 # file exists (basicchecks.sh is in the source tree).
-prog=header
-img=headertest.fits
+prog=fits
+img=fitstest.fits
 execname=../bin/$prog/ast$prog
 
 
diff --git a/tests/header/update.sh b/tests/fits/update.sh
similarity index 97%
rename from tests/header/update.sh
rename to tests/fits/update.sh
index 751b009..889e7eb 100755
--- a/tests/header/update.sh
+++ b/tests/fits/update.sh
@@ -22,8 +22,8 @@
 # Set the variabels (The executable is in the build tree). Do the
 # basic checks to see if the executable is made or if the defaults
 # file exists (basicchecks.sh is in the source tree).
-prog=header
-img=headertest.fits
+prog=fits
+img=fitstest.fits
 execname=../bin/$prog/ast$prog
 
 
diff --git a/tests/header/write.sh b/tests/fits/write.sh
similarity index 86%
rename from tests/header/write.sh
rename to tests/fits/write.sh
index 0f0b75b..ab476bf 100755
--- a/tests/header/write.sh
+++ b/tests/fits/write.sh
@@ -22,7 +22,7 @@
 # Set the variabels (The executable is in the build tree). Do the
 # basic checks to see if the executable is made or if the defaults
 # file exists (basicchecks.sh is in the source tree).
-prog=header
+prog=fits
 img=mkprofcat1.fits
 execname=../bin/$prog/ast$prog
 
@@ -48,6 +48,6 @@ if [ ! -f $execname ] || [ ! -f $img ]; then exit 77; fi
 
 # Actual test script
 # ==================
-cp $img headertest.fits
-$execname headertest.fits --write=ABSJUNK,10.92,"A Header Test.",m/s --date \
-          --write=ABSJNK2,2343fdsa,"Another absolute junk test!"
+cp $img fitstest.fits
+$execname fitstest.fits --write=ABSJUNK,10.92,"A Fits keyword Test.",m/s \
+          --date --write=ABSJNK2,2343fdsa,"Another absolute junk test!"
diff --git a/tests/prepconf.sh b/tests/prepconf.sh
index be8fa81..b568c1b 100755
--- a/tests/prepconf.sh
+++ b/tests/prepconf.sh
@@ -74,7 +74,7 @@ EOF
 # Each utility's configuration file is read and appended with the
 # addedoptions.txt file to create the configuration file which will be used
 # by `make check'.
-for prog in arithmetic convertt convolve cosmiccal crop header    \
+for prog in arithmetic convertt convolve cosmiccal crop fits      \
             warp mkcatalog mknoise mkprof noisechisel statistics  \
             subtractsky table
 do
diff --git a/tmpfs-config-make b/tmpfs-config-make
index 8dde40a..6c48b73 100755
--- a/tmpfs-config-make
+++ b/tmpfs-config-make
@@ -132,7 +132,7 @@ cd $build_dir
 if [ ! -f Makefile ]; then
     $srcdir/configure --srcdir=$srcdir --disable-shared CFLAGS="-g -O0"        
\
                       --enable-arithmetic --enable-convertt   
--enable-convolve\
-                      --enable-cosmiccal  --enable-crop       --enable-header  
\
+                      --enable-cosmiccal  --enable-crop       --enable-fits    
\
                       --enable-mknoise    --enable-statistics --enable-mkprof  
\
                       --enable-table      --enable-warp
 fi