Index: /branches/eam_branches/ipp-20120905/Ohana/src/getstar/src/ConfigInit.c
===================================================================
--- /branches/eam_branches/ipp-20120905/Ohana/src/getstar/src/ConfigInit.c	(revision 34688)
+++ /branches/eam_branches/ipp-20120905/Ohana/src/getstar/src/ConfigInit.c	(revision 34689)
@@ -5,5 +5,4 @@
   char *config, *file;
   char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -21,5 +20,4 @@
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig (config, "PHOTCODE_FILE",         	"%s",  0, MasterPhotcodeFile);
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) {
     SKY_DEPTH = 2;
@@ -34,6 +32,6 @@
   /* XXX this does not yet write out the master photcode table */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
-    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
+    fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);
   }
Index: /branches/eam_branches/ipp-20120905/Ohana/src/libdvo/src/LoadPhotcodes.c
===================================================================
--- /branches/eam_branches/ipp-20120905/Ohana/src/libdvo/src/LoadPhotcodes.c	(revision 34688)
+++ /branches/eam_branches/ipp-20120905/Ohana/src/libdvo/src/LoadPhotcodes.c	(revision 34689)
@@ -11,4 +11,6 @@
   }
 
+  if (!master_file) return FALSE;
+
   /* next try to load the photcodes from the master text photcode file */
   /* automatically (or on demand?) save the text file to the FITS version */
Index: /branches/eam_branches/ipp-20120905/Ohana/src/markrock/src/ConfigInit.c
===================================================================
--- /branches/eam_branches/ipp-20120905/Ohana/src/markrock/src/ConfigInit.c	(revision 34688)
+++ /branches/eam_branches/ipp-20120905/Ohana/src/markrock/src/ConfigInit.c	(revision 34689)
@@ -5,5 +5,4 @@
   char *config, *file;
   char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -21,5 +20,4 @@
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig (config, "PHOTCODE_FILE",         	"%s",  0, MasterPhotcodeFile);
 
   /* unique to markrock */
@@ -44,6 +42,6 @@
   /* XXX this does not yet write out the master photcode table */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
-    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
+    fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);
   }
Index: /branches/eam_branches/ipp-20120905/Ohana/src/markstar/src/ConfigInit.c
===================================================================
--- /branches/eam_branches/ipp-20120905/Ohana/src/markstar/src/ConfigInit.c	(revision 34688)
+++ /branches/eam_branches/ipp-20120905/Ohana/src/markstar/src/ConfigInit.c	(revision 34689)
@@ -5,5 +5,4 @@
   char *config, *file;
   char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -21,5 +20,4 @@
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig (config, "PHOTCODE_FILE",         	"%s",  0, MasterPhotcodeFile);
 
   sprintf (ImageCat, "%s/Images.dat", CATDIR);
@@ -54,6 +52,6 @@
   /* XXX this does not yet write out the master photcode table */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
-    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
+    fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);
   }
Index: /branches/eam_branches/ipp-20120905/Ohana/src/photdbc/src/ConfigInit.c
===================================================================
--- /branches/eam_branches/ipp-20120905/Ohana/src/photdbc/src/ConfigInit.c	(revision 34688)
+++ /branches/eam_branches/ipp-20120905/Ohana/src/photdbc/src/ConfigInit.c	(revision 34689)
@@ -14,5 +14,4 @@
   char *config, *file;
   char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -60,6 +59,4 @@
   free (tmpcatdir);
 
-  ScanConfig (config, "PHOTCODE_FILE",         	"%s",  0, MasterPhotcodeFile);
-
   sprintf (ImageCat, "%s/Images.dat", CATDIR);
 
@@ -73,5 +70,5 @@
   /* XXX this does not yet write out the master photcode table */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, TRUE)) {
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
     fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);
Index: /branches/eam_branches/ipp-20120905/Ohana/src/relastro/src/ConfigInit.c
===================================================================
--- /branches/eam_branches/ipp-20120905/Ohana/src/relastro/src/ConfigInit.c	(revision 34688)
+++ /branches/eam_branches/ipp-20120905/Ohana/src/relastro/src/ConfigInit.c	(revision 34689)
@@ -5,5 +5,4 @@
   char  *config, *file;
   char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
   struct stat filestat;
   int status;
@@ -46,5 +45,4 @@
   ScanConfig(config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig(config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig(config, "PHOTCODE_FILE",          "%s",  0, MasterPhotcodeFile);
 
   // Defaults for WHERE_A are established in db_utils.c: intializeConstraints
@@ -73,6 +71,6 @@
   /* update master photcode table if not defined */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
-    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
+    fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);
   }
Index: /branches/eam_branches/ipp-20120905/Ohana/src/relphot/src/ConfigInit.c
===================================================================
--- /branches/eam_branches/ipp-20120905/Ohana/src/relphot/src/ConfigInit.c	(revision 34688)
+++ /branches/eam_branches/ipp-20120905/Ohana/src/relphot/src/ConfigInit.c	(revision 34689)
@@ -6,5 +6,4 @@
   char  *config, *file;
   char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
 
   /*** load configuration info ***/
@@ -45,7 +44,6 @@
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
-  ScanConfig (config, "PHOTCODE_FILE",         	"%s",  0, MasterPhotcodeFile);
 
-  sprintf (ImageCat, "%s/Images.dat", CATDIR);
+  sprintf (ImageCat, DVO_MAX_PATH, "%s/Images.dat", CATDIR);
 
   if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) {
@@ -69,6 +67,6 @@
   /* XXX this does not yet write out the master photcode table */
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
-    fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
+    fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);
   }
Index: /branches/eam_branches/ipp-20120905/Ohana/src/uniphot/src/initialize_setphot.c
===================================================================
--- /branches/eam_branches/ipp-20120905/Ohana/src/uniphot/src/initialize_setphot.c	(revision 34688)
+++ /branches/eam_branches/ipp-20120905/Ohana/src/uniphot/src/initialize_setphot.c	(revision 34689)
@@ -21,5 +21,5 @@
   // load the photcode table
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, TRUE)) {
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
     fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);
Index: /branches/eam_branches/ipp-20120905/Ohana/src/uniphot/src/initialize_setphot_client.c
===================================================================
--- /branches/eam_branches/ipp-20120905/Ohana/src/uniphot/src/initialize_setphot_client.c	(revision 34688)
+++ /branches/eam_branches/ipp-20120905/Ohana/src/uniphot/src/initialize_setphot_client.c	(revision 34689)
@@ -17,5 +17,5 @@
   // load the photcode table : XXX needed?
   sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", CATDIR);
-  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, TRUE)) {
+  if (!LoadPhotcodes (CatdirPhotcodeFile, NULL, FALSE)) {
     fprintf (stderr, "error loading photcode table %s\n", CatdirPhotcodeFile);
     exit (1);