Changeset 28003 for branches/pap/Ohana/src/uniphot/src/ConfigInit.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/uniphot/src/ConfigInit.c (modified) (4 diffs)

branches/pap/Ohana/src/uniphot/src/ConfigInit.c

@@ -1 +1 @@
 # include "uniphot.h"
+
+void GetConfig (char *config, char *field, char *format, int N, void *ptr);
 
 void ConfigInit (int *argc, char **argv) {
@@ -18 +20 @@
   if (VERBOSE) fprintf (stderr, "loaded config file: %s\n", file);
 
-  ScanConfig (config, "CATDIR",                 "%s",  0, CATDIR);
+  GetConfig (config, "CATDIR",                 "%s",  0, CATDIR);
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
@@ -24 +26 @@
 
   sprintf (ImageCat, "%s/Images.dat", CATDIR);
+
+  GetConfig (config, "GSCFILE",                 "%s",  0, GSCFILE);
+  if (!ScanConfig (config, "SKY_DEPTH",         "%d",  0, &SKY_DEPTH)) {
+    SKY_DEPTH = 2;
+  }
+  if (!ScanConfig (config, "SKY_TABLE",         "%s",  0, SKY_TABLE)) {
+    SKY_TABLE[0] = 0;
+  }
 
   ScanConfig (config, "ZERO_PT",                "%lf", 0, &ZERO_POINT);
@@ -42 +52 @@
 
 }
+
+void GetConfig (char *config, char *field, char *format, int N, void *ptr) {
+
+  char *status;
+
+  status = ScanConfig (config, field, format, N, ptr);
+  if (status == NULL) {
+    fprintf (stderr, "error in config, cannot find %s\n", field);
+    exit (1);
+  }
+  return;
+}