Changeset 35535 for branches/eam_branches/ipp-20130419/pswarp/src/pswarpLoop.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/pswarpLoop.c (modified) (9 diffs)

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

@@ -1 +1 @@
 /** @file pswarpLoop.c
  *
- *  @brief mail processing loop for pswarp
+ *  @brief main processing loop for pswarp
  *  @ingroup pswarp
  *
@@ -13 +13 @@
 #include "pswarpFileNames.h"            // Lists of file rules used at different stages
 
-// Loop over the inputs, warp them to the output skycell and then write out the output.
+// Loop over the inputs, warp them to the output skycell and then update metadata
 bool pswarpLoop(pmConfig *config, psMetadata *stats)
 {
-    const char *skyCamera = psMetadataLookupStr(NULL, config->arguments,
-                                                "SKYCELL.CAMERA");  // Name of camera for skycell
-    pmConfigCamerasCull(config, skyCamera);
-    pmConfigRecipesCull(config, "PSWARP,PPSTATS,PSPHOT,PSASTRO,MASKS,JPEG");
 
     // load the recipe
@@ -26 +22 @@
     if (!recipe) {
         psError(PSWARP_ERR_CONFIG, false, "missing recipe %s", PSWARP_RECIPE);
-        return false;
-    }
-
-    // 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");
         return false;
     }
@@ -66 +56 @@
         }
 
-        fprintf (stderr, "loading file %s\n", input->filename);
-
-        // use the external astrometry source if supplied
+        // select the input data sources
         pmFPAfile *astrom = pmFPAfileSelectSingle(config->files, "PSWARP.ASTROM", i);
         if (!astrom) {
@@ -74 +62 @@
         }
 
-        if (astrom->camera != input->camera) {
-            psError(PSWARP_ERR_DATA, true, "Input camera and astrometry camera do not match.");
-            return false;
-        }
-
-        // ensure everyone is off except what we need below
-        pswarpFileActivation(config, detectorFiles, false);
+        // 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);
     
-        // the loops below load the input data
-        pswarpFileActivation(config, detectorFiles, true);
-
-        // need to read in these (but only if CMF, right?)
+        // 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");
-
-        // pswarpFileActivation(config, independentFiles, true);
 
         pmFPAviewReset (view);
@@ -174 +154 @@
             goto FAIL;
         }
-        if (!pswarpUpdateMetadata (output->fpa, input->fpa, astrom->fpa, config)) {
+        if (!pswarpUpdateMetadata (output->fpa, skycell->fpa, input->fpa, astrom->fpa, config, true)) {
             psError(psErrorCodeLast(), false, "problem generating statistics.");
             goto FAIL;
@@ -184 +164 @@
       goto FAIL;
     }
-
-    // XXX
-    // pswarpDumpOutput (config);
-    // exit (0);
 
     psFree(view);
@@ -196 +172 @@
     return false;
 }
-
-// static int Nout = 0;
 
 // once the output fpa elements have been built, loop over the fpa and generate stats
@@ -219 +193 @@
             while ((readout = pmFPAviewNextReadout(view, output, 1)) != NULL) {
                 pswarpTransformReadout (readout, input, config);
-                // char name[64];
-                // snprintf (name, 64, "dumpwarp.%02d.fits", Nout);
-                // Nout ++;
-                // 
-                // psphotSaveImage (NULL, readout->image, name);
             }
         }