Changeset 36360

Timestamp:

Dec 9, 2013, 12:51:46 PM (13 years ago)

Author:

watersc1

Message:

Update to ppSkycell to switch to exptime=1.0 target. Change to filerule to ensure we write 32-bit images. Change to script to support exptime scaling

Location:

trunk

Files:

• ippScripts/scripts/skycell_jpeg.pl (modified) (2 diffs)
• ippconfig/recipes/filerules-split.mdc (modified) (1 diff)
• ppSkycell/src/ppSkycellLoop.c (modified) (4 diffs)

trunk/ippScripts/scripts/skycell_jpeg.pl

@@ -271 +271 @@
 
     my %products = ('image' => "PPSTACK.UNCONV",
-                    'mask'  => "PPSTACK.UNCONV.MASK",
+#                   'mask'  => "PPSTACK.UNCONV.MASK",
                     'variance' => "PPSTACK.UNCONV.VARIANCE",
                     'exp'   => "PPSTACK.UNCONV.EXP",
@@ -327 +327 @@
                 $command .= " -Di BIN1 1 -Di BIN2 1 ";
             }
-#           elsif ($key eq 'image') {
-#               $command .= " -masks $tangents{$projection_cell}{mask}{NAME} ";
-#           }
-#           elsif ($key eq 'mask') { 
-#               next; # This should be made with the images.
-#           }
-            else {
-                # Append the image list to other objects, in case the WCS information is unpopulated
-                $command .= " -wcsref $tangents{$projection_cell}{image}{NAME} ";
-            }
+            elsif ($key eq 'image') {
+                $command .= " -exptimeOrder 1 ";
+            }
+            elsif ($key eq 'variance') { 
+                $command .= " -exptimeOrder 2 ";
+            }
+            # Append the image list to other objects, in case the WCS information is unpopulated
+            $command .= " -wcsref $tangents{$projection_cell}{image}{NAME} ";
+
             if ($tangents{$projection_cell}{$key}{N} > 0) {
                 print "$command\n";

trunk/ippconfig/recipes/filerules-split.mdc

@@ -380 +380 @@
 PPSKYCELL.JPEG1              OUTPUT {OUTPUT}.0.b1.jpeg     JPEG            NONE       CHIP       TRUE      NONE
 PPSKYCELL.JPEG2              OUTPUT {OUTPUT}.0.b2.jpeg     JPEG            NONE       CHIP       TRUE      NONE
-PPSKYCELL.BIN1               OUTPUT {OUTPUT}.b1.fits     IMAGE     COMP_IMG       FPA        TRUE      NONE
-PPSKYCELL.BIN2               OUTPUT {OUTPUT}.b2.fits     IMAGE     COMP_IMG       FPA       TRUE      NONE
+PPSKYCELL.BIN1               OUTPUT {OUTPUT}.b1.fits     IMAGE     NONE       FPA        TRUE      NONE
+PPSKYCELL.BIN2               OUTPUT {OUTPUT}.b2.fits     IMAGE     NONE       FPA       TRUE      NONE
 PPSKYCELL.BIN1.MASK          OUTPUT {OUTPUT}.b1.mk.fits     MASK     COMP_MASK       FPA        TRUE      NONE
 PPSKYCELL.BIN2.MASK          OUTPUT {OUTPUT}.b2.mk.fits     MASK     COMP_MASK       FPA       TRUE      NONE

trunk/ppSkycell/src/ppSkycellLoop.c

@@ -158 +158 @@
     }
 
-    psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
-    psVectorStats(stats,exptimes,NULL, NULL, 0);
+    float exptime_target = 1.0;
+
+    //    psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
+    //    psVectorStats(stats,exptimes,NULL, NULL, 0);
+    //    exptime_target = stats->robustMedian;
     
     pmFPAfileActivate(data->config->files, false, NULL);
@@ -258 +261 @@
 
             // Scale by exposure time
-            double exptime_factor = pow(exptimes->data.F64[j]/stats->robustMedian,data->exptimeOrder);
+            double exptime_factor = pow(exptimes->data.F64[j]/exptime_target,data->exptimeOrder);
             if ((isfinite(exptime_factor))&&(exptime_factor != 0.0)) {
               psBinaryOp(bin1RO->image,bin1RO->image,"/",
@@ -424 +427 @@
           psMetadataItem *item1;
           item1 = psMetadataLookup(Fcell1->concepts,"CELL.EXPOSURE");
-          item1->data.F32 = stats->robustMedian;
+          item1->data.F32 = exptime_target;
 
           pmReadout *Fro1 = pmReadoutAlloc(Fcell1);
@@ -474 +477 @@
 
           psMetadataItem *item2 = psMetadataLookup(Fcell2->concepts,"CELL.EXPOSURE");
-          item2->data.F32 = stats->robustMedian;
+          item2->data.F32 = exptime_target;
           
           pmReadout *Fro2 = pmReadoutAlloc(Fcell2);