Changeset 6791

Timestamp:

Apr 5, 2006, 12:46:25 AM (20 years ago)

Author:

eugene

Message:

working on file I/O

Location:

trunk/psastro/src

Files:

• psastro.c (modified) (2 diffs)
• psastro.h (modified) (1 diff)
• psastroArguments.c (modified) (1 diff)
• psastroDataLoop.c (added)
• psastroIO.c (modified) (1 diff)
• psastroLoadData.c (added)
• psastroParseCamera.c (added)
• testPSastroLoop.c (added)

trunk/psastro/src/psastro.c

@@ -3 +3 @@
 int main (int argc, char **argv) {
 
+    psTimerStart ("complete");
+
     psMetadata *header = NULL;
 
     // load configuration information
-    psMetadata *config = psastroArguments (&argc, argv);
+    pmConfig *config = psastroArguments (&argc, argv);
 
-    // load the input data (cmp file)
-    psArray *rawstars = psastroReadCMP (&header, argv[2]);
+    // load input data (config and images (signal, noise, mask)
+    psastroParseCamera (config);
+
+    // perform the astrometric solution
+    psastroDataLoop (input, config);
 
     // simple layout interpretation, basic WCS conversion
@@ -23 +28 @@
     psastroWriteCMP (fpa, argv[3]);
 
+    psLogMsg ("psphot", 3, "complete psphot run: %f sec\n", psTimerMark ("complete"));
+
     psFree (config);
     psFree (fpa);

trunk/psastro/src/psastro.h

@@ -10 +10 @@
 # define toTPA toTangentPlane
 # define toSky projection
+
+// How much of the FPA to load at a time
+typedef enum {
+    PP_LOAD_NONE,                       // Don't load anything
+    PP_LOAD_FPA,                        // Load the entire FPA at once
+    PP_LOAD_CHIP,                       // Load by chip
+    PP_LOAD_CELL,                       // Load by cell
+} ppImageLoadDepth;
+
+// Configuration data
+typedef struct {
+    psMetadata *site;                   // The site configuration
+    psMetadata *camera;                 // The camera configuration
+    psMetadata *recipe;                 // The recipe (i.e., specific setups)
+    psMetadata *arguments;              // Command-line arguments
+    psMetadata *options;                // Command-line recipe options
+    psDB       *database;               // Database handle
+} ppConfig;
+
+// A file to process
+typedef struct {
+    char *filename;                     // File name
+    psFits *fits;                       // The FITS file handle
+    psMetadata *phu;                    // The FITS header
+    pmFPA *fpa;                         // The FPA, with pixels and extensions
+} ppFile;
 
 bool              pmAstromReadWCS (psPlaneTransform **toFPA, psProjection **toSky, psMetadata *header);

trunk/psastro/src/psastroArguments.c

@@ -1 +1 @@
 # include "psastro.h"
-
-static void usage (void);
-static void usage_test (void);
-
-psMetadata *psastroArguments (int *argc, char **argv) {
-
-    unsigned int Nfail;
-
-    // basic pslib options
-    fprintf (stderr, "starting... %s\n", psLibVersion());
-    psLogSetFormat ("M");
-    psLogArguments (argc, argv);
-    psTraceArguments (argc, argv);
-
-    if (*argc != 4) usage ();
-
-    // load config information
-    psMetadata *config = psMetadataAlloc ();
-    config = psMetadataConfigParse (config, &Nfail, argv[1], FALSE);
-    return (config);
-}
+# include <glob.h>
 
 static void usage (void) {
-    fprintf (stderr, "USAGE: psastro (config) (input) (output)\n");
+    fprintf (stderr, "USAGE: psastro [-file image(s)] [-list imagelist] (output)\n");
     exit (2);
 }
 
-psMetadata *testArguments (int *argc, char **argv) {
+pmConfig *psastroArguments (int *argc, char **argv) {
 
-    unsigned int Nfail;
+    int N;
+
+    if (*argc == 1) usage ();
 
     // basic pslib options
-    fprintf (stderr, "starting... %s\n", psLibVersion());
     psLogSetFormat ("M");
-    psLogArguments (argc, argv);
-    psTraceArguments (argc, argv);
 
-    if (*argc != 6) usage_test ();
+    // these other options override the PSPHOT recipe options
+    psMetadata *options = psMetadataAlloc ();
 
-    // load config information
-    psMetadata *config = psMetadataAlloc ();
-    config = psMetadataConfigParse (config, &Nfail, argv[1], FALSE);
+    // photcode : used in output to supplement header data (argument or recipe?)
+    if ((N = psArgumentGet (*argc, argv, "-photcode"))) {
+        psArgumentRemove (N, argc, argv);
+        psMetadataAddStr (options, PS_LIST_TAIL, "PHOTCODE", PS_META_REPLACE, "", argv[N]);
+        psArgumentRemove (N, argc, argv);
+    }
+
+    // load config data from default locations 
+    pmConfig *config = pmConfigRead(argc, argv);
+
+    // Storage for other command-line arguments
+    config->arguments = psMetadataAlloc ();
+
+    // save these recipe options until we have loaded the options
+    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "PSASTRO.OPTIONS",  PS_DATA_METADATA, "", options);
+
+    // we load all input files onto a psArray, to be parsed later
+    psArray *input = psArrayAlloc (16);
+    input->n = 0;
+
+    // load the list of filenames the supplied file (may be a glob: "file*.fits")
+    if ((N = psArgumentGet (*argc, argv, "-file"))) {
+        glob_t globList;
+        psArgumentRemove (N, argc, argv);
+        globList.gl_offs = 0;
+        glob (argv[N], 0, NULL, &globList);
+        for (int i = 0; i < globList.gl_pathc; i++) {
+            char *filename = psStringCopy (globList.gl_pathv[i]);
+            psArrayAdd (input, 16, filename);
+        }
+        psArgumentRemove (N, argc, argv);
+    }
+
+    // load the list from the supplied text file
+    if ((N = psArgumentGet (*argc, argv, "-list"))) {
+        int nItems;
+        char line[1024]; // XXX limits the list lines to 1024 chars
+        char word[1024];
+        char *filename;
+
+        psArgumentRemove (N, argc, argv);
+        FILE *f = fopen (argv[N], "r");
+        if (f == NULL) {
+            psAbort ("psphot", "unable to open specified list file");
+        }
+        while (fgets (line, 1024, f) != NULL) {
+            nItems = sscanf (line, "%s", word);
+            switch (nItems) {
+              case 0:
+                break;
+              case 1:
+                filename = psStringCopy (word);
+                psArrayAdd (input, 16, filename);
+                break;
+              default:
+                // rigid format, no comments allowed?
+                psAbort ("psphot", "error parsing input list file");
+                break;
+            }
+        }
+        psArgumentRemove (N, argc, argv);
+    }           
+    if (input->n < 1) usage ();
+
+    // input list gets places as an array on the config->arguements list
+    psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "INPUT",  PS_DATA_ARRAY, "", input);
+
+    if (*argc != 2) usage ();
+
+    // output positions is fixed
+    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", argv[2]);
+
+    psTrace(__func__, 1, "Done with psphotArguments...\n");
     return (config);
 }
-
-static void usage_test (void) {
-    fprintf (stderr, "USAGE: psastro-mktest (config) (cmpfile) (catfile) (rawfile) (reffile)\n");
-    exit (2);
-}

trunk/psastro/src/psastroIO.c

@@ -36 +36 @@
     stars->n = 0;
 
-    // we have fixed bytes / line : use that info
+
     for (int i = 0; i < nStars; i++) {
         fread (line, 1, 66, f);