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

Timestamp:

May 8, 2013, 4:41:42 PM (13 years ago)

Author:

eugene

Message:

warping of background model appears to work

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarp.c (modified) (1 diff)

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

@@ -39 +39 @@
     }
 
-# if (1)
-    // XXX I'm going to add the new code before removing the old code.
     // load the input & output astrometry, find the output overlaps, generate the output pixels
     if (!pswarpDefineLayout(config)) {
         pswarpCleanup(config, statsFile);
     }
-    // load and warp
+
+    // load input pixels & and warp
     if (!pswarpLoop(config, statsFile->md)) {
         pswarpCleanup(config, statsFile);
     }
 
-# else
-    // load the skycell layout information:
-    //   read the output astrometry description
-    //   generate the output pixels
-    //   convert header astrometry to pmFPA astrometry structures
-    if (!pswarpDefine(config)) {
-        pswarpCleanup(config, statsFile);
+    // load input pixels & and warp
+    if (!pswarpLoopBackground(config, statsFile->md)) {
+        pswarpCleanup(config, statsFile);
     }
-    if (!pswarpDefineBackground(config)) {
-        pswarpCleanup(config, statsFile);
-    }
-    // load and warp
-    if (!pswarpLoopSkycell(config, statsFile->md)) {
-        pswarpCleanup(config, statsFile);
-    }
-    if (!pswarpLoopBackground(config, statsFile->md)) {
-        fprintf(stderr,"Dying!\n");
-        pswarpCleanup(config, statsFile);
-    }
-# endif
 
+    // output and free 
+    // NOTE: pswarpCleanup calls exit
     psLogMsg("pswarp", PS_LOG_INFO, "complete pswarp run: %f sec\n", psTimerMark("pswarp"));
     pswarpCleanup(config, statsFile);
 }
-
-// NOTE: pswarpCleanup calls exit
-
-// pswarpDumpOutput (config);
-// exit (0);