Commit summary from repository starlink
------------------------------------
(Tim Jenness) atl: atlMapCopy replaced by astMapCopy
100.0% libraries/atl/
(Tim Jenness) ndg: Add ndgAddgh C interface
100.0% libraries/ndg/
(Tim Jenness) kaplibs: Ensure that the merged keymap is stored in the history
100.0% libraries/kaplibs/kpg/
(Tim Jenness) smurf: default memiter to 1
100.0% applications/smurf/defaults/
(Tim Jenness) smurf: fix segvs in memiter=0 case
100.0% applications/smurf/libsmf/
(Tim Jenness) kaplibs/smurf: Remove more debug messages. Sheesh.
84.4% applications/smurf/libsmurf/
15.5% libraries/kaplibs/kpg/
(Tim Jenness) smurf: Remove gain_box default from code
100.0% applications/smurf/libsmf/
(Tim Jenness) kaplibs: Remove debug print and improve prologue
100.0% libraries/kaplibs/kpg/
(Tim Jenness) smurf: Add typo checking for iterative map-maker config files
13.6% applications/smurf/defaults/
81.0% applications/smurf/libsmf/
4.1% applications/smurf/libsmurf/
1.1% applications/smurf/
(Tim Jenness) smurf: Add smf_subinst_str prototype
100.0% applications/smurf/libsmf/
(Tim Jenness) Ignore cursa.sh
(Tim Jenness) kaplibs: Allow "keyword=<undef>" in config files
100.0% libraries/kaplibs/kpg/
(Tim Jenness) kaplibs: minor compiler warning
100.0% libraries/kaplibs/kpg/
(Tim Jenness) smurf: Add subinst enum that counts the number of sub-instruments
100.0% applications/smurf/libsmf/
(Tim Jenness) smurf: Add routine to stringify sub-instrument enum
100.0% applications/smurf/libsmf/
(Tim Jenness) kaplibs: Modify kp1Config to support sub-keymap merging
100.0% libraries/kaplibs/kpg/
(Tim Jenness) kaplibs: Fix ambiguous code in kpgPixsc C interface
100.0% libraries/kaplibs/kpg/
(Tim Jenness) kaplibs: Prologue and whitespace tidying in kpg1Config
100.0% libraries/kaplibs/kpg/
(David Berry) ast: Fix bug in MapCopy that caused sub keymaps to be replaced rather than merged.
100.0% libraries/ast/
(David Berry) ast: Allow KeyMap entries to have undefined values
1.8% libraries/ast/ast_tester/
98.1% libraries/ast/
(Tim Jenness) kaplibs: Merge defaults and supplied values using astMapCopy
100.0% libraries/kaplibs/kpg/
(Tim Jenness) kaplibs: Fix compiler warning and use defensive programming
100.0% libraries/kaplibs/kpg/
(David Berry) ast: New KeyMap method (astMapCopy) to copy entries from one KeyMap to another
39.0% libraries/ast/ast_tester/
60.9% libraries/ast/
Commits from repository starlink
-----------------------------
commit 4f85575d31a48eefbb20e97db3c30ee59ea9d9a2
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 16:05:52 2010 -1000
atl: atlMapCopy replaced by astMapCopy
Which is faster and better.
libraries/atl/Makefile.am | 2 +-
libraries/atl/atl.h | 3 +-
libraries/atl/atl.news | 7 ++-
libraries/atl/atlMapCopy.c | 126 -----------------------------------------
libraries/atl/component.xml | 2 +-
libraries/atl/configure.ac | 2 +-
6 files changed, 11 insertions(+), 131 deletions(-)
commit f609f2173d8c01e050b52a86058d6b42af2c31ad
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 14:48:38 2010 -1000
ndg: Add ndgAddgh C interface
libraries/ndg/ndg.c | 22 +++++++++++++++++++++-
libraries/ndg/ndg.h | 5 ++++-
2 files changed, 25 insertions(+), 2 deletions(-)
commit a529750730a9b1eb906cac32f1b0e9425cd36f2d
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 14:21:26 2010 -1000
kaplibs: Ensure that the merged keymap is stored in the history
Previously it was the user supplied keymap that was stored. Now we
store what is actually going to be used.
libraries/kaplibs/kpg/kpg1Config.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
commit 31eb8cac9f351821928358f6dabcc7be581f4edc
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 14:16:17 2010 -1000
smurf: default memiter to 1
applications/smurf/defaults/smurf_makemap.def | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 209a4bc725d79851ba696d86a1395b28cc832eed
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 14:15:41 2010 -1000
smurf: fix segvs in memiter=0 case
applications/smurf/libsmf/smf_iteratemap.c | 18 ++++++------
applications/smurf/libsmf/smf_model_create.c | 36 ++++++++++++++++--------
2 files changed, 33 insertions(+), 21 deletions(-)
commit 1a989f953a43b41f67013ac03d358fcab6b1e235
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 13:46:00 2010 -1000
kaplibs/smurf: Remove more debug messages. Sheesh.
applications/smurf/libsmurf/smurf_makemap.c | 4 +---
libraries/kaplibs/kpg/kpg1Config.c | 1 -
2 files changed, 1 insertions(+), 4 deletions(-)
commit 9b3b6b1a7486c1f3455a90ee7b4e27174fabe9a5
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 13:11:11 2010 -1000
smurf: Remove gain_box default from code
applications/smurf/libsmf/smf_model_create.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit e729f5c671a8808b10a01f023e5ff38afd09be6a
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 12:42:03 2010 -1000
kaplibs: Remove debug print and improve prologue
libraries/kaplibs/kpg/kpg1Config.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
commit 879ad730bfb82bc4a1f66eabb17589396e166781
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 12:04:25 2010 -1000
smurf: Add typo checking for iterative map-maker config files
We now have default values for the iterative map-maker that are
all defined in one place: smurf_makemap.def.
The config is now read using kpg1Config which handles the
merging of sub-instrument configs, sets the keymap to be
locked (so that only values in the defaults can be
over-ridden) and also sets the keymap to trigger an
error if a keyword is requested that does not exist.
All access to the config keymap has been simplified
since we now guarantee that a value will be available.
We only need to check the return value of astMapGetXX
if the value defaults to <undef> (such as for the csotau
or notch filter).
applications/smurf/Makefile.am | 4 +-
applications/smurf/defaults/smurf_makemap.def | 144 ++++++++
applications/smurf/examples/dimmconfig.lis | 4 +-
.../smurf/examples/dimmconfig_extended.lis | 4 +-
applications/smurf/examples/dimmconfig_faint.lis | 4 +-
applications/smurf/libsmf/smf_calcmodel_ast.c | 22 +-
applications/smurf/libsmf/smf_calcmodel_com.c | 144 +++-----
applications/smurf/libsmf/smf_calcmodel_flt.c | 18 +-
applications/smurf/libsmf/smf_calcmodel_gai.c | 37 +--
applications/smurf/libsmf/smf_calcmodel_noi.c | 9 +-
applications/smurf/libsmf/smf_get_cleanpar.c | 147 ++++-----
applications/smurf/libsmf/smf_iteratemap.c | 317 +++++++-----------
applications/smurf/libsmf/smf_model_create.c | 60 ++--
applications/smurf/libsmurf/smurf_makemap.c | 45 ++-
14 files changed, 509 insertions(+), 450 deletions(-)
commit 07392bbff1120e83b57fd1189064921d536dc1d6
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 12:00:17 2010 -1000
smurf: Add smf_subinst_str prototype
applications/smurf/libsmf/smf.h.source | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
commit 34ca92209a5a60a409edfd56d9f874a5cbb83208
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 11:57:59 2010 -1000
Ignore cursa.sh
.gitignore | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit f72e8ee2980ff01a8e22500e5d1247c69287ddf4
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 11:56:54 2010 -1000
kaplibs: Allow "keyword=<undef>" in config files
libraries/kaplibs/kpg/kpg1_kymap.c | 5 +++++
libraries/kaplibs/kpg/kpg1_kymp1.c | 7 +++++++
libraries/kaplibs/kpg/kpg1_kymp2.c | 8 ++++++++
3 files changed, 20 insertions(+), 0 deletions(-)
commit 5d317d6e3a277f5bf7fb9d8e1dfb98393ceaaa1f
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 11:56:21 2010 -1000
kaplibs: minor compiler warning
libraries/kaplibs/kpg/kpg1_kymp1.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit bbf4edfd5a9aee44872b67b81c994d1544a417bd
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 11:43:19 2010 -1000
smurf: Add subinst enum that counts the number of sub-instruments
applications/smurf/libsmf/smf_typ.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit dcca004f3c238c43b6268d992093013b08283fc0
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 11:42:49 2010 -1000
smurf: Add routine to stringify sub-instrument enum
applications/smurf/libsmf/Makefile.am | 1 +
.../libsmf/{smf_swmode_str.c => smf_subinst_str.c} | 47 ++++++++----------
2 files changed, 21 insertions(+), 27 deletions(-)
commit 861dd55786edb13715d4ef16f017fccb8a9e31e6
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 11:39:59 2010 -1000
kaplibs: Modify kp1Config to support sub-keymap merging
So if you have a config file with:
a.b = 2
xxx.a.b = 3
yyy.a.b = 4
and pass in a definition keymap with
xxx = 1
yyy = 0
you will get a keymap out of kpg1Config that contains
a.b = 3
(the xxx. entry is merged with the parent and the yyy entry
is deleted)
libraries/kaplibs/kpg/kaplibs.h | 4 +-
libraries/kaplibs/kpg/kpg1Config.c | 114 +++++++++++++++++++++++++++++++---
2 files changed, 109 insertions(+), 9 deletions(-)
commit 1cd1a405991a3e69d687c35538cbe4374ef56c9e
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 11:24:08 2010 -1000
kaplibs: Fix ambiguous code in kpgPixsc C interface
libraries/kaplibs/kpg/kaplibs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit ec518e39f3037f89a9cdde76fb78646273db66f2
Author: Tim Jenness <[log in to unmask]>
Date: Wed May 5 09:27:45 2010 -1000
kaplibs: Prologue and whitespace tidying in kpg1Config
libraries/kaplibs/kpg/kpg1Config.c | 39 ++++++++++++++++++---------------
1 files changed, 21 insertions(+), 18 deletions(-)
commit 4e296ec7336108f5d9c24abec8589e9906c399d7
Author: David Berry <[log in to unmask]>
Date: Wed May 5 10:56:21 2010 -1000
ast: Fix bug in MapCopy that caused sub keymaps to be replaced rather
than merged.
libraries/ast/keymap.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
commit b994e490ffceb44e18c40e82e0a9b81270faa7e1
Author: David Berry <[log in to unmask]>
Date: Wed May 5 09:36:15 2010 -1000
ast: Allow KeyMap entries to have undefined values
Such entries can be used as place holders within
KeyMaps that has been locked by setting the MapLocked attribute non-zero.
libraries/ast/ast.news | 4 +
libraries/ast/ast_par.source | 3 +
libraries/ast/ast_tester/testkeymap.f | 38 +++-
libraries/ast/fkeymap.c | 21 ++
libraries/ast/keymap.c | 331 ++++++++++++++++++++++++++-----
libraries/ast/keymap.h | 5 +
libraries/ast/sun_master.tex | 21 ++-
7 files changed, 369 insertions(+), 54 deletions(-)
commit bd59831d3bcd4e05a90a06e652dc932664c27e55
Author: Tim Jenness <[log in to unmask]>
Date: Tue May 4 22:02:14 2010 -1000
kaplibs: Merge defaults and supplied values using astMapCopy
libraries/kaplibs/kpg/kpg1Config.c | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
commit 34592966dddaca10d1de0d3d6f22968e3a4d4031
Author: Tim Jenness <[log in to unmask]>
Date: Tue May 4 21:18:58 2010 -1000
kaplibs: Fix compiler warning and use defensive programming
libraries/kaplibs/kpg/kpg1Config.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
commit c0340f86b11ca48a64d809ca33a40003d4681769
Author: David Berry <[log in to unmask]>
Date: Wed May 5 07:44:25 2010 +0100
ast: New KeyMap method (astMapCopy) to copy entries from one KeyMap to another
libraries/ast/ast.news | 7 +-
libraries/ast/ast_tester/testkeymap.f | 245 ++++++++++++++++++++++++++++++-
libraries/ast/fkeymap.c | 13 ++
libraries/ast/keymap.c | 172 +++++++++++++++++++++-
libraries/ast/keymap.h | 3 +
libraries/ast/sun_master.tex | 11 ++-
6 files changed, 440 insertions(+), 11 deletions(-)
|
