Changeset 34623

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

Files:

• ppSkycell/src/ppSkycellCamera.c (modified) (1 diff)
• ppSkycell/src/ppSkycellLoop.c (modified) (4 diffs)
• ppStack/src/ppStackCamera.c (modified) (1 diff)
• ppStack/src/ppStackCleanup.c (modified) (1 diff)
• ppStack/src/ppStackCombineFinal.c (modified) (3 diffs)
• ppStack/src/ppStackCombinePrepare.c (modified) (2 diffs)
• ppStack/src/ppStackFiles.c (modified) (1 diff)
• ppStack/src/ppStackLoop.c (modified) (1 diff)
• ppStack/src/ppStackThread.c (modified) (3 diffs)
• ppStack/src/ppStackUpdateHeader.c (modified) (2 diffs)
• psModules/src/camera/pmFPAfileIO.c (modified) (1 diff)

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;
+
+          
         }
 

branches/czw_branch/20120906/ppStack/src/ppStackCamera.c

@@ -223 +223 @@
               pmFPAfile *inputBKG = defineFile(config,NULL,"PPSTACK.INPUT.BKGMODEL",bkgmodel,
                                                PM_FPA_FILE_IMAGE);
-              fprintf(stderr,"ppSC: %s\n",bkgmodel);
               if (!inputBKG) {
                 psError(psErrorCodeLast(), false,

branches/czw_branch/20120906/ppStack/src/ppStackCleanup.c

@@ -28 +28 @@
     options->expRO = NULL;
 
-    options->bkgRO->data_exists = false;
-    options->bkgRO->parent->data_exists = false;
-    options->bkgRO->parent->parent->data_exists = false;
-    psFree(options->bkgRO);
-    options->bkgRO = NULL;
+    if (options->bkgRO) {
+      options->bkgRO->data_exists = false;
+      options->bkgRO->parent->data_exists = false;
+      options->bkgRO->parent->parent->data_exists = false;
+      psFree(options->bkgRO);
+      options->bkgRO = NULL;
+    }
     
     for (int i = 0; i < options->num; i++) {

branches/czw_branch/20120906/ppStack/src/ppStackCombineFinal.c

@@ -27 +27 @@
     return(false);
   }
+#if 0
   if (!ppStackWriteImage("/tmp/test_forced.bkgmdl.fits",
                          bkgRO->parent->parent->parent->hdu->header,
@@ -33 +34 @@
     fprintf(stderr,"Failed to write image because fail.\n");
   }
-  
+#endif
   for (int i = 0; i < options->num; i++) {
     pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.BKGMODEL", i);
@@ -53 +54 @@
   bkgRO->parent->data_exists = true;
   bkgRO->parent->parent->data_exists = true;
+  
   return(true);
 }

branches/czw_branch/20120906/ppStack/src/ppStackCombinePrepare.c

@@ -60 +60 @@
       options->bkgRO->parent->parent->parent->concepts = psMetadataCopy(options->bkgRO->parent->parent->parent->concepts,
                                                                         ro->parent->parent->parent->concepts);
+
     }
 
@@ -84 +85 @@
         return false;
       }
+      
+
+      
     }
 

branches/czw_branch/20120906/ppStack/src/ppStackFiles.c

@@ -27 +27 @@
 static char *filesUnconv[] = { "PPSTACK.UNCONV", "PPSTACK.UNCONV.MASK", "PPSTACK.UNCONV.VARIANCE",
                                "PPSTACK.UNCONV.EXP", "PPSTACK.UNCONV.EXPNUM", "PPSTACK.UNCONV.EXPWT",
-                               "PPSTACK.OUTPUT.BKGMODEL",
                                NULL };
 

branches/czw_branch/20120906/ppStack/src/ppStackLoop.c

@@ -193 +193 @@
 
         // Prepare for combination
-        if (!ppStackCombinePrepare("PPSTACK.UNCONV", "PPSTACK.UNCONV.EXP", "PPSTACK.OUTPUT.BKGMODEL", PPSTACK_FILES_UNCONV,
+        if (!ppStackCombinePrepare("PPSTACK.UNCONV", "PPSTACK.UNCONV.EXP", NULL, PPSTACK_FILES_UNCONV,
                                    stack, options, config)) {
             psError(psErrorCodeLast(), false, "Unable to prepare for combination.");

branches/czw_branch/20120906/ppStack/src/ppStackThread.c

@@ -35 +35 @@
             psFitsClose(stack->varianceFits->data[i]);
         }
-/*         if (stack->bkgFits->data[i]) { */
-/*             psFitsClose(stack->bkgFits->data[i]); */
-/*         } */
         stack->imageFits->data[i] = stack->maskFits->data[i] = stack->varianceFits->data[i] = NULL;
     }
@@ -57 +54 @@
     const psArray *varianceNames = conv ? options->convVariances : options->origVariances; // Variance names
     const psArray *covariances = conv ? options->convCovars : options->origCovars; // Covariance matrices
-    const psArray *bkgNames = options->bkgImages;
+
     PS_ASSERT_ARRAY_NON_NULL(cells, NULL);
     if (imageNames) {
@@ -100 +97 @@
             psFree(resolved); \
         }
-        fprintf(stderr,"%d %s\n",i,(char*) bkgNames->data[i]);
         IMAGE_OPEN(imageNames, stack->imageFits, i);
         IMAGE_OPEN(maskNames, stack->maskFits, i);
         IMAGE_OPEN(varianceNames, stack->varianceFits, i);
-        //      IMAGE_OPEN(bkgNames, stack->bkgFits, i);
     }
 

branches/czw_branch/20120906/ppStack/src/ppStackUpdateHeader.c

@@ -6 +6 @@
 
     pmReadout *outRO = options->outRO;                                      // Output readout
+    pmReadout *expRO = options->expRO;
 
     // Propagate WCS
@@ -123 +124 @@
         snprintf (field, 64, "AIR_%04d", i);
         psMetadataAddF32(hdu->header, PS_LIST_TAIL, field, PS_META_REPLACE, "input image airmass", value);
-    }   
+    }
+
+    // Copy information into expRO, because it should be there too.
+    pmHDU *expROhdu = pmHDUFromCell(expRO->parent);
+    if (!expROhdu->header) {
+      expROhdu->header = psMetadataAlloc();
+    }
+    expRO->parent->parent->parent->hdu->header = psMetadataCopy(expRO->parent->parent->parent->hdu->header,
+                                                                outRO->parent->parent->parent->hdu->header);
+    
+    expRO->parent->concepts = psMetadataCopy(expRO->parent->concepts,
+                                             outRO->parent->concepts);
+    expRO->parent->parent->concepts = psMetadataCopy(expRO->parent->parent->concepts,
+                                                     outRO->parent->concepts);
+    expRO->parent->parent->parent->concepts = psMetadataCopy(expRO->parent->parent->parent->concepts,
+                                                             outRO->parent->parent->parent->concepts);
+    
+    
     return true;
 }

branches/czw_branch/20120906/psModules/src/camera/pmFPAfileIO.c

@@ -76 +76 @@
     while ((item = psMetadataGetAndIncrement (iter)) != NULL) {
         pmFPAfile *file = item->data.V;
-
         switch (place) {
           case PM_FPA_BEFORE: