Index: trunk/Changes.txt
===================================================================
--- trunk/Changes.txt	(revision 29555)
+++ trunk/Changes.txt	(revision 29555)
@@ -0,0 +1,111 @@
+
+2010.10.25 : EAM
+
+  Merging development work from the past 2 months from my branch
+  (branches/eam_branches/ipp-20100823) into the trunk.  This is work
+  that covers a range of issues:
+
+  Ohana:
+    * remove some deprecated code (gfits_downsize_and_convert_$STRUCT)
+    * add support for CMF_PS1_V3 files from psphot to addstar
+    * clean up BYTE_SWAP existence tests
+    * auto-init for RotFonts
+    * kapa improvements: hex/float button, better tick marks & box
+      labels; better positioning of graphs and images, clip contours
+    * add %e,%g,%o,%i,%u,%x to opihi fprintf
+    * add 'extra host' concept to pcontrol (additional processing
+      restrictions)
+    * plug some memory leaks
+    * add opihi 'reindex' function for working with sorted indexes
+    * re-include bond version of svd
+    
+  psLib:
+    * add options for colorbar and scale label to psImageJpeg
+    * plug memory leak in psMinimizeLMM	
+    * add libkapa support for psImageJpeg (bDraw functions)
+
+  psModules/imcombine:
+    * added psf-match stats to output headers; clarified their meaning
+    * replace pmSubtractionMaskInvalid with pmReadoutMaskInvalid (masks
+      only unmasked NANs)
+    * cleanup pmSubtractionMatch to remove various deprecated
+      (if-def-ed out) blocks (especially the SEPARATE sections)
+    * save fwhm independently from pmSubtractionParamsScale
+    * repace central delta function re-zero with 0th gaussian re-zero
+    * re-work matrix to only include the fitted terms (not the
+      normalization or bg, which are done elsewhere)
+    * replace diagonal penalties for DUAL with combined 2nd moments
+      minimization
+    * add function to calculate the moments (needed by DUAL
+      minimization)
+    * modify stack mask to generate OR of inputs for BAD outputs
+      and fuzzy AND over 65% of inputs for not BAD outputs
+    * clarify visualization functions
+    * weighting window uses sampleMedian (but is not actually used)
+    * determine flux normalization from a consistent pair of
+      apertures, selected on the basis of the 1st radial moment
+    * PSF envelope calculation does not apply a S/N limit for pixels
+
+  psModules/objects:
+    * add aperture fluxes (for insignificant and diff objects)
+    * re-work pmSourceMoments to measure centroid with a tophat first
+      then a gaussian window centered on the initial centroid
+    * option to skip aperture magnitudes in pmSourceMag
+    * finish CMF_PS1_V3 format
+    * replace peak position with centroid position were available
+    * replace peak position error with mean fwhm, scaled by S/N
+    * add some fields to PS1_DV2
+    * add S/N limit to type DEFECT assignment
+    
+  psModules/other:
+    * update jpeg creation to select FLIPS, COLORBAR & SCALE options
+      (ready to take object overlays in bDraw format)
+    * add function pmReadoutMaskInvalid to replace
+      pmReadoutMaskNonfinite in most cases
+    * fix possible segfault in pmVisual.c
+     
+  psphot:
+    * allow negative flux in src/psphotFitSourcesLinearStack.c
+    * add header outputs for source size analysis metadata
+    * simplify some visualization routines
+    * use M_minor and Kron magnitude for CR classification
+    * dynamically set CR classif. limits
+    * use psf-kron mag for EXT classification
+    * mask detected CRs
+    * use full image for source classification (do not use sub-regions
+      since we do not use the moments)
+    * remember to subtract sources when doing extended source fitting
+     (even failed sources)
+    * plug some memory leaks
+    * add flag to show that a source was found on another image (ie,
+      this version of the source was supplied not detected) 
+
+  ppSub
+    * failure to re-scale is now an error, not a warning
+    * recipe option to specify convolution target	
+    * use pmReadoutMaskInvalid instead of pmReadoutMaskNonfinite
+    * cleanup visualization and plug some leaks
+
+  ppStack
+    * allow recipe option to specify target PSF size
+    * masking improvements (see psModules above)
+    * avoid possible segfault in ppStackCombineFinal.c
+    * set FWHMs separately from pmSubtractionParamsScale
+
+  ippTools
+    * difftool : handle case of multiple existing runs (rerun mode for
+      definestackstack)
+    * camtool : add -data_group selection
+    * difftool : allow -bothways options for warpstack and stackstack; 
+      	       -not-bothways for warpwarp
+
+  ippconfig
+    * add FPA.ZP to simtest camera
+    * default output format: PS1_V3 (chip) & PS1_DV2 (diff)
+    * add CR detection params
+    * stack output options for RAW or COMP_IMG (filerules-simple.mdc only)
+    * JPEG options
+    * reduce ppSub kernel size, autoscale, use photpipe kernel sizes,
+    * options for PSF manual scaling
+    * adjust slope of bright-star mask to better match fainter
+      saturated stars
Index: trunk/psconfig/INSTALL
===================================================================
--- trunk/psconfig/INSTALL	(revision 29554)
+++ trunk/psconfig/INSTALL	(revision 29555)
@@ -6,18 +6,4 @@
 With the psconfig tools, it is easy to switch between different
 installed versions or to recompile subsets of the IPP tree.
-
-0. Choose a target installation directory.
-
-Choose a location to store the installed software and configuration
-files.  The psconfig system places the installed binary files by
-default in directories below ~/psconfig.  There will be one directory
-for each version of the installation for a given hardware
-architecture.  To use a different location, place the following line
-in ~/.psconfigrc (otherwise, this is not needed):
-
-set PSCONFDIR = INSTALL_PATH
-
-where INSTALL_PATH is the top-level directory for all binary
-installations. 
 
 1. Set up the psconfig system.
@@ -75,4 +61,18 @@
 installation directories.
 
+3. Building (full build in one pass)
+
+It should be possible to build the full IPP installation by issuing
+the single command in this directory (ipp/psconfig):
+
+psbuild -extbuild
+
+If you have checked the IPP tree out of our svn repository, certain
+steps are slightly modified.  In this case, it is necessary to add the
+option '-dev'.  For additional information on using psbuild, see the
+listing of options below (or type psbuild -help)
+
+psbuild -dev -extbuild
+
 3. Dependencies
 
@@ -112,5 +112,5 @@
 pscheckperl -build
 
-4. Building
+4. Building (just IPP tools)
 
 To build the full IPP tree using the psconfig system, run 'psbuild' in
@@ -123,9 +123,4 @@
 option '-dev'.  For additional information on using psbuild, see the
 listing of options below (or type psbuild -help)
-
-It should be possible to build the full IPP installation by issuing
-the single command in this directory (ipp/psconfig):
-
-psbuild -extbuild
 
 5. Building Magic.
@@ -180,2 +175,19 @@
 pscheckperl -build : build and install external modules
 
+----
+0. Choose a target installation directory.
+
+> Choose a location to store the installed software and configuration
+> files.  The psconfig system places the installed binary files by
+> default in directories below ~/psconfig.  There will be one directory
+> for each version of the installation for a given hardware
+> architecture.  To use a different location, place the following line
+> in ~/.psconfigrc (otherwise, this is not needed):
+> 
+> set PSCONFDIR = INSTALL_PATH
+> 
+> where INSTALL_PATH is the top-level directory for all binary
+> installations. 
+
+** the steps above are probably not actually needed.  When is PSCONFDIR needed?
+
Index: trunk/psconfig/tagsets/ipp-2.9.dist
===================================================================
--- trunk/psconfig/tagsets/ipp-2.9.dist	(revision 29554)
+++ trunk/psconfig/tagsets/ipp-2.9.dist	(revision 29555)
@@ -80,4 +80,5 @@
   YYYYY  magic/censorObjects    ipp-2-9          -0
   YYYYY  magic/remove           ipp-2-9          -0
+  YYYYY  console                ipp-2-9          -0
 
 # there are externally required C libraries and perl modules (see INSTALL)
