Changeset 6684 for trunk/Ohana/src/relphot

Timestamp:

Mar 26, 2006, 1:14:47 PM (20 years ago)

Author:

eugene

Message:

removed IMAGE_CATALOG from config, finished proper-motion additions, minor fixes in graphing

Location:

trunk/Ohana/src/relphot/src

Files:

• ConfigInit.c (modified) (1 diff)
• initialize.c (modified) (1 diff)

trunk/Ohana/src/relphot/src/ConfigInit.c

@@ -28 +28 @@
   GetConfig (config, "IMAGE_GOOD_FRACTION",    "%lf", 0, &IMAGE_GOOD_FRACTION);
 
-  GetConfig (config, "IMAGE_CATALOG",          "%s",  0, ImageCat);
-  GetConfig (config, "IMAGE_CATALOG_TEMPLATE", "%s",  0, ImageTemplate);
-  GetConfig (config, "CATALOG_TEMPLATE",       "%s",  0, CatTemplate);
   GetConfig (config, "GSCFILE",                "%s",  0, GSCFILE);
   GetConfig (config, "CATDIR",                 "%s",  0, CATDIR);
   ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
   ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
+  sprintf (ImageCat, "%s/Images.dat", CATDIR);
+
   GetConfig (config, "PHOTCODE_FILE",          "%s",  0, PhotCodeFile);
   GetConfig (config, "ZERO_PT",                "%lf", 0, &ZERO_POINT);

trunk/Ohana/src/relphot/src/initialize.c

@@ -45 +45 @@
     fprintf (stderr, "IMAGE_OFFSET           %lf\n", IMAGE_OFFSET);
     fprintf (stderr, "IMAGE_CATALOG          %s\n",  ImageCat);
-    fprintf (stderr, "IMAGE_CATALOG_TEMPLATE %s\n",  ImageTemplate);
-    fprintf (stderr, "CATALOG_TEMPLATE       %s\n",  CatTemplate);
     fprintf (stderr, "GSCFILE                %s\n",  GSCFILE);
     fprintf (stderr, "CATDIR                 %s\n",  CATDIR);