Commit summary from repository starlink
------------------------------------
(Tim Jenness) smurf: Fix heater reistance and apply heater efficiency data
47.9% applications/smurf/data/
1.8% applications/smurf/defaults/
33.9% applications/smurf/examples/
12.2% applications/smurf/libsmf/
3.7% applications/smurf/libsmurf/
(Tim Jenness) smurf: Change RESIST parameter defaulting
100.0% applications/smurf/
(Tim Jenness) smurf: smf_scale_bols can now take a smfData instead of file name
100.0% applications/smurf/libsmf/
(Tim Jenness) smurf: smf_open_file is now a bit more lenient
100.0% applications/smurf/libsmf/
(Malcolm J. Currie) KAPPA: Typography in the news.
100.0% applications/kappa/
(Malcolm J. Currie) KAPPA: Remind users about FITSEXIST and FITSVAL.
100.0% applications/kappa/
(Malcolm J. Currie) KAPPA: Restore PACKAGE_VERSION token.
100.0% applications/kappa/
(David Berry) atools: Add astAngle
100.0% applications/atools/
Commits from repository starlink
-----------------------------
commit b0341324efe971ca12ee124779816ff854e1355b
Author: Tim Jenness <[log in to unmask]>
Date: Wed Sep 7 16:03:05 2011 -1000
smurf: Fix heater reistance and apply heater efficiency data
The reference heater resistance is now fixed at 3ohms and the
per-bolometer resistance is now fixed at the reference resistor
value and is no longer specified in the resist.cfg file.
smf_flat_standardpow therefore still runs but will never regrid
the heater data (so TABLE mode still works).
Heater efficiency files have been created based on the current
best resistor values but now referenced to 3 ohms. Responsivity
images are now corrected by these values inside
smf_flat_responsivity.
The heater efficiencies are applied as part of flatfielding
rather than being applied when the flatfield itself is
calibrated. This allows us to shift the calibration to
the off-line system without having to worry about new
reistance values forcing all previous flatfields to be
recalculated.
Now smf_find_science looks at all the ARRAYID headers and
caches the corresponding heater efficiency data in an AST
keymap. This keymap is then passed to every routine that
previously took flatramps so much of this commit is simply
changing associated code to take an extra argument. I
decided not to read the efficiency data when a file
was opened (to populate smfDA immediately). I also decided
not to read the efficiency file on demand inside smf_flatten.
The major reasoning being that I do not want to open the
same efficiency file every time an s8a file is opened. There
is also the issue that we now run flatfielding inside a thread
so can not call NDF.
Flatfielded data do now have the same output values and
responsivities as they had before this commit but the
heater efficiencies are easier to manage.
Note that as things stand the heater efficiency will be
applied even if the flatfield was previously calculated
with a resistor value not equal to 3 ohms. This is a
serious issue and the fix requires us to modify
sc2store to write the resistor value (as a surrogate
for a version number). If we can read a resistor value
from the flatfielding information we know we have the
new flatfielding code and can apply the efficiency.
The other thing missing is the ability to write out the
efficiency data that was applied to the output time
series.
applications/smurf/Makefile.am | 10 +-
applications/smurf/data/README | 5 +
applications/smurf/data/mkheateff.sh | 52 +++
.../smurf/data/sg450_m1004d1000_heateff.sdf | Bin 0 -> 10240 bytes
.../smurf/data/sg450_m1006d1003_heateff.sdf | Bin 0 -> 10240 bytes
.../smurf/data/sg450_m1007d1002_heateff.sdf | Bin 0 -> 10240 bytes
.../smurf/data/sg450_m1009d1008_heateff.sdf | Bin 0 -> 10240 bytes
.../smurf/data/sg850_m0906d1005_heateff.sdf | Bin 0 -> 10240 bytes
.../smurf/data/sg850_m1002d1006_heateff.sdf | Bin 0 -> 10240 bytes
.../smurf/data/sg850_m1003d1004_heateff.sdf | Bin 0 -> 10240 bytes
.../smurf/data/sg850_m1005d1007_heateff.sdf | Bin 0 -> 10240 bytes
applications/smurf/defaults/smurf_calcflat.def | 46 +---
applications/smurf/examples/resist.cfg | 292 +-----------------
applications/smurf/libsmf/Makefile.am | 1 +
applications/smurf/libsmf/smf.h.source | 26 +-
applications/smurf/libsmf/smf_clean_pca.c | 2 +-
applications/smurf/libsmf/smf_clean_smfArray.c | 4 +-
applications/smurf/libsmf/smf_concat_smfGroup.c | 12 +-
applications/smurf/libsmf/smf_find_science.c | 34 ++-
applications/smurf/libsmf/smf_flat_calcflat.c | 2 +-
applications/smurf/libsmf/smf_flat_params.c | 186 +++++++-----
applications/smurf/libsmf/smf_flat_responsivity.c | 16 +-
applications/smurf/libsmf/smf_flatfield.c | 10 +-
applications/smurf/libsmf/smf_flatfield_smfData.c | 8 +-
applications/smurf/libsmf/smf_flatten.c | 25 ++-
applications/smurf/libsmf/smf_free_effmap.c | 90 ++++++
applications/smurf/libsmf/smf_iteratemap.c | 42 ++--
applications/smurf/libsmf/smf_model_create.c | 10 +-
applications/smurf/libsmf/smf_open_and_flatfield.c | 9 +-
applications/smurf/libsmf/smf_open_asdouble.c | 18 +-
applications/smurf/libsmurf/smurf_calcdark.c | 2 +-
applications/smurf/libsmurf/smurf_calcflat.c | 2 +-
applications/smurf/libsmurf/smurf_calcnoise.c | 6 +-
applications/smurf/libsmurf/smurf_calcqu.c | 6 +-
applications/smurf/libsmurf/smurf_dreamsolve.c | 12 +-
applications/smurf/libsmurf/smurf_extinction.c | 7 +-
applications/smurf/libsmurf/smurf_flatfield.c | 7 +-
applications/smurf/libsmurf/smurf_fts2_deglitch.c | 3 +-
applications/smurf/libsmurf/smurf_fts2_init.c | 3 +-
applications/smurf/libsmurf/smurf_fts2_removebse.c | 3 +-
applications/smurf/libsmurf/smurf_makemap.c | 12 +-
applications/smurf/libsmurf/smurf_qlmakemap.c | 4 +-
applications/smurf/libsmurf/smurf_remsky.c | 10 +-
applications/smurf/libsmurf/smurf_sc2clean.c | 6 +-
applications/smurf/libsmurf/smurf_sc2concat.c | 6 +-
applications/smurf/libsmurf/smurf_sc2fft.c | 6 +-
applications/smurf/libsmurf/smurf_sc2pca.c | 6 +-
applications/smurf/libsmurf/smurf_smurfcopy.c | 4 +-
applications/smurf/libsmurf/smurf_starecalc.c | 11 +-
49 files changed, 501 insertions(+), 515 deletions(-)
commit 5f140363b155549df5d80e5dd3c826c072db1604
Author: Tim Jenness <[log in to unmask]>
Date: Wed Sep 7 15:57:07 2011 -1000
smurf: Change RESIST parameter defaulting
No longer silently use CURRENT as people can forget that they
once specified a different resistor file and this can cause a lot
of confusion. Now we will always use the default values unless
specifically overridden.
applications/smurf/smurf.ifd.in | 44 ++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 20 deletions(-)
commit 698805269c784f8fc7a249efea936eaeee0f9125
Author: Tim Jenness <[log in to unmask]>
Date: Wed Sep 7 15:55:05 2011 -1000
smurf: smf_scale_bols can now take a smfData instead of file name
We can not read a file when we are in mutltiple threads so in some
cases we need to pass in data that have already been obtained
from somewhere else.
This patch also protects for an undef value being accessed
when reading the optical efficiency parameter.
applications/smurf/libsmf/smf.h.source | 4 +-
applications/smurf/libsmf/smf_clean_smfArray.c | 10 +-
applications/smurf/libsmf/smf_scale_bols.c | 88 ++++++++++++++++------
3 files changed, 72 insertions(+), 30 deletions(-)
commit ffeb920bf1f1dbbcf9d9a2eb6683fe86593d0423
Author: Tim Jenness <[log in to unmask]>
Date: Wed Sep 7 15:45:45 2011 -1000
smurf: smf_open_file is now a bit more lenient
If a 2D image arrived that declared itself to be from SCUBA-2
then the routine got upset if STEPTIME and SCAN_VEL were missing
when they are not really going to be useful.
applications/smurf/libsmf/smf_open_file.c | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
commit d4a6bfc911e0c88fae184b0034819967200e6977
Author: Malcolm J. Currie <[log in to unmask]>
Date: Fri Sep 2 18:14:14 2011 -1000
KAPPA: Typography in the news.
Signed-off-by: Malcolm J. Currie <[log in to unmask]>
applications/kappa/kappa.news.in | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
commit 1f553bddabbab198ab16f348e824ae95f0cec10e
Author: Malcolm J. Currie <[log in to unmask]>
Date: Fri Sep 2 18:12:51 2011 -1000
KAPPA: Remind users about FITSEXIST and FITSVAL.
Signed-off-by: Malcolm J. Currie <[log in to unmask]>
applications/kappa/kappa.news.in | 4 +++-
applications/kappa/sun95.tex | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
commit 655828e353f550c1dbf91cc49f92203e8ffa7e8d
Author: Malcolm J. Currie <[log in to unmask]>
Date: Fri Sep 2 17:48:51 2011 -1000
KAPPA: Restore PACKAGE_VERSION token.
Signed-off-by: Malcolm J. Currie <[log in to unmask]>
applications/kappa/kappa.news.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 80ff527d57446342b68e70fd0fac264aeeef5c6c
Author: David Berry <[log in to unmask]>
Date: Wed Sep 7 11:36:12 2011 +0100
atools: Add astAngle
applications/atools/Makefile.am | 6 +-
applications/atools/{astdistance.f => astangle.f} | 80 ++++++++++--------
applications/atools/atools.ifd.in | 47 +++++++++++
applications/atools/atools.news | 4 +
applications/atools/atools_mon.f | 3 +
applications/atools/component.xml | 2 +-
applications/atools/configure.ac | 2 +-
7 files changed, 103 insertions(+), 41 deletions(-)
|
