Changeset 10952

Timestamp:

Jan 5, 2007, 6:41:08 PM (19 years ago)

Author:

eugene

Message:

compiles without working transformation

Location:

trunk/pswarp/src

Files:

• pswarp.c (modified) (1 diff)
• pswarp.h (modified) (1 diff)
• pswarpCleanup.c (modified) (1 diff)
• pswarpDataLoad.c (modified) (2 diffs)
• pswarpDefine.c (modified) (1 diff)
• pswarpParseCamera.c (modified) (1 diff)
• pswarpTransformReadout.c (added)

trunk/pswarp/src/pswarp.c

@@ -7 +7 @@
     fprintf (stderr, "    [-mask mask.fits] : provide a corresponding mask image\n");
     fprintf (stderr, "    [-weight weight.fits] : provide a corresponding weight image (pixel varience)\n");
-    psErrorStackPrint(stderr, "");
+    psErrorStackPrint(stderr, "\n");
     exit (2);
 }

trunk/pswarp/src/pswarp.h

@@ -13 +13 @@
 # define PSWARP_RECIPE "PSWARP" // Name of the recipe to use
 
+pmConfig *pswarpArguments (int argc, char **argv);
+bool pswarpParseCamera (pmConfig *config);
+bool pswarpDefine (pmConfig *config);
+bool pswarpDataLoad (pmConfig *config);
+bool pswarpDataSave (pmConfig *config);
+void pswarpCleanup (pmConfig *config);

trunk/pswarp/src/pswarpCleanup.c

@@ -3 +3 @@
 void pswarpCleanup (pmConfig *config) {
 
-    psFree (refs);
     psFree (config);
 

trunk/pswarp/src/pswarpDataLoad.c

@@ -17 +17 @@
     if (!input) {
         psError(PSWARP_ERR_CONFIG, true, "Can't find input data!\n");
+        return false;
+    }
+
+    // select the output readout
+    pmFPAview *outView = pmFPAviewAlloc (0);
+    outView->chip = 0;
+    outView->cell = 0;
+    outView->readout = 0;
+    pmReadout  *output = pmFPAfileThisReadout (config->files, outView, "PSWARP.OUTPUT");
+    if (!output) {
+        psError(PSWARP_ERR_CONFIG, true, "Can't find output data!\n");
         return false;
     }
@@ -45 +56 @@
                 if (! readout->data_exists) { continue; }
 
-                pswarpConvertReadout (readout, config);
+                pswarpConvertReadout (output, readout, config);
 
                 pmFPAfileIOChecks (config, view, PM_FPA_AFTER);

trunk/pswarp/src/pswarpDefine.c

@@ -30 +30 @@
     }
 
-    pmFPAfileCreate (output, view, config);
+    pmFPAfileCreate (output, view);
 
     psFree (view);

trunk/pswarp/src/pswarpParseCamera.c

@@ -11 +11 @@
         return false;
     }
-
-    // select recipe options supplied on command line
-    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, PSWARP_RECIPE);
 
     // the input skycell is a required argument: it defines the output image