Index: trunk/pswarp/src/pswarpDataLoad.c
===================================================================
--- trunk/pswarp/src/pswarpDataLoad.c	(revision 10954)
+++ trunk/pswarp/src/pswarpDataLoad.c	(revision 10958)
@@ -12,4 +12,5 @@
     pmCell *cell;
     pmReadout *readout;
+    pmFPAview *view;
 
     // select the input data sources
@@ -21,13 +22,14 @@
 
     // 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");
+    view = pmFPAviewAlloc (0);
+    view->chip = 0;
+    view->cell = 0;
+    view->readout = 0;
+    pmReadout  *output = pmFPAfileThisReadout (config->files, view, "PSWARP.OUTPUT");
     if (!output) {
 	psError(PSWARP_ERR_CONFIG, true, "Can't find output data!\n");
 	return false;
     }
+    psFree (view);
 
     // de-activate PSWARP.SKYCELL and PSWARP.OUTPUT
@@ -35,5 +37,5 @@
     pmFPAfileActivate (config->files, false, "PSWARP.OUTPUT");
 
-    pmFPAview *view = pmFPAviewAlloc (0);
+    view = pmFPAviewAlloc (0);
 
     // find the FPA phu
@@ -81,5 +83,7 @@
 		if (! readout->data_exists) { continue; }
 
-		pswarpTransformReadout (output, readout, config);
+		// XXX _Opt version uses locally-linear map
+		// pswarpTransformReadout (output, readout, config);
+		pswarpTransformReadout_Opt (output, readout, config);
 
 		pmFPAfileIOChecks (config, view, PM_FPA_AFTER);