Commit summary from repository starlink ------------------------------------ (Tim Jenness) smurf: Rearrange quality mapping code in smf_open_file 100.0% applications/smurf/libsmf/ (Tim Jenness) smurf: Correct typo in variable name 100.0% applications/smurf/libsmf/ (Tim Jenness) smurf: Factor out the read-only check into a single location at top 100.0% applications/smurf/libsmf/ (Tim Jenness) smurf: Fix compiler warning in dsutils 100.0% applications/smurf/libsmurf/ (Tim Jenness) smurf: Add BBM support to SC2CLEAN 1.8% applications/smurf/libsmurf/ 98.1% applications/smurf/ (Ed Chapin) smurf: set status if all samples flagged bad during map-making 100.0% applications/smurf/libsmf/ (Ed Chapin) smurf: rename dimmconfig_dark -> dimmconfig_fridgeflat 99.2% applications/smurf/examples/ (Ed Chapin) smurf: fix a couple of quality init/free bugs using new scheme 100.0% applications/smurf/libsmf/ (David Berry) smurf: strncasecmp is defined in strings.h, not string.h 100.0% applications/smurf/libsmf/ (David Berry) smurf: Add new function smf_find_gains to flag bad bolos and calculate gain and offsets 100.0% applications/smurf/libsmf/ (Peter W. Draper) gaia: correct use of foreground value for outline in some plot shapes 100.0% applications/gaia/gaia/generic/ (Tim Jenness) smurf: Use a switch statement instead of many strcmp calls 100.0% applications/smurf/libsmf/ (Tim Jenness) smurf: Alphabetize models in smf_model_gettype 100.0% applications/smurf/libsmf/ (Tim Jenness) smurf: Handle quality differently to variance and data 98.0% applications/smurf/libsmf/ 1.9% applications/smurf/libsmurf/ (Tim Jenness) smurf: Remove unnecessary cast 100.0% applications/smurf/libsmf/ Commits from repository starlink ----------------------------- commit 78e0c1be5061cf6c440db88cd7a9d1e0c056a29a Author: Tim Jenness <[log in to unmask]> Date: Tue Jun 15 16:30:19 2010 -1000 smurf: Rearrange quality mapping code in smf_open_file So that we only have the single call to map QUALITY rather than two separate calls. applications/smurf/libsmf/smf_open_file.c | 80 +++++++++++--------------- 1 files changed, 34 insertions(+), 46 deletions(-) commit 730ad9d96ff9dde94a2a5cb2705a067829870e80 Author: Tim Jenness <[log in to unmask]> Date: Tue Jun 15 16:29:40 2010 -1000 smurf: Correct typo in variable name applications/smurf/libsmf/smf_open_file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit b665d10b30ac400f8eb7a4be3e5aaf958f04f7a3 Author: Tim Jenness <[log in to unmask]> Date: Tue Jun 15 15:46:56 2010 -1000 smurf: Factor out the read-only check into a single location at top applications/smurf/libsmf/smf_open_file.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) commit f180b89a2ce4acd55572cb7309f07efca41934a7 Author: Tim Jenness <[log in to unmask]> Date: Tue Jun 15 15:00:03 2010 -1000 smurf: Fix compiler warning in dsutils applications/smurf/libsmurf/smurf_dsutils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit ffbfdeda23776bbb1d5cd7795a884e616ea3969f Author: Tim Jenness <[log in to unmask]> Date: Tue Jun 15 14:59:18 2010 -1000 smurf: Add BBM support to SC2CLEAN applications/smurf/libsmurf/smurf_sc2clean.c | 16 ++++++++++++++++ applications/smurf/smurf.ifd.in | 10 ++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) commit 350ac9b1b4541185c4b56e21ba8159e981f40d76 Author: Ed Chapin <[log in to unmask]> Date: Tue Jun 15 15:21:32 2010 -0700 smurf: set status if all samples flagged bad during map-making applications/smurf/libsmf/smf.h.source | 3 +- applications/smurf/libsmf/smf_iteratemap.c | 55 ++++++++++++++------ applications/smurf/libsmf/smf_qualstats_report.c | 11 +++- 3 files changed, 49 insertions(+), 20 deletions(-) commit b1d6adfe13a69e917ce53b80c06efa2aafdd5939 Author: Ed Chapin <[log in to unmask]> Date: Tue Jun 15 15:17:05 2010 -0700 smurf: rename dimmconfig_dark -> dimmconfig_fridgeflat This is now more of a generic config for measuring responsivities off of the common-mode variations. applications/smurf/Makefile.am | 2 +- applications/smurf/examples/dimmconfig_dark.lis | 48 ------------ .../smurf/examples/dimmconfig_fridgeflat.lis | 73 ++++++++++++++++++ 3 files changed, 74 insertions(+), 49 deletions(-) commit a6f9cd956ca4fa05d4a057b1a92af5de3ed56a83 Author: Ed Chapin <[log in to unmask]> Date: Tue Jun 15 11:24:31 2010 -0700 smurf: fix a couple of quality init/free bugs using new scheme applications/smurf/libsmf/smf_close_file.c | 5 ++++- applications/smurf/libsmf/smf_create_bolfile.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) commit eb38afd4dd498dd342980c6aca315f961ac9ef19 Author: David Berry <[log in to unmask]> Date: Tue Jun 15 15:58:23 2010 +0100 smurf: strncasecmp is defined in strings.h, not string.h applications/smurf/libsmf/smf_model_gettype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit d659a6842adb79c0b97c9b96cd56e022a5b22ceb Author: David Berry <[log in to unmask]> Date: Tue Jun 15 15:49:55 2010 +0100 smurf: Add new function smf_find_gains to flag bad bolos and calculate gain and offsets This is based on code copied from smf_calcmodel_com. This is just an initial commit to publicise the interface. As yet, the new function has not been tested and smf_calcmodel_com has not been modified to use the new function. applications/smurf/libsmf/Makefile.am | 1 + applications/smurf/libsmf/smf.h.source | 4 + applications/smurf/libsmf/smf_find_gains.c | 989 ++++++++++++++++++++++++++ 3 files changed, 994 insertions(+), 0 deletions(-) commit 25ccec3463e0befd9488060e0516286927a5ab20 Author: Peter W. Draper <[log in to unmask]> Date: Tue Jun 15 13:16:20 2010 +0100 gaia: correct use of foreground value for outline in some plot shapes when drawing black and white this bug displayed black only applications/gaia/gaia/generic/StarRtdImage.C | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) commit 4f9a43aba2252e47ffb3797007b5ea991a6aa4b9 Author: Tim Jenness <[log in to unmask]> Date: Mon Jun 14 20:17:12 2010 -1000 smurf: Use a switch statement instead of many strcmp calls applications/smurf/libsmf/smf_model_gettype.c | 114 ++++++++++++++--------- 1 files changed, 68 insertions(+), 46 deletions(-) commit b27aa69aa87d54e098c261c5bbd8fca10534b4fd Author: Tim Jenness <[log in to unmask]> Date: Mon Jun 14 20:01:46 2010 -1000 smurf: Alphabetize models in smf_model_gettype applications/smurf/libsmf/smf_model_gettype.c | 32 ++++++++++++---------- 1 files changed, 17 insertions(+), 15 deletions(-) commit 4a7d3ec735949e8751e6ed6183ee1229c6954199 Author: Tim Jenness <[log in to unmask]> Date: Mon Jun 14 19:53:14 2010 -1000 smurf: Handle quality differently to variance and data * Replace "unsigned char" usage for quality type with smf_qual_t * Use SMF__QUALTYPE instead of SMF__UBYTE * Use VAL__BADQ instead of VAL__BADUB Also no longer store the pointer to quality in the pntr[] part of smfData. It's now in standalone as "smf_qual_t qual". I think that all usage treating pntr[2] as a special case is now using smfData.qual as a special case. A handful of routines needed some reorganizing to make this work. This patch also protects any attempt to map an NDF quality array with any type other than _UBYTE so we can not yet change smf_qual_t to be an "unsigned short". We will need some extra code in place to copy quality rather than mallocing it and we will need something to compress quality and copy it back out. applications/smurf/libsmf/smf.h.source | 86 ++++---- applications/smurf/libsmf/smf_addmap1.c | 12 +- applications/smurf/libsmf/smf_apodize.c | 10 +- applications/smurf/libsmf/smf_apply_mask.c | 10 +- applications/smurf/libsmf/smf_bolonoise.c | 10 +- applications/smurf/libsmf/smf_boxcar1.cgen | 10 +- applications/smurf/libsmf/smf_calcmodel_ast.c | 4 +- applications/smurf/libsmf/smf_calcmodel_com.c | 12 +- applications/smurf/libsmf/smf_calcmodel_dks.c | 2 +- applications/smurf/libsmf/smf_calcmodel_ext.c | 2 +- applications/smurf/libsmf/smf_calcmodel_flt.c | 2 +- applications/smurf/libsmf/smf_calcmodel_gai.c | 2 +- applications/smurf/libsmf/smf_calcmodel_noi.c | 2 +- applications/smurf/libsmf/smf_calcmodel_pln.c | 2 +- applications/smurf/libsmf/smf_calcmodel_smo.c | 4 +- applications/smurf/libsmf/smf_calcmodel_two.c | 2 +- applications/smurf/libsmf/smf_check_quality.c | 10 +- applications/smurf/libsmf/smf_check_smfData.c | 12 +- applications/smurf/libsmf/smf_checkmem_dimm.c | 2 +- applications/smurf/libsmf/smf_checkmem_map.c | 2 +- applications/smurf/libsmf/smf_clean_dksquid.c | 16 +- applications/smurf/libsmf/smf_clean_smfData.c | 10 +- applications/smurf/libsmf/smf_collapse_quality.c | 14 +- applications/smurf/libsmf/smf_collapse_tseries.c | 4 +- applications/smurf/libsmf/smf_concat_smfGroup.c | 91 ++++----- applications/smurf/libsmf/smf_construct_smfData.c | 21 ++- applications/smurf/libsmf/smf_correct_steps.c | 20 +- applications/smurf/libsmf/smf_create_bolfile.c | 7 +- applications/smurf/libsmf/smf_create_smfData.c | 8 +- applications/smurf/libsmf/smf_dataOrder.c | 216 ++++++++++--------- applications/smurf/libsmf/smf_deepcopy_smfData.c | 17 +- applications/smurf/libsmf/smf_dump_smfData.c | 2 +- applications/smurf/libsmf/smf_fft_avpspec.c | 10 +- applications/smurf/libsmf/smf_fillgaps.c | 24 +- applications/smurf/libsmf/smf_filter_execute.c | 12 +- applications/smurf/libsmf/smf_fit_poly.c | 10 +- applications/smurf/libsmf/smf_fix_steps.c | 28 ++-- applications/smurf/libsmf/smf_flag_spikes.c | 16 +- applications/smurf/libsmf/smf_flag_spikes2.c | 22 +- applications/smurf/libsmf/smf_flag_stationary.c | 12 +- applications/smurf/libsmf/smf_flat_fitpoly.c | 10 +- applications/smurf/libsmf/smf_flat_malloc.c | 8 +- applications/smurf/libsmf/smf_flat_responsivity.c | 5 +- applications/smurf/libsmf/smf_flatten.c | 4 +- applications/smurf/libsmf/smf_get_goodrange.c | 12 +- applications/smurf/libsmf/smf_iteratemap.c | 14 +- applications/smurf/libsmf/smf_map_spikes.c | 6 +- applications/smurf/libsmf/smf_median_smooth.c | 14 +- applications/smurf/libsmf/smf_model_create.c | 6 +- applications/smurf/libsmf/smf_open_file.c | 75 +++++-- applications/smurf/libsmf/smf_open_ndf.c | 4 +- applications/smurf/libsmf/smf_open_ndfname.c | 4 +- applications/smurf/libsmf/smf_open_newfile.c | 17 ++- applications/smurf/libsmf/smf_qualstats.c | 8 +- applications/smurf/libsmf/smf_qualstats_model.c | 8 +- applications/smurf/libsmf/smf_qualstats_report.c | 4 +- applications/smurf/libsmf/smf_quick_noise.c | 12 +- applications/smurf/libsmf/smf_rebinmap1.c | 10 +- applications/smurf/libsmf/smf_scanfit.c | 6 +- applications/smurf/libsmf/smf_select_pntr.c | 6 +- applications/smurf/libsmf/smf_stats1.cgen | 10 +- applications/smurf/libsmf/smf_subtract_plane3.c | 10 +- applications/smurf/libsmf/smf_subtract_poly.c | 10 +- applications/smurf/libsmf/smf_templateFit1.cgen | 16 +- applications/smurf/libsmf/smf_tophat1.cgen | 14 +- applications/smurf/libsmf/smf_typ.h | 13 +- applications/smurf/libsmf/smf_update_quality.c | 12 +- applications/smurf/libsmf/smf_update_valbad.c | 16 +- applications/smurf/libsmf/smf_write_smfData.c | 36 ++-- applications/smurf/libsmurf/smurf_calcnoise.c | 6 +- applications/smurf/libsmurf/smurf_makemap.c | 4 +- applications/smurf/libsmurf/smurf_sc2fft.c | 2 +- applications/smurf/libsmurf/smurf_stackframes.c | 14 +- 73 files changed, 611 insertions(+), 543 deletions(-) commit bf574947a1c60d6e7efa2d16910c5f5a0c5b690a Author: Tim Jenness <[log in to unmask]> Date: Mon Jun 14 16:07:14 2010 -1000 smurf: Remove unnecessary cast applications/smurf/libsmf/smf_iteratemap.c | 2 +- applications/smurf/libsmf/smf_update_quality.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)