Changeset 34531

Timestamp:

Oct 12, 2012, 4:12:45 PM (14 years ago)

Author:

watersc1

Message:

Finally was able to get a background model out of ppStack. Now to get a background restored model out as well.

Location:

branches/czw_branch/20120906

Files:

• ippScripts/scripts/stack_skycell.pl (modified) (2 diffs)
• ippconfig/gpc1/pswarp.config (modified) (1 diff)
• ippconfig/recipes/filerules-mef.mdc (modified) (2 diffs)
• ippconfig/recipes/filerules-simple.mdc (modified) (2 diffs)
• ippconfig/recipes/filerules-split.mdc (modified) (2 diffs)
• ppStack/src/ppStackCombineFinal.c (modified) (3 diffs)
• ppStack/src/ppStackCombinePrepare.c (modified) (2 diffs)
• ppStack/src/ppStackFiles.c (modified) (1 diff)

branches/czw_branch/20120906/ippScripts/scripts/stack_skycell.pl

@@ -229 +229 @@
     my $sources = $ipprc->filename("PSWARP.OUTPUT.SOURCES", $file->{path_base}); # Sources name
 
+    my $bkgmodel = $ipprc->filename("PSWARP.OUTPUT.BKGMODEL", $file->{path_base});
+
     &my_die("Image $image does not exist", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists( $image );
     &my_die("Mask $mask does not exist", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists( $mask );
@@ -240 +242 @@
     print $listFile "\tPSF\tSTR\t" . $psf . "\n" if $convolve;
     print $listFile "\tSOURCES\tSTR\t" . $sources . "\n";
+    print $listFile "\tBKGMODEL\tSTR\t" . $bkgmodel . "\n" if $ipprc->file_exists( $bkgmodel );
 
     print $listFile "END\n\n";

branches/czw_branch/20120906/ippconfig/gpc1/pswarp.config

@@ -1 +1 @@
 ASTROM.SOURCE           STR     PSASTRO.OUTPUT  # Source file rule for astrometry, or NULL
+BACKGROUND.MODEL        BOOL    TRUE
+BKG.XGRID               S32     50
+BKG.YGRID               S32     50

branches/czw_branch/20120906/ippconfig/recipes/filerules-mef.mdc

@@ -125 +125 @@
 PPSTACK.INPUT.PSF       INPUT    @FILES        CHIP       PSF
 PPSTACK.INPUT.SOURCES   INPUT    @FILES        FPA        CMF
+PPSTACK.INPUT.BKGMODEL    INPUT    @FILES        FPA        IMAGE
 
 ## files used by ppstamp
@@ -311 +312 @@
 PPSTACK.OUTPUT.JPEG1    OUTPUT {OUTPUT}.b1.jpg                   JPEG      NONE       FPA        TRUE      NONE
 PPSTACK.OUTPUT.JPEG2    OUTPUT {OUTPUT}.b2.jpg                   JPEG      NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGMODEL OUTPUT {OUTPUT}.mdl.fits                 IMAGE     NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGREST  OUTPUT {OUTPUT}.bkgrest.fits             IMAGE            NONE       FPA        TRUE      NONE
 PPSTACK.CONFIG          OUTPUT {OUTPUT}.ppStack.mdc              TEXT      NONE       FPA        TRUE      NONE
                                                                                      

branches/czw_branch/20120906/ippconfig/recipes/filerules-simple.mdc

@@ -107 +107 @@
 PPSTACK.INPUT.PSF         INPUT    @FILES        CHIP       PSF
 PPSTACK.INPUT.SOURCES     INPUT    @FILES        FPA        CMF
+PPSTACK.INPUT.BKGMODEL    INPUT    @FILES        FPA        IMAGE
 
 ## files used by ppstamp
@@ -291 +292 @@
 PPSTACK.OUTPUT.JPEG1         OUTPUT {OUTPUT}.b1.jpg               JPEG            NONE       FPA        TRUE      NONE
 PPSTACK.OUTPUT.JPEG2         OUTPUT {OUTPUT}.b2.jpg               JPEG            NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGMODEL      OUTPUT {OUTPUT}.mdl.fits             IMAGE           NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGREST       OUTPUT {OUTPUT}.bkgrest.fits         IMAGE           NONE       FPA        TRUE      NONE
 PPSTACK.CONFIG               OUTPUT {OUTPUT}.ppStack.mdc          TEXT            NONE       FPA        TRUE      NONE
                                              

branches/czw_branch/20120906/ippconfig/recipes/filerules-split.mdc

@@ -127 +127 @@
 PPSTACK.INPUT.PSF         INPUT    @FILES        CHIP       PSF
 PPSTACK.INPUT.SOURCES     INPUT    @FILES        FPA        CMF
+PPSTACK.INPUT.BKGMODEL    INPUT    @FILES        FPA        IMAGE
                           
 ## files used by ppstamp  
@@ -324 +325 @@
 PPSTACK.OUTPUT.JPEG1         OUTPUT {OUTPUT}.b1.jpg                   JPEG            NONE       FPA        TRUE      NONE
 PPSTACK.OUTPUT.JPEG2         OUTPUT {OUTPUT}.b2.jpg                   JPEG            NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGMODEL      OUTPUT {OUTPUT}.mdl.fits                 IMAGE           NONE       FPA        TRUE      NONE
+PPSTACK.OUTPUT.BKGREST       OUTPUT {OUTPUT}.bkgrest.fits             IMAGE           NONE       FPA        TRUE      NONE
 PPSTACK.CONFIG               OUTPUT {OUTPUT}.ppStack.mdc              TEXT            NONE       FPA        TRUE      NONE
 

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

@@ -15 +15 @@
   
   psArray *inputs  = psArrayAlloc(options->num);
-  //  const psArray *cells = options->cells;
   for (int i = 0; i < options->num; i++) {
     ppStackFileActivationSingle(config, PPSTACK_FILES_BKG, true, i);
@@ -23 +22 @@
     inputs->data[i] = ro;
     pmFPAfileClose(file,view);
-    ppStackFileActivationSingle(config, PPSTACK_FILES_BKG, false, i);
   }
   if (!pmStackSimpleMedianCombine(bkgRO,inputs)) {
@@ -29 +27 @@
     return(false);
   }
-/*   for (int i = 0; i < options->num; i++) { */
-/*     //    ppStackFilesIterateUp(config); */
-/* /\*     pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.BKGMODEL", i); *\/ */
-/* /\*     pmFPAview *view = ppStackFilesIterateDown(config); *\/ */
-/*     pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.BKGMODEL", i); */
-    
-/*     ppStackFileActivationSingle(config, PPSTACK_FILES_BKG, false, i); */
-/*   }   */
+  if (!ppStackWriteImage("/tmp/test_forced.bkgmdl.fits",
+                         bkgRO->parent->parent->parent->hdu->header,
+                         bkgRO->image,
+                         config)) {
+    fprintf(stderr,"Failed to write image because fail.\n");
+  }
+  
+  for (int i = 0; i < options->num; i++) {
+    pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.BKGMODEL", i);
+    pmFPAview *view = ppStackFilesIterateDown(config);
+    bool success = pmFPAfileClose(file,view);
+    if (!success) {
+      psTrace("ppStack",5,"I failed at closing a file.\n");
+    }
+              
+    psFitsClose(file->fits);
+    file->fits = NULL;
+    file->header = NULL;
+    file->state = PM_FPA_STATE_CLOSED;
+    file->wrote_phu = false;
+    ppStackFileActivationSingle(config, PPSTACK_FILES_BKG, false, i);
+  }
   psFree(inputs);
-  //  psFree(stack->bkgFits);
   bkgRO->data_exists = true;
+  bkgRO->parent->data_exists = true;
+  bkgRO->parent->parent->data_exists = true;
   return(true);
 }

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

@@ -31 +31 @@
 
     pmCell *bkgCell;
+    int bkg_r0,bkg_c0;
+    int bkg_nC,bkg_nR;
     if (bkgName) {
+      ppStackFileActivationSingle(config, PPSTACK_FILES_BKG, true, 0);
+      pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PPSTACK.INPUT.BKGMODEL", 0);
+      pmFPAview *view = ppStackFilesIterateDown(config);
+      pmReadout *ro = pmFPAviewThisReadout(view,file->fpa);
+
+      bkg_r0 = ro->image->row0;
+      bkg_c0 = ro->image->col0;
+      bkg_nC = ro->image->numCols;
+      bkg_nR = ro->image->numRows;
       bkgCell = pmFPAfileThisCell(config->files, view, bkgName); // Bkg cell
+      
       options->bkgRO = pmReadoutAlloc(bkgCell); // BKG readout
+      //      if (!pmHDUGenerateForFPA(options->bkgRO->parent->parent->parent)) {
+      options->bkgRO->parent->parent->parent->hdu = pmHDUAlloc(NULL);
+      if (!options->bkgRO->parent->parent->parent->hdu) {
+        fprintf(stderr,"failed to generate a HDU for this thing.\n");
+      }
+      options->bkgRO->parent->parent->parent->hdu->header = psMetadataCopy(options->bkgRO->parent->parent->parent->hdu->header,
+                                                                           ro->parent->parent->parent->hdu->header);
+
+      options->bkgRO->parent->concepts = psMetadataCopy(options->bkgRO->parent->concepts,
+                                                        ro->parent->concepts);
+      options->bkgRO->parent->parent->concepts = psMetadataCopy(options->bkgRO->parent->parent->concepts,
+                                                                ro->parent->parent->concepts);
+      options->bkgRO->parent->parent->parent->concepts = psMetadataCopy(options->bkgRO->parent->parent->parent->concepts,
+                                                                        ro->parent->parent->parent->concepts);
     }
 
@@ -54 +80 @@
 
     if (bkgName) {
-      if (!pmReadoutStackDefineOutput(options->bkgRO, col0, row0, numCols, numRows, false, false, 0)) {
+      if (!pmReadoutStackDefineOutput(options->bkgRO, bkg_c0, bkg_r0, bkg_nC, bkg_nR, false, false, 0)) {
         psError(PPSTACK_ERR_ARGUMENTS, false, "Unable to prepare output.");
         return false;

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

@@ -92 +92 @@
     for (int i = 0; files[i] != NULL; i++) {
         pmFPAfileActivate(config->files, state, files[i]);
-        fprintf(stderr,"ACTIVE: %d %s %d\n",i,files[i],state);
     }
     return;