Changeset 34623 for branches/czw_branch/20120906/ppSkycell

Timestamp:

Oct 29, 2012, 2:26:09 PM (14 years ago)

Author:

watersc1

Message:

ppSkycell binning mostly working, but not for masks yet.

Location:

branches/czw_branch/20120906/ppSkycell/src

Files:

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

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

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

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

@@ -249 +249 @@
             psFree(view);
 
+            //      data->maskVal = 1;
             pmReadout *bin1RO = pmReadoutAlloc(NULL), *bin2RO = pmReadoutAlloc(NULL); // Binned readouts
             if (!pmReadoutRebin(bin1RO, inRO, data->maskVal, data->bin1, data->bin1)) {
@@ -293 +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"); */
+/*        } */
         }
         
@@ -400 +405 @@
           fits1->fileIndex = i;
 
+          // Do the mask if we need to
+/*        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); */
+/*          pmChip *Mchip1 = pmFPAfileThisChip(data->config->files, view, "PPSKYCELL.BIN1.MASK"); */
+/*          psMetadataAddS32(Mchip1->concepts,PS_LIST_TAIL,"CHIP.XPARITY", PS_META_REPLACE,"",1); */
+/*          psMetadataAddS32(Mchip1->concepts,PS_LIST_TAIL,"CHIP.YPARITY", PS_META_REPLACE,"",1); */
+            
+/*          pmCell *Mcell1 = pmFPAfileThisCell(data->config->files, view, "PPSKYCELL.BIN1.MASK"); // Rebinned cell 1 */
+/*          /\*           // This is a hack to get a functioning header created so the fits images can be written out. *\/ */
+/*          psMetadataAddS32(Mcell1->concepts,PS_LIST_TAIL,"CELL.XPARITY", PS_META_REPLACE,"",1); */
+/*          psMetadataAddS32(Mcell1->concepts,PS_LIST_TAIL,"CELL.YPARITY", PS_META_REPLACE,"",1); */
+/*          psMetadataAddS32(Mcell1->concepts,PS_LIST_TAIL,"CELL.READDIR", PS_META_REPLACE,"",1); */
+            
+/*          pmReadout *Mro1 = pmReadoutAlloc(Mcell1); */
+/*          Mro1->image = image1; */
+/*          Mro1->mask = mask1; */
+/*          Mro1->data_exists = Mcell1->data_exists = Mcell1->parent->data_exists = true; */
+            
+/*          Mask1->save = true; */
+/*          Mask1->fileIndex = i; */
+/*        } */
+            
+            
+          
           // Repeat with second binned image
           pmFPAfile *fits2 = pmFPAfileSelectSingle(data->config->files, "PPSKYCELL.BIN2", 0);
@@ -447 +479 @@
           fits2->save = true;
           fits2->fileIndex = i;
+
+          
         }