Changeset 25210 for branches/czw_branch/cleanup/ppImage/src/ppImageBurntoolMask.c

Timestamp:

Aug 26, 2009, 4:56:14 PM (17 years ago)

Author:

watersc1

Message:

alterations to ppImage to allow masking of burntool remnants by ppImage.

File:

• branches/czw_branch/cleanup/ppImage/src/ppImageBurntoolMask.c (modified) (6 diffs)

branches/czw_branch/cleanup/ppImage/src/ppImageBurntoolMask.c

@@ -3 +3 @@
 #endif
 
+#define PPIMAGE_BURNTOOL_DEBUG 1
+
 #include "ppImage.h"
 
-bool ppImageBurntoolMask (pmConfig *config, ppImageOptions *options, pmFPAview *view) {
-
+bool ppImageBurntoolMask (pmConfig *config, ppImageOptions *options, pmFPAview *view,pmReadout *mask) {
   bool status = true;
+  int burntool_cell;
+  /* Find input filename */
   pmFPAfile *inputFile = psMetadataLookupPtr(&status , config->files, "PPIMAGE.INPUT");
   if (!status) {
@@ -13 +16 @@
     return(false);
   }
-
   psFits *fits = inputFile->fits;
 
+  /* Read input header, and find the burntool data table. */
+  psMetadata *phu = psFitsReadHeader(NULL, fits);
+  
   if (!psFitsMoveExtName(fits,"burntool_areas")) {
     psError(PS_ERR_IO,false, "Unable to find extension burntool_areas");
@@ -21 +26 @@
   }
   long Nrows = psFitsTableSize(fits);  
+
   long row = 0;
-  
-  pmFPAview *detview = pmFPAviewAlloc(0);
-  *detview = *view;
-  detview->readout = 0;
-  pmReadout *mask = pmFPAfileThisReadout(config->files,detview,"PPIMAGE.MASK");
+
+  psLogMsg ("ppImageBurntoolMask", 4, "Inside burntool mask %ld", Nrows);
+
+  /* Redirects and Memory juggling. */
+  view->readout = 0;
   psImage *image = mask->mask;
 
-  psImageMaskType maskValue = psMetadataLookupS32(&status,config->files,"PPIMAGE.BURNTOOL_MASK");
   
+  /* Set the maskValue from the recipes. */
+  psImageMaskType maskValue = options->burntoolMask;
+#ifdef PPIMAGE_BURNTOOL_DEBUG
+  psLogMsg("ppImageBurntoolMask", 4, "Status: %ld %d\n",Nrows,maskValue);
+#endif
+
+  burntool_cell = view->cell;
+  burntool_cell = (view->cell % 8) * 8 + (view->cell - (view->cell % 8)) / 8;
+  psLogMsg("ppImageBurntoolMask", 4, "Cell mapping: %d %d %d\n",view->cell,burntool_cell,-1);
   for (row = 0; row < Nrows; row++) {
     psMetadata *rowMD = psFitsReadTableRow(fits,row);
 
-    if (psMetadataLookupS32(&status,rowMD,"cell") == detview->cell) {
-
-      if (psMetadataLookupS32(&status,rowMD,"func") != -1) { // This should be an actual check
-
+    if (psMetadataLookupS32(&status,rowMD,"cell") == burntool_cell) {
+      if (((options->burntoolTrails & 0x01)&&(psMetadataLookupS32(&status,rowMD,"nfit") == 0))||
+          ((options->burntoolTrails & 0x02)&&(psMetadataLookupS32(&status,rowMD,"up") == 1))||
+          ((options->burntoolTrails & 0x04)&&(psMetadataLookupS32(&status,rowMD,"up") == 0))) {
+        /*       If the fit fails, burntool reports zero here.  This
+                 signifies that it expected to see a trail (else why
+                 fit) but did not find it when it attempted to
+                 correct. */
+#ifdef PPIMAGE_BURNTOOL_DEBUG
+        psLogMsg ("ppImageBurntoolMask", 4, "Masking! %d (%d %d %d) %d %d",
+                  psMetadataLookupS32(&status,rowMD,"cell"),
+                  ((options->burntoolTrails & 0x0001)&&(psMetadataLookupS32(&status,rowMD,"nfit") == 0)),
+                  ((options->burntoolTrails & 0x02)&&(psMetadataLookupS32(&status,rowMD,"up") == 1)),
+                  ((options->burntoolTrails & 0x04)&&(psMetadataLookupS32(&status,rowMD,"up") == 0)),
+                  options->burntoolTrails,
+                  maskValue
+                  );
+#endif
         for (int i = psMetadataLookupS32(&status,rowMD,"sxfit");
              i <= psMetadataLookupS32(&status,rowMD,"exfit");
@@ -44 +72 @@
           if (psMetadataLookupS32(&status,rowMD,"up") == 0) {
             for (int j = 0; j <= psMetadataLookupS32(&status,rowMD,"y1p"); j++) {
+/* #ifdef PPIMAGE_BURNTOOL_DEBUG */
+/*            psLogMsg("ppImageBurntoolMask", 4, "Noisy!: %d %d %d %d\n", */
+/*                     i,j,image->data.PS_TYPE_IMAGE_MASK_DATA[j][i],maskValue); */
+/* #endif */
               image->data.PS_TYPE_IMAGE_MASK_DATA[j][i] |= maskValue;
             }
@@ -49 +81 @@
           else {
             for (int j = psMetadataLookupS32(&status,rowMD,"y1m"); j < image->numRows ; j++) {
+/* #ifdef PPIMAGE_BURNTOOL_DEBUG */
+/*            psLogMsg("ppImageBurntoolMask", 4, "Noisy!: %d %d %d %d\n", */
+/*                     i,j,image->data.PS_TYPE_IMAGE_MASK_DATA[j][i],maskValue); */
+/* #endif */
               image->data.PS_TYPE_IMAGE_MASK_DATA[j][i] |= maskValue;
             }
@@ -56 +92 @@
       }
     }
+    psFree(rowMD);
   }
-
+  psFree(phu);
   return(status);
 }