Index: /branches/eam_branch_20081026/psphot/src/psphot.c
===================================================================
--- /branches/eam_branch_20081026/psphot/src/psphot.c	(revision 20403)
+++ /branches/eam_branch_20081026/psphot/src/psphot.c	(revision 20404)
@@ -10,8 +10,5 @@
     psTimerStart ("complete");
     pmErrorRegister();			// register psModule's error codes/messages
-    psphotErrorRegister();              // register our error codes/messages
-    psphotModelClassInit ();            // load implementation-specific models
-    psphotSetThreads ();
-
+    psphotInit();
 
     // load command-line arguments, options, and system config data
Index: /branches/eam_branch_20081026/psphot/src/psphot.h
===================================================================
--- /branches/eam_branch_20081026/psphot/src/psphot.h	(revision 20403)
+++ /branches/eam_branch_20081026/psphot/src/psphot.h	(revision 20404)
@@ -28,4 +28,5 @@
 
 bool            psphotModelTest (pmConfig *config, const pmFPAview *view, psMetadata *recipe);
+bool            psphotInit ();
 bool            psphotReadout (pmConfig *config, const pmFPAview *view);
 bool            psphotReadoutFindPSF(pmConfig *config, const pmFPAview *view);