Index: /branches/cnb_branch_20090215/Ohana/src/getstar/src/ReadImageFiles.c =================================================================== --- /branches/cnb_branch_20090215/Ohana/src/getstar/src/ReadImageFiles.c (revision 22213) +++ /branches/cnb_branch_20090215/Ohana/src/getstar/src/ReadImageFiles.c (revision 22214) @@ -135,5 +135,6 @@ if (!strcmp (tmpword, "SMPDATA") || !strcmp (tmpword, "PS1_DEV_0") || - !strcmp (tmpword, "PS1_DEV_1")) { + !strcmp (tmpword, "PS1_DEV_1") || + !strcmp (tmpword, "PS1_V1")) { exttype[Nimage] = strcreate (tmpword); Index: /branches/cnb_branch_20090215/Ohana/src/misc/src/applyscat.c =================================================================== --- /branches/cnb_branch_20090215/Ohana/src/misc/src/applyscat.c (revision 22213) +++ /branches/cnb_branch_20090215/Ohana/src/misc/src/applyscat.c (revision 22214) @@ -2,4 +2,10 @@ # include # define BYTES_STAR 66 + +typedef struct { + double X; + double Y; + double M; +} Stars; int main (int argc, char **argv) { Index: /branches/cnb_branch_20090215/Ohana/src/opihi/cmd.data/init.c =================================================================== --- /branches/cnb_branch_20090215/Ohana/src/opihi/cmd.data/init.c (revision 22213) +++ /branches/cnb_branch_20090215/Ohana/src/opihi/cmd.data/init.c (revision 22214) @@ -134,5 +134,4 @@ {1, "box", box, "draw a box on the plot"}, {1, "buffers", list_buffers, "list the currently allocated buffers (images)"}, - {1, "images", list_buffers, "list the currently allocated images"}, {1, "center", center, "center image on coords"}, {1, "circstats", circstats, "circular statistics"}, Index: /branches/cnb_branch_20090215/Ohana/src/opihi/dvo/init.c =================================================================== --- /branches/cnb_branch_20090215/Ohana/src/opihi/dvo/init.c (revision 22213) +++ /branches/cnb_branch_20090215/Ohana/src/opihi/dvo/init.c (revision 22214) @@ -35,5 +35,4 @@ int imrough PROTO((int, char **)); int imsearch PROTO((int, char **)); -int imstats PROTO((int, char **)); int lcat PROTO((int, char **)); int lcurve PROTO((int, char **)); @@ -86,5 +85,4 @@ {1, "imrough", imrough, "get info from imruf database"}, {1, "imsearch", imsearch, "get info from imreg database"}, - {1, "imstats", imstats, "plot image statistics"}, {1, "lcat", lcat, "list catalogs in region"}, {1, "lcurve", lcurve, "plot lightcurve for a star"}, @@ -104,4 +102,5 @@ {1, "subpix", subpix, "get subpixel positions"}, {1, "version", version, "show version information"}, +//{1, "imstats", imstats, "plot image statistics"}, //{1, "addxtra", addxtra, "add extra data to object"}, //{1, "getxtra", getxtra, "get extra data from object"}, Index: /branches/cnb_branch_20090215/ippconfig/gpc1/camera.config =================================================================== --- /branches/cnb_branch_20090215/ippconfig/gpc1/camera.config (revision 22213) +++ /branches/cnb_branch_20090215/ippconfig/gpc1/camera.config (revision 22214) @@ -85,4 +85,11 @@ y STR y.00000 w STR w.00000 + # the following were needed for detrend.correct because input and output images seem to be inconsistent sometimes: + # g STR g + # r STR r + # i STR i + # z STR z + # y STR y + # w STR w OPEN STR OPEN END Index: /branches/cnb_branch_20090215/ippconfig/gpc1/format_20090120.config =================================================================== --- /branches/cnb_branch_20090215/ippconfig/gpc1/format_20090120.config (revision 22213) +++ /branches/cnb_branch_20090215/ippconfig/gpc1/format_20090120.config (revision 22214) @@ -1,5 +1,4 @@ -# Gain, readnoise and saturation are now specified in the headers. -# Note that the readnoise is in ADU instead of electrons. -# Change effective from Sidik's e-mail, sent Sat, 11 Oct 2008 15:12:44 HST +# Refurbished GPC1 +# Change effective from January 2009 Camera refurbishment # How to identify this type @@ -27,5 +26,5 @@ CCID58-2-15a1 STR XY01:GPCChip # chip 00 CCID58-2-18a1 STR XY02:GPCChip # chip 01 - CCID58-2-04a2 STR XY03:GPCChip # chip 02 + CCID58-1-04a2 STR XY03:GPCChip # chip 02 CCID58-1-01b1 STR XY04:GPCChip # chip 03 CCID58-1-09b1 STR XY05:GPCChip # chip 04 @@ -54,5 +53,5 @@ CCID58-1-01b2 STR XY35:GPCChip # chip 27 CCID58-3-14b1 STR XY36:GPCChip # chip 28 - CCID58-3-23b2 STR XY37:GPCChip # chip 29 + CCID58-2-23b2 STR XY37:GPCChip # chip 29 CCID58-3-02b1 STR XY40:GPCChip # chip 30 CCID58-1-03b2 STR XY41:GPCChip # chip 31 Index: /branches/cnb_branch_20090215/ippconfig/recipes/filerules-split.mdc =================================================================== --- /branches/cnb_branch_20090215/ippconfig/recipes/filerules-split.mdc (revision 22213) +++ /branches/cnb_branch_20090215/ippconfig/recipes/filerules-split.mdc (revision 22214) @@ -191,8 +191,8 @@ PPSUB.INPUT.CONV OUTPUT {OUTPUT}.inConv.fits IMAGE COMP_SUB FPA TRUE NONE PPSUB.INPUT.CONV.MASK OUTPUT {OUTPUT}.inConv.mk.fits MASK COMP_MASK FPA TRUE NONE -PPSUB.INPUT.CONV.WEIGHT OUTPUT {OUTPUT}.inConv.wt.fits WEIGHT COMP_WT FPA TRUE NONE +PPSUB.INPUT.CONV.VARIANCE OUTPUT {OUTPUT}.inConv.wt.fits VARIANCE COMP_WT FPA TRUE NONE PPSUB.REF.CONV OUTPUT {OUTPUT}.refConv.fits IMAGE COMP_SUB FPA TRUE NONE PPSUB.REF.CONV.MASK OUTPUT {OUTPUT}.refConv.mk.fits MASK COMP_MASK FPA TRUE NONE -PPSUB.REF.CONV.WEIGHT OUTPUT {OUTPUT}.refConv.wt.fits WEIGHT COMP_WT FPA TRUE NONE +PPSUB.REF.CONV.VARIANCE OUTPUT {OUTPUT}.refConv.wt.fits VARIANCE COMP_WT FPA TRUE NONE PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE COMP_IMG FPA TRUE NONE Index: /branches/cnb_branch_20090215/ippconfig/recipes/fitstypes.mdc =================================================================== --- /branches/cnb_branch_20090215/ippconfig/recipes/fitstypes.mdc (revision 22213) +++ /branches/cnb_branch_20090215/ippconfig/recipes/fitstypes.mdc (revision 22214) @@ -55,5 +55,5 @@ COMP_MASK METADATA BITPIX S32 16 - COMPRESSION STR PLIO + COMPRESSION STR GZIP TILE.X S32 0 TILE.Y S32 1 Index: /branches/cnb_branch_20090215/ippconfig/vysos5/ppImage.config =================================================================== --- /branches/cnb_branch_20090215/ippconfig/vysos5/ppImage.config (revision 22213) +++ /branches/cnb_branch_20090215/ippconfig/vysos5/ppImage.config (revision 22214) @@ -17,6 +17,6 @@ MASK BOOL FALSE # Mask bad pixels FRINGE BOOL FALSE # Fringe subtraction -BIN1.FITS BOOL FALSE # Save 1st binned chip image? -BIN2.FITS BOOL FALSE # Save 2nd binned chip image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? PHOTOM BOOL TRUE # Source identification and photometry ASTROM.CHIP BOOL FALSE # Astrometry per chip? @@ -150,5 +150,5 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL TRUE # Dark subtraction + DARK BOOL FALSE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation @@ -170,6 +170,6 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - SHUTTER BOOL TRUE # Shutter correction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction FLAT BOOL FALSE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels @@ -190,6 +190,6 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - SHUTTER BOOL TRUE # Shutter correction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels @@ -210,6 +210,6 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - SHUTTER BOOL TRUE # Shutter correction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels @@ -229,8 +229,8 @@ CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? OVERSCAN BOOL TRUE # Overscan subtraction - BIAS BOOL FALSE # Bias subtraction + BIAS BOOL TRUE # Bias subtraction DARK BOOL FALSE # Dark subtraction SHUTTER BOOL FALSE # Shutter correction - FLAT BOOL FALSE # Flat-field normalisation + FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels FRINGE BOOL FALSE # Fringe subtraction @@ -252,6 +252,6 @@ OVERSCAN BOOL TRUE # Overscan subtraction BIAS BOOL TRUE # Bias subtraction - DARK BOOL TRUE # Dark subtraction - SHUTTER BOOL TRUE # Shutter correction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction FLAT BOOL TRUE # Flat-field normalisation MASK BOOL FALSE # Mask bad pixels Index: /branches/cnb_branch_20090215/ppStack/src/ppStackArguments.c =================================================================== --- /branches/cnb_branch_20090215/ppStack/src/ppStackArguments.c (revision 22213) +++ /branches/cnb_branch_20090215/ppStack/src/ppStackArguments.c (revision 22214) @@ -182,5 +182,5 @@ "Delete temporary files on completion?", false); psMetadataAddS32(arguments, PS_LIST_TAIL, "-threads", 0, "Number of threads to use", 0); - psMetadataAddBool(arguments, PS_LIST_TAIL, "-visual", 0, "visualisation", 0); + psMetadataAddBool(arguments, PS_LIST_TAIL, "-visual", 0, "visualisation", false); if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 3) { @@ -256,4 +256,8 @@ valueArgRecipeStr(arguments, recipe, "-psf-model", "PSF.MODEL", recipe); + if (psMetadataLookupBool(NULL, arguments, "-viusal") { + pmVisualSetVisual(true); + } + if (psMetadataLookupBool(NULL, arguments, "-photometry") || psMetadataLookupBool(NULL, recipe, "PHOTOMETRY")) { Index: /branches/cnb_branch_20090215/ppStack/src/ppStackLoop.c =================================================================== --- /branches/cnb_branch_20090215/ppStack/src/ppStackLoop.c (revision 22213) +++ /branches/cnb_branch_20090215/ppStack/src/ppStackLoop.c (revision 22214) @@ -1,3 +1,2 @@ -//XXX junk line #ifdef HAVE_CONFIG_H #include