Changeset 25398

Timestamp:

Sep 15, 2009, 3:58:12 PM (17 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/20090715/tools

Files:

• diff_outputs.pl (modified) (2 diffs)
• examine_burntool_pcontrol.pl (copied) (copied from trunk/tools/examine_burntool_pcontrol.pl )
• ipp_apply_burntool.pl (modified) (2 diffs)
• make_burntool_pcontrol.pl (copied) (copied from trunk/tools/make_burntool_pcontrol.pl )

branches/eam_branches/20090715/tools/diff_outputs.pl

@@ -16 +16 @@
                                           'SOURCES', 'JPEG1', 'JPEG2',
                                           'KERNEL' ],
-                           'ALL' => [ 'IMAGE', 'MASK', 'VARIANCE',
-                                      'SOURCES', 'JPEG1', 'JPEG2',
-                                      'KERNEL', 'INVERSE.IMAGE',
-                                      'INVERSE.MASK', 'INVERSE.VARIANCE',
-                                      'INVERSE.SOURCES' ],
+                           'ALL' => [ 'IMAGE', 'MASK', 'VARIANCE', 'SOURCES', 'JPEG1', 'JPEG2', 'KERNEL',
+                                      'INVERSE.IMAGE', 'INVERSE.MASK', 'INVERSE.VARIANCE', 'INVERSE.SOURCES',
+                                      'INCONV.IMAGE', 'INCONV.MASK', 'INCONV.VARIANCE',
+                                      'REFCONV.IMAGE', 'REFCONV.MASK', 'REFCONV.VARIANCE',
+                               ],
                            'INVERSE' => [ 'INVERSE.IMAGE', 'INVERSE.MASK',
                                           'INVERSE.VARIANCE',
@@ -38 +38 @@
                              'INVERSE.VARIANCE' => '.inv.wt.fits', # Variance
                              'INVERSE.SOURCES' => '.inv.cmf', # Sources
+                             'INCONV.IMAGE' => '.inConv.fits', # Convolved input image
+                             'INCONV.MASK' => '.inConv.mk.fits', # Convolved input mask
+                             'INCONV.VARIANCE' => '.inConv.wt.fits', # Convolved input variance
+                             'REFCONV.IMAGE' => '.refConv.fits', # Convolved reference image
+                             'REFCONV.MASK' => '.refConv.mk.fits', # Convolved reference mask
+                             'REFCONV.VARIANCE' => '.refConv.wt.fits', # Convolved reference variance
                          };
 

branches/eam_branches/20090715/tools/ipp_apply_burntool.pl

@@ -140 +140 @@
     my $tempfile = new File::Temp ( TEMPLATE => "$basename.XXXX", 
                                     DIR => '/tmp',
-                                    UNLINK => !$save_temps);
+                                    UNLINK => !$save_temps,
+                                    SUFFIX => '.fits');
     my $tmpImfileReal = $tempfile->filename;
     # print "tmpImfile: $tmpImfile -> $tmpImfileReal\n";
@@ -172 +173 @@
 
         if ($RAWTABLES) {
-            $status = vsystem ("$burntool $tmpImfileReal out=$artImfileReal $prevFileOpt", $REALRUN);
+            $status = vsystem ("$burntool $tmpImfileReal out=$artImfileReal $prevFileOpt persist=t", $REALRUN);
         } else {
-            $status = vsystem ("$burntool $tmpImfileReal $prevFileOpt", $REALRUN);
+            $status = vsystem ("$burntool $tmpImfileReal $prevFileOpt persist=t", $REALRUN);
         }
         if ($status) {