Changeset 34080 for trunk/ippScripts

Timestamp:

Jun 26, 2012, 11:18:50 AM (14 years ago)

Author:

eugene

Message:

changes to configure.ac to support debug-build; fixes for pedantic gcc warnings

Location:

trunk/ippScripts

Files:

• . (modified) (1 prop)
• scripts/addstar_run.pl (modified) (3 diffs)
• scripts/destreak_restore_camera.pl (modified) (1 prop)
• scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• scripts/magic_destreak.pl (modified) (1 prop)

trunk/ippScripts

@@ +1 @@
+MYMETA.json
+MYMETA.yml
 Build
 META.yml

@@ +1 @@
+MYMETA.json
+MYMETA.yml
 Build
 META.yml

trunk/ippScripts/scripts/addstar_run.pl

@@ -261 +261 @@
            
             my $realFile = $ipprc->file_resolve($fpaObjects) or  &my_die("Unable to resolve $fpaObjects", $add_id, $PS_EXIT_SYS_ERROR);
-            
-            
-           
+
+            # most cameras use CHIP_HEADER.  other exceptions:
+            # gpc1 @ camera : PHU_HEADER
+            # gpc1 @ staticsky : NOMINAL (is uncalibrated)
+
+            # temporary hard-wired info
+            my $zeroPointOption = "CHIP_HEADER";
+            if (($camdir =~ /gpc1/) && ($stage =~ /staticsky/)) {
+                $zeroPointOption = "NOMINAL";
+            }           
+            if (($camdir =~ /gpc1/) && ($stage =~ /cam/)) {
+                $zeroPointOption = "PHU_HEADER";
+            }           
 
             # require a defined output dvo database to run addstar (ie, refuse to use the .ptolemyrc default)
@@ -269 +279 @@
             $command .= " -D CAMERA $camdir";
             $command .= " -D CATDIR $minidvodb_path";
+            $command .= " -D ZERO_POINT_OPTION $zeroPointOption";
             $command .= " $realFile";
             $command .= " -use-name $fpaObjects"; # DVO wants the neb-name as a file reference
@@ -275 +286 @@
                 $command .= " -accept-astrom ";
             }  #careful here - this matches staticsky and staticsky_multi
+
             my $mjd_addstar_start = DateTime->now->mjd;   # MJD of starting script
 

@@ +1 @@
+MYMETA.json
+MYMETA.yml
 Build
 META.yml