Changeset 13686

Timestamp:

Jun 6, 2007, 2:19:54 PM (19 years ago)

Author:

Paul Price

Message:

Copying concepts (e.g., exposure time) from the old to the new. We don't copy certain concepts (actually, we copy and then remove them) so as not to confuse between skycells and real cameras.

Location:

trunk/pswarp/src

Files:

• pswarpLoop.c (modified) (4 diffs)
• pswarpTransformReadout_Opt.c (modified) (1 diff)

trunk/pswarp/src/pswarpLoop.c

@@ -68 +68 @@
             psError(PS_ERR_UNKNOWN, false, "Unable to read bilevel mosaic astrometry for input FPA.");
             psFree(view);
+            psFree(stats);
             return false;
         }
@@ -87 +88 @@
                 psError(PS_ERR_UNKNOWN, false, "Unable to read bilevel chip astrometry for input FPA.");
                 psFree(view);
+                psFree(stats);
                 return false;
             }
@@ -94 +96 @@
                 psError(PS_ERR_UNKNOWN, false, "Unable to read WCS astrometry for input FPA.");
                 psFree(view);
+                psFree(stats);
                 return false;
             }
@@ -106 +109 @@
             // process each of the readouts
             pmReadout *readout;
-            while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
-                if (! readout->data_exists) { continue; }
+            while ((readout = pmFPAviewNextReadout(view, input->fpa, 1)) != NULL) {
+                pmFPAfileIOChecks(config, view, PM_FPA_BEFORE);
+                if (!readout->data_exists) {
+                    continue;
+                }
 
-                // XXX _Opt version uses locally-linear map
-                // pswarpTransformReadout (output, readout, config);
-                pswarpTransformReadout_Opt (output, readout, config);
+                pswarpTransformReadout_Opt(output, readout, config);
 
-                pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+                pmFPAfileIOChecks(config, view, PM_FPA_AFTER);
             }
+            pmFPAfileIOChecks(config, view, PM_FPA_AFTER);
+        }
+        pmFPAfileIOChecks(config, view, PM_FPA_AFTER);
+    }
 
-            pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
-        }
-        pmFPAfileIOChecks (config, view, PM_FPA_AFTER);
+    pmCell *outCell = output->parent;   // Output cell
+    pmChip *outChip = outCell->parent;  // Output chip
+    pmFPA *outFPA = outChip->parent;    // Output FPA
+
+    if (!pmFPACopyConcepts(output->parent->parent->parent, input->fpa)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to copy concepts from input to output.");
+        psFree(stats);
+        psFree(view);
+        return false;
     }
+
+
+    // XXX Hack so that INSTRUME header keyword and the like are not updated properly
+    // If INSTRUME (etc) is updated, then the FITS file with the warped image will be often
+    // recognised as coming from the old camera, not the new, warped camera.
+    // The proper solution to this, I believe, would be to define a skycell derivative of the
+    // old camera, so that the skycell can be recognised as coming from the old camera (and would
+    // also therefore inherit all its recipes, which would be good), rather than having a completely
+    // different camera.  That will take some work; the below solution should be good enough for now.
+    {
+        psMetadataItem *item;           // Concepts item to update
+
+        item = psMetadataLookup(outFPA->concepts, "FPA.INSTRUMENT");
+        psFree(item->data.V);
+        item->data.V = NULL;
+
+        item = psMetadataLookup(outFPA->concepts, "FPA.DETECTOR");
+        psFree(item->data.V);
+        item->data.V = NULL;
+    }
+
+
 
     // Perform statistics on the output image

trunk/pswarp/src/pswarpTransformReadout_Opt.c

@@ -2 +2 @@
 
 // NOTE: in this function, the coordinates are transformed from the OUTPUT to the INPUT
-bool pswarpTransformReadout_Opt (pmReadout *output, pmReadout *input, pmConfig *config)
+bool pswarpTransformReadout_Opt(pmReadout *output, pmReadout *input, pmConfig *config)
 {
     // XXX this implementation currently ignores the use of the region