Changeset 7573

Timestamp:

Jun 14, 2006, 4:20:43 PM (20 years ago)

Author:

eugene

Message:

adding autoconf stuff

Location:

trunk/psastro

Files:

• Makefile (deleted)
• Makefile.am (added)
• configure.ac (added)
• psastro.pc.in (added)
• src/Makefile.am (added)
• src/psastroArguments.c (modified) (1 diff)
• src/psastroLoadReferences.c (modified) (4 diffs)
• src/psastroParseCamera.c (modified) (1 diff)

trunk/psastro/src/psastroArguments.c

@@ -41 +41 @@
     if ((N = psArgumentGet (*argc, argv, "-chip"))) {
         psArgumentRemove (N, argc, argv);
-        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTION", PS_DATA_STRING, "", psStringCopy(argv[N]));
+        psMetadataAddStr (config->arguments, PS_LIST_TAIL, "CHIP_SELECTIONS", PS_DATA_STRING, "", psStringCopy(argv[N]));
         psArgumentRemove (N, argc, argv);
     }

trunk/psastro/src/psastroLoadReferences.c

@@ -3 +3 @@
 
 # define ELIXIR_MODE 1
+# define PIPE_MODE 1
 
 psArray *psastroLoadReferences (pmConfig *config) {
@@ -8 +9 @@
     int fd;
     bool status;
-    char tempFile[64], tempLine[256];
+    char tempLine[256];
 
     // select the DVO database?
@@ -25 +26 @@
     // getstar -region RAmin RAmax DECmin DECmax
 
+# if PIPE_MODE
+    // use fork to add timeout capability
+    // use cfitsio |filename format to avoid tempFile
+    # if ELIXIR_MODE
+    sprintf (tempLine, "getstar -D CATFORMAT elixir -D CATMODE mef -region %f %f %f %f |", RAmin, DECmin, RAmax, DECmax, tempFile);
+    # else
+    sprintf (tempLine, "getstar -D CATFORMAT panstarrs -D CATMODE mef -region %f %f %f %f |", RAmin, DECmin, RAmax, DECmax, tempFile);
+    # endif
+
+    psTrace (__func__, 3, "%s\n", tempLine);
+
+    // the output from getstar is a file with the Average table
+    psFits *fits = psFitsOpen (tempLine, "r");
+
+    # if ELIXIR_MODE
+    psFitsMoveExtName (fits, "DVO_AVERAGE_ELIXIR");
+    # else
+    psFitsMoveExtName (fits, "DVO_AVERAGE_PANSTARRS");
+    # endif
+
+    psMetadata *header = psFitsReadHeader (NULL, fits);
+    psArray *table = psFitsReadTable (fits);
+    psFitsClose (fits);
+
+# else /***** use a temp file instead ****/
+
+    char tempFile[64];
     sprintf (tempFile, "/tmp/psastro.XXXXXX");
     if ((fd = mkstemp (tempFile)) == -1) {
@@ -61 +89 @@
     unlink (tempFile);
 
+# endif
+
     // convert the Average table to the pmAstromObj entries
     psArray *refs = psArrayAlloc (table->n);

trunk/psastro/src/psastroParseCamera.c

@@ -44 +44 @@
     return true;
 }
-
-
-// useful for debugging
-# if 0
-for (int i = 0; i < input->fpa->chips->n; i++) {
-    pmChip *chip = input->fpa->chips->data[i];
-    fprintf (stderr, "chip %2d: %x %x\n", i, chip->file_exists, chip->process);
-
-    for (int j = 0; j < chip->cells->n; j++) {
-        pmCell *cell = chip->cells->data[j];
-        fprintf (stderr, "cell %2d: %x %x\n", j, cell->file_exists, cell->process);
-
-    }
-}
-# endif