Changeset 35436 for branches/eam_branches/ipp-20130419

Timestamp:

Apr 26, 2013, 9:36:35 AM (13 years ago)

Author:

eugene

Message:

merged changes from trunk

Location:

branches/eam_branches/ipp-20130419

Files:

• . (modified) (1 prop)
• Nebulous (modified) (1 prop)
• Nebulous-Server (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libohana/src (modified) (1 prop)
• Ohana/src/opihi (modified) (1 prop)
• Ohana/src/opihi/cmd.astro (modified) (1 prop)
• Ohana/src/opihi/cmd.data (modified) (1 prop)
• Ohana/src/relastro/src (modified) (1 prop)
• dbconfig/cam.md (modified) (1 prop)
• dbconfig/changes.txt (modified) (1 prop)
• ippMonitor (modified) (1 prop)
• ippScripts/scripts/chip_imfile.pl (modified) (1 prop)
• 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)
• ippScripts/scripts/minidvodb_premerge.pl (modified) (1 diff)
• ippScripts/scripts/publish_file.pl (modified) (1 prop)
• ippScripts/scripts/warp_skycell.pl (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippTools/share (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/camtool.c (modified) (1 prop)
• ippTools/src/camtoolConfig.c (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/psphot.config (modified) (1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/psphot.config (modified) (1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• psLib/src/math/psMixtureModels.c (modified) (2 diffs)
• psconfig (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src (modified) (1 prop)
• psphot/src/psphotStackImageLoop.c (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• psvideophot (modified) (1 prop)

branches/eam_branches/ipp-20130419/ippScripts/scripts/minidvodb_premerge.pl

@@ -129 +129 @@
             # relphot only takes lower case gpc1
             my $relphot_camera = lc($camera);
-            my $command  = "$relphot -averages -update";
-            $command .= " -D CAMERA $relphot_camera";
-            $command .= " -D CATDIR $minidvodb";
+            #my $command  = "$relphot -averages -update";
+            #$command .= " -D CAMERA $relphot_camera";
+            #$command .= " -D CATDIR $minidvodb";
+            #this is a friday hack
+            my $command = "echo skipping relphot";
             print "$command\n";
             my $mjd_relphot_start = DateTime->now->mjd;   # MJD of starting script

branches/eam_branches/ipp-20130419/psLib/src/math/psMixtureModels.c

@@ -157 +157 @@
   psImage *oldMeans;
   psVector *counts;
-  double R,diff;
+  double diff;
+  // XXX not used: double R;
 
   // Allocations
@@ -210 +211 @@
   *iterations = 0;
   do {
-    R = 0.0;
+      // XXX not used : R = 0.0;
 
     // Reset counts for each mode