Changeset 35521 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c

Timestamp:

May 6, 2013, 10:32:51 AM (13 years ago)

Author:

eugene

Message:

remove superfulous ppStats.h includes; generate output psf model

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c (modified) (6 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.c

@@ -11 +11 @@
 
 #include "pswarp.h"
-#include <ppStats.h>
 #include "pswarpFileNames.h"            // Lists of file rules used at different stages
-
-#define WCS_NONLIN_TOL 0.001            // Non-linear tolerance for header WCS
-#define TESTING 0                       // Testing output?
 
 // Loop over the inputs, warp them to the output skycell and then write out the output.
@@ -33 +29 @@
     }
 
-    // XXX this should probably happen elsewhere (logically it belongs to file I/O, right?)
+    // XXX move this to pswarpParseCamera?  has to come after input mask header is read
     if (!pswarpSetMaskBits(config)) {
         psError(psErrorCodeLast(), false, "failed to set mask bits");
@@ -70 +66 @@
         return false;
     }
-
-    // XXX NOTE : 'output' was a readout, now we need to loop over all output targets
 
     // ensure everyone is off except what we need below
@@ -79 +73 @@
     pswarpFileActivation(config, skycellFiles, false);
     
-    // Turn on the source output --- we need to get rid of these so that we can measure the PSF
-    // XXX NOTE : do not tackle source issues yet...
-    // XXX pmFPAfileActivate(config->files, true, "PSWARP.OUTPUT.SOURCES");
-
     // the loops below load the input data
     pswarpFileActivation(config, detectorFiles, true);
@@ -90 +80 @@
 
     // pswarpFileActivation(config, independentFiles, true);
-
 
     pmFPAview *view = pmFPAviewAlloc(0);
@@ -171 +160 @@
     }
 
-    // XXXX turn these on later .. pswarpMakePSF (output);
-    // XXX have not yet written the output to disk
+    if (!pswarpMakePSF (config, output, stats)) {
+      psError(psErrorCodeLast(), false, "problem generating PSF.");
+      goto FAIL;
+    }
+
     psFree(view);
     return true;