Remove dependency on TPEB-Library, version bump

Version 0.2.4.  Removed dependency on the tpeb-library, since we were only
using a couple routines.  Furthermore, when CFITSIO is upgraded on a machine,
it requires the tpeb-library to be recompiled first, then scopedesign... a bit
of a pain.

Added the two source files from tpeb-library that are used presently, along
with the associated headers.  Modified the illumination.c source file to point
to the new source files rather than the tpeb-library.  Added the new source
files to the Makefile.am, and removed the TPEB-LIBRARY checks from the
configure.ac file.

Whew!

	modified:   config.h.in
	modified:   configure.ac
	modified:   src/Makefile.am
	modified:   src/display.c
	new file:   src/fitsw.c
	new file:   src/fitsw.h
	modified:   src/illumination.c
	new file:   src/imutil.c
	new file:   src/imutil.h

config.h.in

@@ -81,9 +81,6 @@
 /* libpthread */
 #undef HAVE_LIBPTHREAD
 
-/* Define to 1 if you have the `tpeb' library (-ltpeb). */
-#undef HAVE_LIBTPEB
-
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([scopedesign], [0.2.3], [[email protected]])
+AC_INIT([scopedesign], [0.2.4], [[email protected]])
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_HEADERS([config.h])
@@ -238,43 +238,6 @@ AC_CHECK_HEADER(fitsio.h,,
    fi ] )
 
 
-dnl =============================================================
-# Check for TPEB library and headers
-AC_LANG_C
-
-AC_ARG_WITH( tpeblib, 
-        [  --with-tpeblib=DIR      DIR=-LDIR, has libtpeb.a],
-        tpeblib="$withval/" , tpeblib= )
-if test $tpeblib; then
-  if test $rpathset; then
-          LDFLAGS="$LDFLAGS -L$tpeblib -Wl,--rpath -Wl,$tpeblib"
-  else
-       LDFLAGS="$LDFLAGS -L$tpeblib"
-  fi
-fi
-AC_MSG_RESULT( Checking TPEB Library ==================================)
-
-# Check for TPEB library first
-AC_CHECK_LIB(tpeb,main,,
-         [AC_MSG_ERROR("Can't find libtpeb; use --with-tpeblib")], 
-            [-lm "-L$tpeblib"])
-
-# Check for TPEB header next
-AC_ARG_WITH(tpebinc,
-     [  --with-tpebinc=VAL      VAL=-IVAL, has tpeb include files ],
-        [tpebinc="$withval/" CPPFLAGS="$CPPFLAGS -I$tpebinc"],
-     [tpebinc=] )
-AC_CHECK_HEADER(tpeb.h,,
-  [ if test $tpebinc; then
-   AC_MSG_ERROR("tpeb headers not in location specified by --with-tpebinc")
-   elif test $tpeblib; then
-    AC_CHECK_HEADER($tpeblib/../include/tpeb.h,
-     [tpebinc="$tpeblib/../include/" CPPFLAGS="$CPPFLAGS -I$tpebinc"],
-      AC_MSG_ERROR("Can't find tpeb includes; use --with-tpebinc"))
-    else
-      AC_MSG_ERROR("Can't find tpeb includes; use --with-tpebinc")
-   fi ] )
-
 dnl =============================================================
 AC_MSG_RESULT( Checking other libraries ===============================)
 

src/Makefile.am

@@ -1,7 +1,8 @@
 bin_PROGRAMS = scopedesign
 scopedesign_SOURCES = main.c sd_defs.h init.c init.h rays.c rays.h \
 	illumination.c illumination.h mirrors.c mirrors.h setup.c setup.h \
-	display.c display.h vectors.c vectors.h demo.c demo.h ui.c ui.h
+	display.c display.h vectors.c vectors.h demo.c demo.h ui.c ui.h \
+	fitsw.c fitsw.h imutil.c imutil.h
 
 scopedesign_CPPFLAGS = -I$(top_srcdir)/libargtable -I$(top_srcdir)/libxpa $(GTK_CFLAGS)
 scopedesign_LDADD = ../libargtable/libargtable2.a ../libxpa/libxpa.a $(GTK_LIBS)

src/display.c

@@ -34,7 +34,6 @@
 #include <xpa.h>                       // XPA Headers for communication with DS9
 #include <fitsio.h>                    // CFITSIO version #
 #include <gsl/gsl_version.h>           // GSL version #
-
 #include <sys/ioctl.h>                 // Contains the TIOCGWINSZ definition
 
 /* Local headers */

src/fitsw.c

@@ -0,0 +1,246 @@
+/* ScopeDesign
+ * 
+ * A tool for determining the optical consequences of telescope design
+ * through ray tracing and simulated focal planes.
+ * 
+ * Timothy P. Ellsworth Bowers
+ *
+ * FILE: fitsw.c
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#define wombat extern                  // wombat == protect on N_RAYS
+#include "sd_defs.h"                   // Main Package Header
+#undef wombat
+
+/* Include packages */
+#include <stdlib.h>
+#include <unistd.h>
+#include <time.h>                      // To update FITS headers
+
+/* Local headers */
+#include "fitsw.h"
+#include "imutil.h"
+
+/* Routine for opening FITS file READONLY with error checking */
+fitsfile *fitsw_open_read(char *filename, int *status){
+
+  fitsfile *fitsfp;
+
+  if(fits_open_file(&fitsfp, filename, READONLY, status)){
+    fitsw_catcherror(status);    // Send pointer not value
+  }
+
+  return fitsfp;
+}
+
+
+/* Routine for opening FITS file READONLY with error checking */
+fitsfile *fitsw_open_readwrite(char *filename, int *status){
+
+  fitsfile *fitsfp;
+
+  if(fits_open_file(&fitsfp, filename, READWRITE, status)){
+    fitsw_catcherror(status);    // Send pointer not value
+  }
+
+  return fitsfp;
+}
+
+
+/* Routine for reading FITS into array, starting at point, and w/ size */
+/* This version assumes an open FITS file, and accepts the fitsfile pointer */
+double **fitsw_read2array(fitsfile *fitsfp, long xystart[2], long xysize[2],
+			      int data_type, int *status){
+
+  /* Variable declarations & Initilaztion */
+  int i,naxis,bitpix;
+  long fpixel[2],naxes[2];
+  *status=0;
+
+  /* Allocate space for array */
+  double **array = imutil_alloc_2darray(xysize);
+
+
+  /* Read in FITS file using CFITSIO library routines - w/ error checking */
+  /* Note: xystart[2] SHOULD be in 'array' notation (i.e. 0-1023), and this
+     routine needs to convert these into 'human' notation (i.e. 1-1024). */
+
+  /* ERROR CHECKING & CONVERTING NOTATION */
+    /* Get image file parameters */
+    if(fits_get_img_param(fitsfp, 2, &bitpix, &naxis, naxes, status)){
+      fitsw_catcherror(status);    // Send pointer not value
+    }    
+    /* Error catching -- number of axes */
+    if(naxis != 2){
+      fprintf(stderr,"Error: only 2D images are supported.\n\n");
+      fits_close_file(fitsfp,status);
+      exit(1);
+    }
+
+    /* Notation Shift */
+    long xstart = xystart[0] + 1;
+    long ystart = xystart[1] + 1;
+
+
+  /* Check to see if subsection goes beyond image bounds */
+  // First Check x
+  if( xstart < 1 || (xstart + xysize[0] - 1) > naxes[0]){
+    fprintf(stderr,"Error: subsection is out of bounds\n");
+    fits_close_file(fitsfp,status);
+    exit(1);
+  }
+  // Then Check y
+  if( ystart < 1 || (ystart + xysize[1] - 1) > naxes[1]){
+    fprintf(stderr,"Error: subsection is out of bounds\n");
+    fits_close_file(fitsfp,status);
+    exit(1);
+  }
+
+
+  /* Read in the FITS file */  
+  fpixel[0] = xstart;              // Set initial coordinate in the x-axis.
+  for(i=0; i < xysize[1]; i++){    // Loop over xysize[1] (i.e. y) rows
+    fpixel[1] = ystart + i;        // Set initial y-coordinate here...
+
+    if(fits_read_pix(fitsfp, data_type, fpixel, xysize[0], NULL,
+		     array[i], NULL, status)){
+      fits_report_error(stderr,*status);
+      break;
+    }
+  }
+
+  return array;
+}
+
+
+/* Function to write array to FITS file, and copy header info from other file */
+void fitsw_write2file(char *fileout, char *copyhdr, double **array, 
+			  long write_size[2], int *status){
+
+  /* Variable Declarations & Initializations */
+  int k,naxis,bitpix;
+  long fpixel[2],naxes[2],bzero;
+  char buf_date[FLEN_VALUE],buf_time[FLEN_VALUE],*mod_comm;
+  fitsfile *fitsfp,*hdrfp;
+  time_t now;
+  struct tm *ptr;
+  *status = 0;
+
+  /* Open file from which header will be copied */
+  hdrfp = fitsw_open_read(copyhdr, status);
+
+  /* Check for output file -- create & open for write */
+  if(access(fileout,F_OK) == 0)          // Check if output file exists
+    remove(fileout);                     // If yes, remove it
+  if(fits_create_file(&fitsfp, fileout, status)){
+    fitsw_catcherror(status);    // Send pointer not value
+  }
+
+  mod_comm = "Modified by fitsw routine, TPEB.";
+  /* Copy header from copyhdr FITS file. */
+  fits_copy_header(hdrfp, fitsfp, status);  // Copy header from input FITS
+  fits_get_img_param(hdrfp, 2 ,&bitpix, &naxis, naxes, status);
+  fits_read_key(hdrfp, TLONG, "BZERO", &bzero, NULL, status);
+
+  /* Check for needed updates */
+    // Writing new FITS as double
+    if(bitpix != DOUBLE_IMG){
+      bitpix = DOUBLE_IMG;
+      fits_update_key(fitsfp, TSHORT, "BITPIX", &bitpix, mod_comm, status);
+    }
+
+    // check for 'zero level' (needed for type long FITS headers)
+    // NOTE: If input header does not contain this keyword (status = 202), 
+    // skip update & reset CFITSIO status to zero.
+
+    if(bzero != 0 || *status != 202){  
+      bzero = 0;
+      fits_update_key(fitsfp, TSHORT, "BZERO", &bzero, mod_comm, status);
+    }
+    *status = 0;                       // Reset Status
+
+    // Check new axis lengths are correct
+    if(naxes[0] != write_size[0])
+      fits_update_key(fitsfp, TULONG,"NAXIS1",&write_size[0],mod_comm,status);
+    if(naxes[1] != write_size[1])
+      fits_update_key(fitsfp, TULONG,"NAXIS2",&write_size[1],mod_comm,status);
+
+
+  /* Write array to file */
+  fpixel[0] = 1;
+  for(k=0; k < write_size[1]; k++){       // Loop over size[1] rows (i.e. y)
+    fpixel[1] = k + 1; 
+    if(fits_write_pix(fitsfp, TDOUBLE, fpixel, write_size[0], array[k], 
+  		      status)){
+      fits_report_error(stderr,*status);
+      break;
+    }
+  }
+
+  /* Add/modify keyword for date modified 'DATE-MOD' & 'TIME-MOD' */
+  time(&now);
+  ptr = localtime(&now);
+  strftime(buf_date, FLEN_VALUE, "%Y-%m-%d", ptr);
+  strftime(buf_time, FLEN_VALUE, "%H:%M:%S", ptr);
+  fits_update_key(fitsfp, TSTRING, "DATE-MOD", buf_date, mod_comm, status);
+  fits_update_key(fitsfp, TSTRING, "TIME-MOD", buf_time, NULL, status);
+
+  /* Clean up */
+  fits_close_file(fitsfp, status);
+  fits_close_file(hdrfp,  status);
+
+  /* Report any CFITSIO errors to stderr */
+  if(!*status)
+    fitsw_catcherror(status);    // Send pointer not value
+
+  return;
+}
+
+
+/* Function to catch errors thrown by CFITSIO */
+void fitsw_catcherror(int *status){
+  fits_report_error(stderr,*status);
+
+  if(*status){                        // If no error, go on...
+    /* Add error-catching code here */
+    switch(*status){
+
+    case FILE_NOT_OPENED :
+      printf("We encountered this one!\n");
+      break;
+
+    case WRITE_ERROR :
+      printf("This is a write error!\n");
+      break;
+
+    case FITSW_NOFILE_EXIT :
+      printf("This is using a new error code!\n");
+      break;
+
+    default :
+      printf("We hit the default... exiting.\n");
+      exit(1);
+    }
+
+    printf("We need to add some error-catching code here...\n");
+
+    exit(1);
+  }
+
+  return;
+}

src/fitsw.h

@@ -0,0 +1,54 @@
+/* ScopeDesign
+ * 
+ * A tool for determining the optical consequences of telescope design
+ * through ray tracing and simulated focal planes.
+ * 
+ * Timothy P. Ellsworth Bowers
+ * 
+ * FILE: fitsw.h
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+
+#ifndef FITSW_H
+#define FITSW_H
+
+
+#ifndef HAVE_FITSIO_H
+# define HAVE_FITSIO_H
+# include <fitsio.h>
+#endif
+
+
+#define FITSW_NOFILE_EXIT 2104  // Codes used by fitsw_catcherror()
+#define FITSW_NOFILE_CONT 2105
+#define FITSW_EOF_ERROR   2106
+
+
+/* ========================= */
+/*   Function Declarations   */
+/* ========================= */
+
+fitsfile *fitsw_open_read(char *filename, int *status);
+fitsfile *fitsw_open_readwrite(char *filename, int *status);
+double  **fitsw_read2array(fitsfile *fitsfp, long xystart[2], long xysize[2],
+			      int data_type, int *status);
+void      fitsw_write2file(char *fileout, char *copyhdr, double **array, 
+			  long subsize[2], int *status);
+void      fitsw_catcherror(int *status);
+
+#endif  /* FITSW_H */