Changeset 34624

Timestamp:

Oct 29, 2012, 2:45:03 PM (14 years ago)

Author:

watersc1

Message:

Fixed missing mask issue.

Location:

branches/czw_branch/20120906/ppSkycell/src

Files:

• ppSkycellCamera.c (modified) (1 diff)
• ppSkycellLoop.c (modified) (3 diffs)

branches/czw_branch/20120906/ppSkycell/src/ppSkycellCamera.c

@@ -113 +113 @@
         return false;
     }
-    if (!pmFPAfileDefineOutput(data->config, bin1->fpa , "PPSKYCELL.BIN1.MASK")) {
+    if (data->masksName) {
+      pmFPAfile *mask1 = pmFPAfileDefineOutput(data->config, bin1->fpa , "PPSKYCELL.BIN1.MASK");
+      if (!mask1) {
         psError(psErrorCodeLast(), false, "Unable to define output.");
         return false;
-    }
-    if (!pmFPAfileDefineOutput(data->config, bin2->fpa, "PPSKYCELL.BIN2.MASK")) {
+      }
+      mask1->save = true;
+      pmFPAfile *mask2 = pmFPAfileDefineOutput(data->config, bin2->fpa , "PPSKYCELL.BIN2.MASK");
+      if (!mask2) {
         psError(psErrorCodeLast(), false, "Unable to define output.");
         return false;
+      }
+      mask2->save = true;
     }
 

branches/czw_branch/20120906/ppSkycell/src/ppSkycellLoop.c

@@ -294 +294 @@
           pmFPAfileActivate(data->config->files, true, "PPSKYCELL.BIN1");
           pmFPAfileActivate(data->config->files, true, "PPSKYCELL.BIN2");
-/*        if (data->masksName) { */
-/*          pmFPAfileActivate(data->config->files, true, "PPSKYCELL.BIN1.MASK"); */
-/*          pmFPAfileActivate(data->config->files, true, "PPSKYCELL.BIN2.MASK"); */
-/*        } */
+          if (data->masksName) {
+            pmFPAfileActivate(data->config->files, true, "PPSKYCELL.BIN1.MASK");
+            pmFPAfileActivate(data->config->files, true, "PPSKYCELL.BIN2.MASK");
+          }
         }
         
@@ -406 +406 @@
 
           // Do the mask if we need to
-/*        if (data->masksName) { */
+          if (data->masksName) {
 /*          pmFPAfile *Mask1 = pmFPAfileSelectSingle(data->config->files, "PPSKYCELL.BIN1.MASK", 0); */
-/*          Mask1->fpa->hdu = pmHDUAlloc(NULL); */
-/*          Mask1->fpa->hdu->header = psMetadataAlloc(); */
-/*          psMetadataCopy(Mask1->fpa->hdu->header,fits1->fpa->hdu->header); */
+/*          //      Mask1->fpa->hdu = pmHDUAlloc(NULL); */
+/*          //      Mask1->fpa->hdu->header = psMetadataAlloc(); */
+/*          //      psMetadataCopy(Mask1->fpa->hdu->header,fits1->fpa->hdu->header); */
 /*          pmChip *Mchip1 = pmFPAfileThisChip(data->config->files, view, "PPSKYCELL.BIN1.MASK"); */
 /*          psMetadataAddS32(Mchip1->concepts,PS_LIST_TAIL,"CHIP.XPARITY", PS_META_REPLACE,"",1); */
@@ -428 +428 @@
 /*          Mask1->save = true; */
 /*          Mask1->fileIndex = i; */
-/*        } */
+          }