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

Timestamp:

Oct 24, 2006, 1:58:13 PM (20 years ago)

Author:

Paul Price

Message:

Changed definition of psArrayAlloc.

File:

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

trunk/psastro/src/psastroLoadRefstars.c

@@ -24 +24 @@
     char *CATDIR = psMetadataLookupStr(NULL, recipe, "DVO.CATDIR");
     if (CATDIR == NULL) {
-        psLogMsg ("psastro", 2, "warning: missing DVO.CATDIR, using ~/.ptolemyrc definition\n");
+        psLogMsg ("psastro", 2, "warning: missing DVO.CATDIR, using ~/.ptolemyrc definition\n");
     }
 
@@ -33 +33 @@
     sprintf (tempFile, "/tmp/psastro.XXXXXX");
     if ((fd = mkstemp (tempFile)) == -1) {
-        psError(PSASTRO_ERR_REFSTARS, true, "error creating temp output file\n");
+        psError(PSASTRO_ERR_REFSTARS, true, "error creating temp output file\n");
         return NULL;
     }
@@ -42 +42 @@
     // use fork to add timeout capability
     if (ELIXIR_MODE) {
-        psStringAppend (&catformat, "-D CATFORMAT elixir ");
+        psStringAppend (&catformat, "-D CATFORMAT elixir ");
     } else {
-        psStringAppend (&catformat, "-D CATFORMAT panstarrs ");
-    }   
+        psStringAppend (&catformat, "-D CATFORMAT panstarrs ");
+    }
 
     if (CATDIR) {
-        psStringAppend (&catformat, "-D CATDIR %s ", CATDIR);
-    } 
+        psStringAppend (&catformat, "-D CATDIR %s ", CATDIR);
+    }
 
     psStringAppend (&getstarLine, "getstar %s -D CATMODE mef -maglim %f -region %f %f %f %f -o %s", catformat, MAGmax, RAmin, DECmin, RAmax, DECmax, tempFile);
@@ -57 +57 @@
     status = system (getstarLine);
     if (status) {
-        psError(PSASTRO_ERR_REFSTARS, true, "error loading reference data\n");
+        psError(PSASTRO_ERR_REFSTARS, true, "error loading reference data\n");
         return NULL;
     }
@@ -69 +69 @@
 
     if (ELIXIR_MODE) {
-        psFitsMoveExtName (fits, "DVO_AVERAGE_ELIXIR");
+        psFitsMoveExtName (fits, "DVO_AVERAGE_ELIXIR");
     } else {
-        psFitsMoveExtName (fits, "DVO_AVERAGE_PANSTARRS");
+        psFitsMoveExtName (fits, "DVO_AVERAGE_PANSTARRS");
     }
 
@@ -84 +84 @@
     // convert the Average table to the pmAstromObj entries
     psTimerStart ("psastro");
-    psArray *refs = psArrayAlloc (table->n);
+    psArray *refs = psArrayAllocEmpty (table->n);
     for (int i = 0; i < table->n; i++) {
         pmAstromObj *ref = pmAstromObjAlloc ();
@@ -91 +91 @@
 
         // DVO tables are stored in degrees
-        if (ELIXIR_MODE) {
-            ref->sky->r   = RAD_DEG*psMetadataLookupF32 (&status, row, "RA");
-            ref->sky->d   = RAD_DEG*psMetadataLookupF32 (&status, row, "DEC");
-            ref->Mag      = 0.001*psMetadataLookupS32 (&status, row, "MAG");  // ELIXIR uses millimags
+        if (ELIXIR_MODE) {
+            ref->sky->r   = RAD_DEG*psMetadataLookupF32 (&status, row, "RA");
+            ref->sky->d   = RAD_DEG*psMetadataLookupF32 (&status, row, "DEC");
+            ref->Mag      = 0.001*psMetadataLookupS32 (&status, row, "MAG");  // ELIXIR uses millimags
         } else {
-            ref->sky->r   = RAD_DEG*psMetadataLookupF64 (&status, row, "RA");
-            ref->sky->d   = RAD_DEG*psMetadataLookupF64 (&status, row, "DEC");
-            ref->Mag      = psMetadataLookupF32 (&status, row, "MAG"); // PANSTARRS uses mags
-        }
+            ref->sky->r   = RAD_DEG*psMetadataLookupF64 (&status, row, "RA");
+            ref->sky->d   = RAD_DEG*psMetadataLookupF64 (&status, row, "DEC");
+            ref->Mag      = psMetadataLookupF32 (&status, row, "MAG"); // PANSTARRS uses mags
+        }
 
         psArrayAdd (refs, 100, ref);