Changeset 4828 for trunk/Ohana/src/getstar

Timestamp:

Aug 19, 2005, 5:10:19 PM (21 years ago)

Author:

eugene

Message:

modifications to use CATMODE, CATFORMAT

Location:

trunk/Ohana/src/getstar

Files:

• include/getstar.h (modified) (1 diff)
• src/ConfigInit.c (modified) (2 diffs)
• src/gcatalog.c (modified) (1 diff)

trunk/Ohana/src/getstar/include/getstar.h

@@ -22 +22 @@
 char   GSCFILE[256];
 char   CATDIR[256];
+char   CATMODE[16];    /* raw, mef, split, mysql */
+char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
 double DEFAULT_RADIUS, NSIGMA, SNLIMIT;
 double ZeroPt;

trunk/Ohana/src/getstar/src/ConfigInit.c

@@ -40 +40 @@
   ScanConfig (config, "GSCFILE",                "%s", 0, GSCFILE);
   ScanConfig (config, "CATDIR",                 "%s", 0, CATDIR);
+  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
+  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
   ScanConfig (config, "MIN_SN_FSTAT",           "%lf", 0, &SNLIMIT);
   ScanConfig (config, "PHOTCODE_FILE",          "%s", 0, PhotCodeFile);
@@ -53 +55 @@
   ScanConfig (config, "CCDNUM-KEYWORD",         "%s", 0, CCDNumKeyword);
 
+  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
+  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
+
   if (!LoadPhotcodes (PhotCodeFile)) {
     fprintf (stderr, "error loading photcodes\n");

trunk/Ohana/src/getstar/src/gcatalog.c

@@ -5 +5 @@
   int Nsecfilt;
   char mode;
+
+  /* no autodetect for CATMODE yet */
+  strcpy (catalog[0].catmode, CATMODE);
 
   /* read catalog header */