Changeset 7759

Timestamp:

Jun 29, 2006, 11:00:41 AM (20 years ago)

Author:

Paul Price

Message:

Instead of doing open/close each time we want to read (which is really expensive), we hold an array of file pointers. This should make for a significant boost in speed.

Location:

trunk/ppMerge/src

Files:

• ppMergeCheckInputs.c (modified) (2 diffs)
• ppMergeCombine.c (modified) (2 diffs)
• ppMergeData.c (modified) (2 diffs)
• ppMergeData.h (modified) (1 diff)
• ppMergeScaleZero.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -31 +31 @@
         data->in->n = filenames->n;
     }
+    if (!data->files) {
+        data->files = psArrayAlloc(filenames->n);
+        data->files->n = filenames->n;
+    }
     int numGood = 0;                    // Number of good files
     for (int i = 0; i < filenames->n; i++) {
@@ -51 +55 @@
             psMetadataPrint(stdout, header, 9);
         }
-        psFitsClose(inFile);
+        data->files->data[i] = inFile;
 
         // The formats must be identical.  The chief reason for this is so that we know what output format to

trunk/ppMerge/src/ppMergeCombine.c

@@ -68 +68 @@
                         continue;
                     }
-                    psFits *fits = psFitsOpen(filenames->data[k], "r"); // FITS file handle
+                    psFits *fits = data->files->data[k]; // FITS file handle
                     if (!fits) {
                         psError(PS_ERR_IO, false, "Unable to open input file %s --- ignored.\n",
@@ -91 +91 @@
                         numRead++;
                     }
-                    psFitsClose(fits);
                 }
 

trunk/ppMerge/src/ppMergeData.c

@@ -9 +9 @@
     )
 {
+    if (data->files) {
+        for (long i = 0; i < data->files->n; i++) {
+            psFitsClose(data->files->data[i]);
+            data->files->data[i] = NULL;
+        }
+        psFree(data->files);
+    }
     psFree(data->in);
     psFree(data->out);
@@ -23 +30 @@
 
     data->numCells = 0;
+    data->files = NULL;
     data->in = NULL;
     data->out = NULL;

trunk/ppMerge/src/ppMergeData.h

@@ -8 +8 @@
 typedef struct {
     int numCells;                       // Number of (valid) cells in the FPA
+    psArray *files;                     // Input file pointers
     psArray *in;                        // Input FPA structures
     pmFPA *out;                         // Output FPA structure

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -176 +176 @@
         }
         psTrace(__func__, 9, "Opening %s to get background...\n", name);
-        psFits *inFile = psFitsOpen(filenames->data[i], "r"); // The FITS file to read
-        if (!inFile) {
-            psLogMsg(__func__, PS_LOG_WARN, "Unable to open input file %s --- ignored.\n", name);
-            status = false;
-            continue;
-        }
-
+        psFits *inFile = data->files->data[i]; // The FITS file to read
         pmFPA *fpa = data->in->data[i]; // The FPA for this input
         int cellNum = -1;               // Number of the cell
@@ -282 +276 @@
         }
         pmFPAFreeData(fpa);
-        psFitsClose(inFile);
     }
     psFree(bgStats);