Changeset 34902 for branches/eam_branches/ipp-20121219

Timestamp:

Jan 10, 2013, 11:33:10 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121219

Files:

• . (modified) (view diffs)
• ippMonitor (modified) (view diffs)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (view diffs)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (view diffs)
• ippScripts/scripts/magic_destreak.pl (modified) (view diffs)
• ippScripts/scripts/nightly_science.pl (modified) (view diffs)
• ippTasks (modified) (view diffs)
• ippTasks/nightly_science.pro (modified) (view diffs)
• ippToPsps (modified) (view diffs)
• ippToPsps/config/IN/tables.vot (modified) (view diffs)
• ippToPsps/config/P2/tables.vot (modified) (view diffs)
• ippToPsps/config/ST/tables.vot (modified) (view diffs)
• ippToPsps/jython/detectionbatch.py (modified) (view diffs)
• ippToPsps/jython/gpc1db.py (modified) (view diffs)
• ippToPsps/jython/stackbatch.py (modified) (view diffs)
• ippToPsps/perl/pspsSchema2xml.pl (modified) (view diffs)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (view diffs)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (view diffs)
• ippTools/share/pxadmin_create_tables.sql (modified) (view diffs)
• ippTools/share/warptool_towarped.sql (modified) (view diffs)
• ippTools/src (modified) (view diffs)
• ippTools/src/magictool.c (modified) (view diffs)
• ippTools/src/warptoolConfig.c (modified) (view diffs)
• ippconfig (modified) (view diffs)
• ippconfig/recipes/ppStack.config (modified) (view diffs)
• ippconfig/recipes/ppSub.config (modified) (view diffs)
• ippconfig/recipes/psphot.config (modified) (view diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (view diffs)
• ppImage/src (modified) (view diffs)
• ppStack/src (modified) (view diffs)
• ppStack/src/ppStackCombinePrepare.c (modified) (view diffs)
• ppStack/src/ppStackLoop.c (modified) (view diffs)
• psModules (modified) (view diffs)
• psphot (modified) (view diffs)
• psphot/src (modified) (view diffs)
• psphot/src/psphotStackImageLoop.c (modified) (view diffs)
• pstamp/scripts (modified) (view diffs)
• psvideophot (modified) (view diffs)
• tools/queuessky.lap (copied) (copied from trunk/tools/queuessky.lap ) (view diffs)
• tools/run.relastro (copied) (copied from trunk/tools/run.relastro ) (view diffs)
• tools/run.relphot (copied) (copied from trunk/tools/run.relphot ) (view diffs)
• tools/run.setphot (copied) (copied from trunk/tools/run.setphot ) (view diffs)

branches/eam_branches/ipp-20121219/ppStack/src

@@ -6 +6 @@
 *.la
 ppStack
+ppStackMedian
 config.h
 config.h.in
@@ -12 +13 @@
 ppStackErrorCodes.c
 ppStackErrorCodes.h
+

@@ -6 +6 @@
 *.la
 ppStack
+ppStackMedian
 config.h
 config.h.in
@@ -12 +13 @@
 ppStackErrorCodes.c
 ppStackErrorCodes.h
+

@@ -6 +6 @@
 *.la
 ppStack
+ppStackMedian
 config.h
 config.h.in
@@ -12 +13 @@
 ppStackErrorCodes.c
 ppStackErrorCodes.h
+