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

Timestamp:

May 8, 2013, 4:56:44 PM (13 years ago)

Author:

eugene

Message:

cleanup file activation calls

File:

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

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

@@ -11 +11 @@
 
 #include "pswarp.h"
-#include "pswarpFileNames.h"            // Lists of file rules used at different stages
 
 // Loop over the inputs, warp them to the output skycell and then update metadata
@@ -47 +46 @@
     }
 
+    // load in the input pixel data (ex. background model)
+    pmFPAfileActivate(config->files, false, NULL);
+    pmFPAfileActivate(config->files, true, "PSWARP.INPUT");
+    pmFPAfileActivate(config->files, true, "PSWARP.MASK");
+    pmFPAfileActivate(config->files, true, "PSWARP.VARIANCE");
+
+    // We re-activate the CMF load so we can transform the sources as well as the pixels.
+    // We only need to read in these if the astrometry source is CMF.
+    pmFPAfileActivate(config->files, true, "PSWARP.ASTROM");
+
     // loop over this section once per input group
     for (int i = 0; i < nInputs; i++) {
@@ -61 +70 @@
             astrom = input;
         }
-
-        // ensure everyone is off except what we need below 
-        // XXX double-check activation issues in general
-        pswarpFileActivation(config, detectorFiles, true);
-        pswarpFileActivation(config, photFiles, false);
-        pswarpFileActivation(config, independentFiles, false);
-        pswarpFileActivation(config, skycellFiles, false);
-    
-        // We re-activate the CMF load so we can transform the sources as well as the pixels.
-        // We only need to read in these if the astrometry source is CMF.
-        pmFPAfileActivate(config->files, true, "PSWARP.ASTROM");
 
         pmFPAviewReset (view);
@@ -146 +144 @@
         }
 
-        // Done with the detector side of things
-        pswarpFileActivation(config, detectorFiles, false);
-        pswarpFileActivation(config, independentFiles, false);
-
         if (!pswarpUpdateStatistics (output->fpa, stats, input->fpa, astrom->fpa, config)) {
             psError(psErrorCodeLast(), false, "problem generating statistics.");