Index: /trunk/ippToPsps/src/Config.c
===================================================================
--- /trunk/ippToPsps/src/Config.c	(revision 31015)
+++ /trunk/ippToPsps/src/Config.c	(revision 31016)
@@ -4,5 +4,5 @@
  *
  *  @author IfA
- *  Copyright 2009 Institute for Astronomy, University of Hawaii
+ *  Copyright 2011 Institute for Astronomy, University of Hawaii
  */
 
@@ -13,22 +13,4 @@
 
 #include "Fits.h"
-
-/**
-   Gets PS type from string TODO FITS types? should be in Fits class
-   */
-static int ippToPsps_GetDataType(char *typename) {
-
-    if (!strncmp(typename, "TBYTE", 5))  return TBYTE;
-    if (!strncmp(typename, "TSHORT", 6)) return TSHORT;
-    if (!strncmp(typename, "TLONGLONG", 9)) return TLONGLONG;
-    if (!strncmp(typename, "TLONG", 5)) return TLONG;
-    if (!strncmp(typename, "TFLOAT", 6)) return TFLOAT;
-    if (!strncmp(typename, "TDOUBLE", 7)) return TDOUBLE;
-    if (!strncmp(typename, "TSTRING", 7)) return TSTRING;
-
-    psError(PS_ERR_IO, false, "Don't understand type '%s'", typename);
-
-    return 0;
-}
 
 /**
@@ -385,5 +367,5 @@
         // column type
         getAttribute(node, "type", buffer);
-        table->columns[columnNum].pspsType = ippToPsps_GetDataType(buffer);
+        table->columns[columnNum].pspsType = Fits_getDataType(buffer);
 
         // default value
@@ -514,5 +496,5 @@
                 // IPP type
                 getAttribute(node, "ippType", buffer);
-                column->ippType = ippToPsps_GetDataType(buffer); 
+                column->ippType = Fits_getDataType(buffer); 
 
                 column->usingDefault = false;
Index: /trunk/ippToPsps/src/Config.h
===================================================================
--- /trunk/ippToPsps/src/Config.h	(revision 31015)
+++ /trunk/ippToPsps/src/Config.h	(revision 31016)
@@ -6,5 +6,5 @@
  *
  *  @author IfA
- *  Copyright 2009 Institute for Astronomy, University of Hawaii
+ *  Copyright 2011 Institute for Astronomy, University of Hawaii
  */
 
Index: /trunk/ippToPsps/src/Fits.c
===================================================================
--- /trunk/ippToPsps/src/Fits.c	(revision 31015)
+++ /trunk/ippToPsps/src/Fits.c	(revision 31016)
@@ -6,8 +6,28 @@
  *
  *  @author IfA
- *  Copyright 2009 Institute for Astronomy, University of Hawaii
+ *  Copyright 2011 Institute for Astronomy, University of Hawaii
  */
 
 #include "Fits.h"
+
+/**
+  Non-class method
+
+  Gets cfitsio type from string
+  */
+int Fits_getDataType(char *typename) {
+
+    if (!strncmp(typename, "TBYTE", 5))  return TBYTE;
+    if (!strncmp(typename, "TSHORT", 6)) return TSHORT;
+    if (!strncmp(typename, "TLONGLONG", 9)) return TLONGLONG;
+    if (!strncmp(typename, "TLONG", 5)) return TLONG;
+    if (!strncmp(typename, "TFLOAT", 6)) return TFLOAT;
+    if (!strncmp(typename, "TDOUBLE", 7)) return TDOUBLE;
+    if (!strncmp(typename, "TSTRING", 7)) return TSTRING;
+
+    psError(PS_ERR_IO, false, "* Fits: Don't understand data type '%s'", typename);
+
+    return 0;
+}
 
 /**
Index: /trunk/ippToPsps/src/Fits.h
===================================================================
--- /trunk/ippToPsps/src/Fits.h	(revision 31015)
+++ /trunk/ippToPsps/src/Fits.h	(revision 31016)
@@ -27,4 +27,5 @@
     // accessor methods
     fitsfile* (*getFilePtr)();
+    int (*getDataType)();
     char* (*getPath)();
     bool (*countRows)();
@@ -55,3 +56,6 @@
 Fits* new_Fits(char* path);
 
+// non-class methods
+int Fits_getDataType(char *typename);
+
 # endif // IPPTOPSPS_FITS_H 
