Changeset 31434

Timestamp:

May 4, 2011, 3:20:38 PM (15 years ago)

Author:

watersc1

Message:

Merging trunk into this branch

Location:

branches/czw_branch/20110406

Files:

• . (modified) (view diffs)
• Nebulous-Server/lib/Nebulous/Server.pm (modified) (view diffs)
• Nebulous-Server/lib/Nebulous/Server/SQL.pm (modified) (view diffs)
• Nebulous/bin/neb-df (modified) (view diffs)
• Ohana/src/addstar/src/GetFileMode.c (modified) (view diffs)
• Ohana/src/addstar/src/ReadImageHeader.c (modified) (view diffs)
• Ohana/src/libfits/table/F_get_column.c (modified) (view diffs)
• Ohana/src/libfits/table/F_set_column.c (modified) (view diffs)
• dbconfig/add.md (modified) (view diffs)
• dbconfig/changes.txt (modified) (view diffs)
• ippMonitor/def/addRunProcessed.d (modified) (view diffs)
• ippMonitor/def/addRunRun.d (modified) (view diffs)
• ippScripts/Build.PL (modified) (view diffs)
• ippScripts/MANIFEST (modified) (view diffs)
• ippScripts/scripts/addstar_run.pl (modified) (view diffs)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (view diffs)
• ippScripts/scripts/nightly_science.pl (modified) (view diffs)
• ippScripts/scripts/stack_skycell.pl (modified) (view diffs)
• ippScripts/scripts/staticsky.pl (modified) (view diffs)
• ippTasks/addstar.pro (modified) (view diffs)
• ippTasks/survey.pro (modified) (view diffs)
• ippToPsps/config/detection/map.xml (modified) (view diffs)
• ippToPsps/config/detection/tables.xml (modified) (view diffs)
• ippToPsps/config/init/data.xml (modified) (view diffs)
• ippToPsps/config/init/tables.vot (modified) (view diffs)
• ippToPsps/config/init/tables.xml (modified) (view diffs)
• ippToPsps/config/stack/map.xml (modified) (view diffs)
• ippToPsps/config/stack/tables.vot (modified) (view diffs)
• ippToPsps/jython/batch.py (modified) (view diffs)
• ippToPsps/jython/config.xml (modified) (view diffs)
• ippToPsps/jython/detectionbatch.py (modified) (view diffs)
• ippToPsps/jython/dvoToMySQL.py (copied) (copied from trunk/ippToPsps/jython/dvoToMySQL.py ) (view diffs)
• ippToPsps/jython/gpc1db.py (modified) (view diffs)
• ippToPsps/jython/initbatch.py (modified) (view diffs)
• ippToPsps/jython/ipptopspsdb.py (modified) (view diffs)
• ippToPsps/jython/mysql.py (copied) (copied from trunk/ippToPsps/jython/mysql.py ) (view diffs)
• ippToPsps/jython/removeFromDatastore.py (copied) (copied from trunk/ippToPsps/jython/removeFromDatastore.py ) (view diffs)
• ippToPsps/jython/run.sh (modified) (view diffs)
• ippToPsps/jython/scratchdb.py (copied) (copied from trunk/ippToPsps/jython/scratchdb.py ) (view diffs)
• ippToPsps/jython/stackbatch.py (modified) (view diffs)
• ippToPsps/perl/pspsSchema2xml.pl (modified) (view diffs)
• ippToPsps/src/Dvo.c (copied) (copied from trunk/ippToPsps/src/Dvo.c ) (view diffs)
• ippToPsps/src/Dvo.h (copied) (copied from trunk/ippToPsps/src/Dvo.h ) (view diffs)
• ippToPsps/src/Makefile.am (modified) (view diffs)
• ippTools/share/Makefile.am (modified) (view diffs)
• ippTools/share/addtool_find_cam_id.sql (modified) (view diffs)
• ippTools/share/addtool_find_cam_id_dvo.sql (modified) (view diffs)
• ippTools/share/addtool_find_pendingexp.sql (modified) (view diffs)
• ippTools/share/addtool_find_pendingexp_cam.sql (copied) (copied from trunk/ippTools/share/addtool_find_pendingexp_cam.sql ) (view diffs)
• ippTools/share/addtool_find_pendingexp_stack.sql (copied) (copied from trunk/ippTools/share/addtool_find_pendingexp_stack.sql ) (view diffs)
• ippTools/share/addtool_find_pendingexp_staticsky.sql (copied) (copied from trunk/ippTools/share/addtool_find_pendingexp_staticsky.sql ) (view diffs)
• ippTools/share/addtool_find_processedexp_cam.sql (copied) (copied from trunk/ippTools/share/addtool_find_processedexp_cam.sql ) (view diffs)
• ippTools/share/addtool_find_processedexp_stack.sql (copied) (copied from trunk/ippTools/share/addtool_find_processedexp_stack.sql ) (view diffs)
• ippTools/share/addtool_find_processedexp_staticsky.sql (copied) (copied from trunk/ippTools/share/addtool_find_processedexp_staticsky.sql ) (view diffs)
• ippTools/share/addtool_find_sky_id.sql (copied) (copied from trunk/ippTools/share/addtool_find_sky_id.sql ) (view diffs)
• ippTools/share/addtool_find_sky_id_dvo.sql (copied) (copied from trunk/ippTools/share/addtool_find_sky_id_dvo.sql ) (view diffs)
• ippTools/share/addtool_find_stack_id.sql (copied) (copied from trunk/ippTools/share/addtool_find_stack_id.sql ) (view diffs)
• ippTools/share/addtool_find_stack_id_dvo.sql (copied) (copied from trunk/ippTools/share/addtool_find_stack_id_dvo.sql ) (view diffs)
• ippTools/share/addtool_queue_cam_id.sql (modified) (view diffs)
• ippTools/share/addtool_queue_sky_id.sql (copied) (copied from trunk/ippTools/share/addtool_queue_sky_id.sql ) (view diffs)
• ippTools/share/addtool_queue_stack_id.sql (copied) (copied from trunk/ippTools/share/addtool_queue_stack_id.sql ) (view diffs)
• ippTools/share/addtool_revertprocessedexp_cam.sql (copied) (copied from trunk/ippTools/share/addtool_revertprocessedexp_cam.sql ) (view diffs)
• ippTools/share/addtool_revertprocessedexp_stack.sql (copied) (copied from trunk/ippTools/share/addtool_revertprocessedexp_stack.sql ) (view diffs)
• ippTools/share/addtool_revertprocessedexp_staticsky.sql (copied) (copied from trunk/ippTools/share/addtool_revertprocessedexp_staticsky.sql ) (view diffs)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (view diffs)
• ippTools/share/pxadmin_create_tables.sql (modified) (view diffs)
• ippTools/src (modified) (view diffs)
• ippTools/src/addtool.c (modified) (view diffs)
• ippTools/src/addtoolConfig.c (modified) (view diffs)
• ippTools/src/dettoolConfig.c (modified) (view diffs)
• ippTools/src/flatcorr.c (modified) (view diffs)
• ippTools/src/magictool.c (modified) (view diffs)
• ippTools/src/pxadd.c (modified) (view diffs)
• ippTools/src/pxadd.h (modified) (view diffs)
• ippTools/src/regtool.c (modified) (view diffs)
• ippTools/src/staticskytool.c (modified) (view diffs)
• ippTools/src/staticskytoolConfig.c (modified) (view diffs)
• ippconfig (modified) (view diffs)
• ippconfig/gpc1/format_20080925.config (modified) (view diffs)
• ippconfig/gpc1/format_20080929.config (modified) (view diffs)
• ippconfig/gpc1/format_20081011.config (modified) (view diffs)
• ippconfig/gpc1/format_20090120.config (modified) (view diffs)
• ippconfig/gpc1/format_20090220.config (modified) (view diffs)
• ippconfig/gpc1/psastro.config (modified) (view diffs)
• ippconfig/recipes/dqStatsTool.config (modified) (view diffs)
• ippconfig/recipes/filerules-mef.mdc (modified) (view diffs)
• ippconfig/recipes/filerules-simple.mdc (modified) (view diffs)
• ippconfig/recipes/filerules-split.mdc (modified) (view diffs)
• ippconfig/recipes/nightly_science.config (modified) (view diffs)
• ippconfig/recipes/ppStack.config (modified) (view diffs)
• ippconfig/recipes/psastro.config (modified) (view diffs)
• ippconfig/recipes/psphot.config (modified) (view diffs)
• ippconfig/recipes/reductionClasses.mdc (modified) (view diffs)
• ppStack/src/ppStackArguments.c (modified) (view diffs)
• ppStack/src/ppStackLoop.c (modified) (view diffs)
• psModules/src/extras/pmVisualUtils.c (modified) (view diffs)
• psModules/src/objects/pmFootprintAssignPeaks.c (modified) (view diffs)
• psModules/src/objects/pmFootprintCullPeaks.c (modified) (view diffs)
• psModules/src/objects/pmFootprintIDs.c (modified) (view diffs)
• psastro/src/psastroAstromGuess.c (modified) (view diffs)
• psastro/src/psastroChipAstrom.c (modified) (view diffs)
• psastro/src/psastroConvert.c (modified) (view diffs)
• psastro/src/psastroRemoveClumps.c (modified) (view diffs)
• tools/czartool/MetricsIndex.pm (modified) (view diffs)
• tools/czartool/Nebulous.pm (modified) (view diffs)
• tools/mysql-dump/gpc1Import.py (modified) (view diffs)
• tools/mysql-dump/gpc1_dump.sh (modified) (view diffs)
• tools/mysql-dump/gpc1_install.sh (modified) (view diffs)
• tools/mysql-dump/neb_copy.sh (modified) (view diffs)
• tools/mysql-dump/neb_dump.sh (modified) (view diffs)
• tools/mysql-dump/ops_dump.csh (modified) (view diffs)
• tools/regpeek.pl (modified) (view diffs)