Changeset 34750 for trunk

Timestamp:

Nov 30, 2012, 10:08:42 AM (13 years ago)

Author:

eugene

Message:

merge from eam/20120905

Location:

trunk

Files:

• . (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippScripts/scripts/addstar_run.pl (modified) (1 diff)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• mops/OrbFit_4 (modified) (1 prop)
• mops/oorb (modified) (1 prop)
• mops/trunk (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/doc/galaxy.models.txt (copied) (copied from branches/eam_branches/ipp-20120905/psphot/doc/galaxy.models.txt )
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• psvideophot (modified) (1 prop)

trunk/ippScripts/scripts/addstar_run.pl

@@ -300 +300 @@
             $command .= " -image" if $image_only;
             if ($stage =~ /staticsky/) {
-                $command .= " -accept-astrom ";
+                $command .= " -accept-astrom -quick-airmass";
+            }  #careful here - this matches staticsky and staticsky_multi
+            if ($stage =~ /skycal/) {
+                $command .= " -quick-airmass";
             }  #careful here - this matches staticsky and staticsky_multi