Index: trunk/ippToPsps/src/Batch.h
===================================================================
--- trunk/ippToPsps/src/Batch.h	(revision 30968)
+++ trunk/ippToPsps/src/Batch.h	(revision 31011)
@@ -18,4 +18,6 @@
 #include <libxml/tree.h>
 
+#include "Fits.h"
+
 /**
   Abstract base class for all batches. Known subclasses are:
@@ -25,5 +27,5 @@
   - StackBatch
 
-  All subclasses need to implement the run() method and may need to implenent print() and/or init()
+  All subclasses need to implement the run() method and may need to implenent print()
   */
 typedef struct Batch {
@@ -37,11 +39,8 @@
     uint16_t numOfInputFiles;   // number of input files
     char** inputFiles;          // array of input file names
-    char fitsOutFile[100];      // FITS output filename
-    char fitsOutPath[1000];     // path to FITS output
-    fitsfile *fitsOut;          // output FITS file
-    char configsDir[500];       // path to IPP/PSPS mapping file
+    Fits *fitsOut;              // output FITS file
     pmConfig* pmconfig;         // pmConfig
     dvoConfig* dvoConfig;       // dvo database
-    IppToPspsConfig* config;    // config structure
+    Config* config;    // config structure
     char todaysDate[20];        // today's date
     int exitCode;               // ps exit code
@@ -50,5 +49,4 @@
     // methods
     bool (*parseArguments)();
-    bool (*init)();
     int (*run)();
     void (*print)();
@@ -58,4 +56,6 @@
     bool (*gotConfig)();
     bool (*gotSurveyType)(); 
+
+    // destructor
     void (*destroy)();