Changeset 25766 for branches/eam_branches/20090820/Ohana/src/opihi/dvo/photometry.c

Timestamp:

Oct 2, 2009, 5:10:19 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090820

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/dvo/photometry.c (modified) (1 diff)

branches/eam_branches/20090820/Ohana/src/opihi/dvo/photometry.c

@@ -325 +325 @@
     return (FALSE);
   }
-  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile)) {
+
+  // XXX now that DVO does not allow write access, we can drop the MasterPhotcodeFile
+  if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, FALSE)) {
     gprint (GP_ERR, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);
     return (FALSE);