Changeset 7888

Timestamp:

Jul 12, 2006, 4:22:29 PM (20 years ago)

Author:

Paul Price

Message:

Getting rid of template file --- we use the output file for that.

Location:

trunk/ppFringe/src

Files:

• ppFringeData.c (modified) (3 diffs)
• ppFringeData.h (modified) (2 diffs)
• ppFringeSetup.c (modified) (4 diffs)

trunk/ppFringe/src/ppFringeData.c

@@ -18 +18 @@
         data->outFile = NULL;
     }
-    if (data->templateFile) {
-        psFitsClose(data->templateFile);
-        data->templateFile = NULL;
-    }
     return;
 }
@@ -33 +29 @@
     data->inName = NULL;
     data->outName = NULL;
-    data->templateName = NULL;
     data->numPoints = 0;
     data->xWidth = 0;
@@ -43 +38 @@
     data->inFile = NULL;
     data->outFile = NULL;
-    data->templateFile = NULL;
     data->inFPA = NULL;
 

trunk/ppFringe/src/ppFringeData.h

@@ -9 +9 @@
     const char *inName;                 // Input FITS image file
     const char *outName;                // Output FITS table file
-    const char *templateName;           // Name of template output file
     int numPoints;                      // Number of fringe points
     int xWidth, yWidth;                 // Width of fringe points in x and y
@@ -17 +16 @@
     psFits *inFile;                     // Input file handle
     psFits *outFile;                    // Output file handle
-    psFits *templateFile;               // Template file handle
     pmFPA *inFPA;                       // Input FPA
 } ppFringeData;

trunk/ppFringe/src/ppFringeSetup.c

@@ -24 +24 @@
 {
     // Setup and parse command-line arguments
-    psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-template", 0, "Template output", NULL);
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-detid", 0, "Detrend identifier", NULL);
     psMetadataAddStr(config->arguments, PS_LIST_TAIL, "-classid", 0, "Class identifier", NULL);
@@ -40 +39 @@
     data->inName = config->argv[1];
     data->outName = config->argv[2];
-    data->templateName = psMetadataLookupStr(NULL, config->arguments, "-template");
 
     // Open the input file, determine the camera
@@ -69 +67 @@
         goto die;
     }
+    psFree(view);
 
     // Now we have a camera format, we can read the recipe
@@ -96 +95 @@
     READ_RECIPE_ITEM("MASKVAL", recipe, data->maskVal, U8);
 
-    // Open the output and template file
-    data->outFile = psFitsOpen(data->outName, "w");
+    // Open the output file
+    data->outFile = psFitsOpen(data->outName, "a+");
     if (!data->outFile) {
         psError(PS_ERR_IO, false, "Unable to open output file %s\n", data->outName);
         goto die;
-    }
-
-    if (data->templateName && strlen(data->templateName) > 0) {
-        data->templateFile = psFitsOpen(data->templateName, "r");
-        if (!data->templateFile) {
-            psError(PS_ERR_IO, false, "Unable to open template file %s\n", data->templateName);
-            goto die;
-        }
     }