Changeset 34489

Timestamp:

Sep 28, 2012, 4:56:30 PM (14 years ago)

Author:

watersc1

Message:

Removed excess debug information, and pulled header information so that I don't need to hard code anything anymore.

Location:

branches/czw_branch/20120906/pswarp/src

Files:

• pswarp.c (modified) (2 diffs)
• pswarp.h (modified) (1 diff)
• pswarpLoop.c (modified) (3 diffs)
• pswarpTransformReadout.c (modified) (2 diffs)
• pswarpTransformTile.c (modified) (2 diffs)

branches/czw_branch/20120906/pswarp/src/pswarp.c

@@ -47 +47 @@
     }
     if (psMetadataLookupBool(NULL,config->arguments,"BACKGROUND.MODEL")) {
-      fprintf(stderr,"Here!\n");
       if (!pswarpDefineBackground(config)) {
         goto DIE;
@@ -74 +73 @@
     }
     if (psMetadataLookupBool(NULL,config->arguments,"BACKGROUND.MODEL")) {
-      fprintf(stderr,"There!\n");
       if (!pswarpLoopBackground(config, stats)) {
         fprintf(stderr,"Dying!\n");

branches/czw_branch/20120906/pswarp/src/pswarp.h

@@ -62 +62 @@
     psImage *region;
 
+    /** values which are needed to control the background model warping. */
+    bool background_warping;
+    double offset_x;
+    double offset_y;
+  
     /** input values for this tile */
     int gridX;

branches/czw_branch/20120906/pswarp/src/pswarpLoop.c

@@ -605 +605 @@
         }
 
+        // Pull information from the header of the background files so we can use it to set values.
+        pmHDU *hdu = pmFPAviewThisHDU(view,input->fpa);
+        psMetadata *header = hdu->header;
+        
+        int IMAXIS1 = psMetadataLookupS32(NULL,header,"IMNAXIS1");
+        int IMAXIS2 = psMetadataLookupS32(NULL,header,"IMNAXIS2");
+        int NAXIS1 = psMetadataLookupS32(NULL,header,"NAXIS1");
+        int NAXIS2 = psMetadataLookupS32(NULL,header,"NAXIS2");
+        char *CCDSUM = psMetadataLookupStr(NULL,header,"CCDSUM");
+        int CCDSUM1 = atoi(strtok(CCDSUM," "));
+        int CCDSUM2 = atoi(strtok(NULL," "));
+        
+        psMetadataAddF32(config->arguments,PS_LIST_TAIL,"BKG_WARP_XOFFSET", PS_META_REPLACE,
+                         "xoffset for background model data", (NAXIS1 * CCDSUM1 - IMAXIS1) / (2.0 * CCDSUM1));
+        psMetadataAddF32(config->arguments,PS_LIST_TAIL,"BKG_WARP_YOFFSET", PS_META_REPLACE,
+                         "yoffset for background model data", (NAXIS2 * CCDSUM2 - IMAXIS2) / (2.0 * CCDSUM2));
+        psTrace("pswarp",5,"%d %d %d %d %d %d %g %g %d %d",
+                psMetadataLookupS32(NULL,header,"IMNAXIS1"),
+                psMetadataLookupS32(NULL,header,"IMNAXIS2"),
+                psMetadataLookupS32(NULL,header,"NAXIS1"),
+                psMetadataLookupS32(NULL,header,"NAXIS2"),
+                CCDSUM1,CCDSUM2,
+                psMetadataLookupF32(NULL,config->arguments,"BKG_WARP_XOFFSET"),
+                psMetadataLookupF32(NULL,config->arguments,"BKG_WARP_YOFFSET"),
+                psMetadataLookupS32(NULL,config->arguments,"BKG.XGRID"),
+                psMetadataLookupS32(NULL,config->arguments,"BKG.YGRID"));
+        
+        
         // read WCS data from the corresponding header
-        pmHDU *hdu = pmFPAviewThisHDU (view, astrom->fpa);
+        hdu = pmFPAviewThisHDU (view, astrom->fpa);
 
         pmAstromWCS *WCS = pmAstromWCSfromHeader(hdu->header);
 
-        double cd1f = 1.0 * 400;
-        double cd2f = 1.0 * 400;
+        double cd1f = (1.0 * CCDSUM1);// * (1.0 * psMetadataLookupS32(NULL,config->arguments,"BKG.XGRID"));
+        double cd2f = (1.0 * CCDSUM2);// * (1.0 * psMetadataLookupS32(NULL,config->arguments,"BKG.YGRID"));
 
         WCS->cdelt1 *= cd1f;
@@ -681 +709 @@
                 
                 psMetadataAddS32(config->arguments,PS_LIST_TAIL, "INTERPOLATION.MODE", PS_META_REPLACE, "", 8);
-                fprintf(stderr,"Transforming Readout!\n");
 
                 psMetadataAddBool(config->arguments,PS_LIST_TAIL, "BACKGROUND_WARPING", PS_META_REPLACE, "", true);
                 pswarpTransformReadout(output, readout, config);
                 psMetadataAddBool(config->arguments,PS_LIST_TAIL, "BACKGROUND_WARPING", PS_META_REPLACE, "", false);
+
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {
                     psError(psErrorCodeLast(), false, "Unable to write files.");
@@ -701 +729 @@
         }
     }
-    fprintf(stderr,"End readout transformations!\n");
     if (!output->data_exists) {
         psWarning("No overlap between input and skycell.");

branches/czw_branch/20120906/pswarp/src/pswarpTransformReadout.c

@@ -132 +132 @@
             args->goodPixels = 0;
 
+            if (psMetadataLookupBool(NULL,config->arguments,"BACKGROUND_WARPING")) {
+              args->background_warping = true;
+              args->offset_x = psMetadataLookupF32(NULL,config->arguments,"BKG_WARP_XOFFSET");
+              args->offset_y = psMetadataLookupF32(NULL,config->arguments,"BKG_WARP_YOFFSET");
+            }
+
+            
             // allocate a job
             psThreadJob *job = psThreadJobAlloc ("PSWARP_TRANSFORM_TILE");
@@ -184 +191 @@
                 jacobian += args->jacobian * args->goodPixels;
             }
+
+            
         }
         psFree(job);

branches/czw_branch/20120906/pswarp/src/pswarpTransformTile.c

@@ -46 +46 @@
     args->jacobian = NAN;
 
+    args->background_warping = false;
+    args->offset_x = 0.0;
+    args->offset_y = 0.0;
+    
     return args;
 }
@@ -96 +100 @@
 
             // This needs to use a more reliable method to do this offset and limiting
-            if (args->interp->mode == 8) {
-              double xOffset = 177.0 / 400.0; // (modelsize * modelbinning - xsize) / 2.0
-              double yOffset = 166.0 / 400.0; // (modelsize * modelbinning - ysize) / 2.0
-              xIn += xOffset;
-              yIn += yOffset;
+            //      if (args->interp->mode == 8) {
+            if (args->background_warping) {
+              //              double xOffset = 177.0 / 400.0; // (modelsize * modelbinning - xsize) / 2.0
+              //              double yOffset = 166.0 / 400.0; // (modelsize * modelbinning - ysize) / 2.0
+              xIn += args->offset_x;
+              yIn += args->offset_y;
 
-              if ((xIn > inNumCols - xOffset)||
-                  (yIn > inNumRows - yOffset)||
-                  (xIn < xOffset)||
-                  (yIn < yOffset)) {
+              if ((xIn > inNumCols - args->offset_x)||
+                  (yIn > inNumRows - args->offset_y)||
+                  (xIn < args->offset_x)||
+                  (yIn < args->offset_y)) {
                 continue;
               }
-            }           
+            }
             
             if (xIn < 0 || xIn >= inNumCols || yIn < 0 || yIn >= inNumRows) {