Changeset 12806 for trunk/psastro/src/psastroLoadRefstars.c

Timestamp:

Apr 11, 2007, 1:59:28 PM (19 years ago)

Author:

eugene

Message:

moved analysis steps into psastroAnalysis.c
moved file definitions into psastroDefineFiles.c
created psastroInternal.h, and psastroStandAlone.h
moved library prototypes only in psastro.h

File:

• trunk/psastro/src/psastroLoadRefstars.c (modified) (4 diffs)

trunk/psastro/src/psastroLoadRefstars.c

@@ -1 @@
-# include "psastro.h"
+# include "psastroInternal.h"
 # define ELIXIR_MODE 1
 
@@ -22 +22 @@
     PS_ASSERT (CATDIR, NULL);
 
-    char *getstarCommand = psMetadataLookupStr(NULL, recipe, "DVO.GETSTAR");
+    char *getstarCommand = psMemIncrRefCounter(psMetadataLookupStr(NULL, recipe, "DVO.GETSTAR"));
     PS_ASSERT (getstarCommand, NULL);
 
@@ -44 +44 @@
     }
 
-    // XXX check for a default name (use .ptolemyrc)?
-    if (CATDIR) {
+    // check for default name (use .ptolemyrc), or use specified CATDIR
+    if (strcasecmp(CATDIR, "NONE")) {
         psStringAppend (&getstarCommand, " -D CATDIR %s", CATDIR);
-    }
+    } 
 
     // psStringAppend (&getstarCommand, " -D CATMODE mef -maglim %f -region %f %f %f %f -o %s", MAGmax, RAmin, DECmin, RAmax, DECmax, tempFile);
@@ -89 +89 @@
     // convert the Average table to the pmAstromObj entries
     psTimerStart ("psastro");
+
     psArray *refstars = psArrayAllocEmpty (table->n);
     for (int i = 0; i < table->n; i++) {