Changeset 10954

Timestamp:

Jan 7, 2007, 6:48:50 AM (19 years ago)

Author:

eugene

Message:

functioning pswarp, needs opt code

Location:

trunk/pswarp/src

Files:

• Makefile.am (modified) (1 diff)
• pswarp.h (modified) (2 diffs)
• pswarpArguments.c (modified) (1 diff)
• pswarpDataLoad.c (modified) (3 diffs)
• pswarpDefine.c (modified) (1 diff)
• pswarpMapGrid.c (added)
• pswarpParseCamera.c (modified) (4 diffs)
• pswarpTransformReadout.c (modified) (4 diffs)
• pswarpTransformReadout_Opt.c (added)

trunk/pswarp/src/Makefile.am

@@ -19 +19 @@
 pswarpErrorCodes.c         \
 pswarpParseCamera.c        \
+pswarpTransformReadout.c   \
 pswarpVersion.c            
 

trunk/pswarp/src/pswarp.h

@@ -13 +13 @@
 # define PSWARP_RECIPE "PSWARP" // Name of the recipe to use
 
+typedef struct {
+  double Xo, Xx, Xy;
+  double Yo, Yx, Yy;
+} pswarpMap;
+
+typedef struct {
+  pswarpMap **grid;
+  int Nx, Ny;
+  int nXpix, nYpix;
+} pswarpMapGrid;
+
 pmConfig *pswarpArguments (int argc, char **argv);
 bool pswarpParseCamera (pmConfig *config);
@@ -19 +30 @@
 bool pswarpDataSave (pmConfig *config);
 void pswarpCleanup (pmConfig *config);
+bool pswarpTransformReadout (pmReadout *output, pmReadout *input, pmConfig *config);
+

trunk/pswarp/src/pswarpArguments.c

@@ -50 +50 @@
     pmConfigFileSetsMD (config->arguments, config, "WEIGHT", "-weight", "-weightlist");
     
-    if (argc != 2) {
+    if (argc != 3) {
         psError(PSWARP_ERR_ARGUMENTS, true, "Incorrect arguments supplied");
         return NULL;
     }
     
+    psArray *array;
+
     // output position is fixed
     psMetadataAddStr (config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "", argv[1]);
 
     // skycell position is fixed
-    psMetadataAddStr (config->arguments, PS_LIST_TAIL, "SKYCELL", 0, "", argv[2]);
+    array = psArrayAlloc(1);
+    array->data[0] = psStringCopy (argv[2]);
+    status = psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "SKYCELL", PS_DATA_ARRAY, "", array);
+    psFree (array);
 
     psTrace("pswarp", 1, "Done with pswarpArguments...\n");

trunk/pswarp/src/pswarpDataLoad.c

@@ -32 +32 @@
 
     // de-activate PSWARP.SKYCELL and PSWARP.OUTPUT
-    // 
+    pmFPAfileActivate (config->files, false, "PSWARP.SKYCELL");
     pmFPAfileActivate (config->files, false, "PSWARP.OUTPUT");
-    pmFPAfileActivate (config->files, false, "PSWARP.SKYCELL");
 
     pmFPAview *view = pmFPAviewAlloc (0);
+
+    // find the FPA phu
+    // XXX wrap the test below into a function
+    // XXX need to read only the headers for the skycell
+    // XXX need to optionally load the astrometry datafile
+    bool bilevelAstrometry = false;
+    pmHDU *phu = pmFPAviewThisPHU (view, input->fpa);
+    if (phu) {
+      char *ctype = psMetadataLookupStr (NULL, phu->header, "CTYPE1");
+      if (ctype) {
+        bilevelAstrometry = !strcmp (&ctype[4], "-DIS");
+      }
+    }
+    if (bilevelAstrometry) {
+      pmAstromReadBilevelMosaic (input->fpa, phu->header);
+    } 
 
     // files associated with the science image
@@ -45 +60 @@
         if (!chip->process || !chip->file_exists) { continue; }
         pmFPAfileIOChecks (config, view, PM_FPA_BEFORE);
+
+        // read WCS data from the corresponding header
+        pmHDU *hdu = pmFPAviewThisHDU (view, input->fpa);
+        if (bilevelAstrometry) {
+          pmAstromReadBilevelChip (chip, hdu->header); 
+        } else {
+          // XXX get pixelScale from recipes.  does it matter?
+          float pixelScale = 13.5;
+          pmAstromReadWCS (input->fpa, chip, hdu->header, pixelScale);
+        }
 
         while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
@@ -56 +81 @@
                 if (! readout->data_exists) { continue; }
 
-                pswarpConvertReadout (output, readout, config);
+                pswarpTransformReadout (output, readout, config);
 
                 pmFPAfileIOChecks (config, view, PM_FPA_AFTER);

trunk/pswarp/src/pswarpDefine.c

@@ -23 +23 @@
     pmFPAfileRead (skycell, view, config);
 
+    // XXX this is not a sufficient test
+    view->chip = 0;
+    pmChip *chip = pmFPAviewThisChip (view, skycell->fpa);
+    pmHDU *phu = pmFPAviewThisPHU (view, skycell->fpa);
+    pmHDU *hdu = pmFPAviewThisHDU (view, skycell->fpa);
+    bool bilevelAstrometry = false;
+    if (phu) {
+      char *ctype = psMetadataLookupStr (NULL, phu->header, "CTYPE1");
+      if (ctype) {
+        bilevelAstrometry = !strcmp (&ctype[4], "-DIS");
+      }
+    }
+    if (bilevelAstrometry) {
+      pmAstromReadBilevelMosaic (skycell->fpa, phu->header);
+      pmAstromReadBilevelChip (chip, hdu->header); 
+    } else {
+      // XXX get pixelScale from recipes.  does it matter?
+      float pixelScale = 13.5;
+      pmAstromReadWCS (skycell->fpa, chip, hdu->header, pixelScale);
+    }
+
     // construct the output fpa here
     pmFPAfile *output = psMetadataLookupPtr (NULL, config->files, "PSWARP.OUTPUT");

trunk/pswarp/src/pswarpParseCamera.c

@@ -3 +3 @@
 bool pswarpParseCamera (pmConfig *config) {
 
-    bool status = false;
+    bool status;
 
     // the input image(s) are required arguments; they define the camera
+    status = false;
     pmFPAfile *input = pmFPAfileDefineFromArgs (&status, config, "PSWARP.INPUT", "INPUT");
-    if (!status) {
+    if (!input) {
         psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.INPUT");
         return false;
@@ -13 +14 @@
 
     // the input skycell is a required argument: it defines the output image
+    status = false;
     pmFPAfile *skycell = pmFPAfileDefineFromArgs (&status, config, "PSWARP.SKYCELL", "SKYCELL");
-    if (!status) {
-        psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.INPUT");
+    if (!skycell) {
+        psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.SKYCELL");
         return false;
     }
 
     // the mask is not required; the  skycell is a required argument: it defines the output image
+    status = false;
     pmFPAfileDefineFromArgs (&status, config, "PSWARP.MASK", "MASK");
     if (!status) {
@@ -26 +29 @@
 
     // the weight is not required; the  skycell is a required argument: it defines the output image
+    status = false;
     pmFPAfileDefineFromArgs (&status, config, "PSWARP.WEIGHT", "WEIGHT");
     if (!status) {
@@ -32 +36 @@
 
     // these calls bind the I/O handle to the specified fpa
-    pmFPAfileDefineOutput (config, skycell->fpa, "PSWARP.OUTPUT");
+    if (!pmFPAfileDefineOutput (config, skycell->fpa, "PSWARP.OUTPUT")) {
+        psError(PSWARP_ERR_CONFIG, false, "Failed to build FPA from PSWARP.OUTPUT");
+        return false;
+    }
 
     // Chip selection: turn on only the chips specified

trunk/pswarp/src/pswarpTransformReadout.c

@@ -8 +8 @@
 
     // select the current recipe
-    psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSPHOT_RECIPE);
+    // psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, PSWARP_RECIPE);
 
     int outNx = output->image->numCols;
@@ -27 +27 @@
     pmChip *chipOutput = cell->parent;
     pmFPA *fpaOutput = chipOutput->parent;
+
+    psF32 **outData = output->image->data.F32;
+    psImage *inImage = input->image;
 
     // Iterate over the output image pixels
@@ -48 +51 @@
 
                 // XXX get interpolation method from the recipe
-                outImage->data.F32[y][x] = (psF32)psImagePixelInterpolate(image, inPix->x, inPix->y, mask, 1, NAN, PS_INTERPOLATE_BILINEAR);
+                outData[y][x] = (psF32)psImagePixelInterpolate(inImage, inPix->x, inPix->y, NULL, 1, NAN, PS_INTERPOLATE_BILINEAR);
+                // modify zero and scale?
 
+                // outData[y][x] = (psF32)psImagePixelInterpolate(inImage, inPix->x, inPix->y, mask, 1, NAN, PS_INTERPOLATE_BILINEAR);
+                
 # if (0)
                 if (error) {
@@ -58 +64 @@
                                                                                             mask, 1, NAN);
                 }
-# endif
-
-                outImage->data.F32[y][x] = (outImage->data.F32[y][x] - offset) / scale;
-# if (0)
                 if (error) {
                     outError->data.F32[y][x] = outError->data.F32[y][x] / SQUARE(scale);