Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/pswarp/src

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• pswarp/src/pswarp.h (modified) (3 diffs)
• pswarp/src/pswarpMapGrid.c (modified) (9 diffs)
• pswarp/src/pswarpParseCamera.c (modified) (1 diff)
• pswarp/src/pswarpSetMaskBits.c (modified) (1 diff)
• pswarp/src/pswarpSetThreads.c (modified) (1 diff)
• pswarp/src/pswarpTransformReadout.c (modified) (1 diff)
• pswarp/src/pswarpTransformTile.c (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarp.h

@@ -72 +72 @@
 } pswarpTransformTileArgs;
 
-pswarpTransformTileArgs *pswarpTransformTileArgsAlloc();
+pswarpTransformTileArgs *pswarpTransformTileArgsAlloc(void);
 bool pswarpTransformTile (pswarpTransformTileArgs *args);
 
@@ -87 +87 @@
 bool pswarpMatchRange (int *minX, int *minY, int *maxX, int *maxY, pmReadout *dest, pmReadout *src);
 
-pswarpMap *pswarpMapAlloc ();
+pswarpMap *pswarpMapAlloc (void);
 pswarpMapGrid *pswarpMapGridAlloc (int Nx, int Ny);
 
@@ -111 +111 @@
  * define threads for this program
  */
-bool pswarpSetThreads ();
+bool pswarpSetThreads (void);
 
 /// Return software version

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpMapGrid.c

@@ -43 +43 @@
     // measure the map for the center of each superpixel
     for (ni = 0, i = xMin; ni < nXpts; i += nXpix, ni++) {
-        for (nj = 0, j = yMin; nj < nYpts; j += nYpix, nj++) {
-            pswarpMapSetLocalModel (grid->maps[ni][nj], dest, src, i, j);
-        }
+        for (nj = 0, j = yMin; nj < nYpts; j += nYpix, nj++) {
+            pswarpMapSetLocalModel (grid->maps[ni][nj], dest, src, i, j);
+        }
     }
-            
+
     grid->nXpix = nXpix;
     grid->nYpix = nYpix;
@@ -112 +112 @@
 
     for (int i = 0; i < grid->nXpts - 1; i++) {
-        for (int j = 0; j < grid->nYpts - 1; j++) {
-
-            // measure the output coordinates for the next grid position using the current grid map
-            // compare with the coordinates measured using the next grid map
-            pswarpMapApply (&xRaw, &yRaw, grid->maps[i][j], grid->maps[i][j]->xo + grid->nXpix, grid->maps[i][j]->yo);
-            pswarpMapApply (&xRef, &yRef, grid->maps[i+1][j], grid->maps[i][j]->xo + grid->nXpix, grid->maps[i][j]->yo);
-
-            double posError = hypot (xRaw-xRef, yRaw-yRef);
-            maxError = PS_MAX (maxError, posError);
-        }
-    }   
+        for (int j = 0; j < grid->nYpts - 1; j++) {
+
+            // measure the output coordinates for the next grid position using the current grid map
+            // compare with the coordinates measured using the next grid map
+            pswarpMapApply (&xRaw, &yRaw, grid->maps[i][j], grid->maps[i][j]->xo + grid->nXpix, grid->maps[i][j]->yo);
+            pswarpMapApply (&xRef, &yRef, grid->maps[i+1][j], grid->maps[i][j]->xo + grid->nXpix, grid->maps[i][j]->yo);
+
+            double posError = hypot (xRaw-xRef, yRaw-yRef);
+            maxError = PS_MAX (maxError, posError);
+        }
+    }
     return maxError;
 }
@@ -176 +176 @@
     psPlaneTransformApply (FP, fpaDest->fromTPA, TP);
     psPlaneTransformApply (V00, chipDest->fromFPA, FP);
-    
+
     /** V(1,0) position */
     offset->x = ix + 1;
@@ -186 +186 @@
     psPlaneTransformApply (FP, fpaDest->fromTPA, TP);
     psPlaneTransformApply (V10, chipDest->fromFPA, FP);
-    
+
     /** V(0,1) position */
     offset->x = ix;
@@ -204 +204 @@
     map->Yy = V01->y - V00->y;
     map->Yo = V00->y - map->Yx*ix - map->Yy*iy;
- 
+
     map->xo = ix;
     map->yo = iy;
@@ -224 +224 @@
 }
 
-pswarpMap *pswarpMapAlloc () {
+pswarpMap *pswarpMapAlloc(void) {
 
   pswarpMap *map = (pswarpMap *) psAlloc (sizeof(pswarpMap));
@@ -238 +238 @@
 
     for (int i = 0; i < grid->nXpts; i++) {
-        for (int j = 0; j < grid->nYpts; j++) {
-            psFree (grid->maps[i][j]);
-        }
-        psFree (grid->maps[i]);
+        for (int j = 0; j < grid->nYpts; j++) {
+            psFree (grid->maps[i][j]);
+        }
+        psFree (grid->maps[i]);
     }
     psFree (grid->maps);
@@ -256 +256 @@
       grid->maps[i] = psAlloc (nYpts*sizeof(void *));
       for (int j = 0; j < nYpts; j++) {
-          grid->maps[i][j] = pswarpMapAlloc();
+          grid->maps[i][j] = pswarpMapAlloc();
       }
   }
@@ -264 +264 @@
   grid->nXpix = 0;
   grid->nYpix = 0;
-  
+
   return grid;
 }

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpParseCamera.c

@@ -24 +24 @@
 
     // look for the file on the RUN metadata
-    pmFPAfile *file = pmFPAfileDefineFromRun(&status, config, filerule); // File to return
+    pmFPAfile *file = pmFPAfileDefineFromRun(&status, bind, config, filerule); // File to return
     if (!status) {
         psError(PSWARP_ERR_CONFIG, false, "Failed to load file definition for %s", filerule);

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpSetMaskBits.c

@@ -33 +33 @@
 
     // mask for non-linear flat regions (default to DETECTOR if not defined)
-    psImageMaskType badMask = pmConfigMaskGet("BAD.WARP", config);
+    psImageMaskType badMask = pmConfigMaskGet("CONV.BAD", config);
     if (!badMask) {
         badMask = 0x01;
-        pmConfigMaskSet (config, "BAD.WARP", badMask);
+        pmConfigMaskSet (config, "CONV.BAD", badMask);
     }
     maskOut |= badMask;
 
     // mask for non-linear flat regions (default to DETECTOR if not defined)
-    psImageMaskType poorMask = pmConfigMaskGet("POOR.WARP", config);
+    psImageMaskType poorMask = pmConfigMaskGet("CONV.POOR", config);
     if (!poorMask) {
         poorMask = 0x02;
-        pmConfigMaskSet (config, "POOR.WARP", poorMask);
+        pmConfigMaskSet (config, "CONV.POOR", poorMask);
     }
     maskOut |= poorMask;

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpSetThreads.c

@@ -23 +23 @@
 }
 
-bool pswarpSetThreads () {
+bool pswarpSetThreads(void) {
 
     psThreadTask *task = NULL;

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpTransformReadout.c

@@ -37 +37 @@
     // output mask bits
     psImageMaskType maskIn   = psMetadataLookupImageMask(&mdok, recipe, "MASK.INPUT");
-    psImageMaskType maskPoor = pmConfigMaskGet("POOR.WARP", config);
-    psImageMaskType maskBad  = pmConfigMaskGet("BAD.WARP", config);
+    psImageMaskType maskPoor = pmConfigMaskGet("CONV.POOR", config);
+    if (!maskPoor) {
+        maskPoor = pmConfigMaskGet("POOR.WARP", config);
+    }
+    psImageMaskType maskBad  = pmConfigMaskGet("CONV.BAD", config);
+    if (!maskBad) {
+        maskBad  = pmConfigMaskGet("BAD.WARP", config);
+    }
     psAssert(mdok, "MASK.INPUT was not defined");
 

branches/cnb_branches/cnb_branch_20090301/pswarp/src/pswarpTransformTile.c

@@ -24 +24 @@
 }
 
-pswarpTransformTileArgs *pswarpTransformTileArgsAlloc()
+pswarpTransformTileArgs *pswarpTransformTileArgsAlloc(void)
 {
     pswarpTransformTileArgs *args = psAlloc(sizeof(pswarpTransformTileArgs));