From d4da63e8f9c6b9cb0203a2f310b2677b5fdafc9d Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 22 Feb 2024 10:59:16 -0500 Subject: [PATCH] The Reunion [POC] (#412) * Purge WAF cruft * Add hstio library * Ignore cmake * Add tables * Add libraries * applib * cvos * "lib" * One library, one mind * Futher consolidation * Install those libraries * Reorg wfc3 -- 2d is broken * It wants an ACS structure... Hmm. * Add stis * Fix wfc3 build * Remove left over Makefiles * Drop nested directories * Remove HAVE_OPENMP define. Pointless. * Modify INSTALL.md * Purge WAF. * Consolidate fft * Compile with -fPIC * Enable warnings * Move source around * Implement additional changes required to rebase cleanly * Just keep swimming * Move dofwsat to library * rpath: use $ORIGIN on linux * Integrate GitHub Actions * Linux * MacOS * Remove errant conflict marker from .gitignore * Update RT to use cmake * Adjust RPATH * Add missing dependencies * Add MacOS * Drop extra name prefix * Linux matters more * Added functionality to build system * autotools-like source distributions * version information retained in source distributions * git_version emits version to stdout * add WITH_CFITSIO to change path to CFITSIO * pkg-config is optional (but highly recommended) * Disable debug output * Install to the conda prefix * See if the tests influence the weird jenkins workflow * Task order might affect Jenkins workflow * Add wfc3 computelimit.c to source list * Fix DISTINFO and version.h creation * Consolidate required project metadata * Always check for git repository status * Fix bogus include * Improve checking to see if we are operating inside of a repository * Ignore CPack artifacts * Ignore more CPack artifacts * Add system architectdure to cpack output file name * Add copyright text to CPack installer * Strip whitespace * Fix unintentional RPATH mangling on Darwin * Apply fix for missing PATH_MAX on Darwin PATH_MAX moved from limits.h to sys/syslimits.h * Disable Apple Clang check until I can find a better way to handle it * Update installation instructions * Fix code blocks * Add conda section * Change rpath argument format * Update INSTALL.md --- .ci/bin/dist | 26 + .ci/bin/git_version | 77 +++ .github/workflows/cmake.yml | 72 ++ .gitignore | 19 + CMakeLists.txt | 123 ++++ INSTALL.md | 143 ++-- JenkinsfileRT | 41 +- applib/wscript | 12 - build.cfg.example | 2 - config.h.in | 15 + configure | 119 ---- ctegen2/CMakeLists.txt | 50 ++ ctegen2/wscript | 19 - cvos/CMakeLists.txt | 15 + cvos/wscript | 11 - hstio/CMakeLists.txt | 20 + hstio/test/wscript | 18 - hstio/wscript | 13 - include/wscript | 8 - lib/CMakeLists.txt | 21 + {pkg/imphttab => lib}/getphttab.c | 0 {applib => lib}/ncarfft.f | 0 lib/trlbuf.c | 4 +- lib/wscript | 18 - pkg/CMakeLists.txt | 3 + pkg/acs/CMakeLists.txt | 119 ++++ pkg/acs/{calacs => }/Dates | 0 pkg/acs/{calacs => }/Errors | 0 pkg/acs/{calacs => }/History | 0 pkg/acs/{calacs => }/ToDo | 0 pkg/acs/{calacs => }/Updates | 0 pkg/acs/{calacs => }/Warnings | 0 pkg/acs/calacs/acs2d/wscript | 13 - pkg/acs/calacs/acsccd/wscript | 13 - pkg/acs/calacs/acscte/main.c | 9 - pkg/acs/calacs/acscte/wscript | 20 - pkg/acs/calacs/acsrej/wscript | 13 - pkg/acs/calacs/acssum/wscript | 13 - pkg/acs/calacs/calacs/wscript | 17 - pkg/acs/calacs/lib/wscript | 61 -- pkg/acs/calacs/wscript | 25 - pkg/acs/{calacs => }/include/acs.h | 0 pkg/acs/{calacs/calacs => include}/acsasn.h | 0 pkg/acs/{calacs => }/include/acscorr.h | 0 pkg/acs/include/acscte.h | 6 + pkg/acs/{calacs => }/include/acsdq.h | 0 pkg/acs/{calacs => }/include/acsinfo.h | 0 pkg/acs/{calacs => }/include/acsomit.h | 0 pkg/acs/{calacs => }/include/acsrej.h | 0 pkg/acs/{calacs/acssum => include}/acssum.h | 0 pkg/acs/{calacs => }/include/acsversion.h | 0 pkg/acs/{calacs => }/include/acswild.h | 0 pkg/acs/{calacs/calacs => include}/calacs.h | 0 pkg/acs/{calacs => }/include/getacskeys.h | 0 pkg/acs/{calacs/acscte => include}/pcte.h | 2 +- pkg/acs/{calacs/acsrej => include}/rej.h | 0 pkg/acs/lib/CMakeLists.txt | 146 ++++ pkg/acs/{calacs => }/lib/README | 0 pkg/acs/{calacs => lib}/acs2d/acs2d.c | 0 pkg/acs/{calacs => lib}/acs2d/do2d.c | 0 pkg/acs/{calacs => lib}/acs2d/dodark.c | 0 pkg/acs/{calacs => lib}/acs2d/doflash.c | 0 pkg/acs/{calacs => lib}/acs2d/doflat.c | 0 pkg/acs/{calacs => lib}/acs2d/dononlin.c | 0 pkg/acs/{calacs => lib}/acs2d/dophot.c | 0 pkg/acs/{calacs => lib}/acs2d/doshad.c | 0 pkg/acs/{calacs => lib}/acs2d/dospot.c | 0 pkg/acs/{calacs => lib}/acs2d/get2dflags.c | 0 pkg/acs/{calacs => lib}/acs2d/get2dsw.c | 0 pkg/acs/{calacs => lib}/acs2d/getlintab.c | 0 pkg/acs/{calacs => lib}/acs2d/getspottab.c | 0 pkg/acs/{calacs => lib}/acs2d/photmode.c | 0 pkg/acs/{calacs => lib}/acs2d/sanity2d.c | 0 pkg/acs/{calacs => lib}/acsccd/acsccd.c | 0 .../acsccd/blev_funcs_postsm4.c | 0 pkg/acs/{calacs => lib}/acsccd/blevdrift.c | 0 pkg/acs/{calacs => lib}/acsccd/blevfit.c | 0 pkg/acs/{calacs => lib}/acsccd/doatod.c | 0 pkg/acs/{calacs => lib}/acsccd/dobias.c | 0 pkg/acs/{calacs => lib}/acsccd/doblev.c | 0 pkg/acs/{calacs => lib}/acsccd/doccd.c | 0 pkg/acs/{calacs => lib}/acsccd/dofwsat.c | 0 pkg/acs/{calacs => lib}/acsccd/dosink.c | 0 pkg/acs/{calacs => lib}/acsccd/findblev.c | 0 pkg/acs/{calacs => lib}/acsccd/findover.c | 0 pkg/acs/{calacs => lib}/acsccd/getacsflag.c | 0 pkg/acs/{calacs => lib}/acsccd/getccdsw.c | 0 pkg/acs/{calacs => lib}/acscte/acscte.c | 0 pkg/acs/{calacs => lib}/acscte/docte.c | 0 .../maincte.c => lib/acscte/domaincte.c} | 3 +- pkg/acs/{calacs => lib}/acscte/dopcte-gen2.c | 0 pkg/acs/{calacs => lib}/acscte/dopcte.c | 0 pkg/acs/{calacs => lib}/acscte/getcteflag.c | 0 pkg/acs/{calacs => lib}/acscte/getctesw.c | 0 pkg/acs/{calacs => lib}/acscte/pcte_fixycte.c | 0 pkg/acs/{calacs => lib}/acscte/pcte_funcs.c | 0 pkg/acs/{calacs => }/lib/acshist.c | 0 pkg/acs/{calacs => }/lib/acsinfo.c | 0 pkg/acs/{calacs => lib}/acsrej/acsrej.c | 0 pkg/acs/{calacs => lib}/acsrej/acsrej_check.c | 0 pkg/acs/{calacs => lib}/acsrej/acsrej_do.c | 0 pkg/acs/{calacs => lib}/acsrej/acsrej_init.c | 0 pkg/acs/{calacs => lib}/acsrej/acsrej_loop.c | 0 pkg/acs/{calacs => lib}/acsrej/acsrej_sky.c | 0 pkg/acs/{calacs => lib}/acsrej/cr_history.c | 0 pkg/acs/{calacs => lib}/acsrej/cr_mode.c | 0 pkg/acs/{calacs => lib}/acsrej/cr_scaling.c | 0 pkg/acs/{calacs => lib}/acsrej/history | 0 pkg/acs/{calacs => lib}/acsrej/piksrt.c | 0 pkg/acs/{calacs => lib}/acsrej/readpar.c | 0 pkg/acs/{calacs => lib}/acsrej/rej_command.c | 0 pkg/acs/{calacs => }/lib/acssect.c | 0 pkg/acs/{calacs => lib}/acssum/Notes | 0 pkg/acs/{calacs => lib}/acssum/acssum.c | 0 pkg/acs/{calacs => }/lib/addk2d.c | 0 pkg/acs/{calacs => }/lib/bin2d.c | 0 pkg/acs/{calacs => }/lib/bincoords.c | 0 pkg/acs/{calacs => }/lib/binupdate.c | 0 pkg/acs/{calacs => lib}/calacs/README | 0 pkg/acs/{calacs => lib}/calacs/acsdth.c | 0 pkg/acs/{calacs => lib}/calacs/acsinit.c | 0 pkg/acs/{calacs => lib}/calacs/acsmember.c | 0 pkg/acs/{calacs => lib}/calacs/acstable.c | 0 pkg/acs/{calacs => lib}/calacs/calacs.c | 0 pkg/acs/{calacs => lib}/calacs/getflags.c | 0 pkg/acs/{calacs => lib}/calacs/getnewref.c | 0 pkg/acs/{calacs => lib}/calacs/getsciinfo.c | 0 pkg/acs/{calacs => lib}/calacs/refexist.c | 0 pkg/acs/{calacs => lib}/calacs/sciflags.c | 0 pkg/acs/{calacs => }/lib/comparenum.c | 0 pkg/acs/{calacs => }/lib/defswitch.c | 0 pkg/acs/{calacs => }/lib/detchip.c | 0 pkg/acs/{calacs => }/lib/detnsegn.c | 0 pkg/acs/{calacs => }/lib/div1d.c | 0 pkg/acs/{calacs => }/lib/dodqi.c | 0 pkg/acs/{calacs => }/lib/donoise.c | 0 pkg/acs/{calacs => }/lib/dostat.c | 0 pkg/acs/{calacs => }/lib/err.c | 0 pkg/acs/{calacs => }/lib/fileexists.c | 0 pkg/acs/{calacs => }/lib/findbin.c | 0 pkg/acs/{calacs => }/lib/findroot.c | 0 pkg/acs/{calacs => }/lib/fromlt.c | 0 pkg/acs/{calacs => }/lib/getacsgrp.c | 0 pkg/acs/{calacs => }/lib/getacskeys.c | 0 pkg/acs/{calacs => }/lib/getccdtab.c | 0 pkg/acs/{calacs => }/lib/getcorner.c | 0 pkg/acs/{calacs => }/lib/getlt.c | 0 pkg/acs/{calacs => }/lib/getrefname.c | 0 pkg/acs/{calacs => }/lib/getswitch.c | 0 pkg/acs/{calacs => }/lib/gotfilename.c | 0 pkg/acs/{calacs => }/lib/imghistory.c | 0 pkg/acs/{calacs => }/lib/imgpedigree.c | 0 pkg/acs/{calacs => }/lib/initmulti.c | 0 pkg/acs/{calacs => }/lib/interp1d.c | 0 pkg/acs/{calacs => }/lib/interpinfo.c | 0 pkg/acs/{calacs => }/lib/key.c | 0 pkg/acs/{calacs => }/lib/loadhead.c | 0 pkg/acs/{calacs => }/lib/logprogress.c | 0 pkg/acs/{calacs => }/lib/lowcase.c | 0 pkg/acs/{calacs => }/lib/median.c | 0 pkg/acs/{calacs => }/lib/mkname.c | 0 pkg/acs/{calacs => }/lib/mkoutname.c | 0 pkg/acs/{calacs => }/lib/mkspt.c | 0 pkg/acs/{calacs => }/lib/mult1d.c | 0 pkg/acs/{calacs => }/lib/multk1d.c | 0 pkg/acs/{calacs => }/lib/multk2d.c | 0 pkg/acs/{calacs => }/lib/omitstep.c | 0 pkg/acs/{calacs => }/lib/parseamps.c | 0 pkg/acs/{calacs => }/lib/parsedate.c | 0 pkg/acs/{calacs => }/lib/prinfo.c | 0 pkg/acs/{calacs => }/lib/reffiles.c | 0 pkg/acs/{calacs => }/lib/rowpedigree.c | 0 pkg/acs/{calacs => }/lib/sameint.c | 0 pkg/acs/{calacs => }/lib/spline.c | 0 pkg/acs/{calacs => }/lib/streqic.c | 0 pkg/acs/{calacs => }/lib/sub1d.c | 0 pkg/acs/{calacs => }/lib/sub2d.c | 0 pkg/acs/{calacs => }/lib/tabhistory.c | 0 pkg/acs/{calacs => }/lib/tabpedigree.c | 0 pkg/acs/{calacs => }/lib/timestamp.c | 0 pkg/acs/{calacs => }/lib/toelectrons.c | 0 pkg/acs/{calacs => }/lib/trim.c | 0 pkg/acs/{calacs => }/lib/trim2d.c | 0 pkg/acs/{calacs => }/lib/ucalver.c | 0 pkg/acs/{calacs => }/lib/ufilename.c | 0 pkg/acs/{calacs => }/lib/unbinline.c | 0 pkg/acs/{calacs => }/lib/whicherror.c | 0 pkg/acs/{calacs/acs2d => src}/main2d.c | 0 .../calacs/acsmain.c => src/mainacs.c} | 0 pkg/acs/{calacs/acsccd => src}/mainccd.c | 0 pkg/acs/src/maincte.c | 12 + pkg/acs/{calacs/acsrej => src}/mainrej.c | 0 pkg/acs/{calacs/acssum => src}/mainsum.c | 0 pkg/acs/wscript | 9 - pkg/imphttab/wscript | 23 - pkg/stis/CMakeLists.txt | 146 ++++ pkg/stis/calstis/cs0/Makefile | 27 - pkg/stis/calstis/cs0/wscript | 13 - pkg/stis/calstis/cs1/Makefile | 17 - pkg/stis/calstis/cs1/wscript | 13 - pkg/stis/calstis/cs11/Makefile | 13 - pkg/stis/calstis/cs11/wscript | 12 - pkg/stis/calstis/cs12/Makefile | 13 - pkg/stis/calstis/cs12/wscript | 12 - pkg/stis/calstis/cs2/Makefile | 14 - pkg/stis/calstis/cs2/wscript | 13 - pkg/stis/calstis/cs4/Makefile | 17 - pkg/stis/calstis/cs4/wscript | 12 - pkg/stis/calstis/cs6/Makefile | 21 - pkg/stis/calstis/cs6/idtalg/Makefile | 13 - pkg/stis/calstis/cs6/wscript | 13 - pkg/stis/calstis/cs7/Makefile | 16 - pkg/stis/calstis/cs7/wscript | 12 - pkg/stis/calstis/cs8/Makefile | 12 - pkg/stis/calstis/lib/wscript | 111 ---- pkg/stis/calstis/wscript | 17 - pkg/stis/{calstis => }/doc/alg7 | 0 pkg/stis/{calstis => }/doc/alg8 | 0 pkg/stis/{calstis => }/doc/algorithms | 0 pkg/stis/{calstis => }/doc/design | 0 pkg/stis/{calstis => }/doc/ltv.txt | 0 pkg/stis/{calstis/cs0 => include}/calstis0.h | 0 pkg/stis/{calstis/cs1 => include}/calstis1.h | 0 .../{calstis/cs11 => include}/calstis11.h | 0 .../{calstis/cs12 => include}/calstis12.h | 0 pkg/stis/{calstis/cs2 => include}/calstis2.h | 0 pkg/stis/{calstis/cs4 => include}/calstis4.h | 0 pkg/stis/{calstis => }/include/calstis6.h | 0 pkg/stis/{calstis/cs7 => include}/calstis7.h | 0 pkg/stis/{calstis/cs8 => include}/calstis8.h | 0 pkg/stis/{calstis => }/include/cs12.h | 0 pkg/stis/{calstis => }/include/cs2.h | 0 pkg/stis/include/cs2_reset.h | 9 + .../cs6 => include}/idtalg/design.txt | 0 .../{calstis/cs6 => include}/idtalg/idtalg.h | 0 pkg/stis/{calstis => }/include/stis.h | 0 pkg/stis/{calstis => }/include/stisaper.h | 0 pkg/stis/{calstis => }/include/stisdef.h | 0 pkg/stis/{calstis => }/include/stisdq.h | 0 pkg/stis/{calstis => }/include/stisomit.h | 0 pkg/stis/{calstis => }/include/stispht.h | 0 pkg/stis/{calstis => }/include/stisshutter.h | 0 pkg/stis/{calstis => }/include/stissizes.h | 0 pkg/stis/{calstis => }/include/stistds.h | 0 .../{calstis => }/include/stistemperature.h | 0 pkg/stis/{calstis => }/include/stisversion.h | 0 pkg/stis/{calstis => }/include/stisvoltages.h | 0 pkg/stis/{calstis => }/include/stiswild.h | 0 pkg/stis/lib/CMakeLists.txt | 268 ++++++++ pkg/stis/{calstis => }/lib/README | 0 pkg/stis/{calstis => }/lib/add2d.c | 0 pkg/stis/{calstis => }/lib/addk2d.c | 0 pkg/stis/{calstis => }/lib/bin2d.c | 0 pkg/stis/{calstis => }/lib/bincoords.c | 0 pkg/stis/{calstis => }/lib/binupdate.c | 0 pkg/stis/{calstis => }/lib/blazecorr.c | 0 pkg/stis/{calstis => }/lib/checkimsetok.c | 0 pkg/stis/{calstis => lib}/cs0/README | 0 pkg/stis/{calstis => lib}/cs0/calstis0.c | 2 +- pkg/stis/{calstis => lib}/cs0/checkwav.c | 0 pkg/stis/{calstis => lib}/cs0/compfiles.c | 0 pkg/stis/{calstis => lib}/cs0/getflags.c | 0 pkg/stis/{calstis => lib}/cs0/getnewref.c | 0 pkg/stis/{calstis => lib}/cs0/getsciinfo.c | 0 pkg/stis/{calstis => lib}/cs0/getwavinfo.c | 0 pkg/stis/{calstis => lib}/cs0/refexist.c | 0 pkg/stis/{calstis => lib}/cs0/savename.c | 0 pkg/stis/{calstis => lib}/cs0/sciflags.c | 0 pkg/stis/{calstis => lib}/cs0/stisinit.c | 0 pkg/stis/{calstis => lib}/cs0/wavflags.c | 0 pkg/stis/{calstis => lib}/cs1/blevdrift.c | 0 pkg/stis/{calstis => lib}/cs1/blevfit.c | 0 pkg/stis/{calstis => lib}/cs1/calstis1.c | 0 pkg/stis/{calstis => lib}/cs1/checkvolt.c | 0 pkg/stis/{calstis => lib}/cs1/do2d.c | 0 pkg/stis/{calstis => lib}/cs1/doatod.c | 0 pkg/stis/{calstis => lib}/cs1/dobias.c | 0 pkg/stis/{calstis => lib}/cs1/doblev.c | 0 pkg/stis/{calstis => lib}/cs1/dodark.c | 0 pkg/stis/{calstis => lib}/cs1/dodqi.c | 0 pkg/stis/{calstis => lib}/cs1/doflat.c | 0 pkg/stis/{calstis => lib}/cs1/dolores.c | 0 pkg/stis/{calstis => lib}/cs1/donoise.c | 0 pkg/stis/{calstis => lib}/cs1/dononlin.c | 0 pkg/stis/{calstis => lib}/cs1/dophot.c | 0 pkg/stis/{calstis => lib}/cs1/doppconv.c | 0 pkg/stis/{calstis => lib}/cs1/doshad.c | 0 pkg/stis/{calstis => lib}/cs1/findbin.c | 0 pkg/stis/{calstis => lib}/cs1/findblev.c | 0 pkg/stis/{calstis => lib}/cs1/findover.c | 0 pkg/stis/{calstis => lib}/cs1/flagfilter.c | 0 pkg/stis/{calstis => lib}/cs1/getccdtab.c | 0 pkg/stis/{calstis => lib}/cs1/getepctab1.c | 0 pkg/stis/{calstis => lib}/cs1/getflags1.c | 0 pkg/stis/{calstis => lib}/cs1/getgrpinfo1.c | 0 pkg/stis/{calstis => lib}/cs1/getkeyinfo1.c | 0 pkg/stis/{calstis => lib}/cs1/getlintab.c | 0 pkg/stis/{calstis => lib}/cs1/gettdccorr.c | 0 pkg/stis/{calstis => lib}/cs1/gettds1.c | 0 pkg/stis/{calstis => lib}/cs1/history1.c | 0 pkg/stis/{calstis => lib}/cs1/makedopp.c | 0 pkg/stis/{calstis => lib}/cs1/photmode.c | 0 pkg/stis/{calstis => lib}/cs1/sanity1.c | 0 pkg/stis/{calstis => lib}/cs11/binsubtract.c | 0 pkg/stis/{calstis => lib}/cs11/calstis11.c | 0 pkg/stis/{calstis => lib}/cs11/getkeyinfo11.c | 0 pkg/stis/{calstis => lib}/cs11/gettimes11.c | 0 pkg/stis/{calstis => lib}/cs11/matchsci.c | 0 pkg/stis/{calstis => lib}/cs11/subsci.c | 0 pkg/stis/{calstis => lib}/cs12/addshifts.c | 0 pkg/stis/{calstis => lib}/cs12/calstis12.c | 0 pkg/stis/{calstis => lib}/cs12/getkeyinfo12.c | 0 pkg/stis/{calstis => lib}/cs12/getscigrp.c | 0 pkg/stis/{calstis => lib}/cs12/getwavgrp.c | 0 pkg/stis/{calstis => lib}/cs12/history12.c | 0 pkg/stis/{calstis => lib}/cs12/matchwav.c | 0 pkg/stis/{calstis => lib}/cs12/targpos.c | 0 pkg/stis/{calstis => lib}/cs2/calstis2.c | 0 pkg/stis/{calstis => lib}/cs2/cr_history.c | 0 pkg/stis/{calstis => lib}/cs2/cr_mode.c | 0 pkg/stis/{calstis => lib}/cs2/cr_scaling.c | 0 pkg/stis/{calstis => lib}/cs2/crrej_check.c | 0 pkg/stis/{calstis => lib}/cs2/crrej_do.c | 0 pkg/stis/{calstis => lib}/cs2/crrej_init.c | 0 pkg/stis/{calstis => lib}/cs2/crrej_loop.c | 0 pkg/stis/{calstis => lib}/cs2/crrej_sky.c | 0 pkg/stis/{calstis => lib}/cs2/o_cal2_in.c | 0 pkg/stis/{calstis => lib}/cs2/piksrt.c | 0 pkg/stis/lib/cs2_reset.c | 29 + pkg/stis/{calstis => lib}/cs4/Differences | 0 pkg/stis/{calstis => lib}/cs4/Notes | 0 pkg/stis/{calstis => lib}/cs4/calstis4.c | 0 pkg/stis/{calstis => lib}/cs4/convslit.c | 0 pkg/stis/{calstis => lib}/cs4/echshift.c | 0 pkg/stis/{calstis => lib}/cs4/findbars.c | 0 pkg/stis/{calstis => lib}/cs4/findedge.c | 0 pkg/stis/{calstis => lib}/cs4/findends.c | 0 pkg/stis/{calstis => lib}/cs4/findwl.c | 0 pkg/stis/{calstis => lib}/cs4/flagcr.c | 0 pkg/stis/{calstis => lib}/cs4/getangle4.c | 0 pkg/stis/{calstis => lib}/cs4/getapdes4.c | 0 pkg/stis/{calstis => lib}/cs4/getdisp4.c | 0 pkg/stis/{calstis => lib}/cs4/getflags4.c | 0 pkg/stis/{calstis => lib}/cs4/getgrpinfo4.c | 0 pkg/stis/{calstis => lib}/cs4/getinang4.c | 0 pkg/stis/{calstis => lib}/cs4/getkeyinfo4.c | 0 pkg/stis/{calstis => lib}/cs4/getlamp.c | 0 pkg/stis/{calstis => lib}/cs4/gettrace4.c | 0 pkg/stis/{calstis => lib}/cs4/getwcp.c | 0 pkg/stis/{calstis => lib}/cs4/history4.c | 0 pkg/stis/{calstis => lib}/cs4/invert.c | 0 pkg/stis/{calstis => lib}/cs4/maketemplate.c | 0 pkg/stis/{calstis => lib}/cs4/newtrace4.c | 0 pkg/stis/{calstis => lib}/cs4/peakquad3.c | 0 pkg/stis/{calstis => lib}/cs4/scaleref.c | 0 pkg/stis/{calstis => lib}/cs4/spatialshift.c | 0 pkg/stis/{calstis => lib}/cs4/updateshift.c | 0 pkg/stis/{calstis => lib}/cs4/wavecal.c | 0 pkg/stis/{calstis => lib}/cs4/waveshift.c | 0 pkg/stis/{calstis => lib}/cs4/whichslit.c | 0 pkg/stis/{calstis => lib}/cs4/xc4.c | 0 pkg/stis/{calstis => lib}/cs4/xcechelle.c | 0 pkg/stis/{calstis => lib}/cs4/xcpeak.c | 0 pkg/stis/{calstis => lib}/cs4/xcwave.c | 0 pkg/stis/{calstis => lib}/cs6/Notes | 0 pkg/stis/{calstis => lib}/cs6/absflux6.c | 0 pkg/stis/{calstis => lib}/cs6/addoffsets6.c | 0 pkg/stis/{calstis => lib}/cs6/adjustdisp6.c | 0 pkg/stis/{calstis => lib}/cs6/background.c | 0 pkg/stis/{calstis => lib}/cs6/buildoptprof.c | 0 pkg/stis/{calstis => lib}/cs6/buildprof.c | 0 pkg/stis/{calstis => lib}/cs6/calstis6.c | 0 pkg/stis/{calstis => lib}/cs6/calstis6std.c | 0 pkg/stis/{calstis => lib}/cs6/checkoptimal.c | 0 pkg/stis/{calstis => lib}/cs6/commline.c | 0 pkg/stis/{calstis => lib}/cs6/crosscor.c | 0 pkg/stis/{calstis => lib}/cs6/defineback.c | 0 pkg/stis/{calstis => lib}/cs6/design2.txt | 0 pkg/stis/{calstis => lib}/cs6/do1dx.c | 0 pkg/stis/{calstis => lib}/cs6/findlya.c | 0 pkg/stis/{calstis => lib}/cs6/gcrosscor.c | 0 pkg/stis/{calstis => lib}/cs6/getabsphot6.c | 0 pkg/stis/{calstis => lib}/cs6/getapdes6.c | 0 pkg/stis/{calstis => lib}/cs6/getapoffset6.c | 0 pkg/stis/{calstis => lib}/cs6/getapthr6.c | 0 pkg/stis/{calstis => lib}/cs6/getccdtab6.c | 0 pkg/stis/{calstis => lib}/cs6/getcheckref.c | 0 pkg/stis/{calstis => lib}/cs6/getdisp6.c | 0 pkg/stis/{calstis => lib}/cs6/getextract.c | 0 pkg/stis/{calstis => lib}/cs6/getflags6.c | 0 pkg/stis/{calstis => lib}/cs6/getgac6.c | 0 pkg/stis/{calstis => lib}/cs6/getgrpinfo6.c | 0 pkg/stis/{calstis => lib}/cs6/getinang6.c | 0 pkg/stis/{calstis => lib}/cs6/getintens.c | 0 pkg/stis/{calstis => lib}/cs6/getkeyinfo6.c | 0 pkg/stis/{calstis => lib}/cs6/getpct6.c | 0 pkg/stis/{calstis => lib}/cs6/getprofile.c | 0 pkg/stis/{calstis => lib}/cs6/getrefcline.c | 0 pkg/stis/{calstis => lib}/cs6/getsdc6.c | 0 pkg/stis/{calstis => lib}/cs6/gettrace6.c | 0 pkg/stis/{calstis => lib}/cs6/heliofactor6.c | 0 pkg/stis/{calstis => lib}/cs6/history6.c | 0 pkg/stis/{calstis => lib}/cs6/init.c | 0 pkg/stis/{calstis => lib}/cs6/lee.c | 0 pkg/stis/{calstis => lib}/cs6/memory.c | 0 pkg/stis/{calstis => lib}/cs6/message6.c | 0 pkg/stis/{calstis => lib}/cs6/newcoord6.c | 0 pkg/stis/{calstis => lib}/cs6/newdisp6.c | 0 pkg/stis/{calstis => lib}/cs6/newextract.c | 0 pkg/stis/{calstis => lib}/cs6/newprofile.c | 0 pkg/stis/{calstis => lib}/cs6/newtrace6.c | 0 pkg/stis/{calstis => lib}/cs6/output.c | 0 pkg/stis/{calstis => lib}/cs6/poly.c | 0 pkg/stis/{calstis => lib}/cs6/selectalg.c | 0 pkg/stis/{calstis => lib}/cs6/setranges.c | 0 pkg/stis/{calstis => lib}/cs6/timestamp6.c | 0 pkg/stis/{calstis => lib}/cs6/wave.c | 0 pkg/stis/{calstis => lib}/cs6/x1dspec.c | 0 pkg/stis/{calstis => lib}/cs7/Notes | 0 pkg/stis/{calstis => lib}/cs7/absflux.c | 0 pkg/stis/{calstis => lib}/cs7/adjustdisp.c | 0 pkg/stis/{calstis => lib}/cs7/calstis7.c | 0 pkg/stis/{calstis => lib}/cs7/datamasked.c | 0 pkg/stis/{calstis => lib}/cs7/do2dx.c | 0 pkg/stis/{calstis => lib}/cs7/evaldisp7.c | 0 pkg/stis/{calstis => lib}/cs7/geocorr7.c | 0 pkg/stis/{calstis => lib}/cs7/getabsphot.c | 0 pkg/stis/{calstis => lib}/cs7/getapdes7.c | 0 pkg/stis/{calstis => lib}/cs7/getapoffset.c | 0 pkg/stis/{calstis => lib}/cs7/getapthr.c | 0 pkg/stis/{calstis => lib}/cs7/getdisp.c | 0 pkg/stis/{calstis => lib}/cs7/getflags7.c | 0 pkg/stis/{calstis => lib}/cs7/getgrpinfo7.c | 0 pkg/stis/{calstis => lib}/cs7/getidc.c | 0 pkg/stis/{calstis => lib}/cs7/getinang.c | 0 pkg/stis/{calstis => lib}/cs7/getkeyinfo7.c | 0 pkg/stis/{calstis => lib}/cs7/getpct.c | 0 pkg/stis/{calstis => lib}/cs7/getsdc.c | 0 pkg/stis/{calstis => lib}/cs7/gettrace.c | 0 pkg/stis/{calstis => lib}/cs7/heliofactor.c | 0 pkg/stis/{calstis => lib}/cs7/history7.c | 0 pkg/stis/{calstis => lib}/cs7/newcoord.c | 0 pkg/stis/{calstis => lib}/cs7/newdisp.c | 0 pkg/stis/{calstis => lib}/cs7/newtrace.c | 0 pkg/stis/{calstis => lib}/cs7/putgrpinfo7.c | 0 pkg/stis/{calstis => lib}/cs7/scalewcs.c | 0 pkg/stis/{calstis => lib}/cs7/x2dcorr7.c | 0 pkg/stis/{calstis => lib}/cs8/calstis8.c | 0 pkg/stis/{calstis => }/lib/defswitch.c | 0 pkg/stis/{calstis => }/lib/div2d.c | 0 pkg/stis/{calstis => }/lib/dostat.c | 0 pkg/stis/{calstis => }/lib/evaldisp.c | 0 pkg/stis/{calstis => }/lib/extrap1d.c | 0 pkg/stis/{calstis => }/lib/fileexists.c | 0 pkg/stis/{calstis => }/lib/getcorner.c | 0 pkg/stis/{calstis => }/lib/getdettemp.c | 0 pkg/stis/{calstis => }/lib/getlt.c | 0 pkg/stis/{calstis => }/lib/getlt0.c | 0 pkg/stis/{calstis => }/lib/getmoc.c | 0 pkg/stis/{calstis => }/lib/getrefname.c | 0 pkg/stis/{calstis => }/lib/getswitch.c | 0 pkg/stis/{calstis => }/lib/gettds.c | 0 pkg/stis/{calstis => }/lib/gotfilename.c | 0 .../{calstis/cs6 => lib}/idtalg/calstis6idt.c | 0 .../{calstis/cs6 => lib}/idtalg/echscatread.c | 0 .../{calstis/cs6 => lib}/idtalg/idtmemory.c | 0 .../{calstis/cs6 => lib}/idtalg/rebindata.c | 0 pkg/stis/{calstis/cs6 => lib}/idtalg/splice.c | 0 .../{calstis/cs6 => lib}/idtalg/x1dtable.c | 0 pkg/stis/{calstis/cs6 => lib}/idtalg/xc6.c | 0 pkg/stis/{calstis => }/lib/imghistory.c | 0 pkg/stis/{calstis => }/lib/imgpedigree.c | 0 pkg/stis/{calstis => }/lib/initreftab.c | 0 pkg/stis/{calstis => }/lib/interp1d.c | 0 pkg/stis/{calstis => }/lib/interp2d.c | 0 pkg/stis/{calstis => }/lib/key.c | 0 pkg/stis/{calstis => }/lib/median.c | 0 pkg/stis/{calstis => }/lib/mkname.c | 0 pkg/stis/{calstis => }/lib/mkoutname.c | 0 pkg/stis/{calstis => }/lib/mult2d.c | 0 pkg/stis/{calstis => }/lib/multk2d.c | 0 pkg/stis/{calstis => }/lib/omitstep.c | 0 pkg/stis/{calstis => }/lib/orbitaldopp.c | 0 pkg/stis/{calstis => }/lib/prinfo.c | 0 pkg/stis/{calstis => }/lib/pseudoap.c | 0 pkg/stis/{calstis => }/lib/radialvel.c | 0 pkg/stis/{calstis => }/lib/reffiles.c | 0 pkg/stis/{calstis => }/lib/rotatetrace.c | 0 pkg/stis/{calstis => }/lib/rowpedigree.c | 0 pkg/stis/{calstis => }/lib/sameint.c | 0 pkg/stis/{calstis => }/lib/spline.c | 0 pkg/stis/{calstis => }/lib/strcmptail.c | 0 pkg/stis/{calstis => }/lib/streqic.c | 0 pkg/stis/{calstis => }/lib/strtor.c | 0 pkg/stis/{calstis => }/lib/sub2d.c | 0 pkg/stis/{calstis => }/lib/tabhistory.c | 0 pkg/stis/{calstis => }/lib/tabpedigree.c | 0 pkg/stis/{calstis => }/lib/tdscorrect.c | 0 pkg/stis/{calstis => }/lib/timestamp.c | 0 pkg/stis/{calstis => }/lib/ucalver.c | 0 pkg/stis/{calstis => }/lib/ufilename.c | 0 pkg/stis/{calstis => }/lib/unbin2d.c | 0 pkg/stis/{calstis => }/lib/whicherror.c | 0 pkg/stis/{calstis => }/lib/xcfft.c | 0 pkg/stis/{calstis/cs0 => src}/cs0.c | 0 pkg/stis/{calstis/cs1 => src}/cs1.c | 0 pkg/stis/{calstis/cs11 => src}/cs11.c | 0 pkg/stis/{calstis/cs12 => src}/cs12.c | 0 pkg/stis/{calstis/cs2 => src}/cs2.c | 0 pkg/stis/{calstis/cs2 => src}/cs2_command.c | 24 - pkg/stis/{calstis/cs4 => src}/cs4.c | 0 pkg/stis/{calstis/cs6 => src}/cs6.c | 0 pkg/stis/{calstis/cs7 => src}/cs7.c | 0 pkg/stis/{calstis/cs8 => src}/cs8.c | 0 pkg/stis/wscript | 17 - pkg/wfc3/CMakeLists.txt | 115 ++++ pkg/wfc3/{calwf3 => }/Dates | 0 pkg/wfc3/{calwf3 => }/History | 0 pkg/wfc3/{calwf3 => }/Updates | 0 pkg/wfc3/calwf3/calwf3/wscript | 13 - pkg/wfc3/calwf3/lib/wscript | 69 -- pkg/wfc3/calwf3/wf32d/wscript | 13 - pkg/wfc3/calwf3/wf3ccd/wscript | 13 - pkg/wfc3/calwf3/wf3cte/wscript | 12 - pkg/wfc3/calwf3/wf3ir/wscript | 13 - pkg/wfc3/calwf3/wf3rej/rej.h | 19 - pkg/wfc3/calwf3/wf3rej/wscript | 13 - pkg/wfc3/calwf3/wf3sum/wscript | 13 - pkg/wfc3/calwf3/wscript | 27 - pkg/wfc3/{calwf3/calwf3 => include}/calwf3.h | 0 pkg/wfc3/{calwf3/wf3cte => include}/cte.h | 0 pkg/wfc3/{calwf3/wf3ccd => include}/doccd.h | 0 pkg/wfc3/{calwf3 => }/include/msg.h | 0 pkg/wfc3/{calwf3/wf3ir => include}/rej.h | 0 pkg/wfc3/{calwf3 => }/include/wf3.h | 0 pkg/wfc3/{calwf3/calwf3 => include}/wf3asn.h | 0 pkg/wfc3/{calwf3 => }/include/wf3corr.h | 0 pkg/wfc3/{calwf3 => }/include/wf3dq.h | 0 pkg/wfc3/{calwf3 => }/include/wf3info.h | 0 pkg/wfc3/{calwf3 => }/include/wf3omit.h | 0 pkg/wfc3/{calwf3 => }/include/wf3rej.h | 0 pkg/wfc3/{calwf3/wf3sum => include}/wf3sum.h | 0 pkg/wfc3/{calwf3 => }/include/wf3version.h | 0 pkg/wfc3/{calwf3 => }/include/wf3wild.h | 0 pkg/wfc3/lib/CMakeLists.txt | 166 +++++ pkg/wfc3/{calwf3 => }/lib/README | 0 pkg/wfc3/{calwf3 => }/lib/addk2d.c | 0 pkg/wfc3/{calwf3 => }/lib/bin2d.c | 0 pkg/wfc3/{calwf3 => }/lib/bincoords.c | 0 pkg/wfc3/{calwf3 => }/lib/binupdate.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/calwf3.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/getinfo.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/getnewref.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/getreffiles.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/getswitches.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/procccd.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/procir.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/refexist.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/wf3dth.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/wf3init.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/wf3member.c | 0 pkg/wfc3/{calwf3 => lib}/calwf3/wf3table.c | 0 pkg/wfc3/{calwf3 => }/lib/comparenum.c | 0 pkg/wfc3/{calwf3 => }/lib/computelimits.c | 0 pkg/wfc3/{calwf3 => }/lib/defswitch.c | 0 pkg/wfc3/{calwf3 => }/lib/detchip.c | 0 pkg/wfc3/{calwf3 => }/lib/detnsegn.c | 0 pkg/wfc3/{calwf3 => }/lib/div1d.c | 0 pkg/wfc3/{calwf3 => }/lib/dodqi.c | 0 pkg/wfc3/{calwf3 => }/lib/donoise.c | 0 pkg/wfc3/{calwf3 => }/lib/dostat.c | 0 pkg/wfc3/{calwf3 => }/lib/err.c | 0 pkg/wfc3/{calwf3 => }/lib/fileexists.c | 0 pkg/wfc3/{calwf3 => }/lib/findbin.c | 0 pkg/wfc3/{calwf3 => }/lib/findroot.c | 0 pkg/wfc3/{calwf3 => }/lib/fromlt.c | 0 pkg/wfc3/{calwf3 => }/lib/getccdtab.c | 0 pkg/wfc3/{calwf3 => }/lib/getcorner.c | 0 pkg/wfc3/{calwf3 => }/lib/getgrp.c | 0 pkg/wfc3/{calwf3 => }/lib/getkeys.c | 0 pkg/wfc3/{calwf3 => }/lib/getlt.c | 0 pkg/wfc3/{calwf3 => }/lib/getrefname.c | 0 pkg/wfc3/{calwf3 => }/lib/getswitch.c | 0 pkg/wfc3/{calwf3 => }/lib/gotfilename.c | 0 pkg/wfc3/{calwf3 => }/lib/imghistory.c | 0 pkg/wfc3/{calwf3 => }/lib/imgpedigree.c | 0 pkg/wfc3/{calwf3 => }/lib/initmulti.c | 0 pkg/wfc3/{calwf3 => }/lib/interp1d.c | 0 pkg/wfc3/{calwf3 => }/lib/interpinfo.c | 0 pkg/wfc3/{calwf3 => }/lib/key.c | 0 pkg/wfc3/{calwf3 => }/lib/loadhead.c | 0 pkg/wfc3/{calwf3 => }/lib/logprogress.c | 0 pkg/wfc3/{calwf3 => }/lib/lowcase.c | 0 pkg/wfc3/{calwf3 => }/lib/median.c | 0 pkg/wfc3/{calwf3 => }/lib/mkname.c | 0 pkg/wfc3/{calwf3 => }/lib/mkoutname.c | 0 pkg/wfc3/{calwf3 => }/lib/mkspt.c | 0 pkg/wfc3/{calwf3 => }/lib/mult1d.c | 0 pkg/wfc3/{calwf3 => }/lib/multk1d.c | 0 pkg/wfc3/{calwf3 => }/lib/multk2d.c | 0 pkg/wfc3/{calwf3 => }/lib/omitstep.c | 0 pkg/wfc3/{calwf3 => }/lib/parseamps.c | 0 pkg/wfc3/{calwf3 => }/lib/prinfo.c | 0 pkg/wfc3/{calwf3 => }/lib/razutil.c | 0 pkg/wfc3/{calwf3 => }/lib/reffiles.c | 0 pkg/wfc3/{calwf3 => }/lib/rowpedigree.c | 0 pkg/wfc3/{calwf3 => }/lib/sameint.c | 0 pkg/wfc3/{calwf3 => }/lib/spline.c | 0 pkg/wfc3/{calwf3 => }/lib/streqic.c | 0 pkg/wfc3/{calwf3 => }/lib/sub1d.c | 0 pkg/wfc3/{calwf3 => }/lib/subtools.c | 0 pkg/wfc3/{calwf3 => }/lib/tabhistory.c | 0 pkg/wfc3/{calwf3 => }/lib/tabpedigree.c | 0 pkg/wfc3/{calwf3 => }/lib/timestamp.c | 0 pkg/wfc3/{calwf3 => }/lib/trim.c | 0 pkg/wfc3/{calwf3 => }/lib/ucalver.c | 0 pkg/wfc3/{calwf3 => }/lib/ufilename.c | 0 pkg/wfc3/{calwf3 => }/lib/unbin2d.c | 0 pkg/wfc3/{calwf3 => }/lib/unbinline.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/do2d.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/dodark.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/doflat.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/doflux.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/dophot.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/doshad.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/get2dflags.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/get2dsw.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/photmode.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/sanity2d.c | 0 pkg/wfc3/{calwf3 => lib}/wf32d/wf32d.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/blevdrift.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/blevfit.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/doatod.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/dobias.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/doblev.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/doccd.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/doflash.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/dofwsat.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/findblev.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/findover.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/getccdsw.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/getflags.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/sink.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ccd/wf3ccd.c | 0 pkg/wfc3/{calwf3 => lib}/wf3cte/cte_dobias.c | 0 pkg/wfc3/{calwf3 => lib}/wf3cte/getcteflags.c | 0 pkg/wfc3/{calwf3 => lib}/wf3cte/getctepars.c | 0 pkg/wfc3/{calwf3 => lib}/wf3cte/getctesw.c | 0 pkg/wfc3/{calwf3 => lib}/wf3cte/wf3cte.c | 0 pkg/wfc3/{calwf3 => }/lib/wf3hist.c | 0 pkg/wfc3/{calwf3 => }/lib/wf3info.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/blevcorr.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/cridcalc.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/darkcorr.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/doir.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/dqicorr.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/flatcorr.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/getirflags.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/getirsw.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/groupinfo.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/imageio.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/irhist.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/math.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/nlincorr.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/noiscalc.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/numrec.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/photcalc.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/pixcheck.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/refdata.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/resistmean.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/satcheck.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/statcalc.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/stats.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/unitcorr.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/updatehdr.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/wf3ir.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/zoffcorr.c | 0 pkg/wfc3/{calwf3 => lib}/wf3ir/zsigcorr.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/cr_history.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/cr_mode.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/cr_scaling.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/history | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/piksrt.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/readpar.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/rej_check.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/rej_command.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/rej_do.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/rej_init.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/rej_loop.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/rej_sky.c | 0 pkg/wfc3/{calwf3 => lib}/wf3rej/wf3rej.c | 0 pkg/wfc3/{calwf3 => }/lib/wf3sect.c | 0 pkg/wfc3/{calwf3 => lib}/wf3sum/Notes | 0 pkg/wfc3/{calwf3 => lib}/wf3sum/wf3sum.c | 0 pkg/wfc3/{calwf3 => }/lib/whicherror.c | 0 pkg/wfc3/{calwf3/wf32d => src}/main2d.c | 0 pkg/wfc3/{calwf3/wf3ccd => src}/mainccd.c | 0 pkg/wfc3/{calwf3/wf3cte => src}/maincte.c | 0 pkg/wfc3/{calwf3/wf3ir => src}/mainir.c | 0 pkg/wfc3/{calwf3/wf3rej => src}/mainrej.c | 0 pkg/wfc3/{calwf3/wf3sum => src}/mainsum.c | 0 .../calwf3/wf3main.c => src/mainwf3.c} | 0 pkg/wfc3/wscript | 11 - pkg/wscript | 10 - tables/CMakeLists.txt | 64 ++ tables/wscript | 18 - waf | 1 - waf-2.0.19 | 173 ----- waf_patches/README | 20 - waf_patches/g77.py | 90 --- waf_patches/patch-compiler_fc.py.patch | 27 - wscript | 626 ------------------ 712 files changed, 1660 insertions(+), 2105 deletions(-) create mode 100755 .ci/bin/dist create mode 100755 .ci/bin/git_version create mode 100644 .github/workflows/cmake.yml create mode 100644 CMakeLists.txt delete mode 100644 applib/wscript delete mode 100644 build.cfg.example create mode 100644 config.h.in delete mode 100755 configure create mode 100644 ctegen2/CMakeLists.txt delete mode 100644 ctegen2/wscript create mode 100644 cvos/CMakeLists.txt delete mode 100644 cvos/wscript create mode 100644 hstio/CMakeLists.txt delete mode 100644 hstio/test/wscript delete mode 100644 hstio/wscript delete mode 100644 include/wscript create mode 100644 lib/CMakeLists.txt rename {pkg/imphttab => lib}/getphttab.c (100%) rename {applib => lib}/ncarfft.f (100%) delete mode 100644 lib/wscript create mode 100644 pkg/CMakeLists.txt create mode 100644 pkg/acs/CMakeLists.txt rename pkg/acs/{calacs => }/Dates (100%) rename pkg/acs/{calacs => }/Errors (100%) rename pkg/acs/{calacs => }/History (100%) rename pkg/acs/{calacs => }/ToDo (100%) rename pkg/acs/{calacs => }/Updates (100%) rename pkg/acs/{calacs => }/Warnings (100%) delete mode 100644 pkg/acs/calacs/acs2d/wscript delete mode 100644 pkg/acs/calacs/acsccd/wscript delete mode 100644 pkg/acs/calacs/acscte/main.c delete mode 100644 pkg/acs/calacs/acscte/wscript delete mode 100644 pkg/acs/calacs/acsrej/wscript delete mode 100644 pkg/acs/calacs/acssum/wscript delete mode 100644 pkg/acs/calacs/calacs/wscript delete mode 100644 pkg/acs/calacs/lib/wscript delete mode 100644 pkg/acs/calacs/wscript rename pkg/acs/{calacs => }/include/acs.h (100%) rename pkg/acs/{calacs/calacs => include}/acsasn.h (100%) rename pkg/acs/{calacs => }/include/acscorr.h (100%) create mode 100644 pkg/acs/include/acscte.h rename pkg/acs/{calacs => }/include/acsdq.h (100%) rename pkg/acs/{calacs => }/include/acsinfo.h (100%) rename pkg/acs/{calacs => }/include/acsomit.h (100%) rename pkg/acs/{calacs => }/include/acsrej.h (100%) rename pkg/acs/{calacs/acssum => include}/acssum.h (100%) rename pkg/acs/{calacs => }/include/acsversion.h (100%) rename pkg/acs/{calacs => }/include/acswild.h (100%) rename pkg/acs/{calacs/calacs => include}/calacs.h (100%) rename pkg/acs/{calacs => }/include/getacskeys.h (100%) rename pkg/acs/{calacs/acscte => include}/pcte.h (98%) rename pkg/acs/{calacs/acsrej => include}/rej.h (100%) create mode 100644 pkg/acs/lib/CMakeLists.txt rename pkg/acs/{calacs => }/lib/README (100%) rename pkg/acs/{calacs => lib}/acs2d/acs2d.c (100%) rename pkg/acs/{calacs => lib}/acs2d/do2d.c (100%) rename pkg/acs/{calacs => lib}/acs2d/dodark.c (100%) rename pkg/acs/{calacs => lib}/acs2d/doflash.c (100%) rename pkg/acs/{calacs => lib}/acs2d/doflat.c (100%) rename pkg/acs/{calacs => lib}/acs2d/dononlin.c (100%) rename pkg/acs/{calacs => lib}/acs2d/dophot.c (100%) rename pkg/acs/{calacs => lib}/acs2d/doshad.c (100%) rename pkg/acs/{calacs => lib}/acs2d/dospot.c (100%) rename pkg/acs/{calacs => lib}/acs2d/get2dflags.c (100%) rename pkg/acs/{calacs => lib}/acs2d/get2dsw.c (100%) rename pkg/acs/{calacs => lib}/acs2d/getlintab.c (100%) rename pkg/acs/{calacs => lib}/acs2d/getspottab.c (100%) rename pkg/acs/{calacs => lib}/acs2d/photmode.c (100%) rename pkg/acs/{calacs => lib}/acs2d/sanity2d.c (100%) rename pkg/acs/{calacs => lib}/acsccd/acsccd.c (100%) rename pkg/acs/{calacs => lib}/acsccd/blev_funcs_postsm4.c (100%) rename pkg/acs/{calacs => lib}/acsccd/blevdrift.c (100%) rename pkg/acs/{calacs => lib}/acsccd/blevfit.c (100%) rename pkg/acs/{calacs => lib}/acsccd/doatod.c (100%) rename pkg/acs/{calacs => lib}/acsccd/dobias.c (100%) rename pkg/acs/{calacs => lib}/acsccd/doblev.c (100%) rename pkg/acs/{calacs => lib}/acsccd/doccd.c (100%) rename pkg/acs/{calacs => lib}/acsccd/dofwsat.c (100%) rename pkg/acs/{calacs => lib}/acsccd/dosink.c (100%) rename pkg/acs/{calacs => lib}/acsccd/findblev.c (100%) rename pkg/acs/{calacs => lib}/acsccd/findover.c (100%) rename pkg/acs/{calacs => lib}/acsccd/getacsflag.c (100%) rename pkg/acs/{calacs => lib}/acsccd/getccdsw.c (100%) rename pkg/acs/{calacs => lib}/acscte/acscte.c (100%) rename pkg/acs/{calacs => lib}/acscte/docte.c (100%) rename pkg/acs/{calacs/acscte/maincte.c => lib/acscte/domaincte.c} (99%) rename pkg/acs/{calacs => lib}/acscte/dopcte-gen2.c (100%) rename pkg/acs/{calacs => lib}/acscte/dopcte.c (100%) rename pkg/acs/{calacs => lib}/acscte/getcteflag.c (100%) rename pkg/acs/{calacs => lib}/acscte/getctesw.c (100%) rename pkg/acs/{calacs => lib}/acscte/pcte_fixycte.c (100%) rename pkg/acs/{calacs => lib}/acscte/pcte_funcs.c (100%) rename pkg/acs/{calacs => }/lib/acshist.c (100%) rename pkg/acs/{calacs => }/lib/acsinfo.c (100%) rename pkg/acs/{calacs => lib}/acsrej/acsrej.c (100%) rename pkg/acs/{calacs => lib}/acsrej/acsrej_check.c (100%) rename pkg/acs/{calacs => lib}/acsrej/acsrej_do.c (100%) rename pkg/acs/{calacs => lib}/acsrej/acsrej_init.c (100%) rename pkg/acs/{calacs => lib}/acsrej/acsrej_loop.c (100%) rename pkg/acs/{calacs => lib}/acsrej/acsrej_sky.c (100%) rename pkg/acs/{calacs => lib}/acsrej/cr_history.c (100%) rename pkg/acs/{calacs => lib}/acsrej/cr_mode.c (100%) rename pkg/acs/{calacs => lib}/acsrej/cr_scaling.c (100%) rename pkg/acs/{calacs => lib}/acsrej/history (100%) rename pkg/acs/{calacs => lib}/acsrej/piksrt.c (100%) rename pkg/acs/{calacs => lib}/acsrej/readpar.c (100%) rename pkg/acs/{calacs => lib}/acsrej/rej_command.c (100%) rename pkg/acs/{calacs => }/lib/acssect.c (100%) rename pkg/acs/{calacs => lib}/acssum/Notes (100%) rename pkg/acs/{calacs => lib}/acssum/acssum.c (100%) rename pkg/acs/{calacs => }/lib/addk2d.c (100%) rename pkg/acs/{calacs => }/lib/bin2d.c (100%) rename pkg/acs/{calacs => }/lib/bincoords.c (100%) rename pkg/acs/{calacs => }/lib/binupdate.c (100%) rename pkg/acs/{calacs => lib}/calacs/README (100%) rename pkg/acs/{calacs => lib}/calacs/acsdth.c (100%) rename pkg/acs/{calacs => lib}/calacs/acsinit.c (100%) rename pkg/acs/{calacs => lib}/calacs/acsmember.c (100%) rename pkg/acs/{calacs => lib}/calacs/acstable.c (100%) rename pkg/acs/{calacs => lib}/calacs/calacs.c (100%) rename pkg/acs/{calacs => lib}/calacs/getflags.c (100%) rename pkg/acs/{calacs => lib}/calacs/getnewref.c (100%) rename pkg/acs/{calacs => lib}/calacs/getsciinfo.c (100%) rename pkg/acs/{calacs => lib}/calacs/refexist.c (100%) rename pkg/acs/{calacs => lib}/calacs/sciflags.c (100%) rename pkg/acs/{calacs => }/lib/comparenum.c (100%) rename pkg/acs/{calacs => }/lib/defswitch.c (100%) rename pkg/acs/{calacs => }/lib/detchip.c (100%) rename pkg/acs/{calacs => }/lib/detnsegn.c (100%) rename pkg/acs/{calacs => }/lib/div1d.c (100%) rename pkg/acs/{calacs => }/lib/dodqi.c (100%) rename pkg/acs/{calacs => }/lib/donoise.c (100%) rename pkg/acs/{calacs => }/lib/dostat.c (100%) rename pkg/acs/{calacs => }/lib/err.c (100%) rename pkg/acs/{calacs => }/lib/fileexists.c (100%) rename pkg/acs/{calacs => }/lib/findbin.c (100%) rename pkg/acs/{calacs => }/lib/findroot.c (100%) rename pkg/acs/{calacs => }/lib/fromlt.c (100%) rename pkg/acs/{calacs => }/lib/getacsgrp.c (100%) rename pkg/acs/{calacs => }/lib/getacskeys.c (100%) rename pkg/acs/{calacs => }/lib/getccdtab.c (100%) rename pkg/acs/{calacs => }/lib/getcorner.c (100%) rename pkg/acs/{calacs => }/lib/getlt.c (100%) rename pkg/acs/{calacs => }/lib/getrefname.c (100%) rename pkg/acs/{calacs => }/lib/getswitch.c (100%) rename pkg/acs/{calacs => }/lib/gotfilename.c (100%) rename pkg/acs/{calacs => }/lib/imghistory.c (100%) rename pkg/acs/{calacs => }/lib/imgpedigree.c (100%) rename pkg/acs/{calacs => }/lib/initmulti.c (100%) rename pkg/acs/{calacs => }/lib/interp1d.c (100%) rename pkg/acs/{calacs => }/lib/interpinfo.c (100%) rename pkg/acs/{calacs => }/lib/key.c (100%) rename pkg/acs/{calacs => }/lib/loadhead.c (100%) rename pkg/acs/{calacs => }/lib/logprogress.c (100%) rename pkg/acs/{calacs => }/lib/lowcase.c (100%) rename pkg/acs/{calacs => }/lib/median.c (100%) rename pkg/acs/{calacs => }/lib/mkname.c (100%) rename pkg/acs/{calacs => }/lib/mkoutname.c (100%) rename pkg/acs/{calacs => }/lib/mkspt.c (100%) rename pkg/acs/{calacs => }/lib/mult1d.c (100%) rename pkg/acs/{calacs => }/lib/multk1d.c (100%) rename pkg/acs/{calacs => }/lib/multk2d.c (100%) rename pkg/acs/{calacs => }/lib/omitstep.c (100%) rename pkg/acs/{calacs => }/lib/parseamps.c (100%) rename pkg/acs/{calacs => }/lib/parsedate.c (100%) rename pkg/acs/{calacs => }/lib/prinfo.c (100%) rename pkg/acs/{calacs => }/lib/reffiles.c (100%) rename pkg/acs/{calacs => }/lib/rowpedigree.c (100%) rename pkg/acs/{calacs => }/lib/sameint.c (100%) rename pkg/acs/{calacs => }/lib/spline.c (100%) rename pkg/acs/{calacs => }/lib/streqic.c (100%) rename pkg/acs/{calacs => }/lib/sub1d.c (100%) rename pkg/acs/{calacs => }/lib/sub2d.c (100%) rename pkg/acs/{calacs => }/lib/tabhistory.c (100%) rename pkg/acs/{calacs => }/lib/tabpedigree.c (100%) rename pkg/acs/{calacs => }/lib/timestamp.c (100%) rename pkg/acs/{calacs => }/lib/toelectrons.c (100%) rename pkg/acs/{calacs => }/lib/trim.c (100%) rename pkg/acs/{calacs => }/lib/trim2d.c (100%) rename pkg/acs/{calacs => }/lib/ucalver.c (100%) rename pkg/acs/{calacs => }/lib/ufilename.c (100%) rename pkg/acs/{calacs => }/lib/unbinline.c (100%) rename pkg/acs/{calacs => }/lib/whicherror.c (100%) rename pkg/acs/{calacs/acs2d => src}/main2d.c (100%) rename pkg/acs/{calacs/calacs/acsmain.c => src/mainacs.c} (100%) rename pkg/acs/{calacs/acsccd => src}/mainccd.c (100%) create mode 100644 pkg/acs/src/maincte.c rename pkg/acs/{calacs/acsrej => src}/mainrej.c (100%) rename pkg/acs/{calacs/acssum => src}/mainsum.c (100%) delete mode 100644 pkg/acs/wscript delete mode 100644 pkg/imphttab/wscript create mode 100644 pkg/stis/CMakeLists.txt delete mode 100644 pkg/stis/calstis/cs0/Makefile delete mode 100644 pkg/stis/calstis/cs0/wscript delete mode 100644 pkg/stis/calstis/cs1/Makefile delete mode 100644 pkg/stis/calstis/cs1/wscript delete mode 100644 pkg/stis/calstis/cs11/Makefile delete mode 100644 pkg/stis/calstis/cs11/wscript delete mode 100644 pkg/stis/calstis/cs12/Makefile delete mode 100644 pkg/stis/calstis/cs12/wscript delete mode 100644 pkg/stis/calstis/cs2/Makefile delete mode 100644 pkg/stis/calstis/cs2/wscript delete mode 100644 pkg/stis/calstis/cs4/Makefile delete mode 100644 pkg/stis/calstis/cs4/wscript delete mode 100644 pkg/stis/calstis/cs6/Makefile delete mode 100644 pkg/stis/calstis/cs6/idtalg/Makefile delete mode 100644 pkg/stis/calstis/cs6/wscript delete mode 100644 pkg/stis/calstis/cs7/Makefile delete mode 100644 pkg/stis/calstis/cs7/wscript delete mode 100644 pkg/stis/calstis/cs8/Makefile delete mode 100644 pkg/stis/calstis/lib/wscript delete mode 100644 pkg/stis/calstis/wscript rename pkg/stis/{calstis => }/doc/alg7 (100%) rename pkg/stis/{calstis => }/doc/alg8 (100%) rename pkg/stis/{calstis => }/doc/algorithms (100%) rename pkg/stis/{calstis => }/doc/design (100%) rename pkg/stis/{calstis => }/doc/ltv.txt (100%) rename pkg/stis/{calstis/cs0 => include}/calstis0.h (100%) rename pkg/stis/{calstis/cs1 => include}/calstis1.h (100%) rename pkg/stis/{calstis/cs11 => include}/calstis11.h (100%) rename pkg/stis/{calstis/cs12 => include}/calstis12.h (100%) rename pkg/stis/{calstis/cs2 => include}/calstis2.h (100%) rename pkg/stis/{calstis/cs4 => include}/calstis4.h (100%) rename pkg/stis/{calstis => }/include/calstis6.h (100%) rename pkg/stis/{calstis/cs7 => include}/calstis7.h (100%) rename pkg/stis/{calstis/cs8 => include}/calstis8.h (100%) rename pkg/stis/{calstis => }/include/cs12.h (100%) rename pkg/stis/{calstis => }/include/cs2.h (100%) create mode 100644 pkg/stis/include/cs2_reset.h rename pkg/stis/{calstis/cs6 => include}/idtalg/design.txt (100%) rename pkg/stis/{calstis/cs6 => include}/idtalg/idtalg.h (100%) rename pkg/stis/{calstis => }/include/stis.h (100%) rename pkg/stis/{calstis => }/include/stisaper.h (100%) rename pkg/stis/{calstis => }/include/stisdef.h (100%) rename pkg/stis/{calstis => }/include/stisdq.h (100%) rename pkg/stis/{calstis => }/include/stisomit.h (100%) rename pkg/stis/{calstis => }/include/stispht.h (100%) rename pkg/stis/{calstis => }/include/stisshutter.h (100%) rename pkg/stis/{calstis => }/include/stissizes.h (100%) rename pkg/stis/{calstis => }/include/stistds.h (100%) rename pkg/stis/{calstis => }/include/stistemperature.h (100%) rename pkg/stis/{calstis => }/include/stisversion.h (100%) rename pkg/stis/{calstis => }/include/stisvoltages.h (100%) rename pkg/stis/{calstis => }/include/stiswild.h (100%) create mode 100644 pkg/stis/lib/CMakeLists.txt rename pkg/stis/{calstis => }/lib/README (100%) rename pkg/stis/{calstis => }/lib/add2d.c (100%) rename pkg/stis/{calstis => }/lib/addk2d.c (100%) rename pkg/stis/{calstis => }/lib/bin2d.c (100%) rename pkg/stis/{calstis => }/lib/bincoords.c (100%) rename pkg/stis/{calstis => }/lib/binupdate.c (100%) rename pkg/stis/{calstis => }/lib/blazecorr.c (100%) rename pkg/stis/{calstis => }/lib/checkimsetok.c (100%) rename pkg/stis/{calstis => lib}/cs0/README (100%) rename pkg/stis/{calstis => lib}/cs0/calstis0.c (99%) rename pkg/stis/{calstis => lib}/cs0/checkwav.c (100%) rename pkg/stis/{calstis => lib}/cs0/compfiles.c (100%) rename pkg/stis/{calstis => lib}/cs0/getflags.c (100%) rename pkg/stis/{calstis => lib}/cs0/getnewref.c (100%) rename pkg/stis/{calstis => lib}/cs0/getsciinfo.c (100%) rename pkg/stis/{calstis => lib}/cs0/getwavinfo.c (100%) rename pkg/stis/{calstis => lib}/cs0/refexist.c (100%) rename pkg/stis/{calstis => lib}/cs0/savename.c (100%) rename pkg/stis/{calstis => lib}/cs0/sciflags.c (100%) rename pkg/stis/{calstis => lib}/cs0/stisinit.c (100%) rename pkg/stis/{calstis => lib}/cs0/wavflags.c (100%) rename pkg/stis/{calstis => lib}/cs1/blevdrift.c (100%) rename pkg/stis/{calstis => lib}/cs1/blevfit.c (100%) rename pkg/stis/{calstis => lib}/cs1/calstis1.c (100%) rename pkg/stis/{calstis => lib}/cs1/checkvolt.c (100%) rename pkg/stis/{calstis => lib}/cs1/do2d.c (100%) rename pkg/stis/{calstis => lib}/cs1/doatod.c (100%) rename pkg/stis/{calstis => lib}/cs1/dobias.c (100%) rename pkg/stis/{calstis => lib}/cs1/doblev.c (100%) rename pkg/stis/{calstis => lib}/cs1/dodark.c (100%) rename pkg/stis/{calstis => lib}/cs1/dodqi.c (100%) rename pkg/stis/{calstis => lib}/cs1/doflat.c (100%) rename pkg/stis/{calstis => lib}/cs1/dolores.c (100%) rename pkg/stis/{calstis => lib}/cs1/donoise.c (100%) rename pkg/stis/{calstis => lib}/cs1/dononlin.c (100%) rename pkg/stis/{calstis => lib}/cs1/dophot.c (100%) rename pkg/stis/{calstis => lib}/cs1/doppconv.c (100%) rename pkg/stis/{calstis => lib}/cs1/doshad.c (100%) rename pkg/stis/{calstis => lib}/cs1/findbin.c (100%) rename pkg/stis/{calstis => lib}/cs1/findblev.c (100%) rename pkg/stis/{calstis => lib}/cs1/findover.c (100%) rename pkg/stis/{calstis => lib}/cs1/flagfilter.c (100%) rename pkg/stis/{calstis => lib}/cs1/getccdtab.c (100%) rename pkg/stis/{calstis => lib}/cs1/getepctab1.c (100%) rename pkg/stis/{calstis => lib}/cs1/getflags1.c (100%) rename pkg/stis/{calstis => lib}/cs1/getgrpinfo1.c (100%) rename pkg/stis/{calstis => lib}/cs1/getkeyinfo1.c (100%) rename pkg/stis/{calstis => lib}/cs1/getlintab.c (100%) rename pkg/stis/{calstis => lib}/cs1/gettdccorr.c (100%) rename pkg/stis/{calstis => lib}/cs1/gettds1.c (100%) rename pkg/stis/{calstis => lib}/cs1/history1.c (100%) rename pkg/stis/{calstis => lib}/cs1/makedopp.c (100%) rename pkg/stis/{calstis => lib}/cs1/photmode.c (100%) rename pkg/stis/{calstis => lib}/cs1/sanity1.c (100%) rename pkg/stis/{calstis => lib}/cs11/binsubtract.c (100%) rename pkg/stis/{calstis => lib}/cs11/calstis11.c (100%) rename pkg/stis/{calstis => lib}/cs11/getkeyinfo11.c (100%) rename pkg/stis/{calstis => lib}/cs11/gettimes11.c (100%) rename pkg/stis/{calstis => lib}/cs11/matchsci.c (100%) rename pkg/stis/{calstis => lib}/cs11/subsci.c (100%) rename pkg/stis/{calstis => lib}/cs12/addshifts.c (100%) rename pkg/stis/{calstis => lib}/cs12/calstis12.c (100%) rename pkg/stis/{calstis => lib}/cs12/getkeyinfo12.c (100%) rename pkg/stis/{calstis => lib}/cs12/getscigrp.c (100%) rename pkg/stis/{calstis => lib}/cs12/getwavgrp.c (100%) rename pkg/stis/{calstis => lib}/cs12/history12.c (100%) rename pkg/stis/{calstis => lib}/cs12/matchwav.c (100%) rename pkg/stis/{calstis => lib}/cs12/targpos.c (100%) rename pkg/stis/{calstis => lib}/cs2/calstis2.c (100%) rename pkg/stis/{calstis => lib}/cs2/cr_history.c (100%) rename pkg/stis/{calstis => lib}/cs2/cr_mode.c (100%) rename pkg/stis/{calstis => lib}/cs2/cr_scaling.c (100%) rename pkg/stis/{calstis => lib}/cs2/crrej_check.c (100%) rename pkg/stis/{calstis => lib}/cs2/crrej_do.c (100%) rename pkg/stis/{calstis => lib}/cs2/crrej_init.c (100%) rename pkg/stis/{calstis => lib}/cs2/crrej_loop.c (100%) rename pkg/stis/{calstis => lib}/cs2/crrej_sky.c (100%) rename pkg/stis/{calstis => lib}/cs2/o_cal2_in.c (100%) rename pkg/stis/{calstis => lib}/cs2/piksrt.c (100%) create mode 100644 pkg/stis/lib/cs2_reset.c rename pkg/stis/{calstis => lib}/cs4/Differences (100%) rename pkg/stis/{calstis => lib}/cs4/Notes (100%) rename pkg/stis/{calstis => lib}/cs4/calstis4.c (100%) rename pkg/stis/{calstis => lib}/cs4/convslit.c (100%) rename pkg/stis/{calstis => lib}/cs4/echshift.c (100%) rename pkg/stis/{calstis => lib}/cs4/findbars.c (100%) rename pkg/stis/{calstis => lib}/cs4/findedge.c (100%) rename pkg/stis/{calstis => lib}/cs4/findends.c (100%) rename pkg/stis/{calstis => lib}/cs4/findwl.c (100%) rename pkg/stis/{calstis => lib}/cs4/flagcr.c (100%) rename pkg/stis/{calstis => lib}/cs4/getangle4.c (100%) rename pkg/stis/{calstis => lib}/cs4/getapdes4.c (100%) rename pkg/stis/{calstis => lib}/cs4/getdisp4.c (100%) rename pkg/stis/{calstis => lib}/cs4/getflags4.c (100%) rename pkg/stis/{calstis => lib}/cs4/getgrpinfo4.c (100%) rename pkg/stis/{calstis => lib}/cs4/getinang4.c (100%) rename pkg/stis/{calstis => lib}/cs4/getkeyinfo4.c (100%) rename pkg/stis/{calstis => lib}/cs4/getlamp.c (100%) rename pkg/stis/{calstis => lib}/cs4/gettrace4.c (100%) rename pkg/stis/{calstis => lib}/cs4/getwcp.c (100%) rename pkg/stis/{calstis => lib}/cs4/history4.c (100%) rename pkg/stis/{calstis => lib}/cs4/invert.c (100%) rename pkg/stis/{calstis => lib}/cs4/maketemplate.c (100%) rename pkg/stis/{calstis => lib}/cs4/newtrace4.c (100%) rename pkg/stis/{calstis => lib}/cs4/peakquad3.c (100%) rename pkg/stis/{calstis => lib}/cs4/scaleref.c (100%) rename pkg/stis/{calstis => lib}/cs4/spatialshift.c (100%) rename pkg/stis/{calstis => lib}/cs4/updateshift.c (100%) rename pkg/stis/{calstis => lib}/cs4/wavecal.c (100%) rename pkg/stis/{calstis => lib}/cs4/waveshift.c (100%) rename pkg/stis/{calstis => lib}/cs4/whichslit.c (100%) rename pkg/stis/{calstis => lib}/cs4/xc4.c (100%) rename pkg/stis/{calstis => lib}/cs4/xcechelle.c (100%) rename pkg/stis/{calstis => lib}/cs4/xcpeak.c (100%) rename pkg/stis/{calstis => lib}/cs4/xcwave.c (100%) rename pkg/stis/{calstis => lib}/cs6/Notes (100%) rename pkg/stis/{calstis => lib}/cs6/absflux6.c (100%) rename pkg/stis/{calstis => lib}/cs6/addoffsets6.c (100%) rename pkg/stis/{calstis => lib}/cs6/adjustdisp6.c (100%) rename pkg/stis/{calstis => lib}/cs6/background.c (100%) rename pkg/stis/{calstis => lib}/cs6/buildoptprof.c (100%) rename pkg/stis/{calstis => lib}/cs6/buildprof.c (100%) rename pkg/stis/{calstis => lib}/cs6/calstis6.c (100%) rename pkg/stis/{calstis => lib}/cs6/calstis6std.c (100%) rename pkg/stis/{calstis => lib}/cs6/checkoptimal.c (100%) rename pkg/stis/{calstis => lib}/cs6/commline.c (100%) rename pkg/stis/{calstis => lib}/cs6/crosscor.c (100%) rename pkg/stis/{calstis => lib}/cs6/defineback.c (100%) rename pkg/stis/{calstis => lib}/cs6/design2.txt (100%) rename pkg/stis/{calstis => lib}/cs6/do1dx.c (100%) rename pkg/stis/{calstis => lib}/cs6/findlya.c (100%) rename pkg/stis/{calstis => lib}/cs6/gcrosscor.c (100%) rename pkg/stis/{calstis => lib}/cs6/getabsphot6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getapdes6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getapoffset6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getapthr6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getccdtab6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getcheckref.c (100%) rename pkg/stis/{calstis => lib}/cs6/getdisp6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getextract.c (100%) rename pkg/stis/{calstis => lib}/cs6/getflags6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getgac6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getgrpinfo6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getinang6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getintens.c (100%) rename pkg/stis/{calstis => lib}/cs6/getkeyinfo6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getpct6.c (100%) rename pkg/stis/{calstis => lib}/cs6/getprofile.c (100%) rename pkg/stis/{calstis => lib}/cs6/getrefcline.c (100%) rename pkg/stis/{calstis => lib}/cs6/getsdc6.c (100%) rename pkg/stis/{calstis => lib}/cs6/gettrace6.c (100%) rename pkg/stis/{calstis => lib}/cs6/heliofactor6.c (100%) rename pkg/stis/{calstis => lib}/cs6/history6.c (100%) rename pkg/stis/{calstis => lib}/cs6/init.c (100%) rename pkg/stis/{calstis => lib}/cs6/lee.c (100%) rename pkg/stis/{calstis => lib}/cs6/memory.c (100%) rename pkg/stis/{calstis => lib}/cs6/message6.c (100%) rename pkg/stis/{calstis => lib}/cs6/newcoord6.c (100%) rename pkg/stis/{calstis => lib}/cs6/newdisp6.c (100%) rename pkg/stis/{calstis => lib}/cs6/newextract.c (100%) rename pkg/stis/{calstis => lib}/cs6/newprofile.c (100%) rename pkg/stis/{calstis => lib}/cs6/newtrace6.c (100%) rename pkg/stis/{calstis => lib}/cs6/output.c (100%) rename pkg/stis/{calstis => lib}/cs6/poly.c (100%) rename pkg/stis/{calstis => lib}/cs6/selectalg.c (100%) rename pkg/stis/{calstis => lib}/cs6/setranges.c (100%) rename pkg/stis/{calstis => lib}/cs6/timestamp6.c (100%) rename pkg/stis/{calstis => lib}/cs6/wave.c (100%) rename pkg/stis/{calstis => lib}/cs6/x1dspec.c (100%) rename pkg/stis/{calstis => lib}/cs7/Notes (100%) rename pkg/stis/{calstis => lib}/cs7/absflux.c (100%) rename pkg/stis/{calstis => lib}/cs7/adjustdisp.c (100%) rename pkg/stis/{calstis => lib}/cs7/calstis7.c (100%) rename pkg/stis/{calstis => lib}/cs7/datamasked.c (100%) rename pkg/stis/{calstis => lib}/cs7/do2dx.c (100%) rename pkg/stis/{calstis => lib}/cs7/evaldisp7.c (100%) rename pkg/stis/{calstis => lib}/cs7/geocorr7.c (100%) rename pkg/stis/{calstis => lib}/cs7/getabsphot.c (100%) rename pkg/stis/{calstis => lib}/cs7/getapdes7.c (100%) rename pkg/stis/{calstis => lib}/cs7/getapoffset.c (100%) rename pkg/stis/{calstis => lib}/cs7/getapthr.c (100%) rename pkg/stis/{calstis => lib}/cs7/getdisp.c (100%) rename pkg/stis/{calstis => lib}/cs7/getflags7.c (100%) rename pkg/stis/{calstis => lib}/cs7/getgrpinfo7.c (100%) rename pkg/stis/{calstis => lib}/cs7/getidc.c (100%) rename pkg/stis/{calstis => lib}/cs7/getinang.c (100%) rename pkg/stis/{calstis => lib}/cs7/getkeyinfo7.c (100%) rename pkg/stis/{calstis => lib}/cs7/getpct.c (100%) rename pkg/stis/{calstis => lib}/cs7/getsdc.c (100%) rename pkg/stis/{calstis => lib}/cs7/gettrace.c (100%) rename pkg/stis/{calstis => lib}/cs7/heliofactor.c (100%) rename pkg/stis/{calstis => lib}/cs7/history7.c (100%) rename pkg/stis/{calstis => lib}/cs7/newcoord.c (100%) rename pkg/stis/{calstis => lib}/cs7/newdisp.c (100%) rename pkg/stis/{calstis => lib}/cs7/newtrace.c (100%) rename pkg/stis/{calstis => lib}/cs7/putgrpinfo7.c (100%) rename pkg/stis/{calstis => lib}/cs7/scalewcs.c (100%) rename pkg/stis/{calstis => lib}/cs7/x2dcorr7.c (100%) rename pkg/stis/{calstis => lib}/cs8/calstis8.c (100%) rename pkg/stis/{calstis => }/lib/defswitch.c (100%) rename pkg/stis/{calstis => }/lib/div2d.c (100%) rename pkg/stis/{calstis => }/lib/dostat.c (100%) rename pkg/stis/{calstis => }/lib/evaldisp.c (100%) rename pkg/stis/{calstis => }/lib/extrap1d.c (100%) rename pkg/stis/{calstis => }/lib/fileexists.c (100%) rename pkg/stis/{calstis => }/lib/getcorner.c (100%) rename pkg/stis/{calstis => }/lib/getdettemp.c (100%) rename pkg/stis/{calstis => }/lib/getlt.c (100%) rename pkg/stis/{calstis => }/lib/getlt0.c (100%) rename pkg/stis/{calstis => }/lib/getmoc.c (100%) rename pkg/stis/{calstis => }/lib/getrefname.c (100%) rename pkg/stis/{calstis => }/lib/getswitch.c (100%) rename pkg/stis/{calstis => }/lib/gettds.c (100%) rename pkg/stis/{calstis => }/lib/gotfilename.c (100%) rename pkg/stis/{calstis/cs6 => lib}/idtalg/calstis6idt.c (100%) rename pkg/stis/{calstis/cs6 => lib}/idtalg/echscatread.c (100%) rename pkg/stis/{calstis/cs6 => lib}/idtalg/idtmemory.c (100%) rename pkg/stis/{calstis/cs6 => lib}/idtalg/rebindata.c (100%) rename pkg/stis/{calstis/cs6 => lib}/idtalg/splice.c (100%) rename pkg/stis/{calstis/cs6 => lib}/idtalg/x1dtable.c (100%) rename pkg/stis/{calstis/cs6 => lib}/idtalg/xc6.c (100%) rename pkg/stis/{calstis => }/lib/imghistory.c (100%) rename pkg/stis/{calstis => }/lib/imgpedigree.c (100%) rename pkg/stis/{calstis => }/lib/initreftab.c (100%) rename pkg/stis/{calstis => }/lib/interp1d.c (100%) rename pkg/stis/{calstis => }/lib/interp2d.c (100%) rename pkg/stis/{calstis => }/lib/key.c (100%) rename pkg/stis/{calstis => }/lib/median.c (100%) rename pkg/stis/{calstis => }/lib/mkname.c (100%) rename pkg/stis/{calstis => }/lib/mkoutname.c (100%) rename pkg/stis/{calstis => }/lib/mult2d.c (100%) rename pkg/stis/{calstis => }/lib/multk2d.c (100%) rename pkg/stis/{calstis => }/lib/omitstep.c (100%) rename pkg/stis/{calstis => }/lib/orbitaldopp.c (100%) rename pkg/stis/{calstis => }/lib/prinfo.c (100%) rename pkg/stis/{calstis => }/lib/pseudoap.c (100%) rename pkg/stis/{calstis => }/lib/radialvel.c (100%) rename pkg/stis/{calstis => }/lib/reffiles.c (100%) rename pkg/stis/{calstis => }/lib/rotatetrace.c (100%) rename pkg/stis/{calstis => }/lib/rowpedigree.c (100%) rename pkg/stis/{calstis => }/lib/sameint.c (100%) rename pkg/stis/{calstis => }/lib/spline.c (100%) rename pkg/stis/{calstis => }/lib/strcmptail.c (100%) rename pkg/stis/{calstis => }/lib/streqic.c (100%) rename pkg/stis/{calstis => }/lib/strtor.c (100%) rename pkg/stis/{calstis => }/lib/sub2d.c (100%) rename pkg/stis/{calstis => }/lib/tabhistory.c (100%) rename pkg/stis/{calstis => }/lib/tabpedigree.c (100%) rename pkg/stis/{calstis => }/lib/tdscorrect.c (100%) rename pkg/stis/{calstis => }/lib/timestamp.c (100%) rename pkg/stis/{calstis => }/lib/ucalver.c (100%) rename pkg/stis/{calstis => }/lib/ufilename.c (100%) rename pkg/stis/{calstis => }/lib/unbin2d.c (100%) rename pkg/stis/{calstis => }/lib/whicherror.c (100%) rename pkg/stis/{calstis => }/lib/xcfft.c (100%) rename pkg/stis/{calstis/cs0 => src}/cs0.c (100%) rename pkg/stis/{calstis/cs1 => src}/cs1.c (100%) rename pkg/stis/{calstis/cs11 => src}/cs11.c (100%) rename pkg/stis/{calstis/cs12 => src}/cs12.c (100%) rename pkg/stis/{calstis/cs2 => src}/cs2.c (100%) rename pkg/stis/{calstis/cs2 => src}/cs2_command.c (91%) rename pkg/stis/{calstis/cs4 => src}/cs4.c (100%) rename pkg/stis/{calstis/cs6 => src}/cs6.c (100%) rename pkg/stis/{calstis/cs7 => src}/cs7.c (100%) rename pkg/stis/{calstis/cs8 => src}/cs8.c (100%) delete mode 100644 pkg/stis/wscript create mode 100644 pkg/wfc3/CMakeLists.txt rename pkg/wfc3/{calwf3 => }/Dates (100%) rename pkg/wfc3/{calwf3 => }/History (100%) rename pkg/wfc3/{calwf3 => }/Updates (100%) delete mode 100644 pkg/wfc3/calwf3/calwf3/wscript delete mode 100644 pkg/wfc3/calwf3/lib/wscript delete mode 100644 pkg/wfc3/calwf3/wf32d/wscript delete mode 100644 pkg/wfc3/calwf3/wf3ccd/wscript delete mode 100644 pkg/wfc3/calwf3/wf3cte/wscript delete mode 100644 pkg/wfc3/calwf3/wf3ir/wscript delete mode 100644 pkg/wfc3/calwf3/wf3rej/rej.h delete mode 100644 pkg/wfc3/calwf3/wf3rej/wscript delete mode 100644 pkg/wfc3/calwf3/wf3sum/wscript delete mode 100644 pkg/wfc3/calwf3/wscript rename pkg/wfc3/{calwf3/calwf3 => include}/calwf3.h (100%) rename pkg/wfc3/{calwf3/wf3cte => include}/cte.h (100%) rename pkg/wfc3/{calwf3/wf3ccd => include}/doccd.h (100%) rename pkg/wfc3/{calwf3 => }/include/msg.h (100%) rename pkg/wfc3/{calwf3/wf3ir => include}/rej.h (100%) rename pkg/wfc3/{calwf3 => }/include/wf3.h (100%) rename pkg/wfc3/{calwf3/calwf3 => include}/wf3asn.h (100%) rename pkg/wfc3/{calwf3 => }/include/wf3corr.h (100%) rename pkg/wfc3/{calwf3 => }/include/wf3dq.h (100%) rename pkg/wfc3/{calwf3 => }/include/wf3info.h (100%) rename pkg/wfc3/{calwf3 => }/include/wf3omit.h (100%) rename pkg/wfc3/{calwf3 => }/include/wf3rej.h (100%) rename pkg/wfc3/{calwf3/wf3sum => include}/wf3sum.h (100%) rename pkg/wfc3/{calwf3 => }/include/wf3version.h (100%) rename pkg/wfc3/{calwf3 => }/include/wf3wild.h (100%) create mode 100644 pkg/wfc3/lib/CMakeLists.txt rename pkg/wfc3/{calwf3 => }/lib/README (100%) rename pkg/wfc3/{calwf3 => }/lib/addk2d.c (100%) rename pkg/wfc3/{calwf3 => }/lib/bin2d.c (100%) rename pkg/wfc3/{calwf3 => }/lib/bincoords.c (100%) rename pkg/wfc3/{calwf3 => }/lib/binupdate.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/calwf3.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/getinfo.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/getnewref.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/getreffiles.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/getswitches.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/procccd.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/procir.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/refexist.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/wf3dth.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/wf3init.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/wf3member.c (100%) rename pkg/wfc3/{calwf3 => lib}/calwf3/wf3table.c (100%) rename pkg/wfc3/{calwf3 => }/lib/comparenum.c (100%) rename pkg/wfc3/{calwf3 => }/lib/computelimits.c (100%) rename pkg/wfc3/{calwf3 => }/lib/defswitch.c (100%) rename pkg/wfc3/{calwf3 => }/lib/detchip.c (100%) rename pkg/wfc3/{calwf3 => }/lib/detnsegn.c (100%) rename pkg/wfc3/{calwf3 => }/lib/div1d.c (100%) rename pkg/wfc3/{calwf3 => }/lib/dodqi.c (100%) rename pkg/wfc3/{calwf3 => }/lib/donoise.c (100%) rename pkg/wfc3/{calwf3 => }/lib/dostat.c (100%) rename pkg/wfc3/{calwf3 => }/lib/err.c (100%) rename pkg/wfc3/{calwf3 => }/lib/fileexists.c (100%) rename pkg/wfc3/{calwf3 => }/lib/findbin.c (100%) rename pkg/wfc3/{calwf3 => }/lib/findroot.c (100%) rename pkg/wfc3/{calwf3 => }/lib/fromlt.c (100%) rename pkg/wfc3/{calwf3 => }/lib/getccdtab.c (100%) rename pkg/wfc3/{calwf3 => }/lib/getcorner.c (100%) rename pkg/wfc3/{calwf3 => }/lib/getgrp.c (100%) rename pkg/wfc3/{calwf3 => }/lib/getkeys.c (100%) rename pkg/wfc3/{calwf3 => }/lib/getlt.c (100%) rename pkg/wfc3/{calwf3 => }/lib/getrefname.c (100%) rename pkg/wfc3/{calwf3 => }/lib/getswitch.c (100%) rename pkg/wfc3/{calwf3 => }/lib/gotfilename.c (100%) rename pkg/wfc3/{calwf3 => }/lib/imghistory.c (100%) rename pkg/wfc3/{calwf3 => }/lib/imgpedigree.c (100%) rename pkg/wfc3/{calwf3 => }/lib/initmulti.c (100%) rename pkg/wfc3/{calwf3 => }/lib/interp1d.c (100%) rename pkg/wfc3/{calwf3 => }/lib/interpinfo.c (100%) rename pkg/wfc3/{calwf3 => }/lib/key.c (100%) rename pkg/wfc3/{calwf3 => }/lib/loadhead.c (100%) rename pkg/wfc3/{calwf3 => }/lib/logprogress.c (100%) rename pkg/wfc3/{calwf3 => }/lib/lowcase.c (100%) rename pkg/wfc3/{calwf3 => }/lib/median.c (100%) rename pkg/wfc3/{calwf3 => }/lib/mkname.c (100%) rename pkg/wfc3/{calwf3 => }/lib/mkoutname.c (100%) rename pkg/wfc3/{calwf3 => }/lib/mkspt.c (100%) rename pkg/wfc3/{calwf3 => }/lib/mult1d.c (100%) rename pkg/wfc3/{calwf3 => }/lib/multk1d.c (100%) rename pkg/wfc3/{calwf3 => }/lib/multk2d.c (100%) rename pkg/wfc3/{calwf3 => }/lib/omitstep.c (100%) rename pkg/wfc3/{calwf3 => }/lib/parseamps.c (100%) rename pkg/wfc3/{calwf3 => }/lib/prinfo.c (100%) rename pkg/wfc3/{calwf3 => }/lib/razutil.c (100%) rename pkg/wfc3/{calwf3 => }/lib/reffiles.c (100%) rename pkg/wfc3/{calwf3 => }/lib/rowpedigree.c (100%) rename pkg/wfc3/{calwf3 => }/lib/sameint.c (100%) rename pkg/wfc3/{calwf3 => }/lib/spline.c (100%) rename pkg/wfc3/{calwf3 => }/lib/streqic.c (100%) rename pkg/wfc3/{calwf3 => }/lib/sub1d.c (100%) rename pkg/wfc3/{calwf3 => }/lib/subtools.c (100%) rename pkg/wfc3/{calwf3 => }/lib/tabhistory.c (100%) rename pkg/wfc3/{calwf3 => }/lib/tabpedigree.c (100%) rename pkg/wfc3/{calwf3 => }/lib/timestamp.c (100%) rename pkg/wfc3/{calwf3 => }/lib/trim.c (100%) rename pkg/wfc3/{calwf3 => }/lib/ucalver.c (100%) rename pkg/wfc3/{calwf3 => }/lib/ufilename.c (100%) rename pkg/wfc3/{calwf3 => }/lib/unbin2d.c (100%) rename pkg/wfc3/{calwf3 => }/lib/unbinline.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/do2d.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/dodark.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/doflat.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/doflux.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/dophot.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/doshad.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/get2dflags.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/get2dsw.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/photmode.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/sanity2d.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf32d/wf32d.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/blevdrift.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/blevfit.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/doatod.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/dobias.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/doblev.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/doccd.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/doflash.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/dofwsat.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/findblev.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/findover.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/getccdsw.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/getflags.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/sink.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ccd/wf3ccd.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3cte/cte_dobias.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3cte/getcteflags.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3cte/getctepars.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3cte/getctesw.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3cte/wf3cte.c (100%) rename pkg/wfc3/{calwf3 => }/lib/wf3hist.c (100%) rename pkg/wfc3/{calwf3 => }/lib/wf3info.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/blevcorr.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/cridcalc.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/darkcorr.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/doir.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/dqicorr.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/flatcorr.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/getirflags.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/getirsw.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/groupinfo.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/imageio.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/irhist.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/math.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/nlincorr.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/noiscalc.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/numrec.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/photcalc.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/pixcheck.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/refdata.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/resistmean.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/satcheck.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/statcalc.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/stats.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/unitcorr.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/updatehdr.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/wf3ir.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/zoffcorr.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3ir/zsigcorr.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/cr_history.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/cr_mode.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/cr_scaling.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/history (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/piksrt.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/readpar.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/rej_check.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/rej_command.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/rej_do.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/rej_init.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/rej_loop.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/rej_sky.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3rej/wf3rej.c (100%) rename pkg/wfc3/{calwf3 => }/lib/wf3sect.c (100%) rename pkg/wfc3/{calwf3 => lib}/wf3sum/Notes (100%) rename pkg/wfc3/{calwf3 => lib}/wf3sum/wf3sum.c (100%) rename pkg/wfc3/{calwf3 => }/lib/whicherror.c (100%) rename pkg/wfc3/{calwf3/wf32d => src}/main2d.c (100%) rename pkg/wfc3/{calwf3/wf3ccd => src}/mainccd.c (100%) rename pkg/wfc3/{calwf3/wf3cte => src}/maincte.c (100%) rename pkg/wfc3/{calwf3/wf3ir => src}/mainir.c (100%) rename pkg/wfc3/{calwf3/wf3rej => src}/mainrej.c (100%) rename pkg/wfc3/{calwf3/wf3sum => src}/mainsum.c (100%) rename pkg/wfc3/{calwf3/calwf3/wf3main.c => src/mainwf3.c} (100%) delete mode 100644 pkg/wfc3/wscript delete mode 100644 pkg/wscript create mode 100644 tables/CMakeLists.txt delete mode 100644 tables/wscript delete mode 120000 waf delete mode 100755 waf-2.0.19 delete mode 100644 waf_patches/README delete mode 100644 waf_patches/g77.py delete mode 100644 waf_patches/patch-compiler_fc.py.patch delete mode 100644 wscript diff --git a/.ci/bin/dist b/.ci/bin/dist new file mode 100755 index 000000000..e2d4abafa --- /dev/null +++ b/.ci/bin/dist @@ -0,0 +1,26 @@ +#!/usr/bin/env bash +if [ ! -f CMakeCache.txt ]; then + echo "Run cmake first" >&2 + exit 1 +fi + +read -r VERSION COMMIT BRANCH <<< $(&2 + exit 1 +fi + +if [ ! -f "$srcdir/CMakeLists.txt" ]; then + echo "Not a cmake source directory: $srcdir" >&2 + exit 1 +fi + +if [ -f "$srcdir/DISTINFO" ]; then + vcfile="$srcdir/DISTINFO" +fi + +if [ -f "$vcfile" ] && ! git status &>/dev/null ; then + read -r VERSION COMMIT BRANCH <<< $(<${vcfile}) +else + if git --version &>/dev/null; then + VERSION=$(git describe --first-parent --always --dirty --long --tags --abbrev=8) + COMMIT=$(git rev-parse HEAD) + BRANCH=$(git rev-parse --abbrev-ref HEAD) + else + echo "Git not found. Using default version values." >&2 + fi +fi + +if [ -z "$VERSION" ]; then + VERSION="unknown" +fi + +if [ -z "$COMMIT" ]; then + COMMIT="unknown" +fi + +if [ -z "$BRANCH" ]; then + BRANCH="unknown" +fi + +write_distinfo() { + cat << EOF > "$1" +$VERSION $COMMIT $BRANCH +EOF +} + +write_header() { + cat << EOF > "$1" +#ifndef HSTCAL_VERSION_H +#define HSTCAL_VERSION_H +#define VERSION "$VERSION" +#define COMMIT "$COMMIT" +#define BRANCH "$BRANCH" +#endif // HSTCAL_VERSION_H +EOF +} + +if [ -f "$vcfile" ]; then + tempfile=$(mktemp) + + write_distinfo "$tempfile" + if ! diff "$vcfile" "$tempfile" >&2; then + write_distinfo "$vcfile" + write_header "$hfile" + fi + rm -f "$tempfile" +else + write_distinfo "$vcfile" + write_header "$hfile" +fi + +printf "$VERSION" diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml new file mode 100644 index 000000000..f78ab470f --- /dev/null +++ b/.github/workflows/cmake.yml @@ -0,0 +1,72 @@ +name: CMake + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Release + INSTALL_PREFIX: /tmp/hstcal + +jobs: + build_matrix: + strategy: + matrix: + os: [ubuntu-latest, macos-latest] + gcc: [12] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + + - name: Linux dependencies + if: matrix.os == 'ubuntu-latest' + run: | + sudo apt update + sudo apt install -y libcfitsio-dev gfortran pkg-config + + - name: MacOS dependencies + if: matrix.os == 'macos-latest' + run: | + brew update + brew install gcc@${{ matrix.gcc }} cfitsio + + - name: Linux build + if: matrix.os == 'ubuntu-latest' + run: | + mkdir -p build + cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \ + -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_PREFIX }} + make + + - name: MacOS build + if: matrix.os == 'macos-latest' + env: + CC: gcc-${{ matrix.gcc }} + CXX: g++-${{ matrix.gcc }} + FC: gfortran-${{ matrix.gcc }} + + run: | + mkdir -p build + cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \ + -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_PREFIX }} + make + + + - name: Install + run: | + cd build + make install + + - name: Test + working-directory: ${{github.workspace}}/build + # Execute tests defined by the CMake configuration. + # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + run: ctest -C ${{env.BUILD_TYPE}} + diff --git a/.gitignore b/.gitignore index de9919391..b5701ee20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,28 @@ DISTINFO +version.h *.tar.* +CMakeCache.txt +CMakeFiles +CMakeScripts +CPackConfig.cmake +CPackSourceConfig.cmake +_CPack_Packages/ +Testing +Makefile +cmake_install.cmake +install_manifest.txt +compile_commands.json +CTestTestfile.cmake .lock-waf* .waf* bin.* +*build +build build.* Makefile __pycache__ .cache +*.e +*.a +*.so +hstcal-*.sh diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 000000000..37192edb4 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,123 @@ +cmake_minimum_required(VERSION 3.11) +project(hstcal) +enable_language(C) +set(CMAKE_C_STANDARD 99) + +option(ENABLE_WARNINGS "Enable compiler warnings" ON) +option(ENABLE_OPENMP "Enable OpenMP" ON) +set(WITH_CFITSIO "" CACHE STRING "Path to cfitsio (if empty pkg-config is used)") +set(WITH_CFITSIO_CFLAGS "" CACHE STRING "CFITSIO compiler flags") +set(WITH_CFITSIO_LDFLAGS "-lcfitsio" CACHE STRING "CFITSIO linker flags") + + +# Use git to set package version +# Caveat: unix-only +execute_process( + COMMAND ${CMAKE_SOURCE_DIR}/.ci/bin/git_version "${CMAKE_SOURCE_DIR}" + OUTPUT_VARIABLE version +) + +add_custom_target(distinfo ALL + COMMAND ${CMAKE_COMMAND} -E time ${CMAKE_SOURCE_DIR}/.ci/bin/git_version "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" + BYPRODUCTS + "${CMAKE_CURRENT_BINARY_DIR}/version.h" + "${CMAKE_CURRENT_BINARY_DIR}/DISTINFO" +) + +# Hack to produce autotools-like distribution archives +# Use: make dist +# Caveat: unix-only +add_custom_target(dist + COMMAND ${CMAKE_COMMAND} -E time ${CMAKE_SOURCE_DIR}/.ci/bin/dist "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" + BYPRODUCTS + "${CMAKE_CURRENT_BINARY_DIR}/version.h" + "${CMAKE_CURRENT_BINARY_DIR}/DISTINFO" +) + +set(PROJECT_VERSION "${version}") + +include(CheckSymbolExists) +check_symbol_exists(snprintf "stdio.h" HAVE_SNPRINTF) +check_symbol_exists(strdup "string.h" HAVE_STRDUP) +check_symbol_exists(INT_MAX "limits.h" HAVE_INT_MAX) +check_symbol_exists(PATH_MAX "limits.h" HAVE_LIMITS__PATH_MAX) +check_symbol_exists(PATH_MAX "sys/limits.h" HAVE_SYS_LIMITS__PATH_MAX) +check_symbol_exists(PATH_MAX "sys/syslimits.h" HAVE_SYS_SYSLIMITS__PATH_MAX) + +configure_file(config.h.in config.h @ONLY) + +if(NOT HAVE_SNPRINTF OR NOT HAVE_STRDUP OR NOT HAVE_INT_MAX) + message(FATAL_ERROR "Required symbol is missing!") +endif() + +if(ENABLE_WARNINGS) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall -Wextra") +endif() + +# Initialize pkg-config whether it is used or not +find_package(PkgConfig) + +# Figure out where cfitsio should come from +if("${WITH_CFITSIO}" STREQUAL "") + pkg_check_modules(cfitsio cfitsio REQUIRED) + set(CMAKE_INSTALL_RPATH "${cfitsio_LIBRARY_DIRS}:${CMAKE_INSTALL_RPATH}") +else() + set(cfitsio_INCLUDE_DIRS "${WITH_CFITSIO}/include") + set(cfitsio_LIBRARY_DIRS "${WITH_CFITSIO}/lib") + set(cfitsio_CFLAGS_OTHER "-I${cfitsio_INCLUDE_DIRS} ${WITH_CFITSIO_CFLAGS}") + set(cfitsio_LDFLAGS "-L${cfitsio_LIBRARY_DIRS} ${WITH_CFITSIO_LDFLAGS}") + set(CMAKE_INSTALL_RPATH "${cfitsio_LIBRARY_DIRS}:${CMAKE_INSTALL_RPATH}") +endif() + +# Keep things looking the way they used to +set(CMAKE_EXECUTABLE_SUFFIX_C ".e") + +# Set up include directories +execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/include) +include_directories("${CMAKE_SOURCE_DIR}/include") +include_directories("${CMAKE_CURRENT_BINARY_DIR}/include") +include_directories("${CMAKE_CURRENT_BINARY_DIR}") + +# use, i.e. don't skip the full RPATH for the build tree +set(CMAKE_SKIP_BUILD_RPATH FALSE) + +# when building, don't use the install RPATH already +# (but later on when installing) +set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + +# add the automatically determined parts of the RPATH +# which point to directories outside the build tree to the install RPATH +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + +# the RPATH to be used by installed binaries +if(APPLE) + set(CMAKE_MACOSX_RPATH 1) + set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib) +else() + set(CMAKE_INSTALL_RPATH $ORIGIN/../lib:${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_RPATH}) +endif() + + +set(CPACK_SOURCE_GENERATOR "TGZ") +set(CPACK_PACKAGE_NAME ${PROJECT_NAME}) +set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION}) +set(CPACK_PACKAGE_VENDOR "Association of Universities for Research in Astronomy (AURA)") +set(CPACK_SYSTEM_NAME ${CMAKE_HOST_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt") +set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") +set(CPACK_SOURCE_IGNORE_FILES + .git.* + build/ + ".*~$" +) +set(CPACK_VERBATIM_VARIABLES YES) +include(CPack) + +add_subdirectory(ctegen2) +add_subdirectory(cvos) +add_subdirectory(hstio) +add_subdirectory(lib) +add_subdirectory(tables) +add_subdirectory(pkg) + diff --git a/INSTALL.md b/INSTALL.md index 667901a13..7eda03adf 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -1,21 +1,22 @@ # Installation -HSTCAL uses the WAF build system. A precompiled copy of WAF has been included at the top-level of this project for your convenience. - - ## Supported Platforms - Linux >=RHEL6 - OS X >=10.5 -## Requirements +## Build requirements +- cmake >=3.11 (https://cmake.org) - cfitsio >=3.430 (https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html) - gcc >=4.4.7 (https://gcc.gnu.org) - openmp (http://www.openmp.org/) - pkg-config (https://www.freedesktop.org/wiki/Software/pkg-config) -- python >=2.7 (https://www.python.org) + +## Testing requirements + +- python >=3.8 (https://www.python.org) GCC may be supplemented by Clang under the following conditions: @@ -36,47 +37,129 @@ GCC may be supplemented by Clang under the following conditions: export PKG_CONFIG_PATH=$HOME/programs/cfitsio/lib/pkgconfig:$PKG_CONFIG_PATH ``` -- If `pkg-config` is not installed, define the path to CFITSIO manually via the `--with-cfitsio` argument: +- If you prefer not to use `pkg-config` set `WITH_CFITSIO` to the top-level path where cfitsio is installed. ``` - ./waf configure --with-cfitsio=$HOME/programs/cfitsio + mkdir _build + cd _build + cmake .. -DWITH_CFITSIO=$HOME/programs/cfitsio ``` +### OpenMP -### MacOS / OS X +- If you do not have OpenMP or want to disable OpenMP support, set the `ENABLE_OPENMP` option to `OFF`. + + ``` + cmake .. -DENABLE_OPENMP=OFF + ``` -The LLVM/Clang suite provided by Apple XCode is not sufficient to compile HSTCAL. Please install GCC (C and Fortran compilers) either from source, or using a package management system such as Homebrew, MacPorts, Fink, or Conda. +## Build on Linux -## Compiling HSTCAL +### Debian / Ubuntu + +``` +apt install cmake libcfitsio-dev gcc gfortran pkg-config +``` + +### Fedora + +``` +dnf install cmake cfitsio-devel gcc gcc-gfortran pkgconf-pkg-config +``` -_For a complete listing of useful configuration and build options, run_ `./waf --help` +### Conda / Mamba + +``` +conda create -n hstcal -c conda-forge cmake compilers cfitsio pkgconfig python +conda activate hstcal +export PKG_CONFIG_PATH="$CONDA_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" +export LDFLAGS="-Wl,-rpath=$CONDA_PREFIX/lib" +``` 1. Configure ``` - ./waf configure --prefix=$HOME/hstcal + mkdir _build + cd _build + cmake .. -DCMAKE_INSTAL_PREFIX=$HOME/hstcal ``` 2. Build ``` - ./waf build + make + ``` + +3. Install + + ``` + make install + ``` + +4. Add HSTCAL to `$PATH` + + ```bash + export PATH=$HOME/hstcal/bin:$PATH + ``` + +## Build on MacOS / OS X + +The LLVM/Clang suite provided by Apple XCode is not sufficient to compile HSTCAL. Please install GCC (C and Fortran compilers) either from source, or using a package management system such as Homebrew, MacPorts, Fink, or Conda. + + +### MacPorts + +``` +port install cmake cfitsio gcc13 pkgconfig +openmp +export CC=gcc-mp-13 +export CXX=g++-mp-13 +export FC=gfortran-mp-13 +export PKG_CONFIG_PATH="/opt/local/lib/pkgconfig:$PKG_CONFIG_PATH" +export LDFLAGS="-Wl,-rpath,/opt/local/lib" +``` + +### Homebrew + +``` +brew install cmake cfitsio gcc pkgconfig +export CC=gcc-13 +export CXX=gcc-13 +export FC=gfortran-13 +export PKG_CONFIG_PATH="/opt/homebrew/lib/pkgconfig:$PKG_CONFIG_PATH" +export LDFLAGS="-Wl,-rpath,/opt/homebrew/lib" +``` + +### Conda / Mamba + +``` +conda create -n hstcal -c conda-forge cmake compilers cfitsio pkgconfig python +conda activate hstcal +export PKG_CONFIG_PATH="$CONDA_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH" +export LDFLAGS="-Wl,-rpath,$CONDA_PREFIX/lib" +``` + +1. Configure + + ``` + mkdir _build + cd _build + cmake .. -DCMAKE_INSTAL_PREFIX=$HOME/hstcal ``` -3. Test [OPTIONAL] +2. Build ``` - ./waf test + make ``` -4. Install [OPTIONAL] +3. Install ``` - ./waf install + make install ``` -5. Add HSTCAL to `$PATH` +4. Add HSTCAL to `$PATH` ```bash export PATH=$HOME/hstcal/bin:$PATH @@ -85,16 +168,16 @@ _For a complete listing of useful configuration and build options, run_ `./waf - ## Build Targets -To install individual parts of HSTCAL, use the `--targets` option. For example, to install the `acs` and `lib` targets, do the following: +To install individual parts of HSTCAL... ``` -./waf install --targets=acs,lib +make install acscte ``` To list available build targets: ``` -./waf configure list +make help ``` Some common targets include: @@ -104,24 +187,8 @@ Target | Description acs | calacs wf3 | calwf3 and other WFC3-related tools stis | calstis -lib | static libraries and header files for the included libraries -test | self-test executables ## Debugging -To enable support for debugging symbols run, `./waf configure --debug` - - -## build.cfg file - -Shell arguments normally passed to `./waf configure` may be issued via `build.cfg`. This configuration file may contain any arguments accepted by `./waf configure`. An example is given in the `build.cfg.example` file. - - -# Notes for developers - - -## Using headers - - -C has two forms of `#include` syntax, `#include "foo.h"` (i.e. `include/foo.h`) for local include files, and `#include ` (i.e. `/usr/include/foo.h`) for system include files. WAF does not track changes to system include files, so the first syntax should be used whenever including files within the project. +To enable support for debugging symbols use one of the following defines, `cmake .. -DCMAKE_BUILD_TYPE=[RelWithDebInfo|Debug]` diff --git a/JenkinsfileRT b/JenkinsfileRT index be9a44032..98eed17c7 100644 --- a/JenkinsfileRT +++ b/JenkinsfileRT @@ -8,11 +8,7 @@ jobconfig = new JobConfig() jobconfig.post_test_summary = true // Config data to share between builds. -CFLAGS = '' -LDFLAGS = '' -DEFAULT_FLAGS = "${CFLAGS} ${LDFLAGS}" -// Some waf flags cause a prompt for input during configuration, hence the 'yes'. -configure_cmd = "yes '' | ./waf configure --prefix=./_install ${DEFAULT_FLAGS}" +configure_cmd = "cmake . -DCMAKE_INSTALL_PREFIX=./_install" // Configure artifactory ingest data_config = new DataConfig() @@ -22,10 +18,10 @@ data_config.match_prefix = '(.*)_result' // .json is appended automatically // Run nightly tests, which include the slow ones. bc = new BuildConfig() -bc.nodetype = "RHEL-7" +bc.nodetype = "linux" bc.name = "release" // Note: The source tree is placed in the 'clone' subdir by the CI system. -bc.env_vars = ['PATH=./clone/_install/bin:$PATH', +bc.env_vars = ['PATH=/usr/local/bin:$PATH', 'OMP_NUM_THREADS=4', 'TEST_BIGDATA=https://bytesalad.stsci.edu/artifactory', 'jref=/grp/hst/cdbs/jref/', @@ -33,13 +29,16 @@ bc.env_vars = ['PATH=./clone/_install/bin:$PATH', 'oref=/grp/hst/cdbs/oref/'] bc.conda_channels = ['http://conda.anaconda.org/conda-forge/'] bc.conda_packages = ['python=3.9', + 'compilers', + 'bzip2', 'cfitsio', 'pkg-config', - 'astropy'] + 'astropy', + 'cmake'] -bc.build_cmds = ["${configure_cmd} --release-with-symbols", - "./waf build", - "./waf install", +bc.build_cmds = ["${configure_cmd} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=\$CONDA_PREFIX", + "make", + "make install", "calacs.e --version", "calwf3.e --version", "cs0.e --version", @@ -51,11 +50,25 @@ bc.failedFailureThresh = 6 // Upload artifacts bc.test_configs = [data_config] +// MacOS is report-only: short tests, no artifact upload bc1 = utils.copy(bc) -bc1.name = "linux" -bc1.nodetype = "linux" +bc1.name = "quick" +bc1.nodetype = "macos" +bc1.env_vars += ['LDFLAGS=-L/usr/local/opt/libomp/lib -Wl,-rpath,/usr/local/opt/libomp/lib -Wl,-rpath,\$CONDA_PREFIX/lib -Wl,-rpath,/usr/local/lib', + 'CFLAGS=-I/usr/local/opt/libomp/include', + 'CC=/usr/local/bin/gcc-13', + 'CXX=/usr/local/bin/g++-13', + 'FC=/usr/local/bin/gfortran-13'] +bc1.conda_packages = ['python=3.9', + 'bzip2', + 'cfitsio', + 'pkg-config', + 'astropy', + 'cmake'] +bc1.test_cmds[0] = "pytest tests --basetemp=tests_output --junitxml results.xml -v" +bc1.test_configs = [] // Iterate over configurations that define the (distributed) build matrix. // Spawn a host of the given nodetype for each combination and run in parallel. // Also apply the job configuration defined in `jobconfig` above. -utils.run([bc, bc1, jobconfig]) +utils.run([jobconfig, bc, bc1]) diff --git a/applib/wscript b/applib/wscript deleted file mode 100644 index 92fd0760f..000000000 --- a/applib/wscript +++ /dev/null @@ -1,12 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - bld( - # Use Fortran - features = ['fc', 'fcstlib'], - source = [ - 'ncarfft.f' - ], - target = 'applib', - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib', - ) diff --git a/build.cfg.example b/build.cfg.example deleted file mode 100644 index 93121f741..000000000 --- a/build.cfg.example +++ /dev/null @@ -1,2 +0,0 @@ ---prefix=/home/me/install_root - diff --git a/config.h.in b/config.h.in new file mode 100644 index 000000000..9714c8635 --- /dev/null +++ b/config.h.in @@ -0,0 +1,15 @@ +#ifndef HSTCAL_CONFIG_H +#define HSTCAL_CONFIG_H +#cmakedefine HAVE_LIMITS__PATH_MAX +#cmakedefine HAVE_SYS_LIMITS__PATH_MAX +#cmakedefine HAVE_SYS_SYSLIMITS__PATH_MAX + +#if defined(HAVE_LIMITS__PATH_MAX) +#include +#elif defined(HAVE_SYS_LIMITS__PATH_MAX) +#include +#elif defined(HAVE_SYS_SYSLIMITS__PATH_MAX) +#include +#endif + +#endif // HSTCAL_CONFIG_H diff --git a/configure b/configure deleted file mode 100755 index 3151d755e..000000000 --- a/configure +++ /dev/null @@ -1,119 +0,0 @@ -#! /bin/sh - -# waf configure wrapper - -# Fancy colors used to beautify the output a bit. -# -if [ "$NOCOLOR" ] ; then - NORMAL="" - BOLD="" - RED="" - YELLOW="" - GREEN="" -else - NORMAL='\033[0m' - BOLD='\033[01;1m' - RED='\033[01;91m' - YELLOW='\033[00;33m' - GREEN='\033[01;92m' -fi - -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_ERROR=2 -EXIT_BUG=10 - -CUR_DIR=$PWD - -#possible relative path -WORKINGDIR=`dirname $0` -cd $WORKINGDIR -#abs path -WORKINGDIR=`pwd` -cd $CUR_DIR - - -# Checks for WAF. Honours $WAF if set. Stores path to 'waf' in $WAF. -# Requires that $PYTHON is set. -# -checkWAF() -{ - printf "Checking for WAF\t\t\t: " - #installed miniwaf in sourcedir - if [ -z "$WAF" ] ; then - if [ -f "${WORKINGDIR}/waf" ] ; then - WAF="${WORKINGDIR}/waf" - if [ ! -x "$WAF" ] ; then - chmod +x $WAF - fi - fi - fi - if [ -z "$WAF" ] ; then - if [ -f "${WORKINGDIR}/waf-light" ] ; then - ${WORKINGDIR}/waf-light --make-waf - WAF="${WORKINGDIR}/waf" - fi - fi - #global installed waf with waf->waf.py link - if [ -z "$WAF" ] ; then - WAF=`which waf 2>/dev/null` - fi - # neither waf nor miniwaf could be found - if [ ! -x "$WAF" ] ; then - printf "$RED""not found""$NORMAL""\n" - echo "Go to http://code.google.com/p/waf/" - echo "and download a waf version" - exit $EXIT_FAILURE - else - printf "$GREEN""$WAF""$NORMAL""\n" - fi -} - -# Generates a Makefile. Requires that $WAF is set. -# -generateMakefile() -{ - cat > Makefile << EOF -#!/usr/bin/make -f -# Waf Makefile wrapper -WAF_HOME=$CUR_DIR - -all: - $WAF build - -all-debug: - $WAF -v build - -all-progress: - $WAF -p build - -install: - $WAF install - -uninstall: - $WAF uninstall - -clean: - @$WAF clean - -distclean: - $WAF distclean - @-rm -rf build - @-rm -f Makefile - -check: - $WAF check - -dist: - $WAF dist - -.PHONY: clean dist distclean check uninstall install all - -EOF -} - -checkWAF -generateMakefile - -"${WAF}" configure $* -exit $? diff --git a/ctegen2/CMakeLists.txt b/ctegen2/CMakeLists.txt new file mode 100644 index 000000000..09307fe01 --- /dev/null +++ b/ctegen2/CMakeLists.txt @@ -0,0 +1,50 @@ +project(ctegen2) + +find_package(OpenMP COMPONENTS C) +# This interferes with Conda, because it uses clang AND provides +# its own libomp. I need to figure out a better way to handle +# pure Apple Clang builds. +#if(${CMAKE_C_COMPILER_ID} MATCHES "Clang") +# if(APPLE) +# message("Apple Clang does not support OpenMP. Disabled.") +# set(ENABLE_OPENMP OFF) +# endif() +#endif() + +# Circular dependency on ACS, so this MUST be STATIC +add_library(${PROJECT_NAME} STATIC + ctegen2.c + ctehelpers.c +) +target_link_libraries(${PROJECT_NAME} + PUBLIC hstio + PUBLIC tables +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC ${HSTCAL_include} + PUBLIC ../pkg/acs/include + PUBLIC ../pkg/wfc3/include + PUBLIC ../pkg/stis/include +) + +target_compile_options(${PROJECT_NAME} + PUBLIC "-fPIC" +) + +if(OpenMP_FOUND AND ENABLE_OPENMP) + target_link_libraries(${PROJECT_NAME} + PUBLIC ${OpenMP_C_LIB_NAMES} + ) + target_compile_options(${PROJECT_NAME} + PUBLIC ${OpenMP_C_FLAGS} + ) +endif() + +set_target_properties(${PROJECT_NAME} + PROPERTIES + OUTPUT_NAME hst${PROJECT_NAME} +) +install(TARGETS ${PROJECT_NAME} + DESTINATION lib +) diff --git a/ctegen2/wscript b/ctegen2/wscript deleted file mode 100644 index 928b048f3..000000000 --- a/ctegen2/wscript +++ /dev/null @@ -1,19 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.stlib( - source = [ - 'ctehelpers.c', - 'ctegen2.c' - ], - target = 'ctegen2', - includes = ['.', - '../pkg/acs/calacs/acscte/', - '../pkg/acs/calacs/include/', - '../pkg/wfc3/calwf3/include/', - '../pkg/wfc3/calwf3/wf3cte/', - '../include/' - ], - use = ['CFITSIO', 'OPENMP', 'hstcallib'], - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib' - ) diff --git a/cvos/CMakeLists.txt b/cvos/CMakeLists.txt new file mode 100644 index 000000000..8de89cdaa --- /dev/null +++ b/cvos/CMakeLists.txt @@ -0,0 +1,15 @@ +project(cvos) +add_library(${PROJECT_NAME} SHARED + c_iraf_priv.c + irafinit.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} +) +set_target_properties(${PROJECT_NAME} + PROPERTIES + OUTPUT_NAME hst${PROJECT_NAME} +) +install(TARGETS ${PROJECT_NAME} + DESTINATION lib +) diff --git a/cvos/wscript b/cvos/wscript deleted file mode 100644 index eb397d8ed..000000000 --- a/cvos/wscript +++ /dev/null @@ -1,11 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.stlib( - source = [ - 'c_iraf_priv.c', - 'irafinit.c', - ], - target = 'cvos', - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib' - ) diff --git a/hstio/CMakeLists.txt b/hstio/CMakeLists.txt new file mode 100644 index 000000000..e4df726a4 --- /dev/null +++ b/hstio/CMakeLists.txt @@ -0,0 +1,20 @@ +project(hstio) +add_library(${PROJECT_NAME} SHARED + hstio.c + keyword.c + numeric.c +) +target_link_libraries(${PROJECT_NAME} + PUBLIC cvos + PUBLIC ${cfitsio_LDFLAGS} +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${cfitsio_INCLUDE_DIRS} +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} +) +target_compile_options(${PROJECT_NAME} PUBLIC ${cfitsio_CFLAGS_OTHER}) +install(TARGETS ${PROJECT_NAME} + DESTINATION lib +) diff --git a/hstio/test/wscript b/hstio/test/wscript deleted file mode 100644 index 7fd5d0385..000000000 --- a/hstio/test/wscript +++ /dev/null @@ -1,18 +0,0 @@ -# vim: set syntax=python: -import os - -def build_test(bld, name): - return bld.program( - source = name, - target = os.path.splitext(name)[0], - use = bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = bld.env.INSTALL_TEST and '${PREFIX}/bin' - ) - -def build(bld): - for x in os.listdir(bld.path.abspath()): - if x.startswith('test') and x.endswith('.c'): - build_test(bld, x) diff --git a/hstio/wscript b/hstio/wscript deleted file mode 100644 index a19e263fe..000000000 --- a/hstio/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.stlib( - source = [ - 'hstio.c', - 'numeric.c', - 'keyword.c' - ], - target = 'hstio', - uselib = ['CFITSIO'], - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib' - ) diff --git a/include/wscript b/include/wscript deleted file mode 100644 index 3499a728e..000000000 --- a/include/wscript +++ /dev/null @@ -1,8 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - # We don't really build any of these files, but we want to install them - if bld.env.INSTALL_LIB: - bld.install_files( - '${PREFIX}/include', - 'c_iraf.h hstio.h numeric.h xclio.h ximio.h xsynphot.h xtables.h') diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt new file mode 100644 index 000000000..2a15900a1 --- /dev/null +++ b/lib/CMakeLists.txt @@ -0,0 +1,21 @@ +project(hstcalib C Fortran) +add_library(${PROJECT_NAME} SHARED + ncarfft.f + getphttab.c + hstcal_memory.c + hstcalversion.c + str_util.c + trlbuf.c +) +target_link_libraries(${PROJECT_NAME} + hstio + tables + ${cfitsio_LDFLAGS} +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} +) +install(TARGETS ${PROJECT_NAME} + DESTINATION lib +) + diff --git a/pkg/imphttab/getphttab.c b/lib/getphttab.c similarity index 100% rename from pkg/imphttab/getphttab.c rename to lib/getphttab.c diff --git a/applib/ncarfft.f b/lib/ncarfft.f similarity index 100% rename from applib/ncarfft.f rename to lib/ncarfft.f diff --git a/lib/trlbuf.c b/lib/trlbuf.c index 5c019633d..10fbb6b8d 100644 --- a/lib/trlbuf.c +++ b/lib/trlbuf.c @@ -99,6 +99,8 @@ #include "hstcalversion.h" #include "hstio.h" +char MsgText[MSG_BUFF_LENGTH]; +int status; const unsigned initLength = 2; // Should always be > 0 to prevent issues with use of realloc(). /* Internal trailer file buffer routines */ @@ -109,7 +111,7 @@ static void CatTrlFile (FILE *ip, FILE *op); static void CatTrlFile_NoEOF (FILE *ip, FILE *op); static int AppendTrlFile(void); -extern struct TrlBuf trlbuf; +struct TrlBuf trlbuf; int InitTrlFile (char *inlist, char *output) { diff --git a/lib/wscript b/lib/wscript deleted file mode 100644 index 418a96c8d..000000000 --- a/lib/wscript +++ /dev/null @@ -1,18 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.stlib( - source = [ - 'hstcal_memory.c', - 'trlbuf.c', - 'hstcalversion.c', - 'str_util.c' - ], - target = 'hstcallib', - includes = ['./', - '../include/', - '../cfitsio' - ], - use = ['CFITSIO', 'OPENMP'], - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib' - ) diff --git a/pkg/CMakeLists.txt b/pkg/CMakeLists.txt new file mode 100644 index 000000000..cb1a68af8 --- /dev/null +++ b/pkg/CMakeLists.txt @@ -0,0 +1,3 @@ +add_subdirectory(acs) +add_subdirectory(wfc3) +add_subdirectory(stis) diff --git a/pkg/acs/CMakeLists.txt b/pkg/acs/CMakeLists.txt new file mode 100644 index 000000000..18e3faba7 --- /dev/null +++ b/pkg/acs/CMakeLists.txt @@ -0,0 +1,119 @@ + +project(acs_top) +add_subdirectory(lib) + +project(acs2d) +add_executable(${PROJECT_NAME} + src/main2d.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC acs +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(acsccd) +add_executable(${PROJECT_NAME} + src/mainccd.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC acs +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(acscte) +add_executable(${PROJECT_NAME} + src/maincte.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC acs + PUBLIC ctegen2 + PUBLIC hstcalib +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +#project(acscteforwardmodel) +#add_executable(${PROJECT_NAME} +# src/mainacscteforwardmodel.c +#) +#target_include_directories(${PROJECT_NAME} +# PUBLIC ${HSTCAL_include} +# PUBLIC ${PROJECT_NAME}/../include +#) +#target_link_libraries(${PROJECT_NAME} +# PUBLIC acs +# PUBLIC ctegen2 +# PUBLIC hstcalib +#) +#install(TARGETS ${PROJECT_NAME} +# DESTINATION bin +#) + + +project(acsrej) +add_executable(${PROJECT_NAME} + src/mainrej.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC acs + PUBLIC hstcalib +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(acssum) +add_executable(${PROJECT_NAME} + src/mainsum.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC acs +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(calacs) +add_executable(${PROJECT_NAME} + src/mainacs.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC acs +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) diff --git a/pkg/acs/calacs/Dates b/pkg/acs/Dates similarity index 100% rename from pkg/acs/calacs/Dates rename to pkg/acs/Dates diff --git a/pkg/acs/calacs/Errors b/pkg/acs/Errors similarity index 100% rename from pkg/acs/calacs/Errors rename to pkg/acs/Errors diff --git a/pkg/acs/calacs/History b/pkg/acs/History similarity index 100% rename from pkg/acs/calacs/History rename to pkg/acs/History diff --git a/pkg/acs/calacs/ToDo b/pkg/acs/ToDo similarity index 100% rename from pkg/acs/calacs/ToDo rename to pkg/acs/ToDo diff --git a/pkg/acs/calacs/Updates b/pkg/acs/Updates similarity index 100% rename from pkg/acs/calacs/Updates rename to pkg/acs/Updates diff --git a/pkg/acs/calacs/Warnings b/pkg/acs/Warnings similarity index 100% rename from pkg/acs/calacs/Warnings rename to pkg/acs/Warnings diff --git a/pkg/acs/calacs/acs2d/wscript b/pkg/acs/calacs/acs2d/wscript deleted file mode 100644 index 4960193a3..000000000 --- a/pkg/acs/calacs/acs2d/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'acs2d.e', - source = 'main2d.c', - target = 'acs2d.e', - use = ['hstcallib', 'calacs', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/acs/calacs/acsccd/wscript b/pkg/acs/calacs/acsccd/wscript deleted file mode 100644 index bfbed4519..000000000 --- a/pkg/acs/calacs/acsccd/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - source = 'mainccd.c', - target = 'acsccd.e', - use = ['hstcallib', 'calacs', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) - diff --git a/pkg/acs/calacs/acscte/main.c b/pkg/acs/calacs/acscte/main.c deleted file mode 100644 index 68f2f70b3..000000000 --- a/pkg/acs/calacs/acscte/main.c +++ /dev/null @@ -1,9 +0,0 @@ -/* ACSCTE -- CTE loss correction */ - -extern int doMainCTE (int argc, char **argv); - -int main (int argc, char **argv) -{ - return doMainCTE(argc, argv); -} - diff --git a/pkg/acs/calacs/acscte/wscript b/pkg/acs/calacs/acscte/wscript deleted file mode 100644 index e78be81f8..000000000 --- a/pkg/acs/calacs/acscte/wscript +++ /dev/null @@ -1,20 +0,0 @@ -# vim: set syntax=python: -from waflib import Utils - - -def build(bld): - t = bld.program( - source = ['maincte.c', - 'main.c' - ], - target = 'acscte.e', - includes = ['.', - '../../../../ctegen2', - '../../../../include'], - use = ['hstcallib', 'calacs', 'imphttab', 'ctegen2'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) - bld.install_as('${PREFIX}/bin/acscteforwardmodel.e', 'acscte.e', chmod=Utils.O755) diff --git a/pkg/acs/calacs/acsrej/wscript b/pkg/acs/calacs/acsrej/wscript deleted file mode 100644 index 4deba39a3..000000000 --- a/pkg/acs/calacs/acsrej/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - source = 'mainrej.c', - target = 'acsrej.e', - use = ['hstcallib', 'calacs', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) - diff --git a/pkg/acs/calacs/acssum/wscript b/pkg/acs/calacs/acssum/wscript deleted file mode 100644 index 9be042d11..000000000 --- a/pkg/acs/calacs/acssum/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - source = 'mainsum.c', - target = 'acssum.e', - use = ['hstcallib', 'calacs', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) - diff --git a/pkg/acs/calacs/calacs/wscript b/pkg/acs/calacs/calacs/wscript deleted file mode 100644 index d32146283..000000000 --- a/pkg/acs/calacs/calacs/wscript +++ /dev/null @@ -1,17 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'calacs.e', - source = 'acsmain.c', - target = 'calacs.e', - includes = ['./', - '../include/', - '../../../../include/' - ], - use = ['hstcallib', 'calacs', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/acs/calacs/lib/wscript b/pkg/acs/calacs/lib/wscript deleted file mode 100644 index ec8b49458..000000000 --- a/pkg/acs/calacs/lib/wscript +++ /dev/null @@ -1,61 +0,0 @@ -# vim: set syntax=python: - -# The files that make up calacs.a are distributed amongst the -# various acs* directories. - -def build(bld): - t = bld.stlib( - source = """ - acshist.c acsinfo.c acssect.c addk2d.c bin2d.c bincoords.c - binupdate.c comparenum.c defswitch.c detchip.c - detnsegn.c div1d.c dodqi.c donoise.c dostat.c - err.c fileexists.c findbin.c findroot.c fromlt.c - getacsgrp.c getacskeys.c getccdtab.c getcorner.c - getlt.c getrefname.c getswitch.c gotfilename.c - imghistory.c imgpedigree.c initmulti.c interp1d.c - interpinfo.c key.c loadhead.c logprogress.c lowcase.c - median.c mkname.c mkoutname.c mkspt.c mult1d.c - multk1d.c multk2d.c omitstep.c parseamps.c parsedate.c - prinfo.c reffiles.c rowpedigree.c sameint.c spline.c - streqic.c sub1d.c sub2d.c tabhistory.c tabpedigree.c - timestamp.c trim.c trim2d.c ucalver.c ufilename.c - unbinline.c whicherror.c toelectrons.c - - ../acs2d/acs2d.c ../acs2d/do2d.c ../acs2d/dodark.c - ../acs2d/doflat.c ../acs2d/dononlin.c ../acs2d/dophot.c - ../acs2d/doshad.c ../acs2d/dospot.c ../acs2d/get2dflags.c - ../acs2d/getlintab.c ../acs2d/getspottab.c ../acs2d/doflash.c - ../acs2d/photmode.c ../acs2d/sanity2d.c ../acs2d/get2dsw.c - - ../acsccd/acsccd.c ../acsccd/blevdrift.c ../acsccd/blevfit.c - ../acsccd/doatod.c ../acsccd/dobias.c ../acsccd/doblev.c - ../acsccd/doccd.c ../acsccd/findblev.c ../acsccd/dosink.c - ../acsccd/findover.c ../acsccd/getacsflag.c - ../acsccd/getccdsw.c ../acsccd/blev_funcs_postsm4.c - ../acsccd/dofwsat.c - - ../acscte/docte.c ../acscte/acscte.c - ../acscte/getcteflag.c ../acscte/getctesw.c ../acscte/dopcte.c - ../acscte/dopcte-gen2.c ../acscte/pcte_fixycte.c ../acscte/pcte_funcs.c - - ../acsrej/acsrej.c ../acsrej/acsrej_check.c - ../acsrej/acsrej_do.c ../acsrej/acsrej_init.c - ../acsrej/acsrej_loop.c ../acsrej/acsrej_sky.c - ../acsrej/cr_history.c ../acsrej/cr_mode.c - ../acsrej/cr_scaling.c - ../acsrej/piksrt.c ../acsrej/readpar.c ../acsrej/rej_command.c - - ../acssum/acssum.c - - ../calacs/acsdth.c ../calacs/acsinit.c - ../calacs/acsmember.c ../calacs/acstable.c - ../calacs/calacs.c ../calacs/getflags.c - ../calacs/getnewref.c ../calacs/getsciinfo.c - ../calacs/refexist.c ../calacs/sciflags.c - """, - target = 'calacs', - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib', - use = ['hstcallib', 'CFITSIO', 'OPENMP', 'ctegen2'], - includes = ['../include'], - export_includes = ['../include'], - ) diff --git a/pkg/acs/calacs/wscript b/pkg/acs/calacs/wscript deleted file mode 100644 index 7077b5252..000000000 --- a/pkg/acs/calacs/wscript +++ /dev/null @@ -1,25 +0,0 @@ -# vim: set syntax=python: - -SUBDIRS = [ - 'lib', - 'calacs', - 'acsrej', - 'acssum', - 'acsccd', - 'acscte', - 'acs2d' - ] - -def build(bld): - for subdir in SUBDIRS: - bld.recurse(subdir) - - bld(name='acs', - depends_on=[ - 'calacs.e', - 'acsccd.e', - 'acsrej.e', - 'acscte.e', - 'acs2d.e', - 'acssum.e'], - always=True) diff --git a/pkg/acs/calacs/include/acs.h b/pkg/acs/include/acs.h similarity index 100% rename from pkg/acs/calacs/include/acs.h rename to pkg/acs/include/acs.h diff --git a/pkg/acs/calacs/calacs/acsasn.h b/pkg/acs/include/acsasn.h similarity index 100% rename from pkg/acs/calacs/calacs/acsasn.h rename to pkg/acs/include/acsasn.h diff --git a/pkg/acs/calacs/include/acscorr.h b/pkg/acs/include/acscorr.h similarity index 100% rename from pkg/acs/calacs/include/acscorr.h rename to pkg/acs/include/acscorr.h diff --git a/pkg/acs/include/acscte.h b/pkg/acs/include/acscte.h new file mode 100644 index 000000000..d33024234 --- /dev/null +++ b/pkg/acs/include/acscte.h @@ -0,0 +1,6 @@ +#ifndef ACSCTE_INCL +#define ACSCTE_INCL + +int doMainCTE(int argc, char **argv); + +#endif diff --git a/pkg/acs/calacs/include/acsdq.h b/pkg/acs/include/acsdq.h similarity index 100% rename from pkg/acs/calacs/include/acsdq.h rename to pkg/acs/include/acsdq.h diff --git a/pkg/acs/calacs/include/acsinfo.h b/pkg/acs/include/acsinfo.h similarity index 100% rename from pkg/acs/calacs/include/acsinfo.h rename to pkg/acs/include/acsinfo.h diff --git a/pkg/acs/calacs/include/acsomit.h b/pkg/acs/include/acsomit.h similarity index 100% rename from pkg/acs/calacs/include/acsomit.h rename to pkg/acs/include/acsomit.h diff --git a/pkg/acs/calacs/include/acsrej.h b/pkg/acs/include/acsrej.h similarity index 100% rename from pkg/acs/calacs/include/acsrej.h rename to pkg/acs/include/acsrej.h diff --git a/pkg/acs/calacs/acssum/acssum.h b/pkg/acs/include/acssum.h similarity index 100% rename from pkg/acs/calacs/acssum/acssum.h rename to pkg/acs/include/acssum.h diff --git a/pkg/acs/calacs/include/acsversion.h b/pkg/acs/include/acsversion.h similarity index 100% rename from pkg/acs/calacs/include/acsversion.h rename to pkg/acs/include/acsversion.h diff --git a/pkg/acs/calacs/include/acswild.h b/pkg/acs/include/acswild.h similarity index 100% rename from pkg/acs/calacs/include/acswild.h rename to pkg/acs/include/acswild.h diff --git a/pkg/acs/calacs/calacs/calacs.h b/pkg/acs/include/calacs.h similarity index 100% rename from pkg/acs/calacs/calacs/calacs.h rename to pkg/acs/include/calacs.h diff --git a/pkg/acs/calacs/include/getacskeys.h b/pkg/acs/include/getacskeys.h similarity index 100% rename from pkg/acs/calacs/include/getacskeys.h rename to pkg/acs/include/getacskeys.h diff --git a/pkg/acs/calacs/acscte/pcte.h b/pkg/acs/include/pcte.h similarity index 98% rename from pkg/acs/calacs/acscte/pcte.h rename to pkg/acs/include/pcte.h index 0896e7f67..014763f74 100644 --- a/pkg/acs/calacs/acscte/pcte.h +++ b/pkg/acs/include/pcte.h @@ -2,7 +2,7 @@ #define PCTE_INCL #include "hstio.h" -#include "../../../../ctegen2/ctegen2.h" +#include "../../../ctegen2/ctegen2.h" /* constants describing the CTE parameters reference file */ #define NUM_PHI 11 /* number of phi values in cte params file */ diff --git a/pkg/acs/calacs/acsrej/rej.h b/pkg/acs/include/rej.h similarity index 100% rename from pkg/acs/calacs/acsrej/rej.h rename to pkg/acs/include/rej.h diff --git a/pkg/acs/lib/CMakeLists.txt b/pkg/acs/lib/CMakeLists.txt new file mode 100644 index 000000000..e812fdcf4 --- /dev/null +++ b/pkg/acs/lib/CMakeLists.txt @@ -0,0 +1,146 @@ +project(acs) +add_library(${PROJECT_NAME} SHARED + acs2d/acs2d.c + acs2d/do2d.c + acs2d/dodark.c + acs2d/doflash.c + acs2d/doflat.c + acs2d/dononlin.c + acs2d/dophot.c + acs2d/doshad.c + acs2d/dospot.c + acs2d/get2dflags.c + acs2d/get2dsw.c + acs2d/getlintab.c + acs2d/getspottab.c + acs2d/photmode.c + acs2d/sanity2d.c + acsccd/acsccd.c + acsccd/blev_funcs_postsm4.c + acsccd/blevdrift.c + acsccd/blevfit.c + acsccd/doatod.c + acsccd/dobias.c + acsccd/doblev.c + #acsccd/doblev_v504.c # ... what?? + acsccd/doccd.c + acsccd/dofwsat.c + acsccd/dosink.c + acsccd/findblev.c + acsccd/findover.c + acsccd/getacsflag.c + acsccd/getccdsw.c + acscte/acscte.c + acscte/docte.c + acscte/domaincte.c + acscte/dopcte-gen2.c + acscte/dopcte.c + acscte/getcteflag.c + acscte/getctesw.c + acscte/pcte_fixycte.c + acscte/pcte_funcs.c + acshist.c + acsinfo.c + acsrej/acsrej.c + acsrej/acsrej_check.c + acsrej/acsrej_do.c + acsrej/acsrej_init.c + acsrej/acsrej_loop.c + acsrej/acsrej_sky.c + acsrej/cr_history.c + acsrej/cr_mode.c + acsrej/cr_scaling.c + acsrej/piksrt.c + acsrej/readpar.c + acsrej/rej_command.c + acssect.c + acssum/acssum.c + calacs/acsdth.c + calacs/acsinit.c + calacs/acsmember.c + calacs/acstable.c + calacs/calacs.c + calacs/getflags.c + calacs/getnewref.c + calacs/getsciinfo.c + calacs/refexist.c + calacs/sciflags.c + addk2d.c + bin2d.c + bincoords.c + binupdate.c + comparenum.c + defswitch.c + detchip.c + detnsegn.c + div1d.c + dodqi.c + donoise.c + dostat.c + err.c + fileexists.c + findbin.c + findroot.c + fromlt.c + getacsgrp.c + getacskeys.c + getccdtab.c + getcorner.c + getlt.c + getrefname.c + getswitch.c + gotfilename.c + imghistory.c + imgpedigree.c + initmulti.c + interp1d.c + interpinfo.c + key.c + loadhead.c + logprogress.c + lowcase.c + median.c + mkname.c + mkoutname.c + mkspt.c + mult1d.c + multk1d.c + multk2d.c + omitstep.c + parseamps.c + parsedate.c + prinfo.c + reffiles.c + rowpedigree.c + sameint.c + spline.c + streqic.c + sub1d.c + sub2d.c + tabhistory.c + tabpedigree.c + timestamp.c + toelectrons.c + trim.c + trim2d.c + ucalver.c + ufilename.c + unbinline.c + whicherror.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME_INCLUDE_DIR} + PUBLIC ${PROJECT_SOURCE_DIR}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC ctegen2 + PUBLIC hstcalib +) +set_target_properties(${PROJECT_NAME} + PROPERTIES + OUTPUT_NAME hst${PROJECT_NAME} +) +install(TARGETS ${PROJECT_NAME} + DESTINATION lib +) diff --git a/pkg/acs/calacs/lib/README b/pkg/acs/lib/README similarity index 100% rename from pkg/acs/calacs/lib/README rename to pkg/acs/lib/README diff --git a/pkg/acs/calacs/acs2d/acs2d.c b/pkg/acs/lib/acs2d/acs2d.c similarity index 100% rename from pkg/acs/calacs/acs2d/acs2d.c rename to pkg/acs/lib/acs2d/acs2d.c diff --git a/pkg/acs/calacs/acs2d/do2d.c b/pkg/acs/lib/acs2d/do2d.c similarity index 100% rename from pkg/acs/calacs/acs2d/do2d.c rename to pkg/acs/lib/acs2d/do2d.c diff --git a/pkg/acs/calacs/acs2d/dodark.c b/pkg/acs/lib/acs2d/dodark.c similarity index 100% rename from pkg/acs/calacs/acs2d/dodark.c rename to pkg/acs/lib/acs2d/dodark.c diff --git a/pkg/acs/calacs/acs2d/doflash.c b/pkg/acs/lib/acs2d/doflash.c similarity index 100% rename from pkg/acs/calacs/acs2d/doflash.c rename to pkg/acs/lib/acs2d/doflash.c diff --git a/pkg/acs/calacs/acs2d/doflat.c b/pkg/acs/lib/acs2d/doflat.c similarity index 100% rename from pkg/acs/calacs/acs2d/doflat.c rename to pkg/acs/lib/acs2d/doflat.c diff --git a/pkg/acs/calacs/acs2d/dononlin.c b/pkg/acs/lib/acs2d/dononlin.c similarity index 100% rename from pkg/acs/calacs/acs2d/dononlin.c rename to pkg/acs/lib/acs2d/dononlin.c diff --git a/pkg/acs/calacs/acs2d/dophot.c b/pkg/acs/lib/acs2d/dophot.c similarity index 100% rename from pkg/acs/calacs/acs2d/dophot.c rename to pkg/acs/lib/acs2d/dophot.c diff --git a/pkg/acs/calacs/acs2d/doshad.c b/pkg/acs/lib/acs2d/doshad.c similarity index 100% rename from pkg/acs/calacs/acs2d/doshad.c rename to pkg/acs/lib/acs2d/doshad.c diff --git a/pkg/acs/calacs/acs2d/dospot.c b/pkg/acs/lib/acs2d/dospot.c similarity index 100% rename from pkg/acs/calacs/acs2d/dospot.c rename to pkg/acs/lib/acs2d/dospot.c diff --git a/pkg/acs/calacs/acs2d/get2dflags.c b/pkg/acs/lib/acs2d/get2dflags.c similarity index 100% rename from pkg/acs/calacs/acs2d/get2dflags.c rename to pkg/acs/lib/acs2d/get2dflags.c diff --git a/pkg/acs/calacs/acs2d/get2dsw.c b/pkg/acs/lib/acs2d/get2dsw.c similarity index 100% rename from pkg/acs/calacs/acs2d/get2dsw.c rename to pkg/acs/lib/acs2d/get2dsw.c diff --git a/pkg/acs/calacs/acs2d/getlintab.c b/pkg/acs/lib/acs2d/getlintab.c similarity index 100% rename from pkg/acs/calacs/acs2d/getlintab.c rename to pkg/acs/lib/acs2d/getlintab.c diff --git a/pkg/acs/calacs/acs2d/getspottab.c b/pkg/acs/lib/acs2d/getspottab.c similarity index 100% rename from pkg/acs/calacs/acs2d/getspottab.c rename to pkg/acs/lib/acs2d/getspottab.c diff --git a/pkg/acs/calacs/acs2d/photmode.c b/pkg/acs/lib/acs2d/photmode.c similarity index 100% rename from pkg/acs/calacs/acs2d/photmode.c rename to pkg/acs/lib/acs2d/photmode.c diff --git a/pkg/acs/calacs/acs2d/sanity2d.c b/pkg/acs/lib/acs2d/sanity2d.c similarity index 100% rename from pkg/acs/calacs/acs2d/sanity2d.c rename to pkg/acs/lib/acs2d/sanity2d.c diff --git a/pkg/acs/calacs/acsccd/acsccd.c b/pkg/acs/lib/acsccd/acsccd.c similarity index 100% rename from pkg/acs/calacs/acsccd/acsccd.c rename to pkg/acs/lib/acsccd/acsccd.c diff --git a/pkg/acs/calacs/acsccd/blev_funcs_postsm4.c b/pkg/acs/lib/acsccd/blev_funcs_postsm4.c similarity index 100% rename from pkg/acs/calacs/acsccd/blev_funcs_postsm4.c rename to pkg/acs/lib/acsccd/blev_funcs_postsm4.c diff --git a/pkg/acs/calacs/acsccd/blevdrift.c b/pkg/acs/lib/acsccd/blevdrift.c similarity index 100% rename from pkg/acs/calacs/acsccd/blevdrift.c rename to pkg/acs/lib/acsccd/blevdrift.c diff --git a/pkg/acs/calacs/acsccd/blevfit.c b/pkg/acs/lib/acsccd/blevfit.c similarity index 100% rename from pkg/acs/calacs/acsccd/blevfit.c rename to pkg/acs/lib/acsccd/blevfit.c diff --git a/pkg/acs/calacs/acsccd/doatod.c b/pkg/acs/lib/acsccd/doatod.c similarity index 100% rename from pkg/acs/calacs/acsccd/doatod.c rename to pkg/acs/lib/acsccd/doatod.c diff --git a/pkg/acs/calacs/acsccd/dobias.c b/pkg/acs/lib/acsccd/dobias.c similarity index 100% rename from pkg/acs/calacs/acsccd/dobias.c rename to pkg/acs/lib/acsccd/dobias.c diff --git a/pkg/acs/calacs/acsccd/doblev.c b/pkg/acs/lib/acsccd/doblev.c similarity index 100% rename from pkg/acs/calacs/acsccd/doblev.c rename to pkg/acs/lib/acsccd/doblev.c diff --git a/pkg/acs/calacs/acsccd/doccd.c b/pkg/acs/lib/acsccd/doccd.c similarity index 100% rename from pkg/acs/calacs/acsccd/doccd.c rename to pkg/acs/lib/acsccd/doccd.c diff --git a/pkg/acs/calacs/acsccd/dofwsat.c b/pkg/acs/lib/acsccd/dofwsat.c similarity index 100% rename from pkg/acs/calacs/acsccd/dofwsat.c rename to pkg/acs/lib/acsccd/dofwsat.c diff --git a/pkg/acs/calacs/acsccd/dosink.c b/pkg/acs/lib/acsccd/dosink.c similarity index 100% rename from pkg/acs/calacs/acsccd/dosink.c rename to pkg/acs/lib/acsccd/dosink.c diff --git a/pkg/acs/calacs/acsccd/findblev.c b/pkg/acs/lib/acsccd/findblev.c similarity index 100% rename from pkg/acs/calacs/acsccd/findblev.c rename to pkg/acs/lib/acsccd/findblev.c diff --git a/pkg/acs/calacs/acsccd/findover.c b/pkg/acs/lib/acsccd/findover.c similarity index 100% rename from pkg/acs/calacs/acsccd/findover.c rename to pkg/acs/lib/acsccd/findover.c diff --git a/pkg/acs/calacs/acsccd/getacsflag.c b/pkg/acs/lib/acsccd/getacsflag.c similarity index 100% rename from pkg/acs/calacs/acsccd/getacsflag.c rename to pkg/acs/lib/acsccd/getacsflag.c diff --git a/pkg/acs/calacs/acsccd/getccdsw.c b/pkg/acs/lib/acsccd/getccdsw.c similarity index 100% rename from pkg/acs/calacs/acsccd/getccdsw.c rename to pkg/acs/lib/acsccd/getccdsw.c diff --git a/pkg/acs/calacs/acscte/acscte.c b/pkg/acs/lib/acscte/acscte.c similarity index 100% rename from pkg/acs/calacs/acscte/acscte.c rename to pkg/acs/lib/acscte/acscte.c diff --git a/pkg/acs/calacs/acscte/docte.c b/pkg/acs/lib/acscte/docte.c similarity index 100% rename from pkg/acs/calacs/acscte/docte.c rename to pkg/acs/lib/acscte/docte.c diff --git a/pkg/acs/calacs/acscte/maincte.c b/pkg/acs/lib/acscte/domaincte.c similarity index 99% rename from pkg/acs/calacs/acscte/maincte.c rename to pkg/acs/lib/acscte/domaincte.c index 0641c3529..ac7f5a44f 100644 --- a/pkg/acs/calacs/acscte/maincte.c +++ b/pkg/acs/lib/acscte/domaincte.c @@ -1,5 +1,6 @@ /* ACSCTE -- CTE loss correction */ +#include "config.h" # include # include /* calloc */ # include @@ -226,7 +227,7 @@ int doMainCTE (int argc, char **argv) { } else if (strncmp(argv[i], "--forwardModelOnly", 18) == 0) { - printf("WARNING: running CTE forward model only"); + printf("WARNING: running CTE forward model only\n"); forwardModelOnly = true; continue; } diff --git a/pkg/acs/calacs/acscte/dopcte-gen2.c b/pkg/acs/lib/acscte/dopcte-gen2.c similarity index 100% rename from pkg/acs/calacs/acscte/dopcte-gen2.c rename to pkg/acs/lib/acscte/dopcte-gen2.c diff --git a/pkg/acs/calacs/acscte/dopcte.c b/pkg/acs/lib/acscte/dopcte.c similarity index 100% rename from pkg/acs/calacs/acscte/dopcte.c rename to pkg/acs/lib/acscte/dopcte.c diff --git a/pkg/acs/calacs/acscte/getcteflag.c b/pkg/acs/lib/acscte/getcteflag.c similarity index 100% rename from pkg/acs/calacs/acscte/getcteflag.c rename to pkg/acs/lib/acscte/getcteflag.c diff --git a/pkg/acs/calacs/acscte/getctesw.c b/pkg/acs/lib/acscte/getctesw.c similarity index 100% rename from pkg/acs/calacs/acscte/getctesw.c rename to pkg/acs/lib/acscte/getctesw.c diff --git a/pkg/acs/calacs/acscte/pcte_fixycte.c b/pkg/acs/lib/acscte/pcte_fixycte.c similarity index 100% rename from pkg/acs/calacs/acscte/pcte_fixycte.c rename to pkg/acs/lib/acscte/pcte_fixycte.c diff --git a/pkg/acs/calacs/acscte/pcte_funcs.c b/pkg/acs/lib/acscte/pcte_funcs.c similarity index 100% rename from pkg/acs/calacs/acscte/pcte_funcs.c rename to pkg/acs/lib/acscte/pcte_funcs.c diff --git a/pkg/acs/calacs/lib/acshist.c b/pkg/acs/lib/acshist.c similarity index 100% rename from pkg/acs/calacs/lib/acshist.c rename to pkg/acs/lib/acshist.c diff --git a/pkg/acs/calacs/lib/acsinfo.c b/pkg/acs/lib/acsinfo.c similarity index 100% rename from pkg/acs/calacs/lib/acsinfo.c rename to pkg/acs/lib/acsinfo.c diff --git a/pkg/acs/calacs/acsrej/acsrej.c b/pkg/acs/lib/acsrej/acsrej.c similarity index 100% rename from pkg/acs/calacs/acsrej/acsrej.c rename to pkg/acs/lib/acsrej/acsrej.c diff --git a/pkg/acs/calacs/acsrej/acsrej_check.c b/pkg/acs/lib/acsrej/acsrej_check.c similarity index 100% rename from pkg/acs/calacs/acsrej/acsrej_check.c rename to pkg/acs/lib/acsrej/acsrej_check.c diff --git a/pkg/acs/calacs/acsrej/acsrej_do.c b/pkg/acs/lib/acsrej/acsrej_do.c similarity index 100% rename from pkg/acs/calacs/acsrej/acsrej_do.c rename to pkg/acs/lib/acsrej/acsrej_do.c diff --git a/pkg/acs/calacs/acsrej/acsrej_init.c b/pkg/acs/lib/acsrej/acsrej_init.c similarity index 100% rename from pkg/acs/calacs/acsrej/acsrej_init.c rename to pkg/acs/lib/acsrej/acsrej_init.c diff --git a/pkg/acs/calacs/acsrej/acsrej_loop.c b/pkg/acs/lib/acsrej/acsrej_loop.c similarity index 100% rename from pkg/acs/calacs/acsrej/acsrej_loop.c rename to pkg/acs/lib/acsrej/acsrej_loop.c diff --git a/pkg/acs/calacs/acsrej/acsrej_sky.c b/pkg/acs/lib/acsrej/acsrej_sky.c similarity index 100% rename from pkg/acs/calacs/acsrej/acsrej_sky.c rename to pkg/acs/lib/acsrej/acsrej_sky.c diff --git a/pkg/acs/calacs/acsrej/cr_history.c b/pkg/acs/lib/acsrej/cr_history.c similarity index 100% rename from pkg/acs/calacs/acsrej/cr_history.c rename to pkg/acs/lib/acsrej/cr_history.c diff --git a/pkg/acs/calacs/acsrej/cr_mode.c b/pkg/acs/lib/acsrej/cr_mode.c similarity index 100% rename from pkg/acs/calacs/acsrej/cr_mode.c rename to pkg/acs/lib/acsrej/cr_mode.c diff --git a/pkg/acs/calacs/acsrej/cr_scaling.c b/pkg/acs/lib/acsrej/cr_scaling.c similarity index 100% rename from pkg/acs/calacs/acsrej/cr_scaling.c rename to pkg/acs/lib/acsrej/cr_scaling.c diff --git a/pkg/acs/calacs/acsrej/history b/pkg/acs/lib/acsrej/history similarity index 100% rename from pkg/acs/calacs/acsrej/history rename to pkg/acs/lib/acsrej/history diff --git a/pkg/acs/calacs/acsrej/piksrt.c b/pkg/acs/lib/acsrej/piksrt.c similarity index 100% rename from pkg/acs/calacs/acsrej/piksrt.c rename to pkg/acs/lib/acsrej/piksrt.c diff --git a/pkg/acs/calacs/acsrej/readpar.c b/pkg/acs/lib/acsrej/readpar.c similarity index 100% rename from pkg/acs/calacs/acsrej/readpar.c rename to pkg/acs/lib/acsrej/readpar.c diff --git a/pkg/acs/calacs/acsrej/rej_command.c b/pkg/acs/lib/acsrej/rej_command.c similarity index 100% rename from pkg/acs/calacs/acsrej/rej_command.c rename to pkg/acs/lib/acsrej/rej_command.c diff --git a/pkg/acs/calacs/lib/acssect.c b/pkg/acs/lib/acssect.c similarity index 100% rename from pkg/acs/calacs/lib/acssect.c rename to pkg/acs/lib/acssect.c diff --git a/pkg/acs/calacs/acssum/Notes b/pkg/acs/lib/acssum/Notes similarity index 100% rename from pkg/acs/calacs/acssum/Notes rename to pkg/acs/lib/acssum/Notes diff --git a/pkg/acs/calacs/acssum/acssum.c b/pkg/acs/lib/acssum/acssum.c similarity index 100% rename from pkg/acs/calacs/acssum/acssum.c rename to pkg/acs/lib/acssum/acssum.c diff --git a/pkg/acs/calacs/lib/addk2d.c b/pkg/acs/lib/addk2d.c similarity index 100% rename from pkg/acs/calacs/lib/addk2d.c rename to pkg/acs/lib/addk2d.c diff --git a/pkg/acs/calacs/lib/bin2d.c b/pkg/acs/lib/bin2d.c similarity index 100% rename from pkg/acs/calacs/lib/bin2d.c rename to pkg/acs/lib/bin2d.c diff --git a/pkg/acs/calacs/lib/bincoords.c b/pkg/acs/lib/bincoords.c similarity index 100% rename from pkg/acs/calacs/lib/bincoords.c rename to pkg/acs/lib/bincoords.c diff --git a/pkg/acs/calacs/lib/binupdate.c b/pkg/acs/lib/binupdate.c similarity index 100% rename from pkg/acs/calacs/lib/binupdate.c rename to pkg/acs/lib/binupdate.c diff --git a/pkg/acs/calacs/calacs/README b/pkg/acs/lib/calacs/README similarity index 100% rename from pkg/acs/calacs/calacs/README rename to pkg/acs/lib/calacs/README diff --git a/pkg/acs/calacs/calacs/acsdth.c b/pkg/acs/lib/calacs/acsdth.c similarity index 100% rename from pkg/acs/calacs/calacs/acsdth.c rename to pkg/acs/lib/calacs/acsdth.c diff --git a/pkg/acs/calacs/calacs/acsinit.c b/pkg/acs/lib/calacs/acsinit.c similarity index 100% rename from pkg/acs/calacs/calacs/acsinit.c rename to pkg/acs/lib/calacs/acsinit.c diff --git a/pkg/acs/calacs/calacs/acsmember.c b/pkg/acs/lib/calacs/acsmember.c similarity index 100% rename from pkg/acs/calacs/calacs/acsmember.c rename to pkg/acs/lib/calacs/acsmember.c diff --git a/pkg/acs/calacs/calacs/acstable.c b/pkg/acs/lib/calacs/acstable.c similarity index 100% rename from pkg/acs/calacs/calacs/acstable.c rename to pkg/acs/lib/calacs/acstable.c diff --git a/pkg/acs/calacs/calacs/calacs.c b/pkg/acs/lib/calacs/calacs.c similarity index 100% rename from pkg/acs/calacs/calacs/calacs.c rename to pkg/acs/lib/calacs/calacs.c diff --git a/pkg/acs/calacs/calacs/getflags.c b/pkg/acs/lib/calacs/getflags.c similarity index 100% rename from pkg/acs/calacs/calacs/getflags.c rename to pkg/acs/lib/calacs/getflags.c diff --git a/pkg/acs/calacs/calacs/getnewref.c b/pkg/acs/lib/calacs/getnewref.c similarity index 100% rename from pkg/acs/calacs/calacs/getnewref.c rename to pkg/acs/lib/calacs/getnewref.c diff --git a/pkg/acs/calacs/calacs/getsciinfo.c b/pkg/acs/lib/calacs/getsciinfo.c similarity index 100% rename from pkg/acs/calacs/calacs/getsciinfo.c rename to pkg/acs/lib/calacs/getsciinfo.c diff --git a/pkg/acs/calacs/calacs/refexist.c b/pkg/acs/lib/calacs/refexist.c similarity index 100% rename from pkg/acs/calacs/calacs/refexist.c rename to pkg/acs/lib/calacs/refexist.c diff --git a/pkg/acs/calacs/calacs/sciflags.c b/pkg/acs/lib/calacs/sciflags.c similarity index 100% rename from pkg/acs/calacs/calacs/sciflags.c rename to pkg/acs/lib/calacs/sciflags.c diff --git a/pkg/acs/calacs/lib/comparenum.c b/pkg/acs/lib/comparenum.c similarity index 100% rename from pkg/acs/calacs/lib/comparenum.c rename to pkg/acs/lib/comparenum.c diff --git a/pkg/acs/calacs/lib/defswitch.c b/pkg/acs/lib/defswitch.c similarity index 100% rename from pkg/acs/calacs/lib/defswitch.c rename to pkg/acs/lib/defswitch.c diff --git a/pkg/acs/calacs/lib/detchip.c b/pkg/acs/lib/detchip.c similarity index 100% rename from pkg/acs/calacs/lib/detchip.c rename to pkg/acs/lib/detchip.c diff --git a/pkg/acs/calacs/lib/detnsegn.c b/pkg/acs/lib/detnsegn.c similarity index 100% rename from pkg/acs/calacs/lib/detnsegn.c rename to pkg/acs/lib/detnsegn.c diff --git a/pkg/acs/calacs/lib/div1d.c b/pkg/acs/lib/div1d.c similarity index 100% rename from pkg/acs/calacs/lib/div1d.c rename to pkg/acs/lib/div1d.c diff --git a/pkg/acs/calacs/lib/dodqi.c b/pkg/acs/lib/dodqi.c similarity index 100% rename from pkg/acs/calacs/lib/dodqi.c rename to pkg/acs/lib/dodqi.c diff --git a/pkg/acs/calacs/lib/donoise.c b/pkg/acs/lib/donoise.c similarity index 100% rename from pkg/acs/calacs/lib/donoise.c rename to pkg/acs/lib/donoise.c diff --git a/pkg/acs/calacs/lib/dostat.c b/pkg/acs/lib/dostat.c similarity index 100% rename from pkg/acs/calacs/lib/dostat.c rename to pkg/acs/lib/dostat.c diff --git a/pkg/acs/calacs/lib/err.c b/pkg/acs/lib/err.c similarity index 100% rename from pkg/acs/calacs/lib/err.c rename to pkg/acs/lib/err.c diff --git a/pkg/acs/calacs/lib/fileexists.c b/pkg/acs/lib/fileexists.c similarity index 100% rename from pkg/acs/calacs/lib/fileexists.c rename to pkg/acs/lib/fileexists.c diff --git a/pkg/acs/calacs/lib/findbin.c b/pkg/acs/lib/findbin.c similarity index 100% rename from pkg/acs/calacs/lib/findbin.c rename to pkg/acs/lib/findbin.c diff --git a/pkg/acs/calacs/lib/findroot.c b/pkg/acs/lib/findroot.c similarity index 100% rename from pkg/acs/calacs/lib/findroot.c rename to pkg/acs/lib/findroot.c diff --git a/pkg/acs/calacs/lib/fromlt.c b/pkg/acs/lib/fromlt.c similarity index 100% rename from pkg/acs/calacs/lib/fromlt.c rename to pkg/acs/lib/fromlt.c diff --git a/pkg/acs/calacs/lib/getacsgrp.c b/pkg/acs/lib/getacsgrp.c similarity index 100% rename from pkg/acs/calacs/lib/getacsgrp.c rename to pkg/acs/lib/getacsgrp.c diff --git a/pkg/acs/calacs/lib/getacskeys.c b/pkg/acs/lib/getacskeys.c similarity index 100% rename from pkg/acs/calacs/lib/getacskeys.c rename to pkg/acs/lib/getacskeys.c diff --git a/pkg/acs/calacs/lib/getccdtab.c b/pkg/acs/lib/getccdtab.c similarity index 100% rename from pkg/acs/calacs/lib/getccdtab.c rename to pkg/acs/lib/getccdtab.c diff --git a/pkg/acs/calacs/lib/getcorner.c b/pkg/acs/lib/getcorner.c similarity index 100% rename from pkg/acs/calacs/lib/getcorner.c rename to pkg/acs/lib/getcorner.c diff --git a/pkg/acs/calacs/lib/getlt.c b/pkg/acs/lib/getlt.c similarity index 100% rename from pkg/acs/calacs/lib/getlt.c rename to pkg/acs/lib/getlt.c diff --git a/pkg/acs/calacs/lib/getrefname.c b/pkg/acs/lib/getrefname.c similarity index 100% rename from pkg/acs/calacs/lib/getrefname.c rename to pkg/acs/lib/getrefname.c diff --git a/pkg/acs/calacs/lib/getswitch.c b/pkg/acs/lib/getswitch.c similarity index 100% rename from pkg/acs/calacs/lib/getswitch.c rename to pkg/acs/lib/getswitch.c diff --git a/pkg/acs/calacs/lib/gotfilename.c b/pkg/acs/lib/gotfilename.c similarity index 100% rename from pkg/acs/calacs/lib/gotfilename.c rename to pkg/acs/lib/gotfilename.c diff --git a/pkg/acs/calacs/lib/imghistory.c b/pkg/acs/lib/imghistory.c similarity index 100% rename from pkg/acs/calacs/lib/imghistory.c rename to pkg/acs/lib/imghistory.c diff --git a/pkg/acs/calacs/lib/imgpedigree.c b/pkg/acs/lib/imgpedigree.c similarity index 100% rename from pkg/acs/calacs/lib/imgpedigree.c rename to pkg/acs/lib/imgpedigree.c diff --git a/pkg/acs/calacs/lib/initmulti.c b/pkg/acs/lib/initmulti.c similarity index 100% rename from pkg/acs/calacs/lib/initmulti.c rename to pkg/acs/lib/initmulti.c diff --git a/pkg/acs/calacs/lib/interp1d.c b/pkg/acs/lib/interp1d.c similarity index 100% rename from pkg/acs/calacs/lib/interp1d.c rename to pkg/acs/lib/interp1d.c diff --git a/pkg/acs/calacs/lib/interpinfo.c b/pkg/acs/lib/interpinfo.c similarity index 100% rename from pkg/acs/calacs/lib/interpinfo.c rename to pkg/acs/lib/interpinfo.c diff --git a/pkg/acs/calacs/lib/key.c b/pkg/acs/lib/key.c similarity index 100% rename from pkg/acs/calacs/lib/key.c rename to pkg/acs/lib/key.c diff --git a/pkg/acs/calacs/lib/loadhead.c b/pkg/acs/lib/loadhead.c similarity index 100% rename from pkg/acs/calacs/lib/loadhead.c rename to pkg/acs/lib/loadhead.c diff --git a/pkg/acs/calacs/lib/logprogress.c b/pkg/acs/lib/logprogress.c similarity index 100% rename from pkg/acs/calacs/lib/logprogress.c rename to pkg/acs/lib/logprogress.c diff --git a/pkg/acs/calacs/lib/lowcase.c b/pkg/acs/lib/lowcase.c similarity index 100% rename from pkg/acs/calacs/lib/lowcase.c rename to pkg/acs/lib/lowcase.c diff --git a/pkg/acs/calacs/lib/median.c b/pkg/acs/lib/median.c similarity index 100% rename from pkg/acs/calacs/lib/median.c rename to pkg/acs/lib/median.c diff --git a/pkg/acs/calacs/lib/mkname.c b/pkg/acs/lib/mkname.c similarity index 100% rename from pkg/acs/calacs/lib/mkname.c rename to pkg/acs/lib/mkname.c diff --git a/pkg/acs/calacs/lib/mkoutname.c b/pkg/acs/lib/mkoutname.c similarity index 100% rename from pkg/acs/calacs/lib/mkoutname.c rename to pkg/acs/lib/mkoutname.c diff --git a/pkg/acs/calacs/lib/mkspt.c b/pkg/acs/lib/mkspt.c similarity index 100% rename from pkg/acs/calacs/lib/mkspt.c rename to pkg/acs/lib/mkspt.c diff --git a/pkg/acs/calacs/lib/mult1d.c b/pkg/acs/lib/mult1d.c similarity index 100% rename from pkg/acs/calacs/lib/mult1d.c rename to pkg/acs/lib/mult1d.c diff --git a/pkg/acs/calacs/lib/multk1d.c b/pkg/acs/lib/multk1d.c similarity index 100% rename from pkg/acs/calacs/lib/multk1d.c rename to pkg/acs/lib/multk1d.c diff --git a/pkg/acs/calacs/lib/multk2d.c b/pkg/acs/lib/multk2d.c similarity index 100% rename from pkg/acs/calacs/lib/multk2d.c rename to pkg/acs/lib/multk2d.c diff --git a/pkg/acs/calacs/lib/omitstep.c b/pkg/acs/lib/omitstep.c similarity index 100% rename from pkg/acs/calacs/lib/omitstep.c rename to pkg/acs/lib/omitstep.c diff --git a/pkg/acs/calacs/lib/parseamps.c b/pkg/acs/lib/parseamps.c similarity index 100% rename from pkg/acs/calacs/lib/parseamps.c rename to pkg/acs/lib/parseamps.c diff --git a/pkg/acs/calacs/lib/parsedate.c b/pkg/acs/lib/parsedate.c similarity index 100% rename from pkg/acs/calacs/lib/parsedate.c rename to pkg/acs/lib/parsedate.c diff --git a/pkg/acs/calacs/lib/prinfo.c b/pkg/acs/lib/prinfo.c similarity index 100% rename from pkg/acs/calacs/lib/prinfo.c rename to pkg/acs/lib/prinfo.c diff --git a/pkg/acs/calacs/lib/reffiles.c b/pkg/acs/lib/reffiles.c similarity index 100% rename from pkg/acs/calacs/lib/reffiles.c rename to pkg/acs/lib/reffiles.c diff --git a/pkg/acs/calacs/lib/rowpedigree.c b/pkg/acs/lib/rowpedigree.c similarity index 100% rename from pkg/acs/calacs/lib/rowpedigree.c rename to pkg/acs/lib/rowpedigree.c diff --git a/pkg/acs/calacs/lib/sameint.c b/pkg/acs/lib/sameint.c similarity index 100% rename from pkg/acs/calacs/lib/sameint.c rename to pkg/acs/lib/sameint.c diff --git a/pkg/acs/calacs/lib/spline.c b/pkg/acs/lib/spline.c similarity index 100% rename from pkg/acs/calacs/lib/spline.c rename to pkg/acs/lib/spline.c diff --git a/pkg/acs/calacs/lib/streqic.c b/pkg/acs/lib/streqic.c similarity index 100% rename from pkg/acs/calacs/lib/streqic.c rename to pkg/acs/lib/streqic.c diff --git a/pkg/acs/calacs/lib/sub1d.c b/pkg/acs/lib/sub1d.c similarity index 100% rename from pkg/acs/calacs/lib/sub1d.c rename to pkg/acs/lib/sub1d.c diff --git a/pkg/acs/calacs/lib/sub2d.c b/pkg/acs/lib/sub2d.c similarity index 100% rename from pkg/acs/calacs/lib/sub2d.c rename to pkg/acs/lib/sub2d.c diff --git a/pkg/acs/calacs/lib/tabhistory.c b/pkg/acs/lib/tabhistory.c similarity index 100% rename from pkg/acs/calacs/lib/tabhistory.c rename to pkg/acs/lib/tabhistory.c diff --git a/pkg/acs/calacs/lib/tabpedigree.c b/pkg/acs/lib/tabpedigree.c similarity index 100% rename from pkg/acs/calacs/lib/tabpedigree.c rename to pkg/acs/lib/tabpedigree.c diff --git a/pkg/acs/calacs/lib/timestamp.c b/pkg/acs/lib/timestamp.c similarity index 100% rename from pkg/acs/calacs/lib/timestamp.c rename to pkg/acs/lib/timestamp.c diff --git a/pkg/acs/calacs/lib/toelectrons.c b/pkg/acs/lib/toelectrons.c similarity index 100% rename from pkg/acs/calacs/lib/toelectrons.c rename to pkg/acs/lib/toelectrons.c diff --git a/pkg/acs/calacs/lib/trim.c b/pkg/acs/lib/trim.c similarity index 100% rename from pkg/acs/calacs/lib/trim.c rename to pkg/acs/lib/trim.c diff --git a/pkg/acs/calacs/lib/trim2d.c b/pkg/acs/lib/trim2d.c similarity index 100% rename from pkg/acs/calacs/lib/trim2d.c rename to pkg/acs/lib/trim2d.c diff --git a/pkg/acs/calacs/lib/ucalver.c b/pkg/acs/lib/ucalver.c similarity index 100% rename from pkg/acs/calacs/lib/ucalver.c rename to pkg/acs/lib/ucalver.c diff --git a/pkg/acs/calacs/lib/ufilename.c b/pkg/acs/lib/ufilename.c similarity index 100% rename from pkg/acs/calacs/lib/ufilename.c rename to pkg/acs/lib/ufilename.c diff --git a/pkg/acs/calacs/lib/unbinline.c b/pkg/acs/lib/unbinline.c similarity index 100% rename from pkg/acs/calacs/lib/unbinline.c rename to pkg/acs/lib/unbinline.c diff --git a/pkg/acs/calacs/lib/whicherror.c b/pkg/acs/lib/whicherror.c similarity index 100% rename from pkg/acs/calacs/lib/whicherror.c rename to pkg/acs/lib/whicherror.c diff --git a/pkg/acs/calacs/acs2d/main2d.c b/pkg/acs/src/main2d.c similarity index 100% rename from pkg/acs/calacs/acs2d/main2d.c rename to pkg/acs/src/main2d.c diff --git a/pkg/acs/calacs/calacs/acsmain.c b/pkg/acs/src/mainacs.c similarity index 100% rename from pkg/acs/calacs/calacs/acsmain.c rename to pkg/acs/src/mainacs.c diff --git a/pkg/acs/calacs/acsccd/mainccd.c b/pkg/acs/src/mainccd.c similarity index 100% rename from pkg/acs/calacs/acsccd/mainccd.c rename to pkg/acs/src/mainccd.c diff --git a/pkg/acs/src/maincte.c b/pkg/acs/src/maincte.c new file mode 100644 index 000000000..1fee8c2ab --- /dev/null +++ b/pkg/acs/src/maincte.c @@ -0,0 +1,12 @@ + +#include +#include +#include + +extern int doMainCTE (int argc, char **argv); + +int main (int argc, char **argv) +{ + const int status = doMainCTE(argc, argv); + return status; +} diff --git a/pkg/acs/calacs/acsrej/mainrej.c b/pkg/acs/src/mainrej.c similarity index 100% rename from pkg/acs/calacs/acsrej/mainrej.c rename to pkg/acs/src/mainrej.c diff --git a/pkg/acs/calacs/acssum/mainsum.c b/pkg/acs/src/mainsum.c similarity index 100% rename from pkg/acs/calacs/acssum/mainsum.c rename to pkg/acs/src/mainsum.c diff --git a/pkg/acs/wscript b/pkg/acs/wscript deleted file mode 100644 index a1cdb0268..000000000 --- a/pkg/acs/wscript +++ /dev/null @@ -1,9 +0,0 @@ -# vim: set syntax=python: - -LIBRARIES = [ - 'calacs' - ] - -def build(bld): - for library in LIBRARIES: - bld.recurse(library) diff --git a/pkg/imphttab/wscript b/pkg/imphttab/wscript deleted file mode 100644 index ec88a03a5..000000000 --- a/pkg/imphttab/wscript +++ /dev/null @@ -1,23 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - #bld.program( - # source = ['test_getphttab.c', 'getphttab.c'], - # target = 'testphot.e', - # # The order of these libraries is important - # use = ['calacs'] + bld.env.LOCAL_LIBS, - # lib = bld.env.EXTERNAL_LIBS, - # libpath = bld.env.LIBPATH, - # install_path = bld.env.INSTALL_TEST and '${PREFIX}/bin' - # ) - - bld.stlib( - source = ['getphttab.c'], - target = 'imphttab', - # The order of these libraries is important - use = bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib' - ) diff --git a/pkg/stis/CMakeLists.txt b/pkg/stis/CMakeLists.txt new file mode 100644 index 000000000..c48a629af --- /dev/null +++ b/pkg/stis/CMakeLists.txt @@ -0,0 +1,146 @@ +project(wf3_top) +add_subdirectory(lib) + +project(cs0) +add_executable(${PROJECT_NAME} + src/cs0.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC stis +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(cs1) +add_executable(${PROJECT_NAME} + src/cs1.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC stis +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(cs2) +add_executable(${PROJECT_NAME} + src/cs2.c + src/cs2_command.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC stis +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(cs4) +add_executable(${PROJECT_NAME} + src/cs4.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC stis +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(cs6) +add_executable(${PROJECT_NAME} + src/cs6.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC stis +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(cs7) +add_executable(${PROJECT_NAME} + src/cs7.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC stis +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(cs8) +add_executable(${PROJECT_NAME} + src/cs8.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC stis +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(cs11) +add_executable(${PROJECT_NAME} + src/cs11.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC stis +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(cs12) +add_executable(${PROJECT_NAME} + src/cs12.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC stis +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) diff --git a/pkg/stis/calstis/cs0/Makefile b/pkg/stis/calstis/cs0/Makefile deleted file mode 100644 index 38ab5ab4d..000000000 --- a/pkg/stis/calstis/cs0/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# Use 'make. to compile. -# Use 'make cs0.e' to link. - -CFITSIO := /user/hodge/tables/cfitsio - -CC := gcc -CFLAGS = -I ../../ -LIBS = ../../libhstio.a ../../libcvos.a ../../libapplib.a \ -../../libxtables.a $(CFITSIO)/libcfitsio.a - -OBJECTS := calstis0.o checkwav.o compfiles.o getflags.o getnewref.o \ -getsciinfo.o getwavinfo.o refexist.o savename.o sciflags.o \ -stisinit.o wavflags.o - -# .INTERMEDIATE: $(OBJECTS) - -../calstis.a: $(OBJECTS) - ar -r -s ../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ - -cs0.e: cs0.o ../calstis.a - $(CC) -o cs0.e cs0.o ../calstis.a $(LIBS) -lm - -cs0.o: cs0.c - $(CC) -c $(CFLAGS) cs0.c diff --git a/pkg/stis/calstis/cs0/wscript b/pkg/stis/calstis/cs0/wscript deleted file mode 100644 index cd882f731..000000000 --- a/pkg/stis/calstis/cs0/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'cs0.e', - source = 'cs0.c', - target = 'cs0.e', - use = ['hstcallib', 'calstis', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/stis/calstis/cs1/Makefile b/pkg/stis/calstis/cs1/Makefile deleted file mode 100644 index 45d74be3e..000000000 --- a/pkg/stis/calstis/cs1/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -CC := gcc -CFLAGS = -I ../../ - -OBJECTS := blevdrift.o blevfit.o calstis1.o checkvolt.o do2d.o \ -doatod.o dobias.o doblev.o dodark.o dodqi.o doflat.o dolores.o \ -donoise.o dononlin.o dophot.o doppconv.o doshad.o findbin.o \ -findblev.o findover.o flagfilter.o getccdtab.o getepctab1.o \ -getflags1.o getgrpinfo1.o getkeyinfo1.o getlintab.o \ -gettdccorr.o gettds1.o history1.o makedopp.o photmode.o sanity1.o - -# .INTERMEDIATE: $(OBJECTS) - -../calstis.a: $(OBJECTS) - ar -r -s ../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/pkg/stis/calstis/cs1/wscript b/pkg/stis/calstis/cs1/wscript deleted file mode 100644 index 167f409a7..000000000 --- a/pkg/stis/calstis/cs1/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'cs1.e', - source = 'cs1.c', - target = 'cs1.e', - use = ['hstcallib', 'calstis', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/stis/calstis/cs11/Makefile b/pkg/stis/calstis/cs11/Makefile deleted file mode 100644 index c3dd61c33..000000000 --- a/pkg/stis/calstis/cs11/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -CC := gcc -CFLAGS = -I ../../ - -OBJECTS := binsubtract.o calstis11.o getkeyinfo11.o gettimes11.o \ -matchsci.o subsci.o - -# .INTERMEDIATE: $(OBJECTS) - -../calstis.a: $(OBJECTS) - ar -r -s ../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/pkg/stis/calstis/cs11/wscript b/pkg/stis/calstis/cs11/wscript deleted file mode 100644 index 01d689a42..000000000 --- a/pkg/stis/calstis/cs11/wscript +++ /dev/null @@ -1,12 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - source = 'cs11.c', - target = 'cs11.e', - use = ['hstcallib', 'calstis'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/stis/calstis/cs12/Makefile b/pkg/stis/calstis/cs12/Makefile deleted file mode 100644 index 3586612d4..000000000 --- a/pkg/stis/calstis/cs12/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -CC := gcc -CFLAGS = -I ../../ - -OBJECTS := addshifts.o calstis12.o getkeyinfo12.o getscigrp.o \ -getwavgrp.o history12.o matchwav.o targpos.o - -# .INTERMEDIATE: $(OBJECTS) - -../calstis.a: $(OBJECTS) - ar -r -s ../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/pkg/stis/calstis/cs12/wscript b/pkg/stis/calstis/cs12/wscript deleted file mode 100644 index 59f9c7f44..000000000 --- a/pkg/stis/calstis/cs12/wscript +++ /dev/null @@ -1,12 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - source = 'cs12.c', - target = 'cs12.e', - use = ['hstcallib', 'calstis'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/stis/calstis/cs2/Makefile b/pkg/stis/calstis/cs2/Makefile deleted file mode 100644 index c0b4190a0..000000000 --- a/pkg/stis/calstis/cs2/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -CC := gcc -CFLAGS = -I ../../ - -OBJECTS := calstis2.o cr_history.o cr_mode.o crrej_check.o crrej_do.o \ -crrej_init.o crrej_loop.o crrej_sky.o cr_scaling.o cs2_command.o \ -o_cal2_in.o piksrt.o - -# .INTERMEDIATE: $(OBJECTS) - -../calstis.a: $(OBJECTS) - ar -r -s ../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/pkg/stis/calstis/cs2/wscript b/pkg/stis/calstis/cs2/wscript deleted file mode 100644 index 1f3c88373..000000000 --- a/pkg/stis/calstis/cs2/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'cs2.e', - source = 'cs2.c', - target = 'cs2.e', - use = ['calstis', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/stis/calstis/cs4/Makefile b/pkg/stis/calstis/cs4/Makefile deleted file mode 100644 index 03f3de535..000000000 --- a/pkg/stis/calstis/cs4/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -CC := gcc -CFLAGS = -I ../../ - -OBJECTS := calstis4.o convslit.o echshift.o findbars.o findedge.o \ -findends.o findwl.o flagcr.o getangle4.o getapdes4.o getdisp4.o \ -getflags4.o getgrpinfo4.o getinang4.o getkeyinfo4.o getlamp.o gettrace4.o \ -getwcp.o history4.o invert.o maketemplate.o newtrace4.o peakquad3.o \ -scaleref.o spatialshift.o updateshift.o wavecal.o waveshift.o whichslit.o \ -xc4.o xcechelle.o xcpeak.o xcwave.o - -# .INTERMEDIATE: $(OBJECTS) - -../calstis.a: $(OBJECTS) - ar -r -s ../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/pkg/stis/calstis/cs4/wscript b/pkg/stis/calstis/cs4/wscript deleted file mode 100644 index 5401ca8b8..000000000 --- a/pkg/stis/calstis/cs4/wscript +++ /dev/null @@ -1,12 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - source = 'cs4.c', - target = 'cs4.e', - use = ['hstcallib', 'calstis'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/stis/calstis/cs6/Makefile b/pkg/stis/calstis/cs6/Makefile deleted file mode 100644 index 039a51a36..000000000 --- a/pkg/stis/calstis/cs6/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -CC := gcc -CFLAGS = -I ../../ - -OBJECTS := absflux6.o addoffsets6.o adjustdisp6.o background.o \ -buildoptprof.o buildprof.o calstis6.o calstis6std.o checkoptimal.o \ -commline.o crosscor.o defineback.o do1dx.o findlya.o \ -gcrosscor.o getabsphot6.o getapdes6.o getapoffset6.o getapthr6.o \ -getccdtab6.o getcheckref.o getdisp6.o getextract.o getflags6.o \ -getgac6.o getgrpinfo6.o getinang6.o getintens.o getkeyinfo6.o \ -getpct6.o getprofile.o getrefcline.o getsdc6.o gettrace6.o \ -heliofactor6.o history6.o init.o lee.o memory.o message6.o newcoord6.o \ -newdisp6.o newextract.o newprofile.o newtrace6.o output.o poly.o \ -selectalg.o setranges.o timestamp6.o wave.o x1dspec.o - -# .INTERMEDIATE: $(OBJECTS) - -../calstis.a: $(OBJECTS) - ar -r -s ../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/pkg/stis/calstis/cs6/idtalg/Makefile b/pkg/stis/calstis/cs6/idtalg/Makefile deleted file mode 100644 index a5bb9a34f..000000000 --- a/pkg/stis/calstis/cs6/idtalg/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -CC := gcc -CFLAGS = -I ../../../ - -OBJECTS := calstis6idt.o echscatread.o idtmemory.o rebindata.o \ -splice.o x1dtable.o xc6.o - -# .INTERMEDIATE: $(OBJECTS) - -../../calstis.a: $(OBJECTS) - ar -r -s ../../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/pkg/stis/calstis/cs6/wscript b/pkg/stis/calstis/cs6/wscript deleted file mode 100644 index 3d559ab1e..000000000 --- a/pkg/stis/calstis/cs6/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'cs6.e', - source = 'cs6.c', - target = 'cs6.e', - use = ['hstcallib', 'calstis', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/stis/calstis/cs7/Makefile b/pkg/stis/calstis/cs7/Makefile deleted file mode 100644 index 0bb75658e..000000000 --- a/pkg/stis/calstis/cs7/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -CC := gcc -CFLAGS = -I ../../ - -OBJECTS := absflux.o adjustdisp.o calstis7.o datamasked.o do2dx.o \ -geocorr7.o getabsphot.o getapdes7.o getapoffset.o getapthr.o \ -getdisp.o getflags7.o getgrpinfo7.o getidc.o getinang.o getkeyinfo7.o \ -getpct.o getsdc.o gettrace.o heliofactor.o history7.o newcoord.o \ -newdisp.o newtrace.o putgrpinfo7.o scalewcs.o x2dcorr7.o - -# .INTERMEDIATE: $(OBJECTS) - -../calstis.a: $(OBJECTS) - ar -r -s ../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/pkg/stis/calstis/cs7/wscript b/pkg/stis/calstis/cs7/wscript deleted file mode 100644 index 04a26c4e9..000000000 --- a/pkg/stis/calstis/cs7/wscript +++ /dev/null @@ -1,12 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - source = 'cs7.c', - target = 'cs7.e', - use = ['hstcallib', 'calstis'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/stis/calstis/cs8/Makefile b/pkg/stis/calstis/cs8/Makefile deleted file mode 100644 index 15c765075..000000000 --- a/pkg/stis/calstis/cs8/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -CC := gcc -CFLAGS = -I ../../ - -OBJECTS := calstis8.o - -# .INTERMEDIATE: $(OBJECTS) - -../calstis.a: $(OBJECTS) - ar -r -s ../calstis.a $(OBJECTS) - -%.o: %.c - $(CC) -c $(CFLAGS) $< -o $@ diff --git a/pkg/stis/calstis/lib/wscript b/pkg/stis/calstis/lib/wscript deleted file mode 100644 index a97893aeb..000000000 --- a/pkg/stis/calstis/lib/wscript +++ /dev/null @@ -1,111 +0,0 @@ -# vim: set syntax=python: - -# The files that make up calstis.a are distributed amongst the -# various cs* directories. - -def build(bld): - t = bld.stlib( - source = """ - add2d.c addk2d.c bin2d.c bincoords.c binupdate.c - blazecorr.c checkimsetok.c defswitch.c div2d.c dostat.c - evaldisp.c - extrap1d.c fileexists.c getcorner.c getdettemp.c getlt0.c - getlt.c getmoc.c getrefname.c getswitch.c gettds.c - gotfilename.c imghistory.c imgpedigree.c initreftab.c - interp1d.c interp2d.c key.c median.c mkname.c mkoutname.c - mult2d.c multk2d.c omitstep.c orbitaldopp.c prinfo.c - pseudoap.c radialvel.c reffiles.c rotatetrace.c - rowpedigree.c sameint.c spline.c strcmptail.c streqic.c - strtor.c sub2d.c tabhistory.c tabpedigree.c tdscorrect.c - timestamp.c ucalver.c ufilename.c unbin2d.c whicherror.c - xcfft.c - - ../cs0/calstis0.c ../cs0/checkwav.c ../cs0/compfiles.c - ../cs0/getflags.c ../cs0/getnewref.c ../cs0/getsciinfo.c - ../cs0/getwavinfo.c ../cs0/refexist.c ../cs0/savename.c - ../cs0/sciflags.c ../cs0/stisinit.c ../cs0/wavflags.c - - ../cs1/blevdrift.c ../cs1/blevfit.c ../cs1/calstis1.c - ../cs1/checkvolt.c ../cs1/do2d.c ../cs1/doatod.c - ../cs1/dobias.c ../cs1/doblev.c ../cs1/dodark.c - ../cs1/dodqi.c ../cs1/doflat.c ../cs1/dolores.c - ../cs1/donoise.c ../cs1/dononlin.c ../cs1/dophot.c - ../cs1/doppconv.c ../cs1/doshad.c ../cs1/findbin.c - ../cs1/findblev.c ../cs1/findover.c ../cs1/flagfilter.c - ../cs1/getccdtab.c ../cs1/getepctab1.c - ../cs1/getflags1.c ../cs1/getgrpinfo1.c - ../cs1/getkeyinfo1.c ../cs1/getlintab.c - ../cs1/gettdccorr.c ../cs1/gettds1.c ../cs1/history1.c - ../cs1/makedopp.c ../cs1/photmode.c ../cs1/sanity1.c - - ../cs2/calstis2.c ../cs2/cr_history.c ../cs2/cr_mode.c - ../cs2/crrej_check.c ../cs2/crrej_do.c ../cs2/crrej_init.c - ../cs2/crrej_loop.c ../cs2/crrej_sky.c ../cs2/cr_scaling.c - ../cs2/cs2_command.c ../cs2/o_cal2_in.c ../cs2/piksrt.c - - ../cs4/calstis4.c ../cs4/convslit.c ../cs4/echshift.c - ../cs4/findbars.c ../cs4/findedge.c ../cs4/findends.c - ../cs4/findwl.c ../cs4/flagcr.c ../cs4/getangle4.c - ../cs4/getapdes4.c ../cs4/getdisp4.c ../cs4/getflags4.c - ../cs4/getgrpinfo4.c ../cs4/getinang4.c - ../cs4/getkeyinfo4.c ../cs4/getlamp.c ../cs4/gettrace4.c - ../cs4/getwcp.c ../cs4/history4.c ../cs4/invert.c - ../cs4/maketemplate.c ../cs4/newtrace4.c - ../cs4/peakquad3.c ../cs4/scaleref.c ../cs4/spatialshift.c - ../cs4/updateshift.c ../cs4/wavecal.c ../cs4/waveshift.c - ../cs4/whichslit.c ../cs4/xc4.c ../cs4/xcechelle.c - ../cs4/xcpeak.c ../cs4/xcwave.c - - ../cs6/absflux6.c ../cs6/addoffsets6.c - ../cs6/adjustdisp6.c ../cs6/background.c - ../cs6/buildoptprof.c ../cs6/buildprof.c ../cs6/calstis6.c - ../cs6/calstis6std.c ../cs6/checkoptimal.c - ../cs6/commline.c ../cs6/crosscor.c ../cs6/defineback.c - ../cs6/do1dx.c ../cs6/findlya.c - ../cs6/gcrosscor.c ../cs6/getabsphot6.c ../cs6/getapdes6.c - ../cs6/getapoffset6.c ../cs6/getapthr6.c - ../cs6/getccdtab6.c ../cs6/getcheckref.c ../cs6/getdisp6.c - ../cs6/getextract.c ../cs6/getflags6.c ../cs6/getgac6.c - ../cs6/getgrpinfo6.c ../cs6/getinang6.c ../cs6/getintens.c - ../cs6/getkeyinfo6.c ../cs6/getpct6.c ../cs6/getprofile.c - ../cs6/getrefcline.c ../cs6/getsdc6.c ../cs6/gettrace6.c - ../cs6/heliofactor6.c ../cs6/history6.c ../cs6/init.c - ../cs6/lee.c ../cs6/memory.c ../cs6/message6.c - ../cs6/newcoord6.c ../cs6/newdisp6.c ../cs6/newextract.c - ../cs6/newprofile.c ../cs6/newtrace6.c ../cs6/output.c - ../cs6/poly.c ../cs6/selectalg.c ../cs6/setranges.c - ../cs6/timestamp6.c ../cs6/wave.c ../cs6/x1dspec.c - - ../cs6/idtalg/calstis6idt.c ../cs6/idtalg/echscatread.c - ../cs6/idtalg/idtmemory.c ../cs6/idtalg/rebindata.c - ../cs6/idtalg/splice.c ../cs6/idtalg/x1dtable.c - ../cs6/idtalg/xc6.c - - ../cs7/absflux.c ../cs7/adjustdisp.c ../cs7/calstis7.c - ../cs7/datamasked.c ../cs7/do2dx.c ../cs7/evaldisp7.c - ../cs7/geocorr7.c ../cs7/getabsphot.c ../cs7/getapdes7.c - ../cs7/getapoffset.c ../cs7/getapthr.c ../cs7/getdisp.c - ../cs7/getflags7.c ../cs7/getgrpinfo7.c ../cs7/getidc.c - ../cs7/getinang.c ../cs7/getkeyinfo7.c ../cs7/getpct.c - ../cs7/getsdc.c ../cs7/gettrace.c ../cs7/heliofactor.c - ../cs7/history7.c ../cs7/newcoord.c ../cs7/newdisp.c - ../cs7/newtrace.c ../cs7/putgrpinfo7.c ../cs7/scalewcs.c - ../cs7/x2dcorr7.c - - ../cs8/calstis8.c - - ../cs11/binsubtract.c ../cs11/calstis11.c - ../cs11/getkeyinfo11.c ../cs11/gettimes11.c - ../cs11/matchsci.c ../cs11/subsci.c - - ../cs12/addshifts.c ../cs12/calstis12.c - ../cs12/getkeyinfo12.c ../cs12/getscigrp.c - ../cs12/getwavgrp.c ../cs12/history12.c ../cs12/matchwav.c - ../cs12/targpos.c - """, - target = 'calstis', - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib', - use = ['hstcallib', 'CFITSIO'], - includes = ['../include'], - export_includes = ['../include'] - ) diff --git a/pkg/stis/calstis/wscript b/pkg/stis/calstis/wscript deleted file mode 100644 index 93bf0faa9..000000000 --- a/pkg/stis/calstis/wscript +++ /dev/null @@ -1,17 +0,0 @@ -# vim: set syntax=python: - -SUBDIRS = [ - 'lib', - 'cs0', - 'cs1', - 'cs2', - 'cs4', - 'cs6', - 'cs7', - 'cs11', - 'cs12' - ] - -def build(bld): - for subdir in SUBDIRS: - bld.recurse(subdir) diff --git a/pkg/stis/calstis/doc/alg7 b/pkg/stis/doc/alg7 similarity index 100% rename from pkg/stis/calstis/doc/alg7 rename to pkg/stis/doc/alg7 diff --git a/pkg/stis/calstis/doc/alg8 b/pkg/stis/doc/alg8 similarity index 100% rename from pkg/stis/calstis/doc/alg8 rename to pkg/stis/doc/alg8 diff --git a/pkg/stis/calstis/doc/algorithms b/pkg/stis/doc/algorithms similarity index 100% rename from pkg/stis/calstis/doc/algorithms rename to pkg/stis/doc/algorithms diff --git a/pkg/stis/calstis/doc/design b/pkg/stis/doc/design similarity index 100% rename from pkg/stis/calstis/doc/design rename to pkg/stis/doc/design diff --git a/pkg/stis/calstis/doc/ltv.txt b/pkg/stis/doc/ltv.txt similarity index 100% rename from pkg/stis/calstis/doc/ltv.txt rename to pkg/stis/doc/ltv.txt diff --git a/pkg/stis/calstis/cs0/calstis0.h b/pkg/stis/include/calstis0.h similarity index 100% rename from pkg/stis/calstis/cs0/calstis0.h rename to pkg/stis/include/calstis0.h diff --git a/pkg/stis/calstis/cs1/calstis1.h b/pkg/stis/include/calstis1.h similarity index 100% rename from pkg/stis/calstis/cs1/calstis1.h rename to pkg/stis/include/calstis1.h diff --git a/pkg/stis/calstis/cs11/calstis11.h b/pkg/stis/include/calstis11.h similarity index 100% rename from pkg/stis/calstis/cs11/calstis11.h rename to pkg/stis/include/calstis11.h diff --git a/pkg/stis/calstis/cs12/calstis12.h b/pkg/stis/include/calstis12.h similarity index 100% rename from pkg/stis/calstis/cs12/calstis12.h rename to pkg/stis/include/calstis12.h diff --git a/pkg/stis/calstis/cs2/calstis2.h b/pkg/stis/include/calstis2.h similarity index 100% rename from pkg/stis/calstis/cs2/calstis2.h rename to pkg/stis/include/calstis2.h diff --git a/pkg/stis/calstis/cs4/calstis4.h b/pkg/stis/include/calstis4.h similarity index 100% rename from pkg/stis/calstis/cs4/calstis4.h rename to pkg/stis/include/calstis4.h diff --git a/pkg/stis/calstis/include/calstis6.h b/pkg/stis/include/calstis6.h similarity index 100% rename from pkg/stis/calstis/include/calstis6.h rename to pkg/stis/include/calstis6.h diff --git a/pkg/stis/calstis/cs7/calstis7.h b/pkg/stis/include/calstis7.h similarity index 100% rename from pkg/stis/calstis/cs7/calstis7.h rename to pkg/stis/include/calstis7.h diff --git a/pkg/stis/calstis/cs8/calstis8.h b/pkg/stis/include/calstis8.h similarity index 100% rename from pkg/stis/calstis/cs8/calstis8.h rename to pkg/stis/include/calstis8.h diff --git a/pkg/stis/calstis/include/cs12.h b/pkg/stis/include/cs12.h similarity index 100% rename from pkg/stis/calstis/include/cs12.h rename to pkg/stis/include/cs12.h diff --git a/pkg/stis/calstis/include/cs2.h b/pkg/stis/include/cs2.h similarity index 100% rename from pkg/stis/calstis/include/cs2.h rename to pkg/stis/include/cs2.h diff --git a/pkg/stis/include/cs2_reset.h b/pkg/stis/include/cs2_reset.h new file mode 100644 index 000000000..6afee0beb --- /dev/null +++ b/pkg/stis/include/cs2_reset.h @@ -0,0 +1,9 @@ +#ifndef _CS2_RESET_H +#define _CS2_RESET_H + +# include "c_iraf.h" + + +void cs2_reset (clpar *, int []); + +#endif diff --git a/pkg/stis/calstis/cs6/idtalg/design.txt b/pkg/stis/include/idtalg/design.txt similarity index 100% rename from pkg/stis/calstis/cs6/idtalg/design.txt rename to pkg/stis/include/idtalg/design.txt diff --git a/pkg/stis/calstis/cs6/idtalg/idtalg.h b/pkg/stis/include/idtalg/idtalg.h similarity index 100% rename from pkg/stis/calstis/cs6/idtalg/idtalg.h rename to pkg/stis/include/idtalg/idtalg.h diff --git a/pkg/stis/calstis/include/stis.h b/pkg/stis/include/stis.h similarity index 100% rename from pkg/stis/calstis/include/stis.h rename to pkg/stis/include/stis.h diff --git a/pkg/stis/calstis/include/stisaper.h b/pkg/stis/include/stisaper.h similarity index 100% rename from pkg/stis/calstis/include/stisaper.h rename to pkg/stis/include/stisaper.h diff --git a/pkg/stis/calstis/include/stisdef.h b/pkg/stis/include/stisdef.h similarity index 100% rename from pkg/stis/calstis/include/stisdef.h rename to pkg/stis/include/stisdef.h diff --git a/pkg/stis/calstis/include/stisdq.h b/pkg/stis/include/stisdq.h similarity index 100% rename from pkg/stis/calstis/include/stisdq.h rename to pkg/stis/include/stisdq.h diff --git a/pkg/stis/calstis/include/stisomit.h b/pkg/stis/include/stisomit.h similarity index 100% rename from pkg/stis/calstis/include/stisomit.h rename to pkg/stis/include/stisomit.h diff --git a/pkg/stis/calstis/include/stispht.h b/pkg/stis/include/stispht.h similarity index 100% rename from pkg/stis/calstis/include/stispht.h rename to pkg/stis/include/stispht.h diff --git a/pkg/stis/calstis/include/stisshutter.h b/pkg/stis/include/stisshutter.h similarity index 100% rename from pkg/stis/calstis/include/stisshutter.h rename to pkg/stis/include/stisshutter.h diff --git a/pkg/stis/calstis/include/stissizes.h b/pkg/stis/include/stissizes.h similarity index 100% rename from pkg/stis/calstis/include/stissizes.h rename to pkg/stis/include/stissizes.h diff --git a/pkg/stis/calstis/include/stistds.h b/pkg/stis/include/stistds.h similarity index 100% rename from pkg/stis/calstis/include/stistds.h rename to pkg/stis/include/stistds.h diff --git a/pkg/stis/calstis/include/stistemperature.h b/pkg/stis/include/stistemperature.h similarity index 100% rename from pkg/stis/calstis/include/stistemperature.h rename to pkg/stis/include/stistemperature.h diff --git a/pkg/stis/calstis/include/stisversion.h b/pkg/stis/include/stisversion.h similarity index 100% rename from pkg/stis/calstis/include/stisversion.h rename to pkg/stis/include/stisversion.h diff --git a/pkg/stis/calstis/include/stisvoltages.h b/pkg/stis/include/stisvoltages.h similarity index 100% rename from pkg/stis/calstis/include/stisvoltages.h rename to pkg/stis/include/stisvoltages.h diff --git a/pkg/stis/calstis/include/stiswild.h b/pkg/stis/include/stiswild.h similarity index 100% rename from pkg/stis/calstis/include/stiswild.h rename to pkg/stis/include/stiswild.h diff --git a/pkg/stis/lib/CMakeLists.txt b/pkg/stis/lib/CMakeLists.txt new file mode 100644 index 000000000..273369496 --- /dev/null +++ b/pkg/stis/lib/CMakeLists.txt @@ -0,0 +1,268 @@ +project(stis C Fortran) +add_library(${PROJECT_NAME} SHARED + add2d.c + addk2d.c + bin2d.c + bincoords.c + binupdate.c + blazecorr.c + checkimsetok.c + cs0/calstis0.c + cs0/checkwav.c + cs0/compfiles.c + cs0/getflags.c + cs0/getnewref.c + cs0/getsciinfo.c + cs0/getwavinfo.c + cs0/refexist.c + cs0/savename.c + cs0/sciflags.c + cs0/stisinit.c + cs0/wavflags.c + cs1/blevdrift.c + cs1/blevfit.c + cs1/calstis1.c + cs1/checkvolt.c + cs1/do2d.c + cs1/doatod.c + cs1/dobias.c + cs1/doblev.c + cs1/dodark.c + cs1/dodqi.c + cs1/doflat.c + cs1/dolores.c + cs1/donoise.c + cs1/dononlin.c + cs1/dophot.c + cs1/doppconv.c + cs1/doshad.c + cs1/findbin.c + cs1/findblev.c + cs1/findover.c + cs1/flagfilter.c + cs1/getccdtab.c + cs1/getepctab1.c + cs1/getflags1.c + cs1/getgrpinfo1.c + cs1/getkeyinfo1.c + cs1/getlintab.c + cs1/gettdccorr.c + cs1/gettds1.c + cs1/history1.c + cs1/makedopp.c + cs1/photmode.c + cs1/sanity1.c + cs11/binsubtract.c + cs11/calstis11.c + cs11/getkeyinfo11.c + cs11/gettimes11.c + cs11/matchsci.c + cs11/subsci.c + cs12/addshifts.c + cs12/calstis12.c + cs12/getkeyinfo12.c + cs12/getscigrp.c + cs12/getwavgrp.c + cs12/history12.c + cs12/matchwav.c + cs12/targpos.c + cs2/calstis2.c + cs2/cr_history.c + cs2/cr_mode.c + cs2/cr_scaling.c + cs2/crrej_check.c + cs2/crrej_do.c + cs2/crrej_init.c + cs2/crrej_loop.c + cs2/crrej_sky.c + cs2/o_cal2_in.c + cs2/piksrt.c + cs2_reset.c + cs4/calstis4.c + cs4/convslit.c + cs4/echshift.c + cs4/findbars.c + cs4/findedge.c + cs4/findends.c + cs4/findwl.c + cs4/flagcr.c + cs4/getangle4.c + cs4/getapdes4.c + cs4/getdisp4.c + cs4/getflags4.c + cs4/getgrpinfo4.c + cs4/getinang4.c + cs4/getkeyinfo4.c + cs4/getlamp.c + cs4/gettrace4.c + cs4/getwcp.c + cs4/history4.c + cs4/invert.c + cs4/maketemplate.c + cs4/newtrace4.c + cs4/peakquad3.c + cs4/scaleref.c + cs4/spatialshift.c + cs4/updateshift.c + cs4/wavecal.c + cs4/waveshift.c + cs4/whichslit.c + cs4/xc4.c + cs4/xcechelle.c + cs4/xcpeak.c + cs4/xcwave.c + cs6/absflux6.c + cs6/addoffsets6.c + cs6/adjustdisp6.c + cs6/background.c + cs6/buildoptprof.c + cs6/buildprof.c + cs6/calstis6.c + cs6/calstis6std.c + cs6/checkoptimal.c + cs6/commline.c + cs6/crosscor.c + cs6/defineback.c + cs6/do1dx.c + cs6/findlya.c + cs6/gcrosscor.c + cs6/getabsphot6.c + cs6/getapdes6.c + cs6/getapoffset6.c + cs6/getapthr6.c + cs6/getccdtab6.c + cs6/getcheckref.c + cs6/getdisp6.c + cs6/getextract.c + cs6/getflags6.c + cs6/getgac6.c + cs6/getgrpinfo6.c + cs6/getinang6.c + cs6/getintens.c + cs6/getkeyinfo6.c + cs6/getpct6.c + cs6/getprofile.c + cs6/getrefcline.c + cs6/getsdc6.c + cs6/gettrace6.c + cs6/heliofactor6.c + cs6/history6.c + cs6/init.c + cs6/lee.c + cs6/memory.c + cs6/message6.c + cs6/newcoord6.c + cs6/newdisp6.c + cs6/newextract.c + cs6/newprofile.c + cs6/newtrace6.c + cs6/output.c + cs6/poly.c + cs6/selectalg.c + cs6/setranges.c + cs6/timestamp6.c + cs6/wave.c + cs6/x1dspec.c + cs7/absflux.c + cs7/adjustdisp.c + cs7/calstis7.c + cs7/datamasked.c + cs7/do2dx.c + cs7/evaldisp7.c + cs7/geocorr7.c + cs7/getabsphot.c + cs7/getapdes7.c + cs7/getapoffset.c + cs7/getapthr.c + cs7/getdisp.c + cs7/getflags7.c + cs7/getgrpinfo7.c + cs7/getidc.c + cs7/getinang.c + cs7/getkeyinfo7.c + cs7/getpct.c + cs7/getsdc.c + cs7/gettrace.c + cs7/heliofactor.c + cs7/history7.c + cs7/newcoord.c + cs7/newdisp.c + cs7/newtrace.c + cs7/putgrpinfo7.c + cs7/scalewcs.c + cs7/x2dcorr7.c + cs8/calstis8.c + defswitch.c + div2d.c + dostat.c + evaldisp.c + extrap1d.c + fileexists.c + getcorner.c + getdettemp.c + getlt.c + getlt0.c + getmoc.c + getrefname.c + getswitch.c + gettds.c + gotfilename.c + idtalg/calstis6idt.c + idtalg/echscatread.c + idtalg/idtmemory.c + idtalg/rebindata.c + idtalg/splice.c + idtalg/x1dtable.c + idtalg/xc6.c + imghistory.c + imgpedigree.c + initreftab.c + interp1d.c + interp2d.c + key.c + median.c + mkname.c + mkoutname.c + mult2d.c + multk2d.c + omitstep.c + orbitaldopp.c + prinfo.c + pseudoap.c + radialvel.c + reffiles.c + rotatetrace.c + rowpedigree.c + sameint.c + spline.c + strcmptail.c + streqic.c + strtor.c + sub2d.c + tabhistory.c + tabpedigree.c + tdscorrect.c + timestamp.c + ucalver.c + ufilename.c + unbin2d.c + whicherror.c + xcfft.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME_INCLUDE_DIR} + PUBLIC ${PROJECT_SOURCE_DIR}/../include + PUBLIC ${PROJECT_SOURCE_DIR}/../include/idtalg +) +target_link_libraries(${PROJECT_NAME} + PUBLIC ctegen2 + PUBLIC hstcalib +) +set_target_properties(${PROJECT_NAME} + PROPERTIES + OUTPUT_NAME hst${PROJECT_NAME} +) +install(TARGETS ${PROJECT_NAME} + DESTINATION lib +) diff --git a/pkg/stis/calstis/lib/README b/pkg/stis/lib/README similarity index 100% rename from pkg/stis/calstis/lib/README rename to pkg/stis/lib/README diff --git a/pkg/stis/calstis/lib/add2d.c b/pkg/stis/lib/add2d.c similarity index 100% rename from pkg/stis/calstis/lib/add2d.c rename to pkg/stis/lib/add2d.c diff --git a/pkg/stis/calstis/lib/addk2d.c b/pkg/stis/lib/addk2d.c similarity index 100% rename from pkg/stis/calstis/lib/addk2d.c rename to pkg/stis/lib/addk2d.c diff --git a/pkg/stis/calstis/lib/bin2d.c b/pkg/stis/lib/bin2d.c similarity index 100% rename from pkg/stis/calstis/lib/bin2d.c rename to pkg/stis/lib/bin2d.c diff --git a/pkg/stis/calstis/lib/bincoords.c b/pkg/stis/lib/bincoords.c similarity index 100% rename from pkg/stis/calstis/lib/bincoords.c rename to pkg/stis/lib/bincoords.c diff --git a/pkg/stis/calstis/lib/binupdate.c b/pkg/stis/lib/binupdate.c similarity index 100% rename from pkg/stis/calstis/lib/binupdate.c rename to pkg/stis/lib/binupdate.c diff --git a/pkg/stis/calstis/lib/blazecorr.c b/pkg/stis/lib/blazecorr.c similarity index 100% rename from pkg/stis/calstis/lib/blazecorr.c rename to pkg/stis/lib/blazecorr.c diff --git a/pkg/stis/calstis/lib/checkimsetok.c b/pkg/stis/lib/checkimsetok.c similarity index 100% rename from pkg/stis/calstis/lib/checkimsetok.c rename to pkg/stis/lib/checkimsetok.c diff --git a/pkg/stis/calstis/cs0/README b/pkg/stis/lib/cs0/README similarity index 100% rename from pkg/stis/calstis/cs0/README rename to pkg/stis/lib/cs0/README diff --git a/pkg/stis/calstis/cs0/calstis0.c b/pkg/stis/lib/cs0/calstis0.c similarity index 99% rename from pkg/stis/calstis/cs0/calstis0.c rename to pkg/stis/lib/cs0/calstis0.c index 1edaf1162..a6568700f 100644 --- a/pkg/stis/calstis/cs0/calstis0.c +++ b/pkg/stis/lib/cs0/calstis0.c @@ -6,6 +6,7 @@ # include "stis.h" # include "calstis0.h" +# include "cs2_reset.h" # include "hstcalerr.h" /* calstis0 -- integrated calstis processing @@ -749,7 +750,6 @@ static int CalStis2_0 (char *input, char *output, int printtime, int verbose) { int status; clpar par; /* parameters used */ int newpar[MAX_PAR+1]; /* user specifiable parameters */ - void cs2_reset (clpar *, int []); cs2_reset (&par, newpar); par.printtime = printtime; diff --git a/pkg/stis/calstis/cs0/checkwav.c b/pkg/stis/lib/cs0/checkwav.c similarity index 100% rename from pkg/stis/calstis/cs0/checkwav.c rename to pkg/stis/lib/cs0/checkwav.c diff --git a/pkg/stis/calstis/cs0/compfiles.c b/pkg/stis/lib/cs0/compfiles.c similarity index 100% rename from pkg/stis/calstis/cs0/compfiles.c rename to pkg/stis/lib/cs0/compfiles.c diff --git a/pkg/stis/calstis/cs0/getflags.c b/pkg/stis/lib/cs0/getflags.c similarity index 100% rename from pkg/stis/calstis/cs0/getflags.c rename to pkg/stis/lib/cs0/getflags.c diff --git a/pkg/stis/calstis/cs0/getnewref.c b/pkg/stis/lib/cs0/getnewref.c similarity index 100% rename from pkg/stis/calstis/cs0/getnewref.c rename to pkg/stis/lib/cs0/getnewref.c diff --git a/pkg/stis/calstis/cs0/getsciinfo.c b/pkg/stis/lib/cs0/getsciinfo.c similarity index 100% rename from pkg/stis/calstis/cs0/getsciinfo.c rename to pkg/stis/lib/cs0/getsciinfo.c diff --git a/pkg/stis/calstis/cs0/getwavinfo.c b/pkg/stis/lib/cs0/getwavinfo.c similarity index 100% rename from pkg/stis/calstis/cs0/getwavinfo.c rename to pkg/stis/lib/cs0/getwavinfo.c diff --git a/pkg/stis/calstis/cs0/refexist.c b/pkg/stis/lib/cs0/refexist.c similarity index 100% rename from pkg/stis/calstis/cs0/refexist.c rename to pkg/stis/lib/cs0/refexist.c diff --git a/pkg/stis/calstis/cs0/savename.c b/pkg/stis/lib/cs0/savename.c similarity index 100% rename from pkg/stis/calstis/cs0/savename.c rename to pkg/stis/lib/cs0/savename.c diff --git a/pkg/stis/calstis/cs0/sciflags.c b/pkg/stis/lib/cs0/sciflags.c similarity index 100% rename from pkg/stis/calstis/cs0/sciflags.c rename to pkg/stis/lib/cs0/sciflags.c diff --git a/pkg/stis/calstis/cs0/stisinit.c b/pkg/stis/lib/cs0/stisinit.c similarity index 100% rename from pkg/stis/calstis/cs0/stisinit.c rename to pkg/stis/lib/cs0/stisinit.c diff --git a/pkg/stis/calstis/cs0/wavflags.c b/pkg/stis/lib/cs0/wavflags.c similarity index 100% rename from pkg/stis/calstis/cs0/wavflags.c rename to pkg/stis/lib/cs0/wavflags.c diff --git a/pkg/stis/calstis/cs1/blevdrift.c b/pkg/stis/lib/cs1/blevdrift.c similarity index 100% rename from pkg/stis/calstis/cs1/blevdrift.c rename to pkg/stis/lib/cs1/blevdrift.c diff --git a/pkg/stis/calstis/cs1/blevfit.c b/pkg/stis/lib/cs1/blevfit.c similarity index 100% rename from pkg/stis/calstis/cs1/blevfit.c rename to pkg/stis/lib/cs1/blevfit.c diff --git a/pkg/stis/calstis/cs1/calstis1.c b/pkg/stis/lib/cs1/calstis1.c similarity index 100% rename from pkg/stis/calstis/cs1/calstis1.c rename to pkg/stis/lib/cs1/calstis1.c diff --git a/pkg/stis/calstis/cs1/checkvolt.c b/pkg/stis/lib/cs1/checkvolt.c similarity index 100% rename from pkg/stis/calstis/cs1/checkvolt.c rename to pkg/stis/lib/cs1/checkvolt.c diff --git a/pkg/stis/calstis/cs1/do2d.c b/pkg/stis/lib/cs1/do2d.c similarity index 100% rename from pkg/stis/calstis/cs1/do2d.c rename to pkg/stis/lib/cs1/do2d.c diff --git a/pkg/stis/calstis/cs1/doatod.c b/pkg/stis/lib/cs1/doatod.c similarity index 100% rename from pkg/stis/calstis/cs1/doatod.c rename to pkg/stis/lib/cs1/doatod.c diff --git a/pkg/stis/calstis/cs1/dobias.c b/pkg/stis/lib/cs1/dobias.c similarity index 100% rename from pkg/stis/calstis/cs1/dobias.c rename to pkg/stis/lib/cs1/dobias.c diff --git a/pkg/stis/calstis/cs1/doblev.c b/pkg/stis/lib/cs1/doblev.c similarity index 100% rename from pkg/stis/calstis/cs1/doblev.c rename to pkg/stis/lib/cs1/doblev.c diff --git a/pkg/stis/calstis/cs1/dodark.c b/pkg/stis/lib/cs1/dodark.c similarity index 100% rename from pkg/stis/calstis/cs1/dodark.c rename to pkg/stis/lib/cs1/dodark.c diff --git a/pkg/stis/calstis/cs1/dodqi.c b/pkg/stis/lib/cs1/dodqi.c similarity index 100% rename from pkg/stis/calstis/cs1/dodqi.c rename to pkg/stis/lib/cs1/dodqi.c diff --git a/pkg/stis/calstis/cs1/doflat.c b/pkg/stis/lib/cs1/doflat.c similarity index 100% rename from pkg/stis/calstis/cs1/doflat.c rename to pkg/stis/lib/cs1/doflat.c diff --git a/pkg/stis/calstis/cs1/dolores.c b/pkg/stis/lib/cs1/dolores.c similarity index 100% rename from pkg/stis/calstis/cs1/dolores.c rename to pkg/stis/lib/cs1/dolores.c diff --git a/pkg/stis/calstis/cs1/donoise.c b/pkg/stis/lib/cs1/donoise.c similarity index 100% rename from pkg/stis/calstis/cs1/donoise.c rename to pkg/stis/lib/cs1/donoise.c diff --git a/pkg/stis/calstis/cs1/dononlin.c b/pkg/stis/lib/cs1/dononlin.c similarity index 100% rename from pkg/stis/calstis/cs1/dononlin.c rename to pkg/stis/lib/cs1/dononlin.c diff --git a/pkg/stis/calstis/cs1/dophot.c b/pkg/stis/lib/cs1/dophot.c similarity index 100% rename from pkg/stis/calstis/cs1/dophot.c rename to pkg/stis/lib/cs1/dophot.c diff --git a/pkg/stis/calstis/cs1/doppconv.c b/pkg/stis/lib/cs1/doppconv.c similarity index 100% rename from pkg/stis/calstis/cs1/doppconv.c rename to pkg/stis/lib/cs1/doppconv.c diff --git a/pkg/stis/calstis/cs1/doshad.c b/pkg/stis/lib/cs1/doshad.c similarity index 100% rename from pkg/stis/calstis/cs1/doshad.c rename to pkg/stis/lib/cs1/doshad.c diff --git a/pkg/stis/calstis/cs1/findbin.c b/pkg/stis/lib/cs1/findbin.c similarity index 100% rename from pkg/stis/calstis/cs1/findbin.c rename to pkg/stis/lib/cs1/findbin.c diff --git a/pkg/stis/calstis/cs1/findblev.c b/pkg/stis/lib/cs1/findblev.c similarity index 100% rename from pkg/stis/calstis/cs1/findblev.c rename to pkg/stis/lib/cs1/findblev.c diff --git a/pkg/stis/calstis/cs1/findover.c b/pkg/stis/lib/cs1/findover.c similarity index 100% rename from pkg/stis/calstis/cs1/findover.c rename to pkg/stis/lib/cs1/findover.c diff --git a/pkg/stis/calstis/cs1/flagfilter.c b/pkg/stis/lib/cs1/flagfilter.c similarity index 100% rename from pkg/stis/calstis/cs1/flagfilter.c rename to pkg/stis/lib/cs1/flagfilter.c diff --git a/pkg/stis/calstis/cs1/getccdtab.c b/pkg/stis/lib/cs1/getccdtab.c similarity index 100% rename from pkg/stis/calstis/cs1/getccdtab.c rename to pkg/stis/lib/cs1/getccdtab.c diff --git a/pkg/stis/calstis/cs1/getepctab1.c b/pkg/stis/lib/cs1/getepctab1.c similarity index 100% rename from pkg/stis/calstis/cs1/getepctab1.c rename to pkg/stis/lib/cs1/getepctab1.c diff --git a/pkg/stis/calstis/cs1/getflags1.c b/pkg/stis/lib/cs1/getflags1.c similarity index 100% rename from pkg/stis/calstis/cs1/getflags1.c rename to pkg/stis/lib/cs1/getflags1.c diff --git a/pkg/stis/calstis/cs1/getgrpinfo1.c b/pkg/stis/lib/cs1/getgrpinfo1.c similarity index 100% rename from pkg/stis/calstis/cs1/getgrpinfo1.c rename to pkg/stis/lib/cs1/getgrpinfo1.c diff --git a/pkg/stis/calstis/cs1/getkeyinfo1.c b/pkg/stis/lib/cs1/getkeyinfo1.c similarity index 100% rename from pkg/stis/calstis/cs1/getkeyinfo1.c rename to pkg/stis/lib/cs1/getkeyinfo1.c diff --git a/pkg/stis/calstis/cs1/getlintab.c b/pkg/stis/lib/cs1/getlintab.c similarity index 100% rename from pkg/stis/calstis/cs1/getlintab.c rename to pkg/stis/lib/cs1/getlintab.c diff --git a/pkg/stis/calstis/cs1/gettdccorr.c b/pkg/stis/lib/cs1/gettdccorr.c similarity index 100% rename from pkg/stis/calstis/cs1/gettdccorr.c rename to pkg/stis/lib/cs1/gettdccorr.c diff --git a/pkg/stis/calstis/cs1/gettds1.c b/pkg/stis/lib/cs1/gettds1.c similarity index 100% rename from pkg/stis/calstis/cs1/gettds1.c rename to pkg/stis/lib/cs1/gettds1.c diff --git a/pkg/stis/calstis/cs1/history1.c b/pkg/stis/lib/cs1/history1.c similarity index 100% rename from pkg/stis/calstis/cs1/history1.c rename to pkg/stis/lib/cs1/history1.c diff --git a/pkg/stis/calstis/cs1/makedopp.c b/pkg/stis/lib/cs1/makedopp.c similarity index 100% rename from pkg/stis/calstis/cs1/makedopp.c rename to pkg/stis/lib/cs1/makedopp.c diff --git a/pkg/stis/calstis/cs1/photmode.c b/pkg/stis/lib/cs1/photmode.c similarity index 100% rename from pkg/stis/calstis/cs1/photmode.c rename to pkg/stis/lib/cs1/photmode.c diff --git a/pkg/stis/calstis/cs1/sanity1.c b/pkg/stis/lib/cs1/sanity1.c similarity index 100% rename from pkg/stis/calstis/cs1/sanity1.c rename to pkg/stis/lib/cs1/sanity1.c diff --git a/pkg/stis/calstis/cs11/binsubtract.c b/pkg/stis/lib/cs11/binsubtract.c similarity index 100% rename from pkg/stis/calstis/cs11/binsubtract.c rename to pkg/stis/lib/cs11/binsubtract.c diff --git a/pkg/stis/calstis/cs11/calstis11.c b/pkg/stis/lib/cs11/calstis11.c similarity index 100% rename from pkg/stis/calstis/cs11/calstis11.c rename to pkg/stis/lib/cs11/calstis11.c diff --git a/pkg/stis/calstis/cs11/getkeyinfo11.c b/pkg/stis/lib/cs11/getkeyinfo11.c similarity index 100% rename from pkg/stis/calstis/cs11/getkeyinfo11.c rename to pkg/stis/lib/cs11/getkeyinfo11.c diff --git a/pkg/stis/calstis/cs11/gettimes11.c b/pkg/stis/lib/cs11/gettimes11.c similarity index 100% rename from pkg/stis/calstis/cs11/gettimes11.c rename to pkg/stis/lib/cs11/gettimes11.c diff --git a/pkg/stis/calstis/cs11/matchsci.c b/pkg/stis/lib/cs11/matchsci.c similarity index 100% rename from pkg/stis/calstis/cs11/matchsci.c rename to pkg/stis/lib/cs11/matchsci.c diff --git a/pkg/stis/calstis/cs11/subsci.c b/pkg/stis/lib/cs11/subsci.c similarity index 100% rename from pkg/stis/calstis/cs11/subsci.c rename to pkg/stis/lib/cs11/subsci.c diff --git a/pkg/stis/calstis/cs12/addshifts.c b/pkg/stis/lib/cs12/addshifts.c similarity index 100% rename from pkg/stis/calstis/cs12/addshifts.c rename to pkg/stis/lib/cs12/addshifts.c diff --git a/pkg/stis/calstis/cs12/calstis12.c b/pkg/stis/lib/cs12/calstis12.c similarity index 100% rename from pkg/stis/calstis/cs12/calstis12.c rename to pkg/stis/lib/cs12/calstis12.c diff --git a/pkg/stis/calstis/cs12/getkeyinfo12.c b/pkg/stis/lib/cs12/getkeyinfo12.c similarity index 100% rename from pkg/stis/calstis/cs12/getkeyinfo12.c rename to pkg/stis/lib/cs12/getkeyinfo12.c diff --git a/pkg/stis/calstis/cs12/getscigrp.c b/pkg/stis/lib/cs12/getscigrp.c similarity index 100% rename from pkg/stis/calstis/cs12/getscigrp.c rename to pkg/stis/lib/cs12/getscigrp.c diff --git a/pkg/stis/calstis/cs12/getwavgrp.c b/pkg/stis/lib/cs12/getwavgrp.c similarity index 100% rename from pkg/stis/calstis/cs12/getwavgrp.c rename to pkg/stis/lib/cs12/getwavgrp.c diff --git a/pkg/stis/calstis/cs12/history12.c b/pkg/stis/lib/cs12/history12.c similarity index 100% rename from pkg/stis/calstis/cs12/history12.c rename to pkg/stis/lib/cs12/history12.c diff --git a/pkg/stis/calstis/cs12/matchwav.c b/pkg/stis/lib/cs12/matchwav.c similarity index 100% rename from pkg/stis/calstis/cs12/matchwav.c rename to pkg/stis/lib/cs12/matchwav.c diff --git a/pkg/stis/calstis/cs12/targpos.c b/pkg/stis/lib/cs12/targpos.c similarity index 100% rename from pkg/stis/calstis/cs12/targpos.c rename to pkg/stis/lib/cs12/targpos.c diff --git a/pkg/stis/calstis/cs2/calstis2.c b/pkg/stis/lib/cs2/calstis2.c similarity index 100% rename from pkg/stis/calstis/cs2/calstis2.c rename to pkg/stis/lib/cs2/calstis2.c diff --git a/pkg/stis/calstis/cs2/cr_history.c b/pkg/stis/lib/cs2/cr_history.c similarity index 100% rename from pkg/stis/calstis/cs2/cr_history.c rename to pkg/stis/lib/cs2/cr_history.c diff --git a/pkg/stis/calstis/cs2/cr_mode.c b/pkg/stis/lib/cs2/cr_mode.c similarity index 100% rename from pkg/stis/calstis/cs2/cr_mode.c rename to pkg/stis/lib/cs2/cr_mode.c diff --git a/pkg/stis/calstis/cs2/cr_scaling.c b/pkg/stis/lib/cs2/cr_scaling.c similarity index 100% rename from pkg/stis/calstis/cs2/cr_scaling.c rename to pkg/stis/lib/cs2/cr_scaling.c diff --git a/pkg/stis/calstis/cs2/crrej_check.c b/pkg/stis/lib/cs2/crrej_check.c similarity index 100% rename from pkg/stis/calstis/cs2/crrej_check.c rename to pkg/stis/lib/cs2/crrej_check.c diff --git a/pkg/stis/calstis/cs2/crrej_do.c b/pkg/stis/lib/cs2/crrej_do.c similarity index 100% rename from pkg/stis/calstis/cs2/crrej_do.c rename to pkg/stis/lib/cs2/crrej_do.c diff --git a/pkg/stis/calstis/cs2/crrej_init.c b/pkg/stis/lib/cs2/crrej_init.c similarity index 100% rename from pkg/stis/calstis/cs2/crrej_init.c rename to pkg/stis/lib/cs2/crrej_init.c diff --git a/pkg/stis/calstis/cs2/crrej_loop.c b/pkg/stis/lib/cs2/crrej_loop.c similarity index 100% rename from pkg/stis/calstis/cs2/crrej_loop.c rename to pkg/stis/lib/cs2/crrej_loop.c diff --git a/pkg/stis/calstis/cs2/crrej_sky.c b/pkg/stis/lib/cs2/crrej_sky.c similarity index 100% rename from pkg/stis/calstis/cs2/crrej_sky.c rename to pkg/stis/lib/cs2/crrej_sky.c diff --git a/pkg/stis/calstis/cs2/o_cal2_in.c b/pkg/stis/lib/cs2/o_cal2_in.c similarity index 100% rename from pkg/stis/calstis/cs2/o_cal2_in.c rename to pkg/stis/lib/cs2/o_cal2_in.c diff --git a/pkg/stis/calstis/cs2/piksrt.c b/pkg/stis/lib/cs2/piksrt.c similarity index 100% rename from pkg/stis/calstis/cs2/piksrt.c rename to pkg/stis/lib/cs2/piksrt.c diff --git a/pkg/stis/lib/cs2_reset.c b/pkg/stis/lib/cs2_reset.c new file mode 100644 index 000000000..c80515797 --- /dev/null +++ b/pkg/stis/lib/cs2_reset.c @@ -0,0 +1,29 @@ +# include "c_iraf.h" +# include "stis.h" +# include "cs2.h" + + +void cs2_reset (clpar *par, int newpar[]) +{ + +/* arguments +clpar *par; o: user specified parameters +int newpar; o: parameter been set by the user? +*/ + + /* First, set parameters specifiable in the command line to be + non-existent. */ + par->tbname[0] = '\0'; + par->verbose = 0; + par->printtime = 0; + + newpar[TOTAL] = 0; + newpar[SCALENSE] = 0; + newpar[INITGUES] = 0; + newpar[SKYSUB] = 0; + newpar[CRSIGMAS] = 0; + newpar[CRRADIUS] = 0; + newpar[CRTHRESH] = 0; + newpar[BADINPDQ] = 0; + newpar[CRMASK] = 0; +} diff --git a/pkg/stis/calstis/cs4/Differences b/pkg/stis/lib/cs4/Differences similarity index 100% rename from pkg/stis/calstis/cs4/Differences rename to pkg/stis/lib/cs4/Differences diff --git a/pkg/stis/calstis/cs4/Notes b/pkg/stis/lib/cs4/Notes similarity index 100% rename from pkg/stis/calstis/cs4/Notes rename to pkg/stis/lib/cs4/Notes diff --git a/pkg/stis/calstis/cs4/calstis4.c b/pkg/stis/lib/cs4/calstis4.c similarity index 100% rename from pkg/stis/calstis/cs4/calstis4.c rename to pkg/stis/lib/cs4/calstis4.c diff --git a/pkg/stis/calstis/cs4/convslit.c b/pkg/stis/lib/cs4/convslit.c similarity index 100% rename from pkg/stis/calstis/cs4/convslit.c rename to pkg/stis/lib/cs4/convslit.c diff --git a/pkg/stis/calstis/cs4/echshift.c b/pkg/stis/lib/cs4/echshift.c similarity index 100% rename from pkg/stis/calstis/cs4/echshift.c rename to pkg/stis/lib/cs4/echshift.c diff --git a/pkg/stis/calstis/cs4/findbars.c b/pkg/stis/lib/cs4/findbars.c similarity index 100% rename from pkg/stis/calstis/cs4/findbars.c rename to pkg/stis/lib/cs4/findbars.c diff --git a/pkg/stis/calstis/cs4/findedge.c b/pkg/stis/lib/cs4/findedge.c similarity index 100% rename from pkg/stis/calstis/cs4/findedge.c rename to pkg/stis/lib/cs4/findedge.c diff --git a/pkg/stis/calstis/cs4/findends.c b/pkg/stis/lib/cs4/findends.c similarity index 100% rename from pkg/stis/calstis/cs4/findends.c rename to pkg/stis/lib/cs4/findends.c diff --git a/pkg/stis/calstis/cs4/findwl.c b/pkg/stis/lib/cs4/findwl.c similarity index 100% rename from pkg/stis/calstis/cs4/findwl.c rename to pkg/stis/lib/cs4/findwl.c diff --git a/pkg/stis/calstis/cs4/flagcr.c b/pkg/stis/lib/cs4/flagcr.c similarity index 100% rename from pkg/stis/calstis/cs4/flagcr.c rename to pkg/stis/lib/cs4/flagcr.c diff --git a/pkg/stis/calstis/cs4/getangle4.c b/pkg/stis/lib/cs4/getangle4.c similarity index 100% rename from pkg/stis/calstis/cs4/getangle4.c rename to pkg/stis/lib/cs4/getangle4.c diff --git a/pkg/stis/calstis/cs4/getapdes4.c b/pkg/stis/lib/cs4/getapdes4.c similarity index 100% rename from pkg/stis/calstis/cs4/getapdes4.c rename to pkg/stis/lib/cs4/getapdes4.c diff --git a/pkg/stis/calstis/cs4/getdisp4.c b/pkg/stis/lib/cs4/getdisp4.c similarity index 100% rename from pkg/stis/calstis/cs4/getdisp4.c rename to pkg/stis/lib/cs4/getdisp4.c diff --git a/pkg/stis/calstis/cs4/getflags4.c b/pkg/stis/lib/cs4/getflags4.c similarity index 100% rename from pkg/stis/calstis/cs4/getflags4.c rename to pkg/stis/lib/cs4/getflags4.c diff --git a/pkg/stis/calstis/cs4/getgrpinfo4.c b/pkg/stis/lib/cs4/getgrpinfo4.c similarity index 100% rename from pkg/stis/calstis/cs4/getgrpinfo4.c rename to pkg/stis/lib/cs4/getgrpinfo4.c diff --git a/pkg/stis/calstis/cs4/getinang4.c b/pkg/stis/lib/cs4/getinang4.c similarity index 100% rename from pkg/stis/calstis/cs4/getinang4.c rename to pkg/stis/lib/cs4/getinang4.c diff --git a/pkg/stis/calstis/cs4/getkeyinfo4.c b/pkg/stis/lib/cs4/getkeyinfo4.c similarity index 100% rename from pkg/stis/calstis/cs4/getkeyinfo4.c rename to pkg/stis/lib/cs4/getkeyinfo4.c diff --git a/pkg/stis/calstis/cs4/getlamp.c b/pkg/stis/lib/cs4/getlamp.c similarity index 100% rename from pkg/stis/calstis/cs4/getlamp.c rename to pkg/stis/lib/cs4/getlamp.c diff --git a/pkg/stis/calstis/cs4/gettrace4.c b/pkg/stis/lib/cs4/gettrace4.c similarity index 100% rename from pkg/stis/calstis/cs4/gettrace4.c rename to pkg/stis/lib/cs4/gettrace4.c diff --git a/pkg/stis/calstis/cs4/getwcp.c b/pkg/stis/lib/cs4/getwcp.c similarity index 100% rename from pkg/stis/calstis/cs4/getwcp.c rename to pkg/stis/lib/cs4/getwcp.c diff --git a/pkg/stis/calstis/cs4/history4.c b/pkg/stis/lib/cs4/history4.c similarity index 100% rename from pkg/stis/calstis/cs4/history4.c rename to pkg/stis/lib/cs4/history4.c diff --git a/pkg/stis/calstis/cs4/invert.c b/pkg/stis/lib/cs4/invert.c similarity index 100% rename from pkg/stis/calstis/cs4/invert.c rename to pkg/stis/lib/cs4/invert.c diff --git a/pkg/stis/calstis/cs4/maketemplate.c b/pkg/stis/lib/cs4/maketemplate.c similarity index 100% rename from pkg/stis/calstis/cs4/maketemplate.c rename to pkg/stis/lib/cs4/maketemplate.c diff --git a/pkg/stis/calstis/cs4/newtrace4.c b/pkg/stis/lib/cs4/newtrace4.c similarity index 100% rename from pkg/stis/calstis/cs4/newtrace4.c rename to pkg/stis/lib/cs4/newtrace4.c diff --git a/pkg/stis/calstis/cs4/peakquad3.c b/pkg/stis/lib/cs4/peakquad3.c similarity index 100% rename from pkg/stis/calstis/cs4/peakquad3.c rename to pkg/stis/lib/cs4/peakquad3.c diff --git a/pkg/stis/calstis/cs4/scaleref.c b/pkg/stis/lib/cs4/scaleref.c similarity index 100% rename from pkg/stis/calstis/cs4/scaleref.c rename to pkg/stis/lib/cs4/scaleref.c diff --git a/pkg/stis/calstis/cs4/spatialshift.c b/pkg/stis/lib/cs4/spatialshift.c similarity index 100% rename from pkg/stis/calstis/cs4/spatialshift.c rename to pkg/stis/lib/cs4/spatialshift.c diff --git a/pkg/stis/calstis/cs4/updateshift.c b/pkg/stis/lib/cs4/updateshift.c similarity index 100% rename from pkg/stis/calstis/cs4/updateshift.c rename to pkg/stis/lib/cs4/updateshift.c diff --git a/pkg/stis/calstis/cs4/wavecal.c b/pkg/stis/lib/cs4/wavecal.c similarity index 100% rename from pkg/stis/calstis/cs4/wavecal.c rename to pkg/stis/lib/cs4/wavecal.c diff --git a/pkg/stis/calstis/cs4/waveshift.c b/pkg/stis/lib/cs4/waveshift.c similarity index 100% rename from pkg/stis/calstis/cs4/waveshift.c rename to pkg/stis/lib/cs4/waveshift.c diff --git a/pkg/stis/calstis/cs4/whichslit.c b/pkg/stis/lib/cs4/whichslit.c similarity index 100% rename from pkg/stis/calstis/cs4/whichslit.c rename to pkg/stis/lib/cs4/whichslit.c diff --git a/pkg/stis/calstis/cs4/xc4.c b/pkg/stis/lib/cs4/xc4.c similarity index 100% rename from pkg/stis/calstis/cs4/xc4.c rename to pkg/stis/lib/cs4/xc4.c diff --git a/pkg/stis/calstis/cs4/xcechelle.c b/pkg/stis/lib/cs4/xcechelle.c similarity index 100% rename from pkg/stis/calstis/cs4/xcechelle.c rename to pkg/stis/lib/cs4/xcechelle.c diff --git a/pkg/stis/calstis/cs4/xcpeak.c b/pkg/stis/lib/cs4/xcpeak.c similarity index 100% rename from pkg/stis/calstis/cs4/xcpeak.c rename to pkg/stis/lib/cs4/xcpeak.c diff --git a/pkg/stis/calstis/cs4/xcwave.c b/pkg/stis/lib/cs4/xcwave.c similarity index 100% rename from pkg/stis/calstis/cs4/xcwave.c rename to pkg/stis/lib/cs4/xcwave.c diff --git a/pkg/stis/calstis/cs6/Notes b/pkg/stis/lib/cs6/Notes similarity index 100% rename from pkg/stis/calstis/cs6/Notes rename to pkg/stis/lib/cs6/Notes diff --git a/pkg/stis/calstis/cs6/absflux6.c b/pkg/stis/lib/cs6/absflux6.c similarity index 100% rename from pkg/stis/calstis/cs6/absflux6.c rename to pkg/stis/lib/cs6/absflux6.c diff --git a/pkg/stis/calstis/cs6/addoffsets6.c b/pkg/stis/lib/cs6/addoffsets6.c similarity index 100% rename from pkg/stis/calstis/cs6/addoffsets6.c rename to pkg/stis/lib/cs6/addoffsets6.c diff --git a/pkg/stis/calstis/cs6/adjustdisp6.c b/pkg/stis/lib/cs6/adjustdisp6.c similarity index 100% rename from pkg/stis/calstis/cs6/adjustdisp6.c rename to pkg/stis/lib/cs6/adjustdisp6.c diff --git a/pkg/stis/calstis/cs6/background.c b/pkg/stis/lib/cs6/background.c similarity index 100% rename from pkg/stis/calstis/cs6/background.c rename to pkg/stis/lib/cs6/background.c diff --git a/pkg/stis/calstis/cs6/buildoptprof.c b/pkg/stis/lib/cs6/buildoptprof.c similarity index 100% rename from pkg/stis/calstis/cs6/buildoptprof.c rename to pkg/stis/lib/cs6/buildoptprof.c diff --git a/pkg/stis/calstis/cs6/buildprof.c b/pkg/stis/lib/cs6/buildprof.c similarity index 100% rename from pkg/stis/calstis/cs6/buildprof.c rename to pkg/stis/lib/cs6/buildprof.c diff --git a/pkg/stis/calstis/cs6/calstis6.c b/pkg/stis/lib/cs6/calstis6.c similarity index 100% rename from pkg/stis/calstis/cs6/calstis6.c rename to pkg/stis/lib/cs6/calstis6.c diff --git a/pkg/stis/calstis/cs6/calstis6std.c b/pkg/stis/lib/cs6/calstis6std.c similarity index 100% rename from pkg/stis/calstis/cs6/calstis6std.c rename to pkg/stis/lib/cs6/calstis6std.c diff --git a/pkg/stis/calstis/cs6/checkoptimal.c b/pkg/stis/lib/cs6/checkoptimal.c similarity index 100% rename from pkg/stis/calstis/cs6/checkoptimal.c rename to pkg/stis/lib/cs6/checkoptimal.c diff --git a/pkg/stis/calstis/cs6/commline.c b/pkg/stis/lib/cs6/commline.c similarity index 100% rename from pkg/stis/calstis/cs6/commline.c rename to pkg/stis/lib/cs6/commline.c diff --git a/pkg/stis/calstis/cs6/crosscor.c b/pkg/stis/lib/cs6/crosscor.c similarity index 100% rename from pkg/stis/calstis/cs6/crosscor.c rename to pkg/stis/lib/cs6/crosscor.c diff --git a/pkg/stis/calstis/cs6/defineback.c b/pkg/stis/lib/cs6/defineback.c similarity index 100% rename from pkg/stis/calstis/cs6/defineback.c rename to pkg/stis/lib/cs6/defineback.c diff --git a/pkg/stis/calstis/cs6/design2.txt b/pkg/stis/lib/cs6/design2.txt similarity index 100% rename from pkg/stis/calstis/cs6/design2.txt rename to pkg/stis/lib/cs6/design2.txt diff --git a/pkg/stis/calstis/cs6/do1dx.c b/pkg/stis/lib/cs6/do1dx.c similarity index 100% rename from pkg/stis/calstis/cs6/do1dx.c rename to pkg/stis/lib/cs6/do1dx.c diff --git a/pkg/stis/calstis/cs6/findlya.c b/pkg/stis/lib/cs6/findlya.c similarity index 100% rename from pkg/stis/calstis/cs6/findlya.c rename to pkg/stis/lib/cs6/findlya.c diff --git a/pkg/stis/calstis/cs6/gcrosscor.c b/pkg/stis/lib/cs6/gcrosscor.c similarity index 100% rename from pkg/stis/calstis/cs6/gcrosscor.c rename to pkg/stis/lib/cs6/gcrosscor.c diff --git a/pkg/stis/calstis/cs6/getabsphot6.c b/pkg/stis/lib/cs6/getabsphot6.c similarity index 100% rename from pkg/stis/calstis/cs6/getabsphot6.c rename to pkg/stis/lib/cs6/getabsphot6.c diff --git a/pkg/stis/calstis/cs6/getapdes6.c b/pkg/stis/lib/cs6/getapdes6.c similarity index 100% rename from pkg/stis/calstis/cs6/getapdes6.c rename to pkg/stis/lib/cs6/getapdes6.c diff --git a/pkg/stis/calstis/cs6/getapoffset6.c b/pkg/stis/lib/cs6/getapoffset6.c similarity index 100% rename from pkg/stis/calstis/cs6/getapoffset6.c rename to pkg/stis/lib/cs6/getapoffset6.c diff --git a/pkg/stis/calstis/cs6/getapthr6.c b/pkg/stis/lib/cs6/getapthr6.c similarity index 100% rename from pkg/stis/calstis/cs6/getapthr6.c rename to pkg/stis/lib/cs6/getapthr6.c diff --git a/pkg/stis/calstis/cs6/getccdtab6.c b/pkg/stis/lib/cs6/getccdtab6.c similarity index 100% rename from pkg/stis/calstis/cs6/getccdtab6.c rename to pkg/stis/lib/cs6/getccdtab6.c diff --git a/pkg/stis/calstis/cs6/getcheckref.c b/pkg/stis/lib/cs6/getcheckref.c similarity index 100% rename from pkg/stis/calstis/cs6/getcheckref.c rename to pkg/stis/lib/cs6/getcheckref.c diff --git a/pkg/stis/calstis/cs6/getdisp6.c b/pkg/stis/lib/cs6/getdisp6.c similarity index 100% rename from pkg/stis/calstis/cs6/getdisp6.c rename to pkg/stis/lib/cs6/getdisp6.c diff --git a/pkg/stis/calstis/cs6/getextract.c b/pkg/stis/lib/cs6/getextract.c similarity index 100% rename from pkg/stis/calstis/cs6/getextract.c rename to pkg/stis/lib/cs6/getextract.c diff --git a/pkg/stis/calstis/cs6/getflags6.c b/pkg/stis/lib/cs6/getflags6.c similarity index 100% rename from pkg/stis/calstis/cs6/getflags6.c rename to pkg/stis/lib/cs6/getflags6.c diff --git a/pkg/stis/calstis/cs6/getgac6.c b/pkg/stis/lib/cs6/getgac6.c similarity index 100% rename from pkg/stis/calstis/cs6/getgac6.c rename to pkg/stis/lib/cs6/getgac6.c diff --git a/pkg/stis/calstis/cs6/getgrpinfo6.c b/pkg/stis/lib/cs6/getgrpinfo6.c similarity index 100% rename from pkg/stis/calstis/cs6/getgrpinfo6.c rename to pkg/stis/lib/cs6/getgrpinfo6.c diff --git a/pkg/stis/calstis/cs6/getinang6.c b/pkg/stis/lib/cs6/getinang6.c similarity index 100% rename from pkg/stis/calstis/cs6/getinang6.c rename to pkg/stis/lib/cs6/getinang6.c diff --git a/pkg/stis/calstis/cs6/getintens.c b/pkg/stis/lib/cs6/getintens.c similarity index 100% rename from pkg/stis/calstis/cs6/getintens.c rename to pkg/stis/lib/cs6/getintens.c diff --git a/pkg/stis/calstis/cs6/getkeyinfo6.c b/pkg/stis/lib/cs6/getkeyinfo6.c similarity index 100% rename from pkg/stis/calstis/cs6/getkeyinfo6.c rename to pkg/stis/lib/cs6/getkeyinfo6.c diff --git a/pkg/stis/calstis/cs6/getpct6.c b/pkg/stis/lib/cs6/getpct6.c similarity index 100% rename from pkg/stis/calstis/cs6/getpct6.c rename to pkg/stis/lib/cs6/getpct6.c diff --git a/pkg/stis/calstis/cs6/getprofile.c b/pkg/stis/lib/cs6/getprofile.c similarity index 100% rename from pkg/stis/calstis/cs6/getprofile.c rename to pkg/stis/lib/cs6/getprofile.c diff --git a/pkg/stis/calstis/cs6/getrefcline.c b/pkg/stis/lib/cs6/getrefcline.c similarity index 100% rename from pkg/stis/calstis/cs6/getrefcline.c rename to pkg/stis/lib/cs6/getrefcline.c diff --git a/pkg/stis/calstis/cs6/getsdc6.c b/pkg/stis/lib/cs6/getsdc6.c similarity index 100% rename from pkg/stis/calstis/cs6/getsdc6.c rename to pkg/stis/lib/cs6/getsdc6.c diff --git a/pkg/stis/calstis/cs6/gettrace6.c b/pkg/stis/lib/cs6/gettrace6.c similarity index 100% rename from pkg/stis/calstis/cs6/gettrace6.c rename to pkg/stis/lib/cs6/gettrace6.c diff --git a/pkg/stis/calstis/cs6/heliofactor6.c b/pkg/stis/lib/cs6/heliofactor6.c similarity index 100% rename from pkg/stis/calstis/cs6/heliofactor6.c rename to pkg/stis/lib/cs6/heliofactor6.c diff --git a/pkg/stis/calstis/cs6/history6.c b/pkg/stis/lib/cs6/history6.c similarity index 100% rename from pkg/stis/calstis/cs6/history6.c rename to pkg/stis/lib/cs6/history6.c diff --git a/pkg/stis/calstis/cs6/init.c b/pkg/stis/lib/cs6/init.c similarity index 100% rename from pkg/stis/calstis/cs6/init.c rename to pkg/stis/lib/cs6/init.c diff --git a/pkg/stis/calstis/cs6/lee.c b/pkg/stis/lib/cs6/lee.c similarity index 100% rename from pkg/stis/calstis/cs6/lee.c rename to pkg/stis/lib/cs6/lee.c diff --git a/pkg/stis/calstis/cs6/memory.c b/pkg/stis/lib/cs6/memory.c similarity index 100% rename from pkg/stis/calstis/cs6/memory.c rename to pkg/stis/lib/cs6/memory.c diff --git a/pkg/stis/calstis/cs6/message6.c b/pkg/stis/lib/cs6/message6.c similarity index 100% rename from pkg/stis/calstis/cs6/message6.c rename to pkg/stis/lib/cs6/message6.c diff --git a/pkg/stis/calstis/cs6/newcoord6.c b/pkg/stis/lib/cs6/newcoord6.c similarity index 100% rename from pkg/stis/calstis/cs6/newcoord6.c rename to pkg/stis/lib/cs6/newcoord6.c diff --git a/pkg/stis/calstis/cs6/newdisp6.c b/pkg/stis/lib/cs6/newdisp6.c similarity index 100% rename from pkg/stis/calstis/cs6/newdisp6.c rename to pkg/stis/lib/cs6/newdisp6.c diff --git a/pkg/stis/calstis/cs6/newextract.c b/pkg/stis/lib/cs6/newextract.c similarity index 100% rename from pkg/stis/calstis/cs6/newextract.c rename to pkg/stis/lib/cs6/newextract.c diff --git a/pkg/stis/calstis/cs6/newprofile.c b/pkg/stis/lib/cs6/newprofile.c similarity index 100% rename from pkg/stis/calstis/cs6/newprofile.c rename to pkg/stis/lib/cs6/newprofile.c diff --git a/pkg/stis/calstis/cs6/newtrace6.c b/pkg/stis/lib/cs6/newtrace6.c similarity index 100% rename from pkg/stis/calstis/cs6/newtrace6.c rename to pkg/stis/lib/cs6/newtrace6.c diff --git a/pkg/stis/calstis/cs6/output.c b/pkg/stis/lib/cs6/output.c similarity index 100% rename from pkg/stis/calstis/cs6/output.c rename to pkg/stis/lib/cs6/output.c diff --git a/pkg/stis/calstis/cs6/poly.c b/pkg/stis/lib/cs6/poly.c similarity index 100% rename from pkg/stis/calstis/cs6/poly.c rename to pkg/stis/lib/cs6/poly.c diff --git a/pkg/stis/calstis/cs6/selectalg.c b/pkg/stis/lib/cs6/selectalg.c similarity index 100% rename from pkg/stis/calstis/cs6/selectalg.c rename to pkg/stis/lib/cs6/selectalg.c diff --git a/pkg/stis/calstis/cs6/setranges.c b/pkg/stis/lib/cs6/setranges.c similarity index 100% rename from pkg/stis/calstis/cs6/setranges.c rename to pkg/stis/lib/cs6/setranges.c diff --git a/pkg/stis/calstis/cs6/timestamp6.c b/pkg/stis/lib/cs6/timestamp6.c similarity index 100% rename from pkg/stis/calstis/cs6/timestamp6.c rename to pkg/stis/lib/cs6/timestamp6.c diff --git a/pkg/stis/calstis/cs6/wave.c b/pkg/stis/lib/cs6/wave.c similarity index 100% rename from pkg/stis/calstis/cs6/wave.c rename to pkg/stis/lib/cs6/wave.c diff --git a/pkg/stis/calstis/cs6/x1dspec.c b/pkg/stis/lib/cs6/x1dspec.c similarity index 100% rename from pkg/stis/calstis/cs6/x1dspec.c rename to pkg/stis/lib/cs6/x1dspec.c diff --git a/pkg/stis/calstis/cs7/Notes b/pkg/stis/lib/cs7/Notes similarity index 100% rename from pkg/stis/calstis/cs7/Notes rename to pkg/stis/lib/cs7/Notes diff --git a/pkg/stis/calstis/cs7/absflux.c b/pkg/stis/lib/cs7/absflux.c similarity index 100% rename from pkg/stis/calstis/cs7/absflux.c rename to pkg/stis/lib/cs7/absflux.c diff --git a/pkg/stis/calstis/cs7/adjustdisp.c b/pkg/stis/lib/cs7/adjustdisp.c similarity index 100% rename from pkg/stis/calstis/cs7/adjustdisp.c rename to pkg/stis/lib/cs7/adjustdisp.c diff --git a/pkg/stis/calstis/cs7/calstis7.c b/pkg/stis/lib/cs7/calstis7.c similarity index 100% rename from pkg/stis/calstis/cs7/calstis7.c rename to pkg/stis/lib/cs7/calstis7.c diff --git a/pkg/stis/calstis/cs7/datamasked.c b/pkg/stis/lib/cs7/datamasked.c similarity index 100% rename from pkg/stis/calstis/cs7/datamasked.c rename to pkg/stis/lib/cs7/datamasked.c diff --git a/pkg/stis/calstis/cs7/do2dx.c b/pkg/stis/lib/cs7/do2dx.c similarity index 100% rename from pkg/stis/calstis/cs7/do2dx.c rename to pkg/stis/lib/cs7/do2dx.c diff --git a/pkg/stis/calstis/cs7/evaldisp7.c b/pkg/stis/lib/cs7/evaldisp7.c similarity index 100% rename from pkg/stis/calstis/cs7/evaldisp7.c rename to pkg/stis/lib/cs7/evaldisp7.c diff --git a/pkg/stis/calstis/cs7/geocorr7.c b/pkg/stis/lib/cs7/geocorr7.c similarity index 100% rename from pkg/stis/calstis/cs7/geocorr7.c rename to pkg/stis/lib/cs7/geocorr7.c diff --git a/pkg/stis/calstis/cs7/getabsphot.c b/pkg/stis/lib/cs7/getabsphot.c similarity index 100% rename from pkg/stis/calstis/cs7/getabsphot.c rename to pkg/stis/lib/cs7/getabsphot.c diff --git a/pkg/stis/calstis/cs7/getapdes7.c b/pkg/stis/lib/cs7/getapdes7.c similarity index 100% rename from pkg/stis/calstis/cs7/getapdes7.c rename to pkg/stis/lib/cs7/getapdes7.c diff --git a/pkg/stis/calstis/cs7/getapoffset.c b/pkg/stis/lib/cs7/getapoffset.c similarity index 100% rename from pkg/stis/calstis/cs7/getapoffset.c rename to pkg/stis/lib/cs7/getapoffset.c diff --git a/pkg/stis/calstis/cs7/getapthr.c b/pkg/stis/lib/cs7/getapthr.c similarity index 100% rename from pkg/stis/calstis/cs7/getapthr.c rename to pkg/stis/lib/cs7/getapthr.c diff --git a/pkg/stis/calstis/cs7/getdisp.c b/pkg/stis/lib/cs7/getdisp.c similarity index 100% rename from pkg/stis/calstis/cs7/getdisp.c rename to pkg/stis/lib/cs7/getdisp.c diff --git a/pkg/stis/calstis/cs7/getflags7.c b/pkg/stis/lib/cs7/getflags7.c similarity index 100% rename from pkg/stis/calstis/cs7/getflags7.c rename to pkg/stis/lib/cs7/getflags7.c diff --git a/pkg/stis/calstis/cs7/getgrpinfo7.c b/pkg/stis/lib/cs7/getgrpinfo7.c similarity index 100% rename from pkg/stis/calstis/cs7/getgrpinfo7.c rename to pkg/stis/lib/cs7/getgrpinfo7.c diff --git a/pkg/stis/calstis/cs7/getidc.c b/pkg/stis/lib/cs7/getidc.c similarity index 100% rename from pkg/stis/calstis/cs7/getidc.c rename to pkg/stis/lib/cs7/getidc.c diff --git a/pkg/stis/calstis/cs7/getinang.c b/pkg/stis/lib/cs7/getinang.c similarity index 100% rename from pkg/stis/calstis/cs7/getinang.c rename to pkg/stis/lib/cs7/getinang.c diff --git a/pkg/stis/calstis/cs7/getkeyinfo7.c b/pkg/stis/lib/cs7/getkeyinfo7.c similarity index 100% rename from pkg/stis/calstis/cs7/getkeyinfo7.c rename to pkg/stis/lib/cs7/getkeyinfo7.c diff --git a/pkg/stis/calstis/cs7/getpct.c b/pkg/stis/lib/cs7/getpct.c similarity index 100% rename from pkg/stis/calstis/cs7/getpct.c rename to pkg/stis/lib/cs7/getpct.c diff --git a/pkg/stis/calstis/cs7/getsdc.c b/pkg/stis/lib/cs7/getsdc.c similarity index 100% rename from pkg/stis/calstis/cs7/getsdc.c rename to pkg/stis/lib/cs7/getsdc.c diff --git a/pkg/stis/calstis/cs7/gettrace.c b/pkg/stis/lib/cs7/gettrace.c similarity index 100% rename from pkg/stis/calstis/cs7/gettrace.c rename to pkg/stis/lib/cs7/gettrace.c diff --git a/pkg/stis/calstis/cs7/heliofactor.c b/pkg/stis/lib/cs7/heliofactor.c similarity index 100% rename from pkg/stis/calstis/cs7/heliofactor.c rename to pkg/stis/lib/cs7/heliofactor.c diff --git a/pkg/stis/calstis/cs7/history7.c b/pkg/stis/lib/cs7/history7.c similarity index 100% rename from pkg/stis/calstis/cs7/history7.c rename to pkg/stis/lib/cs7/history7.c diff --git a/pkg/stis/calstis/cs7/newcoord.c b/pkg/stis/lib/cs7/newcoord.c similarity index 100% rename from pkg/stis/calstis/cs7/newcoord.c rename to pkg/stis/lib/cs7/newcoord.c diff --git a/pkg/stis/calstis/cs7/newdisp.c b/pkg/stis/lib/cs7/newdisp.c similarity index 100% rename from pkg/stis/calstis/cs7/newdisp.c rename to pkg/stis/lib/cs7/newdisp.c diff --git a/pkg/stis/calstis/cs7/newtrace.c b/pkg/stis/lib/cs7/newtrace.c similarity index 100% rename from pkg/stis/calstis/cs7/newtrace.c rename to pkg/stis/lib/cs7/newtrace.c diff --git a/pkg/stis/calstis/cs7/putgrpinfo7.c b/pkg/stis/lib/cs7/putgrpinfo7.c similarity index 100% rename from pkg/stis/calstis/cs7/putgrpinfo7.c rename to pkg/stis/lib/cs7/putgrpinfo7.c diff --git a/pkg/stis/calstis/cs7/scalewcs.c b/pkg/stis/lib/cs7/scalewcs.c similarity index 100% rename from pkg/stis/calstis/cs7/scalewcs.c rename to pkg/stis/lib/cs7/scalewcs.c diff --git a/pkg/stis/calstis/cs7/x2dcorr7.c b/pkg/stis/lib/cs7/x2dcorr7.c similarity index 100% rename from pkg/stis/calstis/cs7/x2dcorr7.c rename to pkg/stis/lib/cs7/x2dcorr7.c diff --git a/pkg/stis/calstis/cs8/calstis8.c b/pkg/stis/lib/cs8/calstis8.c similarity index 100% rename from pkg/stis/calstis/cs8/calstis8.c rename to pkg/stis/lib/cs8/calstis8.c diff --git a/pkg/stis/calstis/lib/defswitch.c b/pkg/stis/lib/defswitch.c similarity index 100% rename from pkg/stis/calstis/lib/defswitch.c rename to pkg/stis/lib/defswitch.c diff --git a/pkg/stis/calstis/lib/div2d.c b/pkg/stis/lib/div2d.c similarity index 100% rename from pkg/stis/calstis/lib/div2d.c rename to pkg/stis/lib/div2d.c diff --git a/pkg/stis/calstis/lib/dostat.c b/pkg/stis/lib/dostat.c similarity index 100% rename from pkg/stis/calstis/lib/dostat.c rename to pkg/stis/lib/dostat.c diff --git a/pkg/stis/calstis/lib/evaldisp.c b/pkg/stis/lib/evaldisp.c similarity index 100% rename from pkg/stis/calstis/lib/evaldisp.c rename to pkg/stis/lib/evaldisp.c diff --git a/pkg/stis/calstis/lib/extrap1d.c b/pkg/stis/lib/extrap1d.c similarity index 100% rename from pkg/stis/calstis/lib/extrap1d.c rename to pkg/stis/lib/extrap1d.c diff --git a/pkg/stis/calstis/lib/fileexists.c b/pkg/stis/lib/fileexists.c similarity index 100% rename from pkg/stis/calstis/lib/fileexists.c rename to pkg/stis/lib/fileexists.c diff --git a/pkg/stis/calstis/lib/getcorner.c b/pkg/stis/lib/getcorner.c similarity index 100% rename from pkg/stis/calstis/lib/getcorner.c rename to pkg/stis/lib/getcorner.c diff --git a/pkg/stis/calstis/lib/getdettemp.c b/pkg/stis/lib/getdettemp.c similarity index 100% rename from pkg/stis/calstis/lib/getdettemp.c rename to pkg/stis/lib/getdettemp.c diff --git a/pkg/stis/calstis/lib/getlt.c b/pkg/stis/lib/getlt.c similarity index 100% rename from pkg/stis/calstis/lib/getlt.c rename to pkg/stis/lib/getlt.c diff --git a/pkg/stis/calstis/lib/getlt0.c b/pkg/stis/lib/getlt0.c similarity index 100% rename from pkg/stis/calstis/lib/getlt0.c rename to pkg/stis/lib/getlt0.c diff --git a/pkg/stis/calstis/lib/getmoc.c b/pkg/stis/lib/getmoc.c similarity index 100% rename from pkg/stis/calstis/lib/getmoc.c rename to pkg/stis/lib/getmoc.c diff --git a/pkg/stis/calstis/lib/getrefname.c b/pkg/stis/lib/getrefname.c similarity index 100% rename from pkg/stis/calstis/lib/getrefname.c rename to pkg/stis/lib/getrefname.c diff --git a/pkg/stis/calstis/lib/getswitch.c b/pkg/stis/lib/getswitch.c similarity index 100% rename from pkg/stis/calstis/lib/getswitch.c rename to pkg/stis/lib/getswitch.c diff --git a/pkg/stis/calstis/lib/gettds.c b/pkg/stis/lib/gettds.c similarity index 100% rename from pkg/stis/calstis/lib/gettds.c rename to pkg/stis/lib/gettds.c diff --git a/pkg/stis/calstis/lib/gotfilename.c b/pkg/stis/lib/gotfilename.c similarity index 100% rename from pkg/stis/calstis/lib/gotfilename.c rename to pkg/stis/lib/gotfilename.c diff --git a/pkg/stis/calstis/cs6/idtalg/calstis6idt.c b/pkg/stis/lib/idtalg/calstis6idt.c similarity index 100% rename from pkg/stis/calstis/cs6/idtalg/calstis6idt.c rename to pkg/stis/lib/idtalg/calstis6idt.c diff --git a/pkg/stis/calstis/cs6/idtalg/echscatread.c b/pkg/stis/lib/idtalg/echscatread.c similarity index 100% rename from pkg/stis/calstis/cs6/idtalg/echscatread.c rename to pkg/stis/lib/idtalg/echscatread.c diff --git a/pkg/stis/calstis/cs6/idtalg/idtmemory.c b/pkg/stis/lib/idtalg/idtmemory.c similarity index 100% rename from pkg/stis/calstis/cs6/idtalg/idtmemory.c rename to pkg/stis/lib/idtalg/idtmemory.c diff --git a/pkg/stis/calstis/cs6/idtalg/rebindata.c b/pkg/stis/lib/idtalg/rebindata.c similarity index 100% rename from pkg/stis/calstis/cs6/idtalg/rebindata.c rename to pkg/stis/lib/idtalg/rebindata.c diff --git a/pkg/stis/calstis/cs6/idtalg/splice.c b/pkg/stis/lib/idtalg/splice.c similarity index 100% rename from pkg/stis/calstis/cs6/idtalg/splice.c rename to pkg/stis/lib/idtalg/splice.c diff --git a/pkg/stis/calstis/cs6/idtalg/x1dtable.c b/pkg/stis/lib/idtalg/x1dtable.c similarity index 100% rename from pkg/stis/calstis/cs6/idtalg/x1dtable.c rename to pkg/stis/lib/idtalg/x1dtable.c diff --git a/pkg/stis/calstis/cs6/idtalg/xc6.c b/pkg/stis/lib/idtalg/xc6.c similarity index 100% rename from pkg/stis/calstis/cs6/idtalg/xc6.c rename to pkg/stis/lib/idtalg/xc6.c diff --git a/pkg/stis/calstis/lib/imghistory.c b/pkg/stis/lib/imghistory.c similarity index 100% rename from pkg/stis/calstis/lib/imghistory.c rename to pkg/stis/lib/imghistory.c diff --git a/pkg/stis/calstis/lib/imgpedigree.c b/pkg/stis/lib/imgpedigree.c similarity index 100% rename from pkg/stis/calstis/lib/imgpedigree.c rename to pkg/stis/lib/imgpedigree.c diff --git a/pkg/stis/calstis/lib/initreftab.c b/pkg/stis/lib/initreftab.c similarity index 100% rename from pkg/stis/calstis/lib/initreftab.c rename to pkg/stis/lib/initreftab.c diff --git a/pkg/stis/calstis/lib/interp1d.c b/pkg/stis/lib/interp1d.c similarity index 100% rename from pkg/stis/calstis/lib/interp1d.c rename to pkg/stis/lib/interp1d.c diff --git a/pkg/stis/calstis/lib/interp2d.c b/pkg/stis/lib/interp2d.c similarity index 100% rename from pkg/stis/calstis/lib/interp2d.c rename to pkg/stis/lib/interp2d.c diff --git a/pkg/stis/calstis/lib/key.c b/pkg/stis/lib/key.c similarity index 100% rename from pkg/stis/calstis/lib/key.c rename to pkg/stis/lib/key.c diff --git a/pkg/stis/calstis/lib/median.c b/pkg/stis/lib/median.c similarity index 100% rename from pkg/stis/calstis/lib/median.c rename to pkg/stis/lib/median.c diff --git a/pkg/stis/calstis/lib/mkname.c b/pkg/stis/lib/mkname.c similarity index 100% rename from pkg/stis/calstis/lib/mkname.c rename to pkg/stis/lib/mkname.c diff --git a/pkg/stis/calstis/lib/mkoutname.c b/pkg/stis/lib/mkoutname.c similarity index 100% rename from pkg/stis/calstis/lib/mkoutname.c rename to pkg/stis/lib/mkoutname.c diff --git a/pkg/stis/calstis/lib/mult2d.c b/pkg/stis/lib/mult2d.c similarity index 100% rename from pkg/stis/calstis/lib/mult2d.c rename to pkg/stis/lib/mult2d.c diff --git a/pkg/stis/calstis/lib/multk2d.c b/pkg/stis/lib/multk2d.c similarity index 100% rename from pkg/stis/calstis/lib/multk2d.c rename to pkg/stis/lib/multk2d.c diff --git a/pkg/stis/calstis/lib/omitstep.c b/pkg/stis/lib/omitstep.c similarity index 100% rename from pkg/stis/calstis/lib/omitstep.c rename to pkg/stis/lib/omitstep.c diff --git a/pkg/stis/calstis/lib/orbitaldopp.c b/pkg/stis/lib/orbitaldopp.c similarity index 100% rename from pkg/stis/calstis/lib/orbitaldopp.c rename to pkg/stis/lib/orbitaldopp.c diff --git a/pkg/stis/calstis/lib/prinfo.c b/pkg/stis/lib/prinfo.c similarity index 100% rename from pkg/stis/calstis/lib/prinfo.c rename to pkg/stis/lib/prinfo.c diff --git a/pkg/stis/calstis/lib/pseudoap.c b/pkg/stis/lib/pseudoap.c similarity index 100% rename from pkg/stis/calstis/lib/pseudoap.c rename to pkg/stis/lib/pseudoap.c diff --git a/pkg/stis/calstis/lib/radialvel.c b/pkg/stis/lib/radialvel.c similarity index 100% rename from pkg/stis/calstis/lib/radialvel.c rename to pkg/stis/lib/radialvel.c diff --git a/pkg/stis/calstis/lib/reffiles.c b/pkg/stis/lib/reffiles.c similarity index 100% rename from pkg/stis/calstis/lib/reffiles.c rename to pkg/stis/lib/reffiles.c diff --git a/pkg/stis/calstis/lib/rotatetrace.c b/pkg/stis/lib/rotatetrace.c similarity index 100% rename from pkg/stis/calstis/lib/rotatetrace.c rename to pkg/stis/lib/rotatetrace.c diff --git a/pkg/stis/calstis/lib/rowpedigree.c b/pkg/stis/lib/rowpedigree.c similarity index 100% rename from pkg/stis/calstis/lib/rowpedigree.c rename to pkg/stis/lib/rowpedigree.c diff --git a/pkg/stis/calstis/lib/sameint.c b/pkg/stis/lib/sameint.c similarity index 100% rename from pkg/stis/calstis/lib/sameint.c rename to pkg/stis/lib/sameint.c diff --git a/pkg/stis/calstis/lib/spline.c b/pkg/stis/lib/spline.c similarity index 100% rename from pkg/stis/calstis/lib/spline.c rename to pkg/stis/lib/spline.c diff --git a/pkg/stis/calstis/lib/strcmptail.c b/pkg/stis/lib/strcmptail.c similarity index 100% rename from pkg/stis/calstis/lib/strcmptail.c rename to pkg/stis/lib/strcmptail.c diff --git a/pkg/stis/calstis/lib/streqic.c b/pkg/stis/lib/streqic.c similarity index 100% rename from pkg/stis/calstis/lib/streqic.c rename to pkg/stis/lib/streqic.c diff --git a/pkg/stis/calstis/lib/strtor.c b/pkg/stis/lib/strtor.c similarity index 100% rename from pkg/stis/calstis/lib/strtor.c rename to pkg/stis/lib/strtor.c diff --git a/pkg/stis/calstis/lib/sub2d.c b/pkg/stis/lib/sub2d.c similarity index 100% rename from pkg/stis/calstis/lib/sub2d.c rename to pkg/stis/lib/sub2d.c diff --git a/pkg/stis/calstis/lib/tabhistory.c b/pkg/stis/lib/tabhistory.c similarity index 100% rename from pkg/stis/calstis/lib/tabhistory.c rename to pkg/stis/lib/tabhistory.c diff --git a/pkg/stis/calstis/lib/tabpedigree.c b/pkg/stis/lib/tabpedigree.c similarity index 100% rename from pkg/stis/calstis/lib/tabpedigree.c rename to pkg/stis/lib/tabpedigree.c diff --git a/pkg/stis/calstis/lib/tdscorrect.c b/pkg/stis/lib/tdscorrect.c similarity index 100% rename from pkg/stis/calstis/lib/tdscorrect.c rename to pkg/stis/lib/tdscorrect.c diff --git a/pkg/stis/calstis/lib/timestamp.c b/pkg/stis/lib/timestamp.c similarity index 100% rename from pkg/stis/calstis/lib/timestamp.c rename to pkg/stis/lib/timestamp.c diff --git a/pkg/stis/calstis/lib/ucalver.c b/pkg/stis/lib/ucalver.c similarity index 100% rename from pkg/stis/calstis/lib/ucalver.c rename to pkg/stis/lib/ucalver.c diff --git a/pkg/stis/calstis/lib/ufilename.c b/pkg/stis/lib/ufilename.c similarity index 100% rename from pkg/stis/calstis/lib/ufilename.c rename to pkg/stis/lib/ufilename.c diff --git a/pkg/stis/calstis/lib/unbin2d.c b/pkg/stis/lib/unbin2d.c similarity index 100% rename from pkg/stis/calstis/lib/unbin2d.c rename to pkg/stis/lib/unbin2d.c diff --git a/pkg/stis/calstis/lib/whicherror.c b/pkg/stis/lib/whicherror.c similarity index 100% rename from pkg/stis/calstis/lib/whicherror.c rename to pkg/stis/lib/whicherror.c diff --git a/pkg/stis/calstis/lib/xcfft.c b/pkg/stis/lib/xcfft.c similarity index 100% rename from pkg/stis/calstis/lib/xcfft.c rename to pkg/stis/lib/xcfft.c diff --git a/pkg/stis/calstis/cs0/cs0.c b/pkg/stis/src/cs0.c similarity index 100% rename from pkg/stis/calstis/cs0/cs0.c rename to pkg/stis/src/cs0.c diff --git a/pkg/stis/calstis/cs1/cs1.c b/pkg/stis/src/cs1.c similarity index 100% rename from pkg/stis/calstis/cs1/cs1.c rename to pkg/stis/src/cs1.c diff --git a/pkg/stis/calstis/cs11/cs11.c b/pkg/stis/src/cs11.c similarity index 100% rename from pkg/stis/calstis/cs11/cs11.c rename to pkg/stis/src/cs11.c diff --git a/pkg/stis/calstis/cs12/cs12.c b/pkg/stis/src/cs12.c similarity index 100% rename from pkg/stis/calstis/cs12/cs12.c rename to pkg/stis/src/cs12.c diff --git a/pkg/stis/calstis/cs2/cs2.c b/pkg/stis/src/cs2.c similarity index 100% rename from pkg/stis/calstis/cs2/cs2.c rename to pkg/stis/src/cs2.c diff --git a/pkg/stis/calstis/cs2/cs2_command.c b/pkg/stis/src/cs2_command.c similarity index 91% rename from pkg/stis/calstis/cs2/cs2_command.c rename to pkg/stis/src/cs2_command.c index 2061dc5fb..7e0264ff2 100644 --- a/pkg/stis/calstis/cs2/cs2_command.c +++ b/pkg/stis/src/cs2_command.c @@ -192,27 +192,3 @@ static int syntax_error (char *msg) { return (1); } -void cs2_reset (clpar *par, int newpar[]) -{ - -/* arguments -clpar *par; o: user specified parameters -int newpar; o: parameter been set by the user? -*/ - - /* First, set parameters specifiable in the command line to be - non-existent. */ - par->tbname[0] = '\0'; - par->verbose = 0; - par->printtime = 0; - - newpar[TOTAL] = 0; - newpar[SCALENSE] = 0; - newpar[INITGUES] = 0; - newpar[SKYSUB] = 0; - newpar[CRSIGMAS] = 0; - newpar[CRRADIUS] = 0; - newpar[CRTHRESH] = 0; - newpar[BADINPDQ] = 0; - newpar[CRMASK] = 0; -} diff --git a/pkg/stis/calstis/cs4/cs4.c b/pkg/stis/src/cs4.c similarity index 100% rename from pkg/stis/calstis/cs4/cs4.c rename to pkg/stis/src/cs4.c diff --git a/pkg/stis/calstis/cs6/cs6.c b/pkg/stis/src/cs6.c similarity index 100% rename from pkg/stis/calstis/cs6/cs6.c rename to pkg/stis/src/cs6.c diff --git a/pkg/stis/calstis/cs7/cs7.c b/pkg/stis/src/cs7.c similarity index 100% rename from pkg/stis/calstis/cs7/cs7.c rename to pkg/stis/src/cs7.c diff --git a/pkg/stis/calstis/cs8/cs8.c b/pkg/stis/src/cs8.c similarity index 100% rename from pkg/stis/calstis/cs8/cs8.c rename to pkg/stis/src/cs8.c diff --git a/pkg/stis/wscript b/pkg/stis/wscript deleted file mode 100644 index 8abc6a070..000000000 --- a/pkg/stis/wscript +++ /dev/null @@ -1,17 +0,0 @@ -# vim: set syntax=python: - -LIBRARIES = [ - 'calstis' - ] - -def build(bld): - for library in LIBRARIES: - bld.recurse(library) - - bld(name='stis', - depends_on=[ - 'cs0.e', - 'cs1.e', - 'cs2.e', - 'cs6.e'], - always=True) diff --git a/pkg/wfc3/CMakeLists.txt b/pkg/wfc3/CMakeLists.txt new file mode 100644 index 000000000..8935e8ce3 --- /dev/null +++ b/pkg/wfc3/CMakeLists.txt @@ -0,0 +1,115 @@ +project(wf3_top) +add_subdirectory(lib) + +project(wf32d) +add_executable(${PROJECT_NAME} + src/main2d.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC wf3 +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(wf3ccd) +add_executable(${PROJECT_NAME} + src/mainccd.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC wf3 +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(wf3cte) +add_executable(${PROJECT_NAME} + src/maincte.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC wf3 + PUBLIC ctegen2 + PUBLIC hstcalib +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(wf3ir) +add_executable(${PROJECT_NAME} + src/mainir.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC wf3 +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(wf3rej) +add_executable(${PROJECT_NAME} + src/mainrej.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC wf3 +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(wf3sum) +add_executable(${PROJECT_NAME} + src/mainsum.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC wf3 +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) + + +project(calwf3) +add_executable(${PROJECT_NAME} + src/mainwf3.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC wf3 +) +install(TARGETS ${PROJECT_NAME} + DESTINATION bin +) diff --git a/pkg/wfc3/calwf3/Dates b/pkg/wfc3/Dates similarity index 100% rename from pkg/wfc3/calwf3/Dates rename to pkg/wfc3/Dates diff --git a/pkg/wfc3/calwf3/History b/pkg/wfc3/History similarity index 100% rename from pkg/wfc3/calwf3/History rename to pkg/wfc3/History diff --git a/pkg/wfc3/calwf3/Updates b/pkg/wfc3/Updates similarity index 100% rename from pkg/wfc3/calwf3/Updates rename to pkg/wfc3/Updates diff --git a/pkg/wfc3/calwf3/calwf3/wscript b/pkg/wfc3/calwf3/calwf3/wscript deleted file mode 100644 index e176311a3..000000000 --- a/pkg/wfc3/calwf3/calwf3/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'calwf3.e', - source = 'wf3main.c', - target = 'calwf3.e', - use = ['hstcallib', 'calwf3', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/wfc3/calwf3/lib/wscript b/pkg/wfc3/calwf3/lib/wscript deleted file mode 100644 index e568b30d4..000000000 --- a/pkg/wfc3/calwf3/lib/wscript +++ /dev/null @@ -1,69 +0,0 @@ -# vim: set syntax=python: - -# The files that make up calwf3.a are distributed amongst the -# various wf3* directories. - -def build(bld): - t = bld.stlib( - source = """ - wf3hist.c wf3info.c wf3sect.c addk2d.c bin2d.c bincoords.c - binupdate.c comparenum.c computelimits.c defswitch.c detchip.c - detnsegn.c div1d.c dodqi.c donoise.c dostat.c - err.c fileexists.c findbin.c findroot.c fromlt.c - getccdtab.c getcorner.c getgrp.c getkeys.c getlt.c - getrefname.c getswitch.c gotfilename.c - imghistory.c imgpedigree.c initmulti.c interp1d.c - interpinfo.c key.c loadhead.c logprogress.c lowcase.c - median.c mkname.c mkoutname.c mkspt.c mult1d.c - multk1d.c multk2d.c omitstep.c parseamps.c - prinfo.c reffiles.c rowpedigree.c sameint.c spline.c - streqic.c subtools.c sub1d.c tabhistory.c tabpedigree.c - timestamp.c trim.c ucalver.c ufilename.c - unbin2d.c unbinline.c whicherror.c razutil.c - - ../wf32d/wf32d.c ../wf32d/do2d.c ../wf32d/dodark.c - ../wf32d/doflat.c ../wf32d/dophot.c ../wf32d/doflux.c - ../wf32d/doshad.c ../wf32d/get2dflags.c - ../wf32d/photmode.c ../wf32d/sanity2d.c - - ../wf3ccd/wf3ccd.c ../wf3ccd/blevdrift.c ../wf3ccd/blevfit.c - ../wf3ccd/doatod.c ../wf3ccd/dobias.c ../wf3ccd/doblev.c - ../wf3ccd/doccd.c ../wf3ccd/doflash.c ../wf3ccd/findblev.c - ../wf3ccd/findover.c ../wf3ccd/getflags.c - ../wf3ccd/getccdsw.c ../wf3ccd/sink.c ../wf3ccd/dofwsat.c - - ../wf3ir/blevcorr.c ../wf3ir/cridcalc.c ../wf3ir/darkcorr.c - ../wf3ir/doir.c ../wf3ir/dqicorr.c ../wf3ir/flatcorr.c - ../wf3ir/getirflags.c ../wf3ir/getirsw.c ../wf3ir/groupinfo.c - ../wf3ir/imageio.c ../wf3ir/irhist.c ../wf3ir/math.c - ../wf3ir/nlincorr.c ../wf3ir/noiscalc.c ../wf3ir/numrec.c - ../wf3ir/photcalc.c ../wf3ir/pixcheck.c ../wf3ir/refdata.c - ../wf3ir/resistmean.c ../wf3ir/satcheck.c ../wf3ir/statcalc.c - ../wf3ir/stats.c ../wf3ir/unitcorr.c ../wf3ir/updatehdr.c - ../wf3ir/wf3ir.c ../wf3ir/zoffcorr.c ../wf3ir/zsigcorr.c - - ../wf3rej/wf3rej.c ../wf3rej/rej_check.c - ../wf3rej/rej_do.c ../wf3rej/rej_init.c - ../wf3rej/rej_loop.c ../wf3rej/rej_sky.c - ../wf3rej/cr_history.c ../wf3rej/cr_mode.c - ../wf3rej/cr_scaling.c - ../wf3rej/piksrt.c ../wf3rej/readpar.c ../wf3rej/rej_command.c - - ../wf3sum/wf3sum.c - - ../calwf3/calwf3.c ../calwf3/getinfo.c ../calwf3/getnewref.c - ../calwf3/getreffiles.c ../calwf3/getswitches.c - ../calwf3/procccd.c ../calwf3/procir.c ../calwf3/refexist.c - ../calwf3/wf3dth.c ../calwf3/wf3init.c ../calwf3/wf3member.c - ../calwf3/wf3table.c - - ../wf3cte/wf3cte.c ../wf3cte/getctepars.c ../wf3cte/cte_dobias.c - ../wf3cte/getcteflags.c ../wf3cte/getctesw.c - - """, - target = 'calwf3', - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib', - use = ['hstcallib', 'CFITSIO','OPENMP'], - includes = ['../include'], - export_includes = ['../include'] - ) diff --git a/pkg/wfc3/calwf3/wf32d/wscript b/pkg/wfc3/calwf3/wf32d/wscript deleted file mode 100644 index f8317b985..000000000 --- a/pkg/wfc3/calwf3/wf32d/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'wf32d.e', - source = 'main2d.c', - target = 'wf32d.e', - use = ['hstcallib', 'calwf3', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/wfc3/calwf3/wf3ccd/wscript b/pkg/wfc3/calwf3/wf3ccd/wscript deleted file mode 100644 index cc09c487c..000000000 --- a/pkg/wfc3/calwf3/wf3ccd/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'wf3ccd.e', - source = 'mainccd.c', - target = 'wf3ccd.e', - use = ['hstcallib', 'calwf3', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/wfc3/calwf3/wf3cte/wscript b/pkg/wfc3/calwf3/wf3cte/wscript deleted file mode 100644 index 093b23889..000000000 --- a/pkg/wfc3/calwf3/wf3cte/wscript +++ /dev/null @@ -1,12 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - source = 'maincte.c', - target = 'wf3cte.e', - use = ['hstcallib', 'calwf3', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/wfc3/calwf3/wf3ir/wscript b/pkg/wfc3/calwf3/wf3ir/wscript deleted file mode 100644 index 54c4b56bc..000000000 --- a/pkg/wfc3/calwf3/wf3ir/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'wf3ir.e', - source = 'mainir.c', - target = 'wf3ir.e', - use = ['hstcallib', 'calwf3', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/wfc3/calwf3/wf3rej/rej.h b/pkg/wfc3/calwf3/wf3rej/rej.h deleted file mode 100644 index c4854bd03..000000000 --- a/pkg/wfc3/calwf3/wf3rej/rej.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef INCL_REJ_H -#define INCL_REJ_H - -# include "c_iraf.h" -# include "ximio.h" - -# define MAX_ITER 20 -# define MAX_FILES 120 - -# define MAX_NEXP 3 -# define NONEXIST -10000. - -# define IM_MAXDIM 7 - -# define PIX(v,i,j,nx) v[(i) + (j) * (nx)] -# define SQ(x) ((x) * (x)) - - -#endif /* INCL_REJ_H */ diff --git a/pkg/wfc3/calwf3/wf3rej/wscript b/pkg/wfc3/calwf3/wf3rej/wscript deleted file mode 100644 index 61425eaf4..000000000 --- a/pkg/wfc3/calwf3/wf3rej/wscript +++ /dev/null @@ -1,13 +0,0 @@ -# vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'wf3rej.e', - source = 'mainrej.c', - target = 'wf3rej.e', - use = ['hstcallib', 'calwf3', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/wfc3/calwf3/wf3sum/wscript b/pkg/wfc3/calwf3/wf3sum/wscript deleted file mode 100644 index d2dd0fd3e..000000000 --- a/pkg/wfc3/calwf3/wf3sum/wscript +++ /dev/null @@ -1,13 +0,0 @@ -#vim: set syntax=python: - -def build(bld): - t = bld.program( - name = 'wf3sum.e', - source = 'mainsum.c', - target = 'wf3sum.e', - use = ['hstcallib', 'calwf3', 'imphttab'] + bld.env.LOCAL_LIBS, - lib = bld.env.EXTERNAL_LIBS, - libpath = bld.env.LIBPATH, - rpath=bld.env.LIBPATH_CFITSIO, - install_path = '${PREFIX}/bin' - ) diff --git a/pkg/wfc3/calwf3/wscript b/pkg/wfc3/calwf3/wscript deleted file mode 100644 index f3ce4497a..000000000 --- a/pkg/wfc3/calwf3/wscript +++ /dev/null @@ -1,27 +0,0 @@ -# vim: set syntax=python: - -SUBDIRS = [ - 'lib', - 'calwf3', - 'wf3ccd', - 'wf3rej', - 'wf3cte', - 'wf3ir', - 'wf32d', - 'wf3sum', - ] - -def build(bld): - for subdir in SUBDIRS: - bld.recurse(subdir) - - bld(name='wf3', - depends_on=[ - 'calwf3.e', - 'wf3ccd.e', - 'wf3rej.e', - 'wf3cte.e', - 'wf3ir.e', - 'wf32d.e', - 'wf3sum.e'], - always=True) diff --git a/pkg/wfc3/calwf3/calwf3/calwf3.h b/pkg/wfc3/include/calwf3.h similarity index 100% rename from pkg/wfc3/calwf3/calwf3/calwf3.h rename to pkg/wfc3/include/calwf3.h diff --git a/pkg/wfc3/calwf3/wf3cte/cte.h b/pkg/wfc3/include/cte.h similarity index 100% rename from pkg/wfc3/calwf3/wf3cte/cte.h rename to pkg/wfc3/include/cte.h diff --git a/pkg/wfc3/calwf3/wf3ccd/doccd.h b/pkg/wfc3/include/doccd.h similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/doccd.h rename to pkg/wfc3/include/doccd.h diff --git a/pkg/wfc3/calwf3/include/msg.h b/pkg/wfc3/include/msg.h similarity index 100% rename from pkg/wfc3/calwf3/include/msg.h rename to pkg/wfc3/include/msg.h diff --git a/pkg/wfc3/calwf3/wf3ir/rej.h b/pkg/wfc3/include/rej.h similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/rej.h rename to pkg/wfc3/include/rej.h diff --git a/pkg/wfc3/calwf3/include/wf3.h b/pkg/wfc3/include/wf3.h similarity index 100% rename from pkg/wfc3/calwf3/include/wf3.h rename to pkg/wfc3/include/wf3.h diff --git a/pkg/wfc3/calwf3/calwf3/wf3asn.h b/pkg/wfc3/include/wf3asn.h similarity index 100% rename from pkg/wfc3/calwf3/calwf3/wf3asn.h rename to pkg/wfc3/include/wf3asn.h diff --git a/pkg/wfc3/calwf3/include/wf3corr.h b/pkg/wfc3/include/wf3corr.h similarity index 100% rename from pkg/wfc3/calwf3/include/wf3corr.h rename to pkg/wfc3/include/wf3corr.h diff --git a/pkg/wfc3/calwf3/include/wf3dq.h b/pkg/wfc3/include/wf3dq.h similarity index 100% rename from pkg/wfc3/calwf3/include/wf3dq.h rename to pkg/wfc3/include/wf3dq.h diff --git a/pkg/wfc3/calwf3/include/wf3info.h b/pkg/wfc3/include/wf3info.h similarity index 100% rename from pkg/wfc3/calwf3/include/wf3info.h rename to pkg/wfc3/include/wf3info.h diff --git a/pkg/wfc3/calwf3/include/wf3omit.h b/pkg/wfc3/include/wf3omit.h similarity index 100% rename from pkg/wfc3/calwf3/include/wf3omit.h rename to pkg/wfc3/include/wf3omit.h diff --git a/pkg/wfc3/calwf3/include/wf3rej.h b/pkg/wfc3/include/wf3rej.h similarity index 100% rename from pkg/wfc3/calwf3/include/wf3rej.h rename to pkg/wfc3/include/wf3rej.h diff --git a/pkg/wfc3/calwf3/wf3sum/wf3sum.h b/pkg/wfc3/include/wf3sum.h similarity index 100% rename from pkg/wfc3/calwf3/wf3sum/wf3sum.h rename to pkg/wfc3/include/wf3sum.h diff --git a/pkg/wfc3/calwf3/include/wf3version.h b/pkg/wfc3/include/wf3version.h similarity index 100% rename from pkg/wfc3/calwf3/include/wf3version.h rename to pkg/wfc3/include/wf3version.h diff --git a/pkg/wfc3/calwf3/include/wf3wild.h b/pkg/wfc3/include/wf3wild.h similarity index 100% rename from pkg/wfc3/calwf3/include/wf3wild.h rename to pkg/wfc3/include/wf3wild.h diff --git a/pkg/wfc3/lib/CMakeLists.txt b/pkg/wfc3/lib/CMakeLists.txt new file mode 100644 index 000000000..d8eda5fdd --- /dev/null +++ b/pkg/wfc3/lib/CMakeLists.txt @@ -0,0 +1,166 @@ +project(wf3) +add_library(${PROJECT_NAME} SHARED + addk2d.c + bin2d.c + bincoords.c + binupdate.c + calwf3/calwf3.c + calwf3/getinfo.c + calwf3/getnewref.c + calwf3/getreffiles.c + calwf3/getswitches.c + calwf3/procccd.c + calwf3/procir.c + calwf3/refexist.c + calwf3/wf3dth.c + calwf3/wf3init.c + calwf3/wf3member.c + calwf3/wf3table.c + comparenum.c + computelimits.c + defswitch.c + detchip.c + detnsegn.c + div1d.c + dodqi.c + donoise.c + dostat.c + err.c + fileexists.c + findbin.c + findroot.c + fromlt.c + getccdtab.c + getcorner.c + getgrp.c + getkeys.c + getlt.c + getrefname.c + getswitch.c + gotfilename.c + imghistory.c + imgpedigree.c + initmulti.c + interp1d.c + interpinfo.c + key.c + loadhead.c + logprogress.c + lowcase.c + median.c + mkname.c + mkoutname.c + mkspt.c + mult1d.c + multk1d.c + multk2d.c + omitstep.c + parseamps.c + prinfo.c + razutil.c + reffiles.c + rowpedigree.c + sameint.c + spline.c + streqic.c + sub1d.c + subtools.c + tabhistory.c + tabpedigree.c + timestamp.c + trim.c + ucalver.c + ufilename.c + unbin2d.c + unbinline.c + wf32d/do2d.c + wf32d/dodark.c + wf32d/doflat.c + wf32d/doflux.c + wf32d/dophot.c + wf32d/doshad.c + wf32d/get2dflags.c + #wf32d/get2dsw.c # ... what? + wf32d/photmode.c + wf32d/sanity2d.c + wf32d/wf32d.c + wf3ccd/blevdrift.c + wf3ccd/blevfit.c + wf3ccd/doatod.c + wf3ccd/dobias.c + wf3ccd/doblev.c + wf3ccd/doccd.c + wf3ccd/doflash.c + wf3ccd/dofwsat.c + wf3ccd/findblev.c + wf3ccd/findover.c + wf3ccd/getccdsw.c + wf3ccd/getflags.c + wf3ccd/sink.c + wf3ccd/wf3ccd.c + wf3cte/cte_dobias.c + wf3cte/getcteflags.c + wf3cte/getctepars.c + wf3cte/getctesw.c + wf3cte/wf3cte.c + wf3hist.c + wf3info.c + wf3ir/blevcorr.c + wf3ir/cridcalc.c + wf3ir/darkcorr.c + wf3ir/doir.c + wf3ir/dqicorr.c + wf3ir/flatcorr.c + wf3ir/getirflags.c + wf3ir/getirsw.c + wf3ir/groupinfo.c + wf3ir/imageio.c + wf3ir/irhist.c + wf3ir/math.c + wf3ir/nlincorr.c + wf3ir/noiscalc.c + wf3ir/numrec.c + wf3ir/photcalc.c + wf3ir/pixcheck.c + wf3ir/refdata.c + wf3ir/resistmean.c + wf3ir/satcheck.c + wf3ir/statcalc.c + wf3ir/stats.c + wf3ir/unitcorr.c + wf3ir/updatehdr.c + wf3ir/wf3ir.c + wf3ir/zoffcorr.c + wf3ir/zsigcorr.c + wf3rej/cr_history.c + wf3rej/cr_mode.c + wf3rej/cr_scaling.c + wf3rej/piksrt.c + wf3rej/readpar.c + wf3rej/rej_check.c + wf3rej/rej_command.c + wf3rej/rej_do.c + wf3rej/rej_init.c + wf3rej/rej_loop.c + wf3rej/rej_sky.c + wf3rej/wf3rej.c + wf3sect.c + wf3sum/wf3sum.c + whicherror.c +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${PROJECT_NAME_INCLUDE_DIR} + PUBLIC ${PROJECT_SOURCE_DIR}/../include +) +target_link_libraries(${PROJECT_NAME} + PUBLIC ctegen2 + PUBLIC hstcalib +) +set_target_properties(${PROJECT_NAME} + PROPERTIES + OUTPUT_NAME hst${PROJECT_NAME} +) +install(TARGETS ${PROJECT_NAME} + DESTINATION lib +) diff --git a/pkg/wfc3/calwf3/lib/README b/pkg/wfc3/lib/README similarity index 100% rename from pkg/wfc3/calwf3/lib/README rename to pkg/wfc3/lib/README diff --git a/pkg/wfc3/calwf3/lib/addk2d.c b/pkg/wfc3/lib/addk2d.c similarity index 100% rename from pkg/wfc3/calwf3/lib/addk2d.c rename to pkg/wfc3/lib/addk2d.c diff --git a/pkg/wfc3/calwf3/lib/bin2d.c b/pkg/wfc3/lib/bin2d.c similarity index 100% rename from pkg/wfc3/calwf3/lib/bin2d.c rename to pkg/wfc3/lib/bin2d.c diff --git a/pkg/wfc3/calwf3/lib/bincoords.c b/pkg/wfc3/lib/bincoords.c similarity index 100% rename from pkg/wfc3/calwf3/lib/bincoords.c rename to pkg/wfc3/lib/bincoords.c diff --git a/pkg/wfc3/calwf3/lib/binupdate.c b/pkg/wfc3/lib/binupdate.c similarity index 100% rename from pkg/wfc3/calwf3/lib/binupdate.c rename to pkg/wfc3/lib/binupdate.c diff --git a/pkg/wfc3/calwf3/calwf3/calwf3.c b/pkg/wfc3/lib/calwf3/calwf3.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/calwf3.c rename to pkg/wfc3/lib/calwf3/calwf3.c diff --git a/pkg/wfc3/calwf3/calwf3/getinfo.c b/pkg/wfc3/lib/calwf3/getinfo.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/getinfo.c rename to pkg/wfc3/lib/calwf3/getinfo.c diff --git a/pkg/wfc3/calwf3/calwf3/getnewref.c b/pkg/wfc3/lib/calwf3/getnewref.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/getnewref.c rename to pkg/wfc3/lib/calwf3/getnewref.c diff --git a/pkg/wfc3/calwf3/calwf3/getreffiles.c b/pkg/wfc3/lib/calwf3/getreffiles.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/getreffiles.c rename to pkg/wfc3/lib/calwf3/getreffiles.c diff --git a/pkg/wfc3/calwf3/calwf3/getswitches.c b/pkg/wfc3/lib/calwf3/getswitches.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/getswitches.c rename to pkg/wfc3/lib/calwf3/getswitches.c diff --git a/pkg/wfc3/calwf3/calwf3/procccd.c b/pkg/wfc3/lib/calwf3/procccd.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/procccd.c rename to pkg/wfc3/lib/calwf3/procccd.c diff --git a/pkg/wfc3/calwf3/calwf3/procir.c b/pkg/wfc3/lib/calwf3/procir.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/procir.c rename to pkg/wfc3/lib/calwf3/procir.c diff --git a/pkg/wfc3/calwf3/calwf3/refexist.c b/pkg/wfc3/lib/calwf3/refexist.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/refexist.c rename to pkg/wfc3/lib/calwf3/refexist.c diff --git a/pkg/wfc3/calwf3/calwf3/wf3dth.c b/pkg/wfc3/lib/calwf3/wf3dth.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/wf3dth.c rename to pkg/wfc3/lib/calwf3/wf3dth.c diff --git a/pkg/wfc3/calwf3/calwf3/wf3init.c b/pkg/wfc3/lib/calwf3/wf3init.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/wf3init.c rename to pkg/wfc3/lib/calwf3/wf3init.c diff --git a/pkg/wfc3/calwf3/calwf3/wf3member.c b/pkg/wfc3/lib/calwf3/wf3member.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/wf3member.c rename to pkg/wfc3/lib/calwf3/wf3member.c diff --git a/pkg/wfc3/calwf3/calwf3/wf3table.c b/pkg/wfc3/lib/calwf3/wf3table.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/wf3table.c rename to pkg/wfc3/lib/calwf3/wf3table.c diff --git a/pkg/wfc3/calwf3/lib/comparenum.c b/pkg/wfc3/lib/comparenum.c similarity index 100% rename from pkg/wfc3/calwf3/lib/comparenum.c rename to pkg/wfc3/lib/comparenum.c diff --git a/pkg/wfc3/calwf3/lib/computelimits.c b/pkg/wfc3/lib/computelimits.c similarity index 100% rename from pkg/wfc3/calwf3/lib/computelimits.c rename to pkg/wfc3/lib/computelimits.c diff --git a/pkg/wfc3/calwf3/lib/defswitch.c b/pkg/wfc3/lib/defswitch.c similarity index 100% rename from pkg/wfc3/calwf3/lib/defswitch.c rename to pkg/wfc3/lib/defswitch.c diff --git a/pkg/wfc3/calwf3/lib/detchip.c b/pkg/wfc3/lib/detchip.c similarity index 100% rename from pkg/wfc3/calwf3/lib/detchip.c rename to pkg/wfc3/lib/detchip.c diff --git a/pkg/wfc3/calwf3/lib/detnsegn.c b/pkg/wfc3/lib/detnsegn.c similarity index 100% rename from pkg/wfc3/calwf3/lib/detnsegn.c rename to pkg/wfc3/lib/detnsegn.c diff --git a/pkg/wfc3/calwf3/lib/div1d.c b/pkg/wfc3/lib/div1d.c similarity index 100% rename from pkg/wfc3/calwf3/lib/div1d.c rename to pkg/wfc3/lib/div1d.c diff --git a/pkg/wfc3/calwf3/lib/dodqi.c b/pkg/wfc3/lib/dodqi.c similarity index 100% rename from pkg/wfc3/calwf3/lib/dodqi.c rename to pkg/wfc3/lib/dodqi.c diff --git a/pkg/wfc3/calwf3/lib/donoise.c b/pkg/wfc3/lib/donoise.c similarity index 100% rename from pkg/wfc3/calwf3/lib/donoise.c rename to pkg/wfc3/lib/donoise.c diff --git a/pkg/wfc3/calwf3/lib/dostat.c b/pkg/wfc3/lib/dostat.c similarity index 100% rename from pkg/wfc3/calwf3/lib/dostat.c rename to pkg/wfc3/lib/dostat.c diff --git a/pkg/wfc3/calwf3/lib/err.c b/pkg/wfc3/lib/err.c similarity index 100% rename from pkg/wfc3/calwf3/lib/err.c rename to pkg/wfc3/lib/err.c diff --git a/pkg/wfc3/calwf3/lib/fileexists.c b/pkg/wfc3/lib/fileexists.c similarity index 100% rename from pkg/wfc3/calwf3/lib/fileexists.c rename to pkg/wfc3/lib/fileexists.c diff --git a/pkg/wfc3/calwf3/lib/findbin.c b/pkg/wfc3/lib/findbin.c similarity index 100% rename from pkg/wfc3/calwf3/lib/findbin.c rename to pkg/wfc3/lib/findbin.c diff --git a/pkg/wfc3/calwf3/lib/findroot.c b/pkg/wfc3/lib/findroot.c similarity index 100% rename from pkg/wfc3/calwf3/lib/findroot.c rename to pkg/wfc3/lib/findroot.c diff --git a/pkg/wfc3/calwf3/lib/fromlt.c b/pkg/wfc3/lib/fromlt.c similarity index 100% rename from pkg/wfc3/calwf3/lib/fromlt.c rename to pkg/wfc3/lib/fromlt.c diff --git a/pkg/wfc3/calwf3/lib/getccdtab.c b/pkg/wfc3/lib/getccdtab.c similarity index 100% rename from pkg/wfc3/calwf3/lib/getccdtab.c rename to pkg/wfc3/lib/getccdtab.c diff --git a/pkg/wfc3/calwf3/lib/getcorner.c b/pkg/wfc3/lib/getcorner.c similarity index 100% rename from pkg/wfc3/calwf3/lib/getcorner.c rename to pkg/wfc3/lib/getcorner.c diff --git a/pkg/wfc3/calwf3/lib/getgrp.c b/pkg/wfc3/lib/getgrp.c similarity index 100% rename from pkg/wfc3/calwf3/lib/getgrp.c rename to pkg/wfc3/lib/getgrp.c diff --git a/pkg/wfc3/calwf3/lib/getkeys.c b/pkg/wfc3/lib/getkeys.c similarity index 100% rename from pkg/wfc3/calwf3/lib/getkeys.c rename to pkg/wfc3/lib/getkeys.c diff --git a/pkg/wfc3/calwf3/lib/getlt.c b/pkg/wfc3/lib/getlt.c similarity index 100% rename from pkg/wfc3/calwf3/lib/getlt.c rename to pkg/wfc3/lib/getlt.c diff --git a/pkg/wfc3/calwf3/lib/getrefname.c b/pkg/wfc3/lib/getrefname.c similarity index 100% rename from pkg/wfc3/calwf3/lib/getrefname.c rename to pkg/wfc3/lib/getrefname.c diff --git a/pkg/wfc3/calwf3/lib/getswitch.c b/pkg/wfc3/lib/getswitch.c similarity index 100% rename from pkg/wfc3/calwf3/lib/getswitch.c rename to pkg/wfc3/lib/getswitch.c diff --git a/pkg/wfc3/calwf3/lib/gotfilename.c b/pkg/wfc3/lib/gotfilename.c similarity index 100% rename from pkg/wfc3/calwf3/lib/gotfilename.c rename to pkg/wfc3/lib/gotfilename.c diff --git a/pkg/wfc3/calwf3/lib/imghistory.c b/pkg/wfc3/lib/imghistory.c similarity index 100% rename from pkg/wfc3/calwf3/lib/imghistory.c rename to pkg/wfc3/lib/imghistory.c diff --git a/pkg/wfc3/calwf3/lib/imgpedigree.c b/pkg/wfc3/lib/imgpedigree.c similarity index 100% rename from pkg/wfc3/calwf3/lib/imgpedigree.c rename to pkg/wfc3/lib/imgpedigree.c diff --git a/pkg/wfc3/calwf3/lib/initmulti.c b/pkg/wfc3/lib/initmulti.c similarity index 100% rename from pkg/wfc3/calwf3/lib/initmulti.c rename to pkg/wfc3/lib/initmulti.c diff --git a/pkg/wfc3/calwf3/lib/interp1d.c b/pkg/wfc3/lib/interp1d.c similarity index 100% rename from pkg/wfc3/calwf3/lib/interp1d.c rename to pkg/wfc3/lib/interp1d.c diff --git a/pkg/wfc3/calwf3/lib/interpinfo.c b/pkg/wfc3/lib/interpinfo.c similarity index 100% rename from pkg/wfc3/calwf3/lib/interpinfo.c rename to pkg/wfc3/lib/interpinfo.c diff --git a/pkg/wfc3/calwf3/lib/key.c b/pkg/wfc3/lib/key.c similarity index 100% rename from pkg/wfc3/calwf3/lib/key.c rename to pkg/wfc3/lib/key.c diff --git a/pkg/wfc3/calwf3/lib/loadhead.c b/pkg/wfc3/lib/loadhead.c similarity index 100% rename from pkg/wfc3/calwf3/lib/loadhead.c rename to pkg/wfc3/lib/loadhead.c diff --git a/pkg/wfc3/calwf3/lib/logprogress.c b/pkg/wfc3/lib/logprogress.c similarity index 100% rename from pkg/wfc3/calwf3/lib/logprogress.c rename to pkg/wfc3/lib/logprogress.c diff --git a/pkg/wfc3/calwf3/lib/lowcase.c b/pkg/wfc3/lib/lowcase.c similarity index 100% rename from pkg/wfc3/calwf3/lib/lowcase.c rename to pkg/wfc3/lib/lowcase.c diff --git a/pkg/wfc3/calwf3/lib/median.c b/pkg/wfc3/lib/median.c similarity index 100% rename from pkg/wfc3/calwf3/lib/median.c rename to pkg/wfc3/lib/median.c diff --git a/pkg/wfc3/calwf3/lib/mkname.c b/pkg/wfc3/lib/mkname.c similarity index 100% rename from pkg/wfc3/calwf3/lib/mkname.c rename to pkg/wfc3/lib/mkname.c diff --git a/pkg/wfc3/calwf3/lib/mkoutname.c b/pkg/wfc3/lib/mkoutname.c similarity index 100% rename from pkg/wfc3/calwf3/lib/mkoutname.c rename to pkg/wfc3/lib/mkoutname.c diff --git a/pkg/wfc3/calwf3/lib/mkspt.c b/pkg/wfc3/lib/mkspt.c similarity index 100% rename from pkg/wfc3/calwf3/lib/mkspt.c rename to pkg/wfc3/lib/mkspt.c diff --git a/pkg/wfc3/calwf3/lib/mult1d.c b/pkg/wfc3/lib/mult1d.c similarity index 100% rename from pkg/wfc3/calwf3/lib/mult1d.c rename to pkg/wfc3/lib/mult1d.c diff --git a/pkg/wfc3/calwf3/lib/multk1d.c b/pkg/wfc3/lib/multk1d.c similarity index 100% rename from pkg/wfc3/calwf3/lib/multk1d.c rename to pkg/wfc3/lib/multk1d.c diff --git a/pkg/wfc3/calwf3/lib/multk2d.c b/pkg/wfc3/lib/multk2d.c similarity index 100% rename from pkg/wfc3/calwf3/lib/multk2d.c rename to pkg/wfc3/lib/multk2d.c diff --git a/pkg/wfc3/calwf3/lib/omitstep.c b/pkg/wfc3/lib/omitstep.c similarity index 100% rename from pkg/wfc3/calwf3/lib/omitstep.c rename to pkg/wfc3/lib/omitstep.c diff --git a/pkg/wfc3/calwf3/lib/parseamps.c b/pkg/wfc3/lib/parseamps.c similarity index 100% rename from pkg/wfc3/calwf3/lib/parseamps.c rename to pkg/wfc3/lib/parseamps.c diff --git a/pkg/wfc3/calwf3/lib/prinfo.c b/pkg/wfc3/lib/prinfo.c similarity index 100% rename from pkg/wfc3/calwf3/lib/prinfo.c rename to pkg/wfc3/lib/prinfo.c diff --git a/pkg/wfc3/calwf3/lib/razutil.c b/pkg/wfc3/lib/razutil.c similarity index 100% rename from pkg/wfc3/calwf3/lib/razutil.c rename to pkg/wfc3/lib/razutil.c diff --git a/pkg/wfc3/calwf3/lib/reffiles.c b/pkg/wfc3/lib/reffiles.c similarity index 100% rename from pkg/wfc3/calwf3/lib/reffiles.c rename to pkg/wfc3/lib/reffiles.c diff --git a/pkg/wfc3/calwf3/lib/rowpedigree.c b/pkg/wfc3/lib/rowpedigree.c similarity index 100% rename from pkg/wfc3/calwf3/lib/rowpedigree.c rename to pkg/wfc3/lib/rowpedigree.c diff --git a/pkg/wfc3/calwf3/lib/sameint.c b/pkg/wfc3/lib/sameint.c similarity index 100% rename from pkg/wfc3/calwf3/lib/sameint.c rename to pkg/wfc3/lib/sameint.c diff --git a/pkg/wfc3/calwf3/lib/spline.c b/pkg/wfc3/lib/spline.c similarity index 100% rename from pkg/wfc3/calwf3/lib/spline.c rename to pkg/wfc3/lib/spline.c diff --git a/pkg/wfc3/calwf3/lib/streqic.c b/pkg/wfc3/lib/streqic.c similarity index 100% rename from pkg/wfc3/calwf3/lib/streqic.c rename to pkg/wfc3/lib/streqic.c diff --git a/pkg/wfc3/calwf3/lib/sub1d.c b/pkg/wfc3/lib/sub1d.c similarity index 100% rename from pkg/wfc3/calwf3/lib/sub1d.c rename to pkg/wfc3/lib/sub1d.c diff --git a/pkg/wfc3/calwf3/lib/subtools.c b/pkg/wfc3/lib/subtools.c similarity index 100% rename from pkg/wfc3/calwf3/lib/subtools.c rename to pkg/wfc3/lib/subtools.c diff --git a/pkg/wfc3/calwf3/lib/tabhistory.c b/pkg/wfc3/lib/tabhistory.c similarity index 100% rename from pkg/wfc3/calwf3/lib/tabhistory.c rename to pkg/wfc3/lib/tabhistory.c diff --git a/pkg/wfc3/calwf3/lib/tabpedigree.c b/pkg/wfc3/lib/tabpedigree.c similarity index 100% rename from pkg/wfc3/calwf3/lib/tabpedigree.c rename to pkg/wfc3/lib/tabpedigree.c diff --git a/pkg/wfc3/calwf3/lib/timestamp.c b/pkg/wfc3/lib/timestamp.c similarity index 100% rename from pkg/wfc3/calwf3/lib/timestamp.c rename to pkg/wfc3/lib/timestamp.c diff --git a/pkg/wfc3/calwf3/lib/trim.c b/pkg/wfc3/lib/trim.c similarity index 100% rename from pkg/wfc3/calwf3/lib/trim.c rename to pkg/wfc3/lib/trim.c diff --git a/pkg/wfc3/calwf3/lib/ucalver.c b/pkg/wfc3/lib/ucalver.c similarity index 100% rename from pkg/wfc3/calwf3/lib/ucalver.c rename to pkg/wfc3/lib/ucalver.c diff --git a/pkg/wfc3/calwf3/lib/ufilename.c b/pkg/wfc3/lib/ufilename.c similarity index 100% rename from pkg/wfc3/calwf3/lib/ufilename.c rename to pkg/wfc3/lib/ufilename.c diff --git a/pkg/wfc3/calwf3/lib/unbin2d.c b/pkg/wfc3/lib/unbin2d.c similarity index 100% rename from pkg/wfc3/calwf3/lib/unbin2d.c rename to pkg/wfc3/lib/unbin2d.c diff --git a/pkg/wfc3/calwf3/lib/unbinline.c b/pkg/wfc3/lib/unbinline.c similarity index 100% rename from pkg/wfc3/calwf3/lib/unbinline.c rename to pkg/wfc3/lib/unbinline.c diff --git a/pkg/wfc3/calwf3/wf32d/do2d.c b/pkg/wfc3/lib/wf32d/do2d.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/do2d.c rename to pkg/wfc3/lib/wf32d/do2d.c diff --git a/pkg/wfc3/calwf3/wf32d/dodark.c b/pkg/wfc3/lib/wf32d/dodark.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/dodark.c rename to pkg/wfc3/lib/wf32d/dodark.c diff --git a/pkg/wfc3/calwf3/wf32d/doflat.c b/pkg/wfc3/lib/wf32d/doflat.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/doflat.c rename to pkg/wfc3/lib/wf32d/doflat.c diff --git a/pkg/wfc3/calwf3/wf32d/doflux.c b/pkg/wfc3/lib/wf32d/doflux.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/doflux.c rename to pkg/wfc3/lib/wf32d/doflux.c diff --git a/pkg/wfc3/calwf3/wf32d/dophot.c b/pkg/wfc3/lib/wf32d/dophot.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/dophot.c rename to pkg/wfc3/lib/wf32d/dophot.c diff --git a/pkg/wfc3/calwf3/wf32d/doshad.c b/pkg/wfc3/lib/wf32d/doshad.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/doshad.c rename to pkg/wfc3/lib/wf32d/doshad.c diff --git a/pkg/wfc3/calwf3/wf32d/get2dflags.c b/pkg/wfc3/lib/wf32d/get2dflags.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/get2dflags.c rename to pkg/wfc3/lib/wf32d/get2dflags.c diff --git a/pkg/wfc3/calwf3/wf32d/get2dsw.c b/pkg/wfc3/lib/wf32d/get2dsw.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/get2dsw.c rename to pkg/wfc3/lib/wf32d/get2dsw.c diff --git a/pkg/wfc3/calwf3/wf32d/photmode.c b/pkg/wfc3/lib/wf32d/photmode.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/photmode.c rename to pkg/wfc3/lib/wf32d/photmode.c diff --git a/pkg/wfc3/calwf3/wf32d/sanity2d.c b/pkg/wfc3/lib/wf32d/sanity2d.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/sanity2d.c rename to pkg/wfc3/lib/wf32d/sanity2d.c diff --git a/pkg/wfc3/calwf3/wf32d/wf32d.c b/pkg/wfc3/lib/wf32d/wf32d.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/wf32d.c rename to pkg/wfc3/lib/wf32d/wf32d.c diff --git a/pkg/wfc3/calwf3/wf3ccd/blevdrift.c b/pkg/wfc3/lib/wf3ccd/blevdrift.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/blevdrift.c rename to pkg/wfc3/lib/wf3ccd/blevdrift.c diff --git a/pkg/wfc3/calwf3/wf3ccd/blevfit.c b/pkg/wfc3/lib/wf3ccd/blevfit.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/blevfit.c rename to pkg/wfc3/lib/wf3ccd/blevfit.c diff --git a/pkg/wfc3/calwf3/wf3ccd/doatod.c b/pkg/wfc3/lib/wf3ccd/doatod.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/doatod.c rename to pkg/wfc3/lib/wf3ccd/doatod.c diff --git a/pkg/wfc3/calwf3/wf3ccd/dobias.c b/pkg/wfc3/lib/wf3ccd/dobias.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/dobias.c rename to pkg/wfc3/lib/wf3ccd/dobias.c diff --git a/pkg/wfc3/calwf3/wf3ccd/doblev.c b/pkg/wfc3/lib/wf3ccd/doblev.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/doblev.c rename to pkg/wfc3/lib/wf3ccd/doblev.c diff --git a/pkg/wfc3/calwf3/wf3ccd/doccd.c b/pkg/wfc3/lib/wf3ccd/doccd.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/doccd.c rename to pkg/wfc3/lib/wf3ccd/doccd.c diff --git a/pkg/wfc3/calwf3/wf3ccd/doflash.c b/pkg/wfc3/lib/wf3ccd/doflash.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/doflash.c rename to pkg/wfc3/lib/wf3ccd/doflash.c diff --git a/pkg/wfc3/calwf3/wf3ccd/dofwsat.c b/pkg/wfc3/lib/wf3ccd/dofwsat.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/dofwsat.c rename to pkg/wfc3/lib/wf3ccd/dofwsat.c diff --git a/pkg/wfc3/calwf3/wf3ccd/findblev.c b/pkg/wfc3/lib/wf3ccd/findblev.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/findblev.c rename to pkg/wfc3/lib/wf3ccd/findblev.c diff --git a/pkg/wfc3/calwf3/wf3ccd/findover.c b/pkg/wfc3/lib/wf3ccd/findover.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/findover.c rename to pkg/wfc3/lib/wf3ccd/findover.c diff --git a/pkg/wfc3/calwf3/wf3ccd/getccdsw.c b/pkg/wfc3/lib/wf3ccd/getccdsw.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/getccdsw.c rename to pkg/wfc3/lib/wf3ccd/getccdsw.c diff --git a/pkg/wfc3/calwf3/wf3ccd/getflags.c b/pkg/wfc3/lib/wf3ccd/getflags.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/getflags.c rename to pkg/wfc3/lib/wf3ccd/getflags.c diff --git a/pkg/wfc3/calwf3/wf3ccd/sink.c b/pkg/wfc3/lib/wf3ccd/sink.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/sink.c rename to pkg/wfc3/lib/wf3ccd/sink.c diff --git a/pkg/wfc3/calwf3/wf3ccd/wf3ccd.c b/pkg/wfc3/lib/wf3ccd/wf3ccd.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/wf3ccd.c rename to pkg/wfc3/lib/wf3ccd/wf3ccd.c diff --git a/pkg/wfc3/calwf3/wf3cte/cte_dobias.c b/pkg/wfc3/lib/wf3cte/cte_dobias.c similarity index 100% rename from pkg/wfc3/calwf3/wf3cte/cte_dobias.c rename to pkg/wfc3/lib/wf3cte/cte_dobias.c diff --git a/pkg/wfc3/calwf3/wf3cte/getcteflags.c b/pkg/wfc3/lib/wf3cte/getcteflags.c similarity index 100% rename from pkg/wfc3/calwf3/wf3cte/getcteflags.c rename to pkg/wfc3/lib/wf3cte/getcteflags.c diff --git a/pkg/wfc3/calwf3/wf3cte/getctepars.c b/pkg/wfc3/lib/wf3cte/getctepars.c similarity index 100% rename from pkg/wfc3/calwf3/wf3cte/getctepars.c rename to pkg/wfc3/lib/wf3cte/getctepars.c diff --git a/pkg/wfc3/calwf3/wf3cte/getctesw.c b/pkg/wfc3/lib/wf3cte/getctesw.c similarity index 100% rename from pkg/wfc3/calwf3/wf3cte/getctesw.c rename to pkg/wfc3/lib/wf3cte/getctesw.c diff --git a/pkg/wfc3/calwf3/wf3cte/wf3cte.c b/pkg/wfc3/lib/wf3cte/wf3cte.c similarity index 100% rename from pkg/wfc3/calwf3/wf3cte/wf3cte.c rename to pkg/wfc3/lib/wf3cte/wf3cte.c diff --git a/pkg/wfc3/calwf3/lib/wf3hist.c b/pkg/wfc3/lib/wf3hist.c similarity index 100% rename from pkg/wfc3/calwf3/lib/wf3hist.c rename to pkg/wfc3/lib/wf3hist.c diff --git a/pkg/wfc3/calwf3/lib/wf3info.c b/pkg/wfc3/lib/wf3info.c similarity index 100% rename from pkg/wfc3/calwf3/lib/wf3info.c rename to pkg/wfc3/lib/wf3info.c diff --git a/pkg/wfc3/calwf3/wf3ir/blevcorr.c b/pkg/wfc3/lib/wf3ir/blevcorr.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/blevcorr.c rename to pkg/wfc3/lib/wf3ir/blevcorr.c diff --git a/pkg/wfc3/calwf3/wf3ir/cridcalc.c b/pkg/wfc3/lib/wf3ir/cridcalc.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/cridcalc.c rename to pkg/wfc3/lib/wf3ir/cridcalc.c diff --git a/pkg/wfc3/calwf3/wf3ir/darkcorr.c b/pkg/wfc3/lib/wf3ir/darkcorr.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/darkcorr.c rename to pkg/wfc3/lib/wf3ir/darkcorr.c diff --git a/pkg/wfc3/calwf3/wf3ir/doir.c b/pkg/wfc3/lib/wf3ir/doir.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/doir.c rename to pkg/wfc3/lib/wf3ir/doir.c diff --git a/pkg/wfc3/calwf3/wf3ir/dqicorr.c b/pkg/wfc3/lib/wf3ir/dqicorr.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/dqicorr.c rename to pkg/wfc3/lib/wf3ir/dqicorr.c diff --git a/pkg/wfc3/calwf3/wf3ir/flatcorr.c b/pkg/wfc3/lib/wf3ir/flatcorr.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/flatcorr.c rename to pkg/wfc3/lib/wf3ir/flatcorr.c diff --git a/pkg/wfc3/calwf3/wf3ir/getirflags.c b/pkg/wfc3/lib/wf3ir/getirflags.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/getirflags.c rename to pkg/wfc3/lib/wf3ir/getirflags.c diff --git a/pkg/wfc3/calwf3/wf3ir/getirsw.c b/pkg/wfc3/lib/wf3ir/getirsw.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/getirsw.c rename to pkg/wfc3/lib/wf3ir/getirsw.c diff --git a/pkg/wfc3/calwf3/wf3ir/groupinfo.c b/pkg/wfc3/lib/wf3ir/groupinfo.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/groupinfo.c rename to pkg/wfc3/lib/wf3ir/groupinfo.c diff --git a/pkg/wfc3/calwf3/wf3ir/imageio.c b/pkg/wfc3/lib/wf3ir/imageio.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/imageio.c rename to pkg/wfc3/lib/wf3ir/imageio.c diff --git a/pkg/wfc3/calwf3/wf3ir/irhist.c b/pkg/wfc3/lib/wf3ir/irhist.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/irhist.c rename to pkg/wfc3/lib/wf3ir/irhist.c diff --git a/pkg/wfc3/calwf3/wf3ir/math.c b/pkg/wfc3/lib/wf3ir/math.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/math.c rename to pkg/wfc3/lib/wf3ir/math.c diff --git a/pkg/wfc3/calwf3/wf3ir/nlincorr.c b/pkg/wfc3/lib/wf3ir/nlincorr.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/nlincorr.c rename to pkg/wfc3/lib/wf3ir/nlincorr.c diff --git a/pkg/wfc3/calwf3/wf3ir/noiscalc.c b/pkg/wfc3/lib/wf3ir/noiscalc.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/noiscalc.c rename to pkg/wfc3/lib/wf3ir/noiscalc.c diff --git a/pkg/wfc3/calwf3/wf3ir/numrec.c b/pkg/wfc3/lib/wf3ir/numrec.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/numrec.c rename to pkg/wfc3/lib/wf3ir/numrec.c diff --git a/pkg/wfc3/calwf3/wf3ir/photcalc.c b/pkg/wfc3/lib/wf3ir/photcalc.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/photcalc.c rename to pkg/wfc3/lib/wf3ir/photcalc.c diff --git a/pkg/wfc3/calwf3/wf3ir/pixcheck.c b/pkg/wfc3/lib/wf3ir/pixcheck.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/pixcheck.c rename to pkg/wfc3/lib/wf3ir/pixcheck.c diff --git a/pkg/wfc3/calwf3/wf3ir/refdata.c b/pkg/wfc3/lib/wf3ir/refdata.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/refdata.c rename to pkg/wfc3/lib/wf3ir/refdata.c diff --git a/pkg/wfc3/calwf3/wf3ir/resistmean.c b/pkg/wfc3/lib/wf3ir/resistmean.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/resistmean.c rename to pkg/wfc3/lib/wf3ir/resistmean.c diff --git a/pkg/wfc3/calwf3/wf3ir/satcheck.c b/pkg/wfc3/lib/wf3ir/satcheck.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/satcheck.c rename to pkg/wfc3/lib/wf3ir/satcheck.c diff --git a/pkg/wfc3/calwf3/wf3ir/statcalc.c b/pkg/wfc3/lib/wf3ir/statcalc.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/statcalc.c rename to pkg/wfc3/lib/wf3ir/statcalc.c diff --git a/pkg/wfc3/calwf3/wf3ir/stats.c b/pkg/wfc3/lib/wf3ir/stats.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/stats.c rename to pkg/wfc3/lib/wf3ir/stats.c diff --git a/pkg/wfc3/calwf3/wf3ir/unitcorr.c b/pkg/wfc3/lib/wf3ir/unitcorr.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/unitcorr.c rename to pkg/wfc3/lib/wf3ir/unitcorr.c diff --git a/pkg/wfc3/calwf3/wf3ir/updatehdr.c b/pkg/wfc3/lib/wf3ir/updatehdr.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/updatehdr.c rename to pkg/wfc3/lib/wf3ir/updatehdr.c diff --git a/pkg/wfc3/calwf3/wf3ir/wf3ir.c b/pkg/wfc3/lib/wf3ir/wf3ir.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/wf3ir.c rename to pkg/wfc3/lib/wf3ir/wf3ir.c diff --git a/pkg/wfc3/calwf3/wf3ir/zoffcorr.c b/pkg/wfc3/lib/wf3ir/zoffcorr.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/zoffcorr.c rename to pkg/wfc3/lib/wf3ir/zoffcorr.c diff --git a/pkg/wfc3/calwf3/wf3ir/zsigcorr.c b/pkg/wfc3/lib/wf3ir/zsigcorr.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/zsigcorr.c rename to pkg/wfc3/lib/wf3ir/zsigcorr.c diff --git a/pkg/wfc3/calwf3/wf3rej/cr_history.c b/pkg/wfc3/lib/wf3rej/cr_history.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/cr_history.c rename to pkg/wfc3/lib/wf3rej/cr_history.c diff --git a/pkg/wfc3/calwf3/wf3rej/cr_mode.c b/pkg/wfc3/lib/wf3rej/cr_mode.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/cr_mode.c rename to pkg/wfc3/lib/wf3rej/cr_mode.c diff --git a/pkg/wfc3/calwf3/wf3rej/cr_scaling.c b/pkg/wfc3/lib/wf3rej/cr_scaling.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/cr_scaling.c rename to pkg/wfc3/lib/wf3rej/cr_scaling.c diff --git a/pkg/wfc3/calwf3/wf3rej/history b/pkg/wfc3/lib/wf3rej/history similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/history rename to pkg/wfc3/lib/wf3rej/history diff --git a/pkg/wfc3/calwf3/wf3rej/piksrt.c b/pkg/wfc3/lib/wf3rej/piksrt.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/piksrt.c rename to pkg/wfc3/lib/wf3rej/piksrt.c diff --git a/pkg/wfc3/calwf3/wf3rej/readpar.c b/pkg/wfc3/lib/wf3rej/readpar.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/readpar.c rename to pkg/wfc3/lib/wf3rej/readpar.c diff --git a/pkg/wfc3/calwf3/wf3rej/rej_check.c b/pkg/wfc3/lib/wf3rej/rej_check.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/rej_check.c rename to pkg/wfc3/lib/wf3rej/rej_check.c diff --git a/pkg/wfc3/calwf3/wf3rej/rej_command.c b/pkg/wfc3/lib/wf3rej/rej_command.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/rej_command.c rename to pkg/wfc3/lib/wf3rej/rej_command.c diff --git a/pkg/wfc3/calwf3/wf3rej/rej_do.c b/pkg/wfc3/lib/wf3rej/rej_do.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/rej_do.c rename to pkg/wfc3/lib/wf3rej/rej_do.c diff --git a/pkg/wfc3/calwf3/wf3rej/rej_init.c b/pkg/wfc3/lib/wf3rej/rej_init.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/rej_init.c rename to pkg/wfc3/lib/wf3rej/rej_init.c diff --git a/pkg/wfc3/calwf3/wf3rej/rej_loop.c b/pkg/wfc3/lib/wf3rej/rej_loop.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/rej_loop.c rename to pkg/wfc3/lib/wf3rej/rej_loop.c diff --git a/pkg/wfc3/calwf3/wf3rej/rej_sky.c b/pkg/wfc3/lib/wf3rej/rej_sky.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/rej_sky.c rename to pkg/wfc3/lib/wf3rej/rej_sky.c diff --git a/pkg/wfc3/calwf3/wf3rej/wf3rej.c b/pkg/wfc3/lib/wf3rej/wf3rej.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/wf3rej.c rename to pkg/wfc3/lib/wf3rej/wf3rej.c diff --git a/pkg/wfc3/calwf3/lib/wf3sect.c b/pkg/wfc3/lib/wf3sect.c similarity index 100% rename from pkg/wfc3/calwf3/lib/wf3sect.c rename to pkg/wfc3/lib/wf3sect.c diff --git a/pkg/wfc3/calwf3/wf3sum/Notes b/pkg/wfc3/lib/wf3sum/Notes similarity index 100% rename from pkg/wfc3/calwf3/wf3sum/Notes rename to pkg/wfc3/lib/wf3sum/Notes diff --git a/pkg/wfc3/calwf3/wf3sum/wf3sum.c b/pkg/wfc3/lib/wf3sum/wf3sum.c similarity index 100% rename from pkg/wfc3/calwf3/wf3sum/wf3sum.c rename to pkg/wfc3/lib/wf3sum/wf3sum.c diff --git a/pkg/wfc3/calwf3/lib/whicherror.c b/pkg/wfc3/lib/whicherror.c similarity index 100% rename from pkg/wfc3/calwf3/lib/whicherror.c rename to pkg/wfc3/lib/whicherror.c diff --git a/pkg/wfc3/calwf3/wf32d/main2d.c b/pkg/wfc3/src/main2d.c similarity index 100% rename from pkg/wfc3/calwf3/wf32d/main2d.c rename to pkg/wfc3/src/main2d.c diff --git a/pkg/wfc3/calwf3/wf3ccd/mainccd.c b/pkg/wfc3/src/mainccd.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ccd/mainccd.c rename to pkg/wfc3/src/mainccd.c diff --git a/pkg/wfc3/calwf3/wf3cte/maincte.c b/pkg/wfc3/src/maincte.c similarity index 100% rename from pkg/wfc3/calwf3/wf3cte/maincte.c rename to pkg/wfc3/src/maincte.c diff --git a/pkg/wfc3/calwf3/wf3ir/mainir.c b/pkg/wfc3/src/mainir.c similarity index 100% rename from pkg/wfc3/calwf3/wf3ir/mainir.c rename to pkg/wfc3/src/mainir.c diff --git a/pkg/wfc3/calwf3/wf3rej/mainrej.c b/pkg/wfc3/src/mainrej.c similarity index 100% rename from pkg/wfc3/calwf3/wf3rej/mainrej.c rename to pkg/wfc3/src/mainrej.c diff --git a/pkg/wfc3/calwf3/wf3sum/mainsum.c b/pkg/wfc3/src/mainsum.c similarity index 100% rename from pkg/wfc3/calwf3/wf3sum/mainsum.c rename to pkg/wfc3/src/mainsum.c diff --git a/pkg/wfc3/calwf3/calwf3/wf3main.c b/pkg/wfc3/src/mainwf3.c similarity index 100% rename from pkg/wfc3/calwf3/calwf3/wf3main.c rename to pkg/wfc3/src/mainwf3.c diff --git a/pkg/wfc3/wscript b/pkg/wfc3/wscript deleted file mode 100644 index 4ad8175ee..000000000 --- a/pkg/wfc3/wscript +++ /dev/null @@ -1,11 +0,0 @@ -# vim: set syntax=python: - -LIBRARIES = [ - 'calwf3' - ] - -def build(bld): - for library in LIBRARIES: - bld.recurse(library) - - diff --git a/pkg/wscript b/pkg/wscript deleted file mode 100644 index c45340089..000000000 --- a/pkg/wscript +++ /dev/null @@ -1,10 +0,0 @@ -# vim: set syntax=python: - -INSTRUMENTS = [ - 'stis','imphttab','acs','wfc3' - ] - -def build(bld): - for instrument in INSTRUMENTS: - bld.recurse(instrument) - diff --git a/tables/CMakeLists.txt b/tables/CMakeLists.txt new file mode 100644 index 000000000..62b892163 --- /dev/null +++ b/tables/CMakeLists.txt @@ -0,0 +1,64 @@ +project(tables) +add_library(${PROJECT_NAME} SHARED + addCol.c + c_imt.c + c_irafinit.c + c_phopar.c + c_tbagt.c + c_tbapt.c + c_tbcdef1.c + c_tbcfnd1.c + c_tbciga.c + c_tbcigi.c + c_tbcigt.c + c_tbcinf.c + c_tbcnum.c + c_tbegt.c + c_tbept.c + c_tbfpri.c + c_tbfres.c + c_tbhad.c + c_tbhcal.c + c_tbhgcm.c + c_tbhgnp.c + c_tbhgt.c + c_tbhpcm.c + c_tbhptt.c + c_tbparse.c + c_tbpsta.c + c_tbrcsc.c + c_tbrgtr.c + c_tbrudf.c + c_tbtacc.c + c_tbtclo.c + c_tbtcre.c + c_tbtnam.c + c_tbtopn.c + c_vfn2osfn.c + cerror.c + ctables.c + initCol.c + tbCopyTmpl.c + tbHeader.c + tbSaveInfo.c + tbl_util.c +) +target_link_libraries(${PROJECT_NAME} + PUBLIC ${cfitsio_LDFLAGS} + PRIVATE hstio +) +target_include_directories(${PROJECT_NAME} + PUBLIC ${HSTCAL_include} + PUBLIC ${cfitsio_INCLUDE_DIRS} +) +target_compile_options(${PROJECT_NAME} + PUBLIC ${cfitsio_CFLAGS_OTHER} +) +set_target_properties(${PROJECT_NAME} + PROPERTIES + OUTPUT_NAME hst${PROJECT_NAME} +) +install(TARGETS ${PROJECT_NAME} + DESTINATION lib +) + diff --git a/tables/wscript b/tables/wscript deleted file mode 100644 index fe0d719d2..000000000 --- a/tables/wscript +++ /dev/null @@ -1,18 +0,0 @@ -import os - -def build(bld): - t = bld.stlib( - source = """ - c_imt.c addCol.c ctables.c c_tbagt.c c_tbapt.c - c_tbcdef1.c c_tbcfnd1.c c_tbciga.c c_tbcigi.c c_tbcigt.c - c_tbcinf.c c_tbcnum.c c_tbegt.c c_tbept.c c_tbfpri.c c_tbfres.c - c_tbhad.c c_tbhcal.c c_tbhgcm.c c_tbhgnp.c c_tbhgt.c c_tbhpcm.c - c_tbhptt.c c_tbparse.c c_tbpsta.c c_tbrcsc.c c_tbrgtr.c - c_tbrudf.c c_tbtacc.c c_tbtclo.c c_tbtcre.c c_tbtnam.c - c_tbtopn.c initCol.c tbCopyTmpl.c tbHeader.c tbl_util.c - tbSaveInfo.c c_phopar.c - """, - target = 'xtables', - install_path = bld.env.INSTALL_LIB and '${PREFIX}/lib', - use = 'CFITSIO' - ) diff --git a/waf b/waf deleted file mode 120000 index 50ec163bb..000000000 --- a/waf +++ /dev/null @@ -1 +0,0 @@ -waf-2.0.19 \ No newline at end of file diff --git a/waf-2.0.19 b/waf-2.0.19 deleted file mode 100755 index 7ceee1677..000000000 --- a/waf-2.0.19 +++ /dev/null @@ -1,173 +0,0 @@ -#!/usr/bin/env python -# encoding: latin-1 -# Thomas Nagy, 2005-2018 -# -""" -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING -IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. -""" - -import os, sys, inspect - -VERSION="2.0.19" -REVISION="1f3c580272b15a03d2566843c5fe872a" -GIT="61ee22b598cf80e260beb64e475966f58b304d0d" -INSTALL='' -C1='#6' -C2='#.' -C3='#%' -cwd = os.getcwd() -join = os.path.join - - -WAF='waf' -def b(x): - return x -if sys.hexversion>0x300000f: - WAF='waf3' - def b(x): - return x.encode() - -def err(m): - print(('\033[91mError: %s\033[0m' % m)) - sys.exit(1) - -def unpack_wafdir(dir, src): - f = open(src,'rb') - c = 'corrupt archive (%d)' - while 1: - line = f.readline() - if not line: err('run waf-light from a folder containing waflib') - if line == b('#==>\n'): - txt = f.readline() - if not txt: err(c % 1) - if f.readline() != b('#<==\n'): err(c % 2) - break - if not txt: err(c % 3) - txt = txt[1:-1].replace(b(C1), b('\n')).replace(b(C2), b('\r')).replace(b(C3), b('\x00')) - - import shutil, tarfile - try: shutil.rmtree(dir) - except OSError: pass - try: - for x in ('Tools', 'extras'): - os.makedirs(join(dir, 'waflib', x)) - except OSError: - err("Cannot unpack waf lib into %s\nMove waf in a writable directory" % dir) - - os.chdir(dir) - tmp = 't.bz2' - t = open(tmp,'wb') - try: t.write(txt) - finally: t.close() - - try: - t = tarfile.open(tmp) - except: - try: - os.system('bunzip2 t.bz2') - t = tarfile.open('t') - tmp = 't' - except: - os.chdir(cwd) - try: shutil.rmtree(dir) - except OSError: pass - err("Waf cannot be unpacked, check that bzip2 support is present") - - try: - for x in t: t.extract(x) - finally: - t.close() - - for x in ('Tools', 'extras'): - os.chmod(join('waflib',x), 493) - - if sys.hexversion<0x300000f: - sys.path = [join(dir, 'waflib')] + sys.path - import fixpy2 - fixpy2.fixdir(dir) - - os.remove(tmp) - os.chdir(cwd) - - try: dir = unicode(dir, 'mbcs') - except: pass - try: - from ctypes import windll - windll.kernel32.SetFileAttributesW(dir, 2) - except: - pass - -def test(dir): - try: - os.stat(join(dir, 'waflib')) - return os.path.abspath(dir) - except OSError: - pass - -def find_lib(): - src = os.path.abspath(inspect.getfile(inspect.getmodule(err))) - base, name = os.path.split(src) - - #devs use $WAFDIR - w=test(os.environ.get('WAFDIR', '')) - if w: return w - - #waf-light - if name.endswith('waf-light'): - w = test(base) - if w: return w - for dir in sys.path: - if test(dir): - return dir - err('waf-light requires waflib -> export WAFDIR=/folder') - - dirname = '%s-%s-%s' % (WAF, VERSION, REVISION) - for i in (INSTALL,'/usr','/usr/local','/opt'): - w = test(i + '/lib/' + dirname) - if w: return w - - #waf-local - dir = join(base, (sys.platform != 'win32' and '.' or '') + dirname) - w = test(dir) - if w: return w - - #unpack - unpack_wafdir(dir, src) - return dir - -wafdir = find_lib() -sys.path.insert(0, wafdir) - -if __name__ == '__main__': - - from waflib import Scripting - Scripting.waf_entry_point(cwd, VERSION, wafdir) - -#==> -#BZh91AY&SY9 \DPm(¬#%00e(b/mЀ#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%#%zmmkZ旲U#.[iھ:'kd7{o۶ֵK]v'OgvsN)#.Q+ٽpޝ]/{m<{guҋ@{vo;;vi44l{|U9ݟݚyx#%#%@(}h#%` ﲀ=wf:4[aӹyA껴4=d+֨)f0#6 *{Q$#%#6#%YJzV%}jaj3TTf˦Iv]s}6u7z:#.xW_=z֭Z;ۻ}sy{izr>^}azz{x-z̀ݳֲ4fs`uF"EE7w#%(J*OC#%l=n{Ywd >}[vG`>EmkMW`Ly^u#%}at;o}|{mOvpǼ΀o*WƘܶ2>ϟw];j9Qt׷Zt>ܮu|}ܬ&Nq\:.^yaCӶۛХ&nCz|ilͶв[ۺ5koXqؗnl/`{w>PJPTTjB7uv&iv]vݛ:kkUUܘ{x)HЃɯfw#%7ZI#%#%;^3F-mzݙ_U.us[ v]]|H,q{c;vJ{+l+Wg`;{n#]}ww{xv#.mEf"sﯼl$/gєx<V6EǑޮGxO{>w޴#%*;F7;g5Zu!LA ,LQ*")PcZ5OӦ Jtđ8WoT"]^S_3os2 lDs4;mqE6M`Vd]j◘5o# UI7wDKU/~oBE"SU5k3khȋ 7#%H*-E :$H& "HP !#%h#%$@d P@mfLCLd@M$Rj63525)FSm&‰$J2ZQh[Fi,iZ!#.F)iMF #.1eMDRlZSMhYi#. (cRFQ&JlBjcI@hHRF"[MUifLM& mM65%)-53fZL1fdlB!QfR`4TH!`ؤfJb0lBXhdFIR&B4Cl &)BFRf$@YY5ccE#6dK) -) %&ED2hhɉIF($@VAMEfR` ؉1M ͂ab6V$$PRD%Q0EaIL# &RJMEXHjHb iM$"H[b2F̒3bdE(͑&U4Đ)AQ`,i"5+%6(R"I&aLcI &Qi3H("hkP,&YA2%&DM2*4f6)16A! "1F4, &T՘l(#.H!HСYM$QF&JFhb22iD`JM52i!)#.1Sb5*R)#.2)H(HR"E$M)i5DFh&TiD#.,eDYJbD!f k6lmd$4Ld5EPZ XR$cc1 2RXYJ&EM(ZhII$2ɲ#)E,ѥ15e"$4M`BjfF&RLȈ6,&%T٢-L-bC؈RD#HJm~ka͢lVƶ*6L4R44F5Yc(S*HD[%QIKQ&D5acR#6e2eI*4TB+d"TT›63,YLS,JJSLl)%2RZ!գ%AEVMdjEHkD$mhŊl2ѵ0U@iR F2&ƍ&di ժ* KY4IR1!MlY"Y1Jm*RYaZDFK"e5MMk,Xlk+,l  Db4!-T%KQY&6LJ,&l#."+,E1Jl4 AE$&Fm6F6ScE%bH#!4LQJdRP5BT4 JBj-#636)F̤!Hbki4F5&a $YP-4) Ě4Yda, jE54ECF)6bfQj4  2A&ĕ%I1Rcda)ME`0٤lfECJ2ZfhT2Hl0D2hihl,LDRBAh[ QQ-IM#6LR#b-fC26*2%,ѴkTI5E$ԚPdjkA4!E$Ih5EJ"Fd̡jQHfJ$(j#V#.2,Y*6)42V-&)+)DMTRccdd&#HRLɃA#6)6&"ƨY)&RV-ɈF42JԈieheji5 Q5%)Й̌ƚL&kDlU%hԕ,&Lڐ1lj cc$UE2X61mIQ f-F+iQQJVf*B (4X"J&,ʒ+I[M+FbbIE[lR&T*&$1P"CFi&%Xش[F542Y6!mIME26QAjMIʈBLI&RLd"-тnԥC)B51jTqe+(a(h! b LL$hlNz9SUIP?[lȟYLsȠ;L(0\:8pI d*߱r*3ZI(R+g,$b/0-npz%ZM8wBd~ ՋN؜Z,3cRR(lrrXݳfVc`I"lLhcz瓓G]޹w^\/uu\LP"W4LvcK@JAF&ēMb3(]enY74h6 m `ٗ(c2@szo(7p c#6Gv),`rR[R}dzgsNVQL0ФY;d8$ϣ؞j(%?rõ Jxkcx-2Kw%CUyyܖw^Qr車esnCQW6qllO5Z4EA?_W-ȦWȶIu?Go*y|m㊝U"֍UOpi)8+ Ӭ,j[vlQa1KFS7mZ*NP-#6A@*{iXS6ߋMfhF%2+zmW!bSQIܮuV(i%"@X'+&D)J墶/]^"Rkb_-׻*|{=ol|14> ݌>LȲ"4~"UrPaLֶjϹ$![z۲FlWW=4DalAHPŤ''mBCGE2R]U"wլ*Х²SE#6lQ MZH"JuJ *Ó#6ILe„S$+ bN:+#%(\Hp6疴zm*'ܩ1?_k#.VFyeo$Á?jfAv߾ڜNz$!.fܡ\i̩#.#E0F:E&}ٞAg]p?X7d1\NB=}ILƘ#6P#6;g="<R:I2\q.V)gɅ,8`=jPqëZ#.,nMB88׵ۺ1il m׺|5=Z鵦Lu $(w0WX uBdN>ܸIiEw+^{5ZU{)cT @^ǡ=4 Zۍo4^1É -onU>iK|eJ/}m}w*IeQ92e@ hQAA9CrOuu5&JF}w/šjj}( +|~TGR{ES>,߻jj܇Y+$.h>nj]Pꩨ ׶{gmk4Ok{єEˣ;ndmAyQ#6ӫfͲX8TNL\P苁1 63Y yUM3#.X|TW7ΊD^jER,)9߹ȷ)ьuO~$_s4?Zu>]1ykEX)>Om8ŝOz\ڸ;R1~FS_t“Rn(PbRfWYʡcPBYׅDQQe0x~{*nf wiXT)6-;ˣw$3}T|-z85`Bhҡ~J΀Z+9rlVx#6h6Dx0)AX*0_#.ǷzeH,5Aޟ{e7S&yY񯥳LSœ?ك-y69^}pBIiK&nǨsιߎe,&2:L[xHǮ*U91 DL5;i傄QT nUّ`ҟ#oJ41Sv馫a離M4O|I$ {Ur0;0*zG/7+ #%Qb]K\.) I9qa#.5Кw*8A'<:b2xQn:,öTl8:?kborR#R/*3Ѧ4uocȐ#.vnVp)rZ,.O}zwln.LQy@EHiw=Qq"%V2&0+Vqw=Pu7V^-EuQQ'U0D}ޙNi$'1ΝKU=_lS#60D1zǾ+dpڈZ?wx\`<+fJ~WKոݝ8n$zG<c/Y vfz3Lcz7k%EΛY-J`]BvP\Hm2LMwr4:Œ`\Խu}<(f`ňͽUQ9c:O+%PiP/<H`6,Iqz< #?}IL_K'B#+|mתǒ7"nb#sh~?~V]6k)0 UBU,'@5+lX6ɠn.{p}:ybsf19%Z##6 ,&ў3|#6y".$#. #.u. ד*{gdevKfQο7N hÄe hP"1bL`Mm"-X]#6=)#.2¿+]tg:00YUDƊHI#L͒6\j}#.ۻ6=U Sޚt4s ٺ"g.t(:qc1^n*fbfۊ;Xh1as>=N#.(qنfT`al~28r!:Y@e jNec;8`ij%cW?DM@0L\'kKNϧcV*F֘9Oǻ*5,<:ؒ|EI$$G4{S#%beTQ!Pve6^\FfX= *n>Q/nNQ#64E^~`G'0\PDL7؃KuohsyQ*Ss;5XvPf8u[˜Sϒ4s?'ݭi ;n)tYG.K|M6Au8'Uҍ*seܙL)e8|W#%}O`|A>bmf\sIO##y3B#.⊠}աnrCDb+` 왭n>Oqh59b f~~V#+b^Ug:^xTq(Ū1y{TzԲ?[s 5Ygk qjWXv_WmMuZ3Q_{=㳗(5#C ]m9H X1Ƚ7ٟd-KOqDˋs#%$̐@%"iGn gsos+-m%b"moffm{pYpoÆZ̸ 4bx^SuzVlbݵ ϰPO:Zn(#{7)׹L σYӡ"6zXbcG-7J-YSՖ#.[w_#6}P$RF/:HCCo:T=49yzÆrĕ{R4Iom3]Fm;uctloz`(]􁿍5!.ZUǤe(^R F\ެCtFX 8,;hXj$8Yxp6p ݤ$A7c%#%%"A/c9X]5GY"E5#/*9/Q?Bujm-&;z|ըl@'(*i|GSөK!7mV>9&u#% ջ-v޻ #.cc D@?4#6o轶j0**ŽsÇ#."M\"#%gޜ4yRb(>@tơR]eѷsvӠn(+VpE+'6N3[(ZaɻI{ax=9"1[Jl 1H#.%O#%#%cmaI#.5ׯ_~?OHGTUMy5ц6cjb$|_Cu0^~c_d "w#%>בj>ER=Ss|5mfտ.4|j]:;n>:n@ )fw#.l0}(WoNs {G4|0t9bb?Gk_f "@kX/E;fLq58d*{/D4tɚotgSw>XBzs'^͡c7B +Å3r\po_P=T֓4ZMI:ٜ[+Yȍ{Qho`#67]Rd1U[d"b$#6Jk!g۪Lk $,̣[P&UU1#;&bA1dy%* "/Z7cuBsr-$~mL:zXU Dq#6ߩs <=U~L R5} VI魳Lgav_EF -G8?mRG=bSfq7Ai+s"|;O$#Iai׮[H[#.uƎX[ȗJ}[hyѺBJ2\~de#/a74YUCMs{cB'$;ǩ8#.{,jwe#.r^¾<0fx5&Ī6PcQǘ"5UE7yl)p7!$8>{K2ryUD#lwz=wʋ#6Dn}^})DЊ]uq۳2\S{SXY% qnA#U]=@tj&»5&fpK Sd&vE}zGÝ*B#6 Q>Gpvۅm}M *0p|AvB0;k[#6h"# _ z32&Bх56ܦ2,,|زR"QY ҃ LkG>'j1*uiS1u\SdIiTO6Ƙڱᝑzl_g8hxMX0-#sK5?#%yx)7y#%2w Pc  #%t`=!#.fN%[^v'kQŖ`z)nu#?.IpJ[iB*, =`QpgcIezC,f{2ѪRu 7ӝy_>vt|9VKR;#6(lJYbT-žbFrp*(~sꆄ4uy!j#8sy#.bn=>tzh\bPY:—nT `턱ֽnz1DR+GobѣU$2#t^mO8,}YEω{^IfxOpLG#.pYE>vKU} gاڧ^ϭ+#%[a:9ޚ9d+B~e.wqalwE#%{j,d*1wy]OFnsnZ*4xm1|F4sʌ֞{Ζ,l D {#%DhMD)$CTVʍ}14LT.%" #%l@'D188#.A$^0Ʊ\h${ޮ#.NUzJ);I?$J? v#.TTaƻE5vblyA}ɹRC)K.(sN\0pS"o*!WTCyp2b2/mkYKn9J:ܭ\{oMh]ŠfXn#6ۯd ә/Q؅EKNW== ^u?כʓ5+8~яZF0oћ48@_*c0Z4JqF=t%lnb昦J(Bwy.BjܘxHQT84c#6|md@#%奉c6PaFĈ`]w&q22GQۚ1R^+LZyn@m2(ʼn-eFK`(euD 8IwN`;4,:$VbV66PEBD 2NY;6}r=k#6_S0*Byy,SX.9u@+#%)|@zX"%F #%s&;zi|&툝0t651L=õH 9v R4{mnp+=S!t#6ogctnt,luVFƔ#.%Ʒ_Ns*\8r&AڨN6KY#Zԟ:w9Uf j  0F+Iu,NcUGE^ۤɎ4$;>)͙n$"ȵ7͖Ѡf1(vhC5ל` {ԠR#7(HTZ'cJ:7 Zf6NGQ8@sIۤ܎j#%;qnwj٘Q3ai(Vj(bV\M0kD>UzpNzb#.:8J}COv(O 68H^&ץӳ?ty#%#6]V3eGY`I·% | HsϺEH:u) ,Fj0sVY#W6щ(4"4Yadt#6#}ܶ`5Mffmj (#.r V;'\S)=Ǹ#%'܀#%z\n@|ʼm6 7ǿe)vaҡHFXw?!џj̞xOuw4r }7>(8_]`#v#%H=UQ0rmH%x; .?VI|gxq[$}PT=]#6 Lk+ρKd9r_bDA( #6#fcBt~jl3~inn>y{~] n`"1{Y.HGs$<\G=>u>i>:##69dc|Vnm/~J:3#'$!PY]oRm$Z&֯SQUQF@#a}Cuib)fy&D*n&NSӰ%$T^%\wbIlI{VTejŋ:1&WR>2#.#6q4~X30~>{P?F(,>_#63~#6 0\rf#6C j1T,jq#66Od'@h'$K媯1 † ː=r2WPŌw1P(ډPΔVRh!0VJ@-I[\T(#6N=>$o-#o}~?S>}+Sy-[O?8[FDctz/~7|6`V˹G8hqp"#.$`{zEVsbGL9{ϬQEVp2/Xu|]c=!U%i?C CcXPRvą24q`am; ۾_\PW2ī> ~>=TM@jj*B''%=-uHk8ܪpXؼ&>]Cp}!8BvZ>-꘶*ĄǸ$Mp9@IHg2q#.SuFf3yXx{P-2ѰoIO$'ѿƊ4 Cc 5yo|z1QK,,$o_Cd́bWά ZV3XCE.}^&_#68pboח;vدZSqiojgmysrGt{vǃh`G7mSpa:H~ Rj9\RA~^]%="x h^LGe#.s-я3ٍ̝|%n|jWuz}Fp̜S1LSy}{`--z9%[5v2;'D?/?؃}f]wT(9=E)#.]YYxpaE3ƣ0ѼF%.lA>2.sU?F6e2w?.ſ=nn;"^N]i=[y8bwc|{ar#gwv[q$RS>]wtf֞O{u.?Bʹtg*hDA SyGbe>_)n8h>#.[gj ;0v=>14x gP#hp_Y;|PVQ=?~umA#6`Ǚ+Ժ%#.Ó Swt/vn#Ͷ?!bpv l;̙/|S9? "(H;G*t<&/ֆëGKDj`9K#%#61T'&D񪤽[-2+`IBfH&ڒ~;A΋wŏ8,ȿ{#Y^tM ώ7},Ep#.JR#4Lh+w.X%qh !~I}A7w!h; ->B) J҈ǁ>;ZZ;|%9dCPSxsZgDswr+)1/1B+Sk_!(F+~4sgWM/ݎ߶N3hl3-m=Op>#&Q0/S3>mMw\\} $wyR$|_ID'1uluLׄ[=8'x3A#%/SCI%yb1FɥG*bGѺC IO4|Hc cY|u>S#`{Bfe̍cv9G?GF54iTlT Ԣn؀7#6҃,tڛH}=3֤On `a-AȱaILA"hhn)"4[VWc'#.Ss6]&6)":[֡ɠ\6B{qZ8du["?9gBPP}S< =a5rA]EcXw\1ac0]WoOS\V##E4DCH@bi71lXTQ&FCV6ƛfJj*PYO9qߛrӛܙpAFތi|-'lDjUuwu_fWVl:e1ջ(LS>ܬ9H<jUm}Z bvU&겷[GmCfj#6#$pw]uG<~ӧ٣OZx#%8g#65U6;>aL~Yw?VPwu~Uw\3ܮk.&5)n|?>&nnM>MwL[% "B<ëά#6)_@\S|8ћ^F+rEh[J%clX*5gtu^y9fRɢ(([\0ģ#6iȢ chbȣ44W VRңFR\mFAKTQ eBlB#.Q tMy3w%r(*`2shفX;g6JhTCh% 8+:-!itu,#.!@AFY٬uDm#.Q$I8 ~UI#,D֖%\ȪrF(3*®ʌp#R1lbJx3!U$IsJCCID&A;/N} -LH^@u3D>z#.QUhzOT=gx$gSP-Ίj#6ףLPL*fԧ!3F9j~hxc""'NOU876 VY}NO#j@T9s vA#%_${ӫԎV6T=~{ml_/ٵBč'pqC9ˋ!yI<쩫.V|!檣#6uyC'>ܯAe;6LǨ49CHQH2t2wT9"+1r_uLUvhFꑀwf\F>[QZ%T#6լM[he$#܂#.Dl˦mʊBYQYCFF7__{HUu;wOɓA󭬺!BAT1sa虑s,]Wh&6p41-6nH)1=jo\AyY=Zﶊ#6gApE30BHV*h/mM}RdC7y#6ڴsjd$ 8Amb{&o* H86AUrYbZէhCZۅ2SSD#.H#6J lXdL1a4KD#.G3u#.1llX -m(Uzhɐ1(UX0ؔDlp#.i@OlշtS'30\GJ`CT<2+riM -+ATcz^ǶG=4R뫏65atHNj0 FG[qN𮋳  <6ӈ!#6^"X<(Мk]o3H5KKpL,+&,ʁp#.#Za*V>#%h8p͆K9e.lm8V6>d4#C୶Aܺ&F KbV4 =ݠDn$DNAPӌ+gbX̑FP2-c+P)22+*vw?zw_9[ߙoinAyb'j3Xt1m,3tz~a#.6uqMۉq9g,;͝S(v-`kb6V۾ϱ)`f=NRAUHtFE1OSxWxejhSiyif6ܑRn1v6DE qT'wπ.gh#i^Mh3`Qq&ri3haԔ9bXAO}`PwU3~o_FŚ<N=,9}'pF_smA#6#.:M-ɰz! 1I(D8Mp@Τ2l+"Vq*t;$io;n3ن-όu#.pQboyN?uL#.}#.IM$ x)Ϯvюn@:k#.KiccndԪAj[ɕP]K)pU7U"wW; ߒ!r7 JQoŲmZ\IAƆQ#6:26#.];C⍶볺 K%cTnqQ峺m!X kַF=ˤVvNSus'&vl4rb 2䀹iߥCKWnר>pbx_9WΎ@TBъZB얔b>_cOVz|ymx#6fǼYJ- 0#6@wwvOӮ!xnpFQ#%jǷe#1TRV1(340 cpTAϨ9z"3łNZQ:%Д~ND|Eɴ%< &فq4 )Uy_u«޼?zg n;q;҄&LS1eyg)IV\.Bm0J[qkdŰ#-`Rb]83cO]B$K|\ț|jg}'$jaȵ<4=6=&|6]OvpX=TV*yum+1e#gDt,DFQiwqlޟ#.س^O.Ϫ-I]AQ72I8xLjoLk.ˎMDz=t&:o$48;!Cpa}j bݛ94g|3߽4#.O%ԍء:<4E#.543RTW-kycUN-<#.'ik;!:-D7)%#.M;$h.ؖCpJi5Z9#%7CpC #rӬGrɧ嶖9EJ͕aՅ`xf-0%k2#x#.|^:+Њ S9lVoaz3!m \}[crXZ.,#Ώfi?'D`@#6o~h0*:֠hKCi|__.71u"rFxô⠘#Lҹky>Q9ȳ#%h(+fLmh}uڎBN[R fJ{2APjפ/t那Y$yP֖뢕@)է)O~U$BO3ud1/5<kUxduta>y65NQpNHe>D.*Edn2,Y(迃f/sқ DҋؗЦwNI#.PBbVu]Un=El㋷>JE":ǔ̝[~ڋ&Oĭ)%&UrfIJNgqaCFpzPv߷SC:l#:=ɪ/6<0DUF9R3}m6y)87տQe#$\Ƨ^q1J=f3k$L{=Jm&@׆v|^m"X<cQRHyr#6̪\hlτ#6Qɺ*h952g(eG=!B-F= *\[=4ʅܧImЊFo%*ags7s>:$qCntl Œ=DO@};_+'绠EFD_@ʴ/H(%ۏ~!ʨsMG4E8yKڄc66vvl#.gt>";mu,vut=;2h!0H(ލ}s^G ap%N=cQIz]lS#6eh$'Hf#6^UЃt..k#.п46 zXPť\91mRt}yUQ}[;os-W޳Owbe'qt_I&5q"gj2E"*[Wn2AM*aFkm0*e"벰I@.q|%hygt>G0xQZQ]~Lf9hj'YtX?PTQj?o]YQf[DԳGtP?eϤ;m\4x5K@Y ([u`"%K%b5j!#TR,Ы`A5w,u1K#6u+;zEko.V߇>(XV9Cg ugV0P/WF꠪gR0y\ +nSGJՖ^IY}轄BYC;-|CDfVs#%5\a? vs>_5Fypfuʝ#-/\Tz>#dq K{e"ϽF@}#6#6pi1Ic1 |Im'T\&Ilgp/j~?5v ܲ5b7fnN3[al@}sم_ XFۄ'm6)k4', #6֕KdUC#6F6HDpJWSRs~ axƫaz57m.m*E$ CAlBIm*ҡ˳545Jj9}xH5ZQWB(P%D7K#..mLj+,#e3m{wl4/}}YsEC9H2tflkAM1C,`lرkOIiN}#6n#%A^(l!.o7B[8fXHڀWz2s@ɓjcoN=,qkPx١˷qX8~ =ޡOϒӯtq8=žxE@#%mpONaj eTI*xzԢ4lGGޏtОq͇5KVxd*W6XSm$H/᦯FSQ{he!w(Ϛ]ȗc!OZ_y1L6P>eza_j~Z^iJtQa[›9-Qz$oL saHR1T *au|bȳē{S-p5cާws_LG偎c} 5IjJ#fعM$rKLgs9a--Jɖ,㾛`|r]x+n/՜ELmb3O]a(!^\C-(r"FgRҸnXم꣥1+/!ƚ6d#6P dITHS{b31棆N \`- xf<3#6  g |c$S@g"Ġ:9.mچ|[6jg5s͢ٽK=W#%U)AMU7/EVb>|sDD#6T2y qв#6k1~6,%gK"hi2K;e#6 fT X]ӦhvְNZPqWPI| gi ㍢\Ҫaa8ibPJrkL0v\q!ytؠ:ܵos=o[DЂ un2`1NA;o$x?N_X#6bo1QbDzҸnBhtRߌM~޹h>(= 66M1@|]f.s۞(::lzjOk)pVzקkj3pV>If$J?LV2e*Xp平n(#2Yzk09<-wu͈lnIv("`Taߦ:bdBzGm#6yh3儌#.v=Bj+8;>N8dݺu]:D~/Ү*zpIs>ӾĶ7|Џ.Co2@~3 Z/sۤzk.x|~D#%鮈u*Z#.nP>uxiԨ&'a S92)igkH|`ܡiS{`'+U<:I,7_ǍV5O/I~!ZRpqy^Km$?ru;46CR;,VҤu'/0?5{is"Vu jO3KONw/6 .#6XrpoH~!RKz%dn()!ߞnȀrlGܟ#DΎN5wP$~tԟNBekM n 17_޹?5;{Ӻ'ό{q(#%`@)(Ԋ9Mv#(JL+G;I@zxԾ(H)gxTWƮ] oEk\lIi?KWؔRmc-5L>(2͛bFmpߋg~:@4>$_#p$ Ő"AY &ׇz:-&OySg]ܞlf^ʓAo?xG57BH\N91IY[Gt#%qHTi*7+?YCxa(z~[_ ]>Nt"rNK(zKd!ڇEtV}nCi]Y??znN:*F`6$t%5Ɛ󳃊\#%|ӹ1?/Y8K,H|"~Щj!#.Kwk|Y Y=v&S7}fhP#6̷ Ϩ:_B>s<7EaVNK](Q/~w+E@L0\"XB!?_G7Lz߄m>+emf c(QƊ#6"u9#.P?KO L09]#%n?@/T#%tx"RKTgLJæhZ\j +r Lt#"#%o(~#%cmfU#%@ER،ğxiBa`8&H6PXci K$q4a-)>N99‰5v8:je`a"eOX2~ZhCq yWiƺ(Tۿol|H,z(`L${9gWR|1{՟@yi<ހ$ LJS(OgIեOSI#zco*(Bv?t,xT[]3X(~R#6`UMK;6(ܣ؊y?= а섀> aI\}V$42q me#.fqpikZԷ(bRf%ER1#p2\4SywE9g+m!#耠(&]#%iuQ:vٮJ5I4n2mp諡nDA|],ʈ[#6y`#6PIow,lN"c;Y:=Z&W#6fY`38Ȋ7K-T"EvFQ`\P.Dp1Cfoe_}gc'KT֨`XD$\#6P8tbOIan0a֐L bB#. ]\BET d(so)g #.4F̷e`1L`yJIG¥#?YzK2 #.:7ߍaNQi2}}Joȝ.L_fs@v#6ĥ7;_{ɞFy"]yXm~,@yNr+(kخ3zL;," 썼BN3$>q6׿yð]|'<@HZ [*sX@U-0e{3ӓTi7qIy΅'V?rH!d=1#3te~AN{4N Ӈ I5(tD# uՙ`QP+&֗`KHZh! A (eX.~Xp^{ka%&⒒Ww,/mzN5ǎ/mK$j +K6L8~1o'\8`-#!C<׮ l28XNeRb/!E75pdpBq;8]c5 ٽ= L=7#%X%3#6,4"uo8K<׬(E;UZ oX:IMejyyBBT#6=q<,; q̷L-rj~Ă=%u:Rcx+#.Ve(Jź Cצm"1I2*ܼF2?0k˳ߔ?\Cc{ >儯p/UM<g;e#6,ۡ(zbJ :7㠜lG1џt|Px,l5 =J{CTjhbcDi:L$eRItt)ߙ~t#.p}w)@)) 2dt`!. 3Yb(%D#%tdb#7Bʩ'ثYcCgMRa2[4 ]gbҕwoNݫ,.1DXT<5'.?*biW-c@UT #%AJ#%? >[{}aEaE(ώ?Nx` ߷"lP ޷G?`l= j—\4ʤAP(A&0Ax2EMr2I#6Q0D%90(^Cg~ەRT:Fgw}}vT$/d*>Q4CިوVTńKv#.[T_l6q :A-E. x42#.ދ|¥qڡKj#32r2Ț#6<7Y1֑$h>GTx~2@*%39hZ[`tgؒjcz! ,fǭٔd"@2 v0k(!h[YR |"h/#.( (00 Mm>+dʈDTKGE@2. &cu8 #a j6MIFE.3+;b$K*ْTHBn|4D3#6ٽ3${O٫H i"Q`UKs;$>5P({lp?),rb"ZKAƒ;5Wژ O~~ON{Zc#1P'O)ϭΣM!+E>T9sΚ? #%`cnh?+BGG%om_} MQ' wGύwE&hn%pm"&w&$)rup)\uUd{Kq E]R*8#.6lTx2iDLj22JˑuP3Tj :Ŧ%tCA0۳=f[/0MksvLoTw e1 C{R_qZkc>afоlJBBr';<[Kufȫ%3Ja1b{=G\ULj#ERX城ncsrsVm;X;MV ]#.Zm2$ g-$Fñ L%._L6QSxݚ#.I!M#.FϪMCvB#%! qI*tmơt:C\$@0!#6%BeV7vdcA֩FvtFem6ۨ_^q3_évjᙎ:7T%#.a 3#D,PC{Ɩ򽘽Xܩ_=qAg6ОO_*P!6E387Xd]#6m2M#%Fk#U@Ty3o#f, ;Ηm0T&&45I$p~41r/#6jwXh:nxf|LJgXCPt/yҟr#6\(<UTȵ\[#%^H#.}qVFX+1DӭB#..rmȽ͗Y]ZI8LA5N0$юm#6#.Xa.\H܎9Tw_vEF`0HʡE%x+2<<-#.}ϤyT[%)740O:dXoYt{{U;R %D P0Y3#%*V q@iAFL`'!#AV#(RBVc3Ea )X`_ɝ XhD;e􉌎'4QJ#6 Q`(T"@ K `nƴ Z:uYƏtF-RTfsK>BoH~YusPѿ 9:Y&ۘ: cU:ٛBr0>^i[d6p;6 O#.c>U o*&L:.$Lx㤴~9'tld!1#.@u*n&HQT*C.졉=9"E.Ԝ+ueHA$}{;~J\MDF`aGnJBP=#.ݱcLB"YYj@=2RMģ8{x]zBV'׿_S26_g#%:ɩ_xy#%Dه~J$?~~8f>=G/e%A7q,[Yob΢od݊4Cę?a?o$6aH*2AHe,-3W>|opgrjntK;߭%JMYTzQp?y?=BVsɼcNG8(5YyPYξjv1}+sk6dص2y$ܡi)_?_3C6?LG_ȯ5Mu=!~*+LOk2b2V 7DDa{';(#j%3tiץAQǎ2Yhqߞw/Z7#6uiMZ0XL!9zzYϿhnHr`f5N$f"Vޱe>?.3/>K6M(Ÿ9O K#6=mcﾴ'J1EwgO R " m"@D__q4|`R쎉+j`Q(L&‡ПK#.FM=33ISإcҚ ȹ~>qU-^uH19aY?NNѯ]#.y `2/ÈDϐ>#6m*H<\2=|.mcw~w`PM9^j=XŽfulDR,BpRH݉)_Ůߦ.|I MJî EO"aOA$F5xqFwd;zС.'g|9lrl:vGi2]  @  3#M.;G9BG8\D=h^=k<z%LQ>\3pӰv1go cj^\:Hr!i ~ZTװ-(Lr'@ٷU:k+cJ ]8#b=]oGTmü#%AP1@zsnl?]ުzxk@2 e*+h۝:wݩΆ~ TJ^9 ͑4hB&#.xbP;Ԣ^}؀K}!I+@=@- )"-a7&#.J+ǢLp#.uڅ,f5(TMB9l05Ւ:sV6z=or,Ư~\ݿmW#Lv#.{PP6).zE{an!@\N*}W3S+Phucm Ӈ]>j; A^ZՊ0Mǿ*vaF7#%g}l-az3ur#.?̶#6!8P-l]EǮZ[RӇºH535qݥ(*SvAkܴiXE%qan_#%Ee.g}H#lk>.ԯ-(2}T|p= m.C:)]ݐy 07aYј Eg'>ELNz1(\xΩ wiYئe0wԇ%~+} "6U =c8j~>?ss"Cqv? N=3 ύDs\=y-&*J[w bDfNHZZJQb|vꚊz(VtAq#.6r#\g},#6NjBp~ÇBY7;O߫* =\Fv̉RMeE\G)Lŭ<];8iƣ ] Y\6g#%U{[.I<:g#6Q.AQ7##.h;!]X0mgݚ19mH_HGYӼ?NwQ:)$/Kyi6+vJEB@ƉPz,miKeAx1_S4`wٍN{PTXPD]*DCEYc^FOz]cpUʏU@,#%pHmUWa*|HΈ}u'2ԤGC9BSu&35h=3m"|\!XP.{yH[BJ+GPS#.O2,,<ӿf;rM`)@9b\m@@@]ئD #_KcR(?#QQpF#%:U#%"m݄#.4(^(EJB녋2 3W\p4J#.q&zB/!<9#.lcwMzME׮#.CEEE#%q|$T"~$#.YqrA@f#%W@C:Њi&s7&BOCf+uj$ߜzEO$>hntH!#*1".N;]\xVd^ w|gO6;J0&5#%}8Ur/$߅3>x,Cq;@v/#%@]C9Pgr(9 v k$9T4h ~m*8꘻` #%X} lJ^. #.JCVg5t^7!߆ ee#%~zT)AY`N U)>S׋rYXP\!&N0#6zY*Mt tl,tgg2jbON@q7&F)=(({;P'+wV_?tf@nX.3Q%x]]v[kסT4%e^ROkl(FX8g&w!?g#.#Yj~ieu'ݘe;gTLq1 #(#,ptA5+ldw{v偐;mP'@}o=p2H#6O G_0P&J#%TO\jhDpɓêКy9Srx-hvd#.Y|PmS_V?L_"'(PvR6$Z'x=#.A='TP)%}jW\Ҩ3ʡ̸|Z~cF0V(i+t|~!s#.@Zxa%GK1*p'=6qK/ x ҽdRl/UdAr#6+G&InBs\g" _K?Ma{4ÝCɸ~܅zN}˝9)JIƀfڇQM~p݌,&_AgNa{'##6ʰYȇ#s\-~mɱ*6iI@PUG/G$YYzR0gC~6SP^Ӥ#.zkHmim.3xK~%"+G;Lnc53>pxqd} =ӷU Avrv94>LpgL{t6{<]^ޝ X \ ALo8P6;Ak#.njxmXE- ">/ѣ5`[R6q./#%Pr9TX8H^ѬP~ZS~!<פUO'U0°*!5`Y$D#%<珟 A8yF*$PIe#%Z;d>{/ n\A8*#vw3*5`,r5#./܎4WiZG魟!u&(_qDg3$ga:,M{k!R [#.Mi a6`3"N+bvd뗊ZO9$-]ۖ"fpELiUHEe.CgA6ygÏ]wU })#.A`lAd9j*݆ 渻,h ܣdw.dy r %(seFzeڭX#.KiC'~Z6# sYJaLJ #%39FQ"^D6{PSS3yL'n's*zcT#. 2!r(PhP37nPF;E6#%-}]Rk >t[ڍٯkY,oŝѲZf'̆F"_v8<[8X˫ɝ;ru06fڹ$H__B'sW$m#6E]}#.~j4a٣ Mf \=Jq΂{O jATP}1%"͢1#6HsMǡQ5̽9>uR#}3vagvmZU#qVXH2 #.֛@$7cP4i~q\KA!nȂ)YɼL6޼44m3r !Z-*5/!*k VDK;"n[z2b}ֽJ"Xvh{XfbZ辴+Au~Oڰqmބ:Ca,&q\șA̶n<l4(WΔ"o?wzg\.f]%kْt<#.ctgߛr#%s-  mhŻ]N4(Zsc.x*sgi5JI@od/(&_XCZOV?0d<֑ĉ0斕;bzUKd3 ʗ h@ـQmc`Y N18ؔ+n5#F]"RO]WQ5#./٪~a#% (-+Gc`|^D]Ĝ#6El\q`!z I<)MG~oxE߿F'Qn#%xTL9-4Oxp8Yx@o\DNuWL7COZ#6iY|VA]&[_5i>sE/#6%5/N(l9s7hgTHYg}_A0VSNĂHQ'U GJB3qdZ gЇqq׋_a8#%I~Jڞ796`|6/ Yrh ]3K⻳|3|cuyb3f Cx-X3PXt?Q L#628~s;{|%UVv,pgYT*Br)S0ep>V_b?BrC9%_$TIUPYEZAa#^ؔX81#%h] 0;5 gYv|vvގc˫_wNxA3Caڗ :]۸xn4{3 HYTBTCal<;`xG{ڝ{a{.A4A#.P=+Y;]N5%х\K59=} FB t}:$A7߾]M D|_*U./,!nP=`d_&\B7d{ A qP#%)Xu##\>G+[q7b<*w=OGH|=NA LRzH?yCԔV>!0н^.46#.?ipv7jѠX%.S7pMb64yCaΚ#.̷Qv &P<#6vT} XҥW`_ }9w[wmZ?C` t{s?OqVȨ7R.Ȓ(H0p#%o{x-)F,=ٲ"Ý̄䗰9Nw.icvL0*z}pAZsmy^RONY GT%X|B54 T(X# ee=]H#%wZH_6lw0%=i'`w%#{;r6,#.,ćzdx`9pCYTe*iD-& H<>Rg#65Y$?.xRR=TU}@1ME~ kmmG&Fefj~GM2YAwY #%y Mo#̉lB@"$e |5:IF~"->x"#.?#6[p4* *D usmos!fM*fo5йdƿ=1Vmk86l\gbݒK!UU;I#6lJf86#uoz <:YhyfΙSlK6d.SA~!#6|N3;Oy K~İSf=#.vd?IU6[~@@X#6`/{> #6Q@lΦ\)%P7`ׅC.up`gV}|F1bcC2˜0}"Ao#. '#%h&F7yG2M:D(3_}HlqE#.2+ϭM039!F9-E V#6 `dxk #%O-=fq/ʃ*`k|X}y^E!l<FDYA TD )#3S :iq`wr$+">,q$DL#63kNk^!rCi 93C<2.#.Y$࠸oXw^#%rUvA+RWVoqvތz$ceXj1-.Xf]dmffT! }Ŵ5N*nl+CEגI$5LT˭MIikmjzef׌: '^kAַfuGV:eA)2gY(:#6X#64YH0 AP~_bjTm2sxqnaX;ڟ%tG^^Ȟ˼I~}~ռQR}q#%!>^Cwl9;6Iݷ;d]d>a؈ZjH M)QlЪVY$ rPRm82d?ۍc;xzZU#AIE5&Wf^%S-5Rkӄ]Z̿19l=1IAJ~uE4+.^%6 fg -ԦɽI"H~WN3v7()sp*K;϶3dc_dDv~Q![~1mؾ!t)lH3+:K!@Y68x\ż.?-Q*DjIa-zRϢ*%Q[v`#.&2(Ab:69v`9_>ʧ86x'7u'{;HA5twPI(?xyX"DN}+ysFY3m;0#6J#%aAD<Y( .pWapls8?~3 PGpC :3yC?P/id+?GɬV7LUQX4=2ݖ|* kCԦjI'> 5UA4d>/ЯHWb)Z]CZ{_\0GLrupZG}6\ҍT᠞20Uʒ8MA#.7; {tc$:F,!::`bq esdQPNJC2U Z*>RQИeLHc;vbNTmT&tKPtUH%HYW>nC-mur6E+n}|=i'2)E^S2Y"C}iJ;).ٹ h_籄w!,#6|N}C=)BBh"3애kE,e'?`v\>(}M|)k`a]˕aEh#F%LV#%I0% Z\Bah%R2`lHvE6(\Dd󈸂HH"8ERG5֠AC D55-~}#.>(#.<1Z*'Qbr#%*I}kOH~)۴LAGQbY()9gb4 G~s3ܓfHz3J`V߶P+_>q#64X̢3|ͯrҸn[]0Pmy]<(hW?f3M A};`%f #%'YH[#hqk6CH&j Y1#(#.DB2`JhLE(Ҏ*XZO/';+ÓxBJ<9/;3^-i^C#6@գwܟ}RN5 7n9D#%pHo( u}J6+pi:4~1؊&IlLatɆ,#Z4|kf_ K\ U0$UOqHhG:#Y9!|r=H͊@p2 B#t*KHٷZzDZN􁷕NV2K.*~ GX5!/KۅةӀyzK*ü`An߉l/g*|[BUBP 4ń8'Pf,͊dď1k;Ծ#ՄQRQ{mzIIJ0ĉÖd1 *0%v_η?nTt#l1绸UgP=`*II8'ʨFP A_NAJ`}ÿ|/O>9X<|z`7VtdH^mQkKH.pDGb\3>:ZA*=^W< e|9 p]-hẙN{qbB:8jAK F#6#}띸O`yJ <÷ ]ȐJʪ%[9_;#.H.҂POܶܒQμ8*ex _X(A=I\,R cp`Av}ϰO"Ϲ#.,~謙!" "? `]Q{jNo.˾0,bd%pAk:.zh*;ϻk'u9V/N|%bdϡ?*=ym+Pw!d#.[*p aln7^9Lйp4#6}>|{Vu-M)mvnEQ3t6nٺn]C9Qp]q#.v˴[Q̚DF-hja^BVͶl؁#%PXV0PPӮ: nzgxDeb>yk>z{h}s1AdH>fX}Ծ͞#8&`w6pFBBM#6I#6~랠H7V%/xn=@E=jQQEV$[jUUD:z⤊^*eVؔ!&&rl|D\Xi?Xi%x< zfSo[֨ s4'cyPvS0"# ͑~{D_*9ոS^t(Mg#r=})NVA>?e P/#.Yl{d+V=p0tԹ20{Qnwv8Kۨzk02#%#.qTK뇱+WUшxɰ *(D!Q4HT,P@X$Y5eHr;lllWTKw{ZĚ?N=g\31Il݃'0`+m@#.Ycy#/#%B._0j%/9Qr#6W=r(#6`1M3-Sm)s [!DTLYߨ虎hq9"T"#6+AᩅqڟYfg (kf:،C#.XaŨklmYq3~73.%Q: v-r 0#6lH`}gtL|~GnvG;H=iPJޝb$ L.`4m(4^?bS*dp7fM ?A7D$˗t̛d>o#%d*6<<=͸_yaa Lf9mxjt3]]~N.5U4K.wͅGQފi}kCe.Z8=6tYr#6%7"sPDL1ܱ^'y=;*Slbl{*R{ \2@kPᬅDG#6@<0Gz|~HzNcG]bcy҅!!?o?TQ)ލQ6_7ۃ#.ڊp7?v~AJ'b,z@^@q(M9T*.vmº9ψY t"&;:<݇L0{R/$3#6?>_u,6捚slsl˩0躨sG#.uggmPkl$XEvQ ?[IGGHNwS -\x9s{`J:^B4?zf)#.!a1K2_[{lAnLL#6#. q͡S'[oGf(`{Jw$Ru:g<] 3dCp֓48óe2vw]L0Wk8h[, {}/l\_GH#6^'l#6 .rw 0~->]sws&e]]234ٗUt[mjp9-@Ab#6AklԕoTq4g3,Θw1~&#+Uܿ}.ƳӦK7wMTD_Ur{RniU!ȸ>mi?]sy:#63P[~O.p?h^Uf| 7 DN&6iQ-9z-bw{K4d@uL:؀r}Ӷ8\4ݜ&dOxtՊ1oSt}FZ|iw\E^q.y߳#Fכcr 1J?yU`< z 9=(V#%ۻ#%Y]NIr+0Շ#%)aN^/X#$ 2OaA~eoa#%aNͿGη8$Ks{tJ^eQ(L̐#.!~=.gm iij]bM6E@v`waY<<;%3!.I353差N (냝6c9vD[4;ȘQT 4ƒR.aV&BկNhFz *QHj$fU"67UfRHNs8 FeqWzd5օ!;x>eeB-!؝m0M."7Nb>}X3:N7[Saߦ#Hwo̳۴!;Z-"zbS #6ՒAApieTA @h=Bˌf?5q&}rd^W?k{K5,_{/+Yt1Q!%*d`ڟ@R9AF"ݷf۞Pw|}h {g =׷HER!A˴,?=ȪDy_7x<,+.ehX؉+VBG=݊V =R7.rT'(fhV7ʑsWВ&QN!MpqZ%dn;'%1LhUQ#6l}i "eWw}wλw̸Ŷ՚Y$6a74E#v8omfC'amH|M4!vk!VB: ]&@[1#.s3/MC4X#6E)n؝'a[\f@n|?_wݨϦYl2K?*#%a8xI׾=sArfA#6 GMo#.F*wQT`7F4kA#.20hXTZߴb =H7w&C›9#%!zlP?V[=s֙&w"TK=k9zpm)i֚3=FChYCS8G+}95Gsid%(#6nBihIwP%,h ^4{w+#6]nԍJ,!25.!bΒ[sHƶg6|kP奕e#.dӒCG)AkotcC~[^#%DBI(׼U6U;}= |#%֫լ7:UC#6S;\6FjU*F7`rtXȂ@v^G1)^4N)LvY`']L5m3}Y5B@- F&)l۵m,r,aH}3V%O2(J(Hk2fdqDy"N5۹]#.70 :06쪻BR$cHJ$tU&WD9ς*!b8qD-0Ƙ:=&-OgƠ]+KM>i#.$w_ܟь$g\W3nWVGMOUy#.Y7#.ﷻ=h=BRg_t=V[(@2N. c !H>((Q67*=eHor.#6\HzyC?eBVK<`PA>B*!>y5T.(f(ε&@!h!7#%#.[]쁸F/5"i^Udwn\q/ p<` b鷤5e6}cj墩i,AE`d;;` U4W٬c z9$u[}nS(G" uM#%²/lM` 3  IBŅܣPb 0*z*RIzM7Mv%^uy;%ewh䉽#.Eh% Ԧ>6|,}l@$~#%=$.4eEY $$g񝁸|o'&_xre{ڃq#/9xsLXDo7 zF%A\Gvg}hKmBx#6I!ybh*O{hV[sU>2f00$Yӑ·+?㐖#%OP?UHjgy诨f#. rk,CǕs(ldXT #.-T``0f( C.h_ |zՋr7Hda&fA=/Qywv) #%H}0!!?o6*9}H $g/b5B^! i >ЌhFD"#誨d|M׽NV2]Q5J:4x(.QHMn]E>,xC6th/ɏ{hDh8_ē+A#.Zb i0"$qݻ1;nxIx5S2#.Ou *}9,1KE垭')#%B H싶0=I;B q@li8"d3!x#.AR:pxԁ$S'CߣslQap:rS^uz놳dT$֏` >D=N3%cxIʼiă=I#.-3}r#%4vvu#%NvnBq Y(lSiLc&b3Ox#.k#6P2C+LjAX9pqfzblS-&+XRka\rnj`X#% ⒢ ;xh}6u:1[w~ ?7(iHPjj4QPuQt?_bɱ*w(QaDM Ebyf:e8C8PX{il[I~#6!OLc욾@#9OVvøX79#@AV/5MP40#.Bgk7ÿ^ο}(=c~'!Dv^#6@ZXz}fT.R>ޙSڶ8cs(:>z ,>c1t*UGL c3Zo޵㥷;WecpqF;jt,٤m*a\|k/оhDP$S x7m"[lmp`h8x}7:דlAÐ|v#6w;60n1ljm>;Qcn$[9ڌ5)܋QaH$h8f{xl._+bsaצ#%YbdSdƁ#.ps{Il0R&A#6BHjPA)HTL3 #%!+RϢVAHJcv>8}h2|!#%;v+"x%c@x@ 8`ŶoS'+96*v񑭚l6ywP/fW #.W# dn;vFl[ w6%9MpZdK[?i`WXAԄ}{n#.eA=B: h#$R"!>|8f#.(SܾcC|6RGdL}=H)G&r 0zs:wd-㡧"$3!~ I$߿4!#( ] kl1v.ŽsϺ&]CjJm7ڴAh)(rVTu55#h~=Yk"N(DK%OԎLzJ"^q\ѕX0&aŐ?ճhFE5|eܼ_ '_&P5' ;`VSS *Us43d\I]Mښ[]TR5 0`X%JBi)dpnDpfݳ XVh55fʑE$MꝠ!ģc#6l1gk~cginu[P #6+dmJO}g#%#%C#6t|lv+" S)Dr 4I#gmSPp㲵maآumw`WvC0_#%bn*F[fUۦ<ސNHON'H٥#6#.meQFdQB$J`D*XR AiPbB>&'5mSaP#.3U_\ƃnXڀItAjrir%^[p!1XZڧTYfK`^B:"^%GP߭:D-nD\iK6!E$H#%;+:(gw'`v2OAڡbb$(cB6H &:[Bn6LY&ooagZ4S$.v}^Gwx?LD(:lڣ|^ys* oo{o)4"E֊"gьf:JM.8g8$Ie7!F9u VWTvgN^ׁt) c=#j7kgKm&ܹ5.Sɸk4 JApN:leƭm2L?]YءªCC!!hl5\ЙJ\ ץ dHd43d=BH#pK5Qz 5Zt%^EA@@Ȝ_e{> < w+s, "5#%BPiu+554o.#*H)BF`Ș`Yzɘj8M!KI} A#.``(3Uԍ&MlUj0%ԥ-_烞;^Q=\)I#6wH`|FmA;8ck{ {44 Jܙπ}LPCyBMdYbyOĒ䵒~ɹ#.C"I<;Ջ{Finl~}|B{F d#6!!1134ct'HC-&#6hvWqDAt@QD [! Rs't-T#%g雕*YKtF"(UV#60&(&T0}zOQj#%Nn(VMBs bLcC@!.t1'?]& i(DyZ*BejMdFFtHF}Z0"'?h;dYC*;C PCt_#%2NdH<%qHMI\u ΠLĦpM<#.8%fLQ&ј\*01xaj;{<(pю =Hy!wD0ǕAc&b.5sSI1j2EH,k=2E (ʽ :9ZkO<שMF!Lc`03s@}YN#6late-=q:¿ע1 ^P\aaOr@^u4} xc4uXgds;",_MltKV7Lš8 9T(5TH p_;KeYJ9-UAXI.#.#b lImUdA)jѹMF4mj!6I&̓&1>!m.[R>]]+.]xjaJ-#.#6%dAafȭ[&fVI.۹9ML5##|[Au_kA:QB3e/F ws+-+p.QS&h%mKO֨fö Ҋ:yG`$F"|hP;#.aH4K_k@ip[66y3xpBFfL[6knk׫TݥʗN 2I+Fmk>)4+.b$馬˶?mS>^O㍳*0h'~;j0պ5-NeF9HGIr,=4!{n8n ~:ggЃ`-@T/?D/اB !DDE%#.&3R60ܠu*:h$M4h@I&M/WX(,fh#6l#%S`X nyzڹiRJkVr2L7krEERJɷwXU :c7weڊ(ALoܝX-=1&XL9! }IǾ\y$WG~E4mS_ G#%svYBog?~A%*jڹۈ,#6ѵTjն5mͶ-V6vC.'Q E5bG9;#.Y4(u;kۜ+4ֿD4$S&e3J,)I)5EAΤZ1Q4ԡ"P~ܡZLY%[4)4̑hEQCMDFY)PT%ңELFhL)T&%!MAALcH`4S&ge/#6b|[|X&A~lU_SBݘf̈;708Y!,mfvs9` 8#.4czKj\ 0]iټ (5zmn.֛,mDs0xxN;Z-_K# }YJһ0te^fw~A{*񌎃bm d Z^o_bc5#fV*(i`!Fa><90ݽX #6"tXa3ٟyNUMaYb†+NbC 4}0_[/cyOW}#k#6xn4O3=GQP+|ɠV_fw&}z^ p{"r>MG]eUY#.q E)AT$/rdǥoK}eG2XiK􈣬%x4mcǗ$I*#18--ߣ8#+gǏd C֓Im{N`g"PREΨ)xcB?+#6cguVˬ!EPӊ#6+G0'#66[G8 pI5,nm_&ɂ2Wc.["^7L<1YCu-4'ѯ$41 g OS䇽^RA虚O?M" CqdNIDBxK'٪ յގgd6E)Fm2Ib=Oi,(5X@\{w7g FHC:ڷש']z vBx}I\wvϷӖ_? 畧ЪX@w ߜ5#6)~.wzD nGkBkjl8gm]%}; f.IG^fPs3 j5'B;Cq #6;뀛?/>50Y7Q6ȣ0Ħa iFELŒu530W>ًө<4̵<3t,ņq4hQSRJb5D(EVL›WUޜŵ (%?Kľ$.1^{S{eL:"a *cuo\ a\MLhzIƴlV#6'S;ٌ;WGv8 acg9t!^ Ѵd5+6 5#.,0&bNJ:~g]`ɐ/,7#6R[&*_4To#.?02!n6#.ΩсĐ4&:JF9]Ѥ]Ҭuay:0j2w67LL$g}n@upB텴ց=,Y?9@íRPɬ@ZlAs;oNqbg6fl-&llg:5%GQa3:;1d9LJn5͚']ߗQt\P##.'yJX5\Fָ2L/F.ZX]G(jS }5#6jVͶ]*XTqdFSBc\ll^s9*N띡,ߞ]̕O,K+Thu(v[=eƙCAib uS"q0V^ ZkkO+gX]Ne6_y#nukct9)Y69Znl8\e#A#M|fS*CP7vBEVU;"֓X.\[DY\('>;8ghh:yYz&YNڋ0,iQ!XlhpNVNځ]#. H.q:RIFȡb4=#6YE&)+a0[3A@bXQ*1X1qIN~.2ߩh7)nepOVRQ9B&P7sinc7ۃuU6vublwsaevfcy59ݬe|[u`z ۙ L>8O/ R=:%)ǒ:{ZQF72f2"t[LLLb|ZFcE8S7GQgrܨ;翩1W i#\Z%pUX6s2B9H4q:jn21 O)&PmV\[lf5,yULb0vB&ҪCr# SH^i!ʻI>v8Y٪WaEZNχ+a'gj0U☁rӊ*L#6$ 3v{"aN+(0e#6Bu R`hÀp PI,#. fF#6ڰڸcM_{Rƣe\1f2R;Zaf%ñb"zͷ9V2#.#@DEuBI@as#]hP h}uz1U tͮNzzOQ(TwqhR`pZPL;7CN]"̎̀#6.s׫ZÒ4' ^le,Tmt 쉌SR 3 @0ty\)&#.:b8!K@]Nc4܂@re53Al2ȈbiA-RrvֺS%#6# i"23SdtvNI-"S#.['2`Rqf d5eR#.XsL%qiL§n2c*<.G (Ncim T&pL*[#%X*tvmB $I3/ObYDw\#.dx/#.Ӊ\l#6e47U3}/lpNZ)jx#uMXNRҬΠ|`5`p3Pf8&7Pn°j;'CS_&ӌPiI+]#%OD,ze̲9i7R#6tS0@eusǁM׉#6K5BE !UAI HX.b004ڐb;G.NGIF1T*N_;QwWm3oA8TX$GaJtކ`g N }[aYIB5R[#%l8q+Cȡ#.F+2fis l3YHu#.Iawmw#6naqʌW;eU 88JD61C#%CGf1g$NɆ#.f i q0#. ( hLJII4dpjri3f̺Eِ9Fm0jJG8gt^Rg~V@.uXil4I%lK900[Xn&uA#%0IF %#6qC$R5@w;iSh#┈1A6*?g|z(W*I"H#$d#%|j?3$䈌@q::7HhuF@&4TC8 #%-=k<~X$*vʪL>Jhi/'س7RM߬YEr,;B_}P4&A\s'M.iRk5Bh7n20+a7u% exnX!Ս#%c=^4pu\0R pBev#6h"Jk[m&Rj*ᚈPRqX1H_D#.o=#6JABp5㊡\C$;8SoW4U*#%nnR 6._SWwUٍn.nn-sd5GԻo?62.0V<?|~ r=FwEM 44,;Si#67Pon Fbh1D) S@n0.֔.eA2Aczf$YЂQ#.cG3!:?+x˖%A.9FKP?V?_Ui&RkFQ[FIDL`3-lX|Z0POҴTR᳧zK:k5vz4D+Z"kDFI0#%D #EV-ރ xfPD`@[΋I3_k̹< Պ~Qb*Hj}Ja_x;w$l[^A4Ldpb7N(cKi"F'f5j]*MKoB5L1fR@l@E`+KD#0QR&lc8B+ Hy˱JEHq @QUo#.;eK'(z#.sdd%$Ϗ&ٻ#.PԅHT]c(iEj#.^&АZHp08W.cc#%m LNLuY^sŲa#%=wKbmlc+A)aLDH -5Iq0]i> k@ /_m!*  I, ݏ;dD_&,ŠúMʊ6 {8Q`oUNJ## qe]gRrE0;>/#:>mcz"4U#. 2]l0jiiZ}kw 3FCzi!Kbg:'5bCVmc{^ZH8 ˿+#%ӾZ AI4z^ym'Gi9E$P%* UeYNB1B)#669sypY.ݘUfylMxkDilʋ]ѠC|F1#6h7nbC#%ktE.J ԘDbTJ Q$أJ#.L@c#%-P$PR[ t`luqlgL #6?@ B<5 ;+>ER+ɟzM8Qb{(=G+t ~L>WT/k <1GA|A]fs10#!G"dFH"bƨɶZM "BC5 ?=xT\KJ [ikE/k|tu+W n.rr$E#.{:iY%leʵS0:2KYk8ijm&&dv5-zbScA##6pH.KӃƶ>-IS1dS)1jnI$C#:y>*iyXzMp\J}e)3&=&B"75+cdrpQ M=W0 arr1@tXEDLX%ѵeB̴˕kU\^y^ƺi ,sKB4!_hRM:#RD͔Dkm^| U"hI1w>Bms'`Oe3$SFXq⢵E^\$1ga>kg]7b٠3mez4:.L@ݤ"+Ļ/7_K3=n9=C#6?qő@P \cha! )]28Ƙ (W_@p$ -΄>lsu)P;+:lP .3уILFz%;8mfЫԬov.yg PM"~}b\2e؁WC|sл\Lu#68TT>KtJZ~VPv Hdְ# = s~OlqGF#6ƺj76Wi0#._}/[onӀ @#%#%ljʲN"Q@R+r'8#6o("2! Dxbu^U=_v҅Xd[&ya&\TCA!$*c#. SL`OI.!&*xVz@]7=v#.W]{|)LcܚP fsD\Ox#6((S)b#RdA] %@gaZeF6HF&cD2L#l#6h{C5U.m H)fu'6ơXVFA4^Zj vg6& b SRF[K#6@QIL*cR⑿JT#.t#%6:^tqs(Q jQhXzA;Pl|߶4" JLhJX`8ŤM5k"k;CXxj/z/#P|4L`Zh-AXAKۭ[E9b$>#%0 =V.nkm>s gźSi{HԷt0Jc*$L¼Z$!$wI;tnl -i!I#.njRYVTʁ[lc0XlA4(F/nOdʃte&YA16a2e8Qv!h+br@Å/))iQO9&B>|ɭp*YKmji!:I$mDVCCpPc&P1ssgٙ .!H #6PR3xQȵxǙcQ:Ts hi5JKF'3GÜysKM:]` 2UKՕJ̫ZN7~R(: @"ȡQffđiDThA~~N>TPQpGǚp󠥀CaFE<Q#%,2䰮G&9Ť;1AuȌh)`kND =#.Áq [tcv#.iLjD.1V&q"J5`̆/:lF#6ROQz#%=;No+fy*wЙF|"TXBSM4DB *rJZeE@rfP\/Q#%(tWx.ǨP QՂBUN#("X2#%LFM`'fT(#.2p.=Zpv3{raY &&4G] :\cl,u/ xanG$46PDkIt2v+,u UGLc0u{2=A+('_HCX=DmqzEn$ON-ˡe#6SY}Y#6I %ݣH?]$E/]j˼nnșHNZj%mjRC@mQc^:wn) 1K)y#6QҐ4l߷w7D9;nբꙏtN(5IrB̩[q_SRgs%_ƗM~%Db+)'hwJM05YFqt "懲:ʭ4ѴLZQM4jW]6rbK$ج[FߝVbVkJ*K-k嬳oki[V*rtt7ĸe h 'kг)K ]e"JJPB7&r2(-o)<( 7 uh%,3al! hv>3]l4}X(qOtT5(i(#8+!iH@aS*VzPT*dWfTp9P5tQꪅE#5v"IUl#%&+t00pF`&,܏}Cpt,VpCA2 o|'Pg=b,q B=cik=A~x#6gLqˀ.H\h]I1#%%扨&?dI~;#.a aQhFpA24 Mj-F?=+Rl~C~$4K^n&߃By(`=4x(C~A@TTвa81#6{B|'`y~6ߝ=a,rtԟHT̉I9VTSRT IPцj,TU#63SE,#6@I#6e,%ZeC@Q>9y_-6#Dca]<>Zcm\g:F0 0#B &DeıGf4'F4҄qIlb-LQX(J*Ef-H#.Ԓa4J@f@ I2Pْbb$]LR`MS$ ZLibm-B1+=B`HVZMF`L%mV>L䱼xaEXVÆު AF4gJZ,jj0'6Ѵ\6rܾ#.c^.4<-14\3lApjӴK&D`:3k0,$iKbc,PyA5&ΨhQ.H5@k[R5O<#.C:Q6%e{]N! uP2h|imO:4Mix,#>c!Imwe7Y q1 +p8#.ߣ.H( MT?9 0`1 8A%Q#FljTj,TIn0Qr]JƬQmDbd@b -eAn*Z$A$TɸC )ȰD@QHXHEǼ?X#.Gꂤ@Yg¬{S(kf!W]n[erZO¡.TPI&#uV1 Ng["ALlBPoTBDWUZP4mdJT淍V̈+XlTzŊ껪-zjב/]n\|ךZƯ7uY$թ3JA@G2<㥩X|!kkE{\5pʑE.I#%}3@ ,e rIcQ4״0NK2#.#% 0#q MnXq[l'}@a%ǿ3š74&iG ECObȀ(|Md=` T6qr.;Q$!a^ ҥ#.-TiKJTcj׼Uk)WQE%D/9@5];c{nJ*dBda6'.vFqpFCN3BKQ4]#6Ӌ#.g8bCְ :P&&42iPZ0#%G{" M18=ɉG`‡+h}*M b]OCXdI"BMQQ<nF^Ϻ!}z`ûdW#" %54I7L03'|@YA#6?KmɃ:Mlp(̓V "ԧVl@,jnF@$+RM6SHDB0 D#PN5X4O4D1͗='155{:eQi`K;41$еcF^#=ΤA>iTSMZʸk2P|T5PajJLi֌e5tA&2jܶe-,`LKll6Lm$J"3f4M5MUQli$1H$#.GiGL"8lƉ)D MVVŮkvo^aQoѴצA'"vC#%#%FȍD*TK[R]KUm~B #K=Q_fHEQ GZ#>adzApQٸhB9!OGk!' %J؁!NHl`G>B zAm#%܂%KtDByxq;8WU8;g&Lx;Q7VZ֐K6x#6ءp[1v*@7̨ݣB8#. \;:hzp!a#.DV#mbL(4t!#6IO;NϔRb.-+?VF0V~}мmFiAQ:ĕ#%>#&!-ctL!/ٯ9vWԐr[ 9+S:~rt&-twL ,S4]P云C#6(,HQXP9x諒#%2O&ѬH8ՖY!D14P)#.h4L*v#6HLMIJB#.X11"lN9anTGd#6숒6%  `6Ĵwc&i︷lC#.@6dZHfhU)%E`҉c JO'T*cmhF&(}q#%DB;sR; STyzg?~~ Qu}&`]|N^@UBfUЪ`EZ}MI#GG$=;}%&Zi]4ff٫ECnBvP`Cqh\5&+&WsLjF|fw{rTP#6`R#.!%r)(#6a<,<[މK:Md.!Y;0UQTY"$D0BR0!D.bo#]̚T`ѱ".)drf5"^ ih%|#6eOuBȩPW.T[#.i?L#%Ez#636~*(4ͻCVn=辻VHfmڨaYe֔ je 5VWE[$FBNy3, /Xp 8gdp:>j"O=HEeh ˋgؤHޒ%?^uFVmTSĺ+njB#69Br,81rsU:bkg:܋|Ʋ:#6K%$,`#%*#%A DPȊҥh#I n1l+p<;T) ٿ:Uyne#6eǷVQ12Q#%dd!CBbuE!Gv#6($U`ѽsqKѣv\5 H%A#%Ν|:LOBŜN#64/ LdMr5wmJIǒBHT*F2D#6 _J(-!n֐wrPl W1`Gnb bFϸ:64kR&'&{_)wV7t\-25bB<* \KlH2Ym@&"-Pf{n{G.z&#.zP1`WP2O!-0ȔfFD$ #fK0#.`mZhmmؕX"bͲ9Pí( XmG0.M쀿˜iLI!1b;EP DSqScvw'祥U<zNu 'IfbWGq'NP!#%ĐIm^efʍdj)}ʾLU?OǗkە氵0}ސ^xa6E/A!~,v7ۯ#sz%2tƶBÊ -*F,"s^C^GUG݂!p6m=m#6N0^b!d%]-.JZʝ0O ^!0ןb-sy䃉eSZXKfsM%8Tb\?}{>%a8qgd;1C ) T'd%Bnp>f>yKp#GsmGycQۚ%\U#.$HH0QKACoUУR*s$.?K b\ňaY2J2TX (Vy۹uުZۦ#.1AA( ^3@dntyr=EI&01$ե["'4|lMGQOgC_4wA0CfeEpIGG$끪UtZ0hk>1"՗,W%F;q56z{@@q(yCScp_{J!0:t4QZ$\v庺ͩNݵu&4\^.^]Vl@ #%C@US_Bڔ5)ALjrS9 5TXlzMu>#.3k# j G#. 0nJYUiK:apZ2nǁ׬-Wß #%`+ގɬ'm'#.|_uTF#65*oX~\gi[4Gk]9*itQ0#6'wgo`!(RY} _b.5(,DPRSX%DA&?3Y{Z$*mk_z.#mlAA[v,a$v+'C-H4(an~#.šX>7PţFsEӣp&K~iKn<{6gTSE_ϞRI'E,#.mQC^[#6<PiqL =Lo#%{BhҬ܁ls-jg0xAӥgLeXdb`Y)0(ϐQ3I!aÌ:ТIe)Ղ<=c),[I _3r^B8i5V-WBCGcHgMard7O1U;f,1!k q.aP0OvѤg NJO5Ĩwy rm|#%#%p+UC'G j&˖ ![#%BOE+QZ5mdƩ5Y,mb @*TEM25Wn\4"Ԗ* ARUz,.`!i p:6vg7nY;d(])5=:C7-\n}cuWC2mFm CEli 2dS ~(Oy!wF?"5jGcc05⻝vo1kp&|OYQ>#.zޓŇ'kjaАTʥl$ Bm=eYb]ع`#%.L?ɧtnu#%N؀L81zp#.nʪKqt/B+5֍kYf2UBCYI MIǵ܄$:¤*uηLw]#jffPh]u<QfnBhTci0x`hpTZJ0`28hJ!ѭS LkLDa6(߃pHW֙%Do!HHIjUM̋6J\23Y2 rdŠ#6&ۤ 3PE ZH Z@ 0V52lfS$e6,3$e-/]˵ri˛rAf[sNݽy"hR3wٛ f輸"FJ2وA\h@4Ecf16#.j*cq0UkH[yIQMҁp&b\3 Pֆ4ս1ΙEnՊzEFI[#6>k6wĐ 0Ϻ訅]hʈ,`O]3]7Lf7?,lc]̓MBbA1H4id8w&N)Ĕv#.u?! 51*˼UDF>wWْKh*7j*A#6V(1*AXU!R#.aS#6$DQ#6#6,ʎXIvUDdА%0zh RLcAAT#.9?ϝ*(hy]asa`sp%Xgՙ3n#.#.H9F1KQn mkU~[` #.;@@HnݡQ!*'[Cm/C ;&ƽqj#%AD^G9z*J#.,Xc#6+fz#%fθC8>yvo֢JF鍔8ꦈbCD#%E7G*% t4n#61*M63qM!!ȵW|TaX## hLCZxbi(6t\YlEX#%$p4b9&K`Ȱy~5D_ #%^3;HנXYU["zGEMpCݑц|JNqI.k6#.?XC߶&UMWJ(]eB%\;(BLgޭWNWu\vegd!Q Bt?g> YA h7vgy\2嫆uf"i$l&ʖ۴&S60xMܮU͍w^vo.ul ۤW/9y?D[a3FAR1m6q#.rPqP4`!FDm6ɒc$cvHEJG+2ĹR&.-S9;73P-2}ӒxPצ!DO[m4;CAA?{@~Fʈ;g#. ##6&dT#%O]#.0UX%H+Q#6'dg";#%h#%6ӆ#.!]zLɿ$уHX*fO'"[>PA#%GQMA={}ᧃvY)uA_dFϲc[%oE,y J2&ot;6^ouA(77) YLxl+ۚS54w$;8SVT:Wc~ q'lc0U>L#8US3Hw B?kz&)Em[p!oqJЗY{L7LAӎ V0>BG.#DDJ )M+Ik=i4bs '4>}2ksH|DaXwk}e&fRyiΔK=iٰ y/u+`x$0}]J3d-^϶9@Ѽ#.3]7@XT՝F{벛Q2fqLd!o!t8<6c8CgB~QMKCm"9n Hޝs#.An"3-GCt.9#:>pwP +m&#%fFִd92hş$Ey#6,:@(:xwu#66쯟Tή>H{:rzY5z[(g 8uOڨ 0V#% FB$Vgl6өCqEW9v@яaN7 vV ?T'e;}`9=A+/nwBv>U;QUΆRt:`#A'B1a+1MpAH!OmmCP6*#r=??KTH?U7IȗۗXrxi7ƚ:t^ͣ!K,8Azw(I hQw,.1Zwb!&t4!.2E)OkR4?eBF1e$8xnnx-PɌ^û,XFKP<+wOjѬEfMRbZRMR(gfsʵ$u.kOU;HEUԫ@ȥ~ש?~dmeI0hmLBLhb#M*FJ&!&͓a#6$gxɳ':7ܛo'6yRMv̠0h4M4aK7tzh%*M^&y}G1Ԧ׃M6`m8@{*E#R5sQ틓ގ&D +fCx&cz\/ӆ[]4>nܟh#.L 9obkMNu.j!2̺ju^83f[G _3O8 m𦶰9T/ 3#6Rim#%F"[miG#%0NPȩ-D#61u2HQU;JnVݮsuukYۉ׷7 +l4h@1A*%*@’&M˘#%_2HAB,$֙Wrrsk$3*Fד2LE:UA-HK29XarReF?6tees4~/c hX!#6Tr!S/:kz)\Q!T`U7*͈ll/c\(!6B5A;ͷr.xǮuQQiIħ%4Ъ!h&M9Q%SMLRDFY>REB#%!TAܑB{T}*=U&00ҠW!P':Dg#.H1G۫DPV( NLar($ВwRb4w^׻C/X,^bK\ٽ-!lMv|!Ȧ7@_]̏u(7#%˷I#;}+?}n*>[{oѤvB ~?c(G U#6+杂d礇콦zR'j[br#.v#%ηUT71wVfmEßX J^v# ECyƱ, A2AETNRQeTމr\95j#.&t0cZb8z0mEfHMq4 9 #.UHr\vV^QkrKhKrK\6UƎnV鵷MY#.cnm&k-͝r,mj Q+;-#.w˻$v07<}Zkzo=H^"΁!7@A"#6ޔ=D v_oQy>)G#6"4=$S2w@d#% Gq1(IBH%J*N^T#6Z\#x b*""([u#.mt~{oFRd%T] *Q@QHѶ%[~k!D,#6B?@#%$Cϥ'HjMFF{ZPuPP#%;f_@OA$;&Ԭu`٨3`:H#"&Q)T(uqe-L͒IJ1idi66hmIEbRRJd4)E*kjZVjZ52b֋ci5[Ϻϝn$cu#.Ǎ"6W"Dne6aPA$rtӣҮ=t(YD˳eJ[LTzF"``΃ՁRՠiJ%MYS||#6uֽusFp"}rC"lʪؗ[hNI/$f7)֟Gb$CÌCC:s/}wʀDJnTQjPxbZ:>춖9W_Jװyixuw}:甼'u{a*^WW0o򁹘8Vx˜|ʼntCVo#6Uvga*F򪋭lg/=5ln.bNΠlrA׬Рo#.(#LC#%@: #6`FaPa:L6 x`v`qG=269kSAC#%6s^zv Z3K3.&˘sx\#6?#6_Dd\PG`{uDO.O'6 [k,* Gg ¾T"Vs ##lNƹkFaCghz:癎>cETQSSNFb((SۜM e{A]k]zV4o{#.U*#%9G֓6(#.o϶;3\4G>FD(ѽp9f7Z0C㒚֋N21D!.e-lZ'UbQء~%@viVkQ-29ys83D^[)Xɚ" Dv:e;F#6~ٸwÌWoq̋';Cs:#.a :YT [4v4nsx; 2~sw~/j<\WtmG^5&ow7 A%#0M8pq<~7Sۻ߃LΥmZ\dQ{x09hRĥ#%}D4bͅ3璚E=;H>.x[CUZ=7,htz=<7~OfBEo79qLB6Y܉Y;W \q.6 )sf\=#ՃV4(v<@ǔ,,g (y zw-H]BEq3:f,ҭ'! @1HF vM\; 3@.g$$VtIm-SL0w0'#%Y"aU]C#.`f+um?NCw"0)qOn"xXN&y~(p`\r P <߂(;VL{U#.>xKf w'y;`kphSTCç2gϥ_VGG8v'$ODMN};O[Tb,ҡE~ eDamlsԸ#I#6K0m&@<ƅ(`YF91!"DȢEXB!$Jս+F5nZZ"(ciFPTҊaQFR0!\g&x؅ @L##vЅ$c9bmnEɱ*mVUQUUUײ܌P:~C5]c-AKx*1K+ud/io #.hHicf-+W SkN4bJ:`@,זcɠ(2tHqbePDiOR;]xa%dH!V7V (&icRE,%Ecbi4CZ*=[gAuwLtd>lL!P9l#6@Y0 fL7zU3RXQ6֥4ێvFjhMUzmkZALk.\f={p1$a0{w@y9;bƪ['0ot<(k qΑH!Q:ǧ @H !5i WjKV\Ջm]7hlPPHІi#D~9ߥ}~v"R(H#%V Z#61&1 D(ZUil[%RQ$4(ʍ͡M5#JMQJHIQhDKFHS4TȥSFal%(I1X!#%:xg9S[4Uy~Ws5W$$g1$8)ڵW#o$VElO">#.4~Hgahf6ؽLKnR& ~zkpC%߁(2H\9q]=haѹS(BY$ߴsCJFqyڵNj{!:o?Wjߍ&XKX֭siBQݫC!bRbXK20'uE$fP#6>"ٛ).#.>+Qb0rcD>n.5(XRb"D.f+@6lxRXV,I.1{.Гь6&sDܷ/PQ. a#%!`СGLĈĽGI{5OEɟ'& u1p6eJ'LHQb`VAdb(#.LG`6 kgμ6r1JN2,=4,p| d<۫6jHElm#6#%("3@pBh_*UYU#6!պL@ @+-= #%]~7c#`>Ͼ3CftB$#!?"dꅄ|پ~h%{#. ,(`塤|ؔn2L3@>7Vƒiy°=ߵR|2Zf5Uo[52UQJmZJK*G;&u qm g*4-o^n2nF-tiD7C56&TS` &!*QA r]u+NAB/{,tOئӒrFAJ+)( ;Ns>]M˰#.L|R!)B9^jf<;#6A0xw;HA)4gfzqFcEk|!uMG&~#%Q;t@d"Ȉ*#.>/}Rb_cT#D:Ζʱr'5>|}._Tl=Բ]4X`C$0V9'Hv'FIj &g@>3#%pJr`{7s@q{A/U\zge)^=sDX1ƣԌ吰nd[wofXg)P6B\+E,3̈́JSuUtD19W53pTl#.ch` 0pP#.@n`%V TU*2/&Yr-ި5!P0E#QHa6P";^-@Y1n5͗#%1 ,!sYڌflzٹciD&Ho?/3нX2(ṵdݭzYg$&5D EPڥHA~3#% LC}Yf-"}qIQ%^FZTzHK"@Spu^<o.B3@DmjtalrX@zQfkQ A(n7۞W ":7`R7{BdXg&Sf% 0,DuS2cre38t#%a%筻#6LpOpߒX9 WDvkb+L#.ˆ#.BC7!mic#4!k}avߤljW'7q$[vLUD4OЌ!ZS5{XC&;8k\@r2n&='IZBŠF՗,\*V׳p`\HfJY#%㚨"ߑkk%O+vv&?gr{޺(UI XE#656ɛ!dhm^]04qs:0@E}hnLe}8܃^-1|2õ@pVכ;"'塄X%􌁖#%5`+IB27t#.NZũBAb+m:+BN\mgY[6LVlaDg@iDбPM܇)xm&-BkM7If sQfE뻺f$$#6DXfY#%W%UEMѐ^hI#%JSx|k0Jh(Gfuazf?n'ҫ*3#R'W((q#Hei3%< 쪌Jrz#67oSkJF9T@Z0TV(NAqKV+ma4}o{;٬66[[:>DH{hˇ}*s9eDʳ:d{T3D#.CvN]GL@Sޡ#%4C^WfDΗZR7p#6VX"k˻[$2%5;o7vȮ^vҹR#6A0@45*F 8iQ3 iGZK(4]-UD7v)<MFgV#34u*bQ GF읯!<Z H|pDA#%ϡ3jd.1<#P$xamVĮL+ؚ$p((7'&9w#6ncl!#.:&LYU !G(|#%mr,A-aNKMN8R0;n[5')L^b>%C38]6uLD`X B!:Oi悘n%ڒ"a\qK董LQ#.i1ǿ0 0~tm6V,V"$skҌʸ 0')HH2DO"ZͭiHJXDVBEGEE0cUƄe5@mn\0P`M`8#%#%Iѕ*Bah<2ƦZ\Ȥ H:bX1 8 #6 #%H*ߖ[|4O4o}#9thg#.`޻Ÿ3*\Y9)h#65P4aePM2Xl+%ʫEEDLNAGUym^VvV`%QV@INWP3:$#.EG^2S4#%ܥM2,s4PN0:=G,0!&*Ƿ=aօз;sHcif t1aS& 7!,H#%5@% EsRr_kW:*'õnH[h4׷`wAuu#.,q89 J;3O8~k1 $9%y6ZhIEG!+]fvo՘8`n^tY[Ba֛iA~_X>H&삉Xb#.45%!rKl}9='p>(^7/$jYiVIJ#6ba&Ċ*kLm&ߺZkYks<X员aޢs: #.#.+;ÀMI@\z/aٰn#%N=ǾꉑKFzFC?6(ukàXE{J9&rP|i4-J[hyôme;;#.MIqAq)\eqACD 8: 7$l}ufێ6c6ZAI%!pj[-[ +cTdLͶf܀#%PYl!VYCrhM #.ѭN0LoţJ1ȲnFJֆ bk#.?{5b]%OZZl}0 E!΀,"g4 )@w}* uAԠ$ALpIFwIϞ/tAO!## j U6t<4O+ta L;X#6ɨF#%oٔ1d@!T {WnWm'y͌6@g8AZ0?y#%<>,U!f,ʹ5j"-62)E4jtj7~#. D1SQ*)Jzh'̋x"#%Z"gBR1ȸ0ć0HrHNT$>#.D1)-fQlc+E*(@'](]4{qM_Osfaב$W #%'}eL|*j #6{.Ƀxv,!3Iy8Uo{,EE'Ft &nyBQbpt"@T֡dHE9Z B!JSjh("jKNkTRiI[RT l@njma0 NR(+\/*SRe/n.gUP dt=v9.k Ni`Mljh([;R*5XVO8"Ņk4#.y@^K?W-%lc#nzK!XЇovM)%I51R`FZ7m+WZ(F AUdQ$9,i!`P*6+0rBF"EH(Ʌ)hlQ,#%h}qz/uJQ!"kWmF-ڔ5F6XXQZ[3:zYݽ%$kg#6с5#1KL5VFLкƗI$ȫmiGl/$3" *hcQEF*d#%@ S㒡[Fhȓ(1P{5\&4)Dڛ7եG46Y3O `>p?~fE#6ݧ#RffKXZ#.Y9~07"^GM#.UJmG/lr$aB1 SJ@#o($QG)ļ.#.Lo.E`%1GP5/mlpB#%|$xk(#6(i 8>Jiߎ>9t(a-Qޖ3oUbٛ`|B h)Iiף|#.AqK5"gtdBKVw|jPOt~J'`O8)A.F'RK`,n#f4lQ!n`C#wƽ!ȱ|* DaMF՚WuzC<kGG Ղ]j?70EyZ$YϨЁǽuMm/ЅZ8@?j8睯fYF4d-DEC=vN|m:Pi\X"#.%t#̍ѨU׎1Qߪ@[8A ʍ;çKB4Db:[nX#.dRS(@r:|Xrc'pdlA47m~f1ޓBG_hGC"Ws;/~D#.fY{ao}ik*>D-(?Ld* zQf@ݨQD߳2Tm`=W#%w>uL䑙 l#%#%b#%?s/_H]>_|O?~#/?|/=GG__PSLB?i,ϳDy;"e\?E7;sL@Zm4 #%)40)*ǹI IFVh #%QߐjB MρESY8,g +,C҂x#.Ǒ^A:0f@#̏%*Ul·i\şyvǧ‡eԫj݆떅 &P"ƾrUr#.7_ua:Xs+u#6ٙ.7*jHxiiQ]d*iea˜T0eTh޶եpvmTYn44Bl`sO6e75m8q훓Mmƶ9TFdMmTIqx,Y.5myx*ŧ7FskCF #y{4h2faqS1a HF#ydH?F:o4)Ц^EKN\-NS4 '>:`wJ4#.p@ĞGF;tk5Sޒ 넞g w#6Hp,#6^>`L5RE "IEqOv].fB< 3PEATV*AB9wtc߷Y2 k\69U>!^F4?cS9ɬצU1"ǻ'_6+W] 扄8uKxte}C3zg,r.;}0זfT9P^]*zg_Ƴ8ΎQHԼ=#6@C&9Ғ#.QO#.D'G\U򻵊PCGݼម-v챯[kش|nmcm(oSEMAjZU݁y]#6.Q#. |P?!xndN2Ap'PQsp]f!OVݤ7Ub*J9H{cԼ(5@$fR'w=<܎_.EqPX#"(];#D)Qb(mLtjfh ! H 3ئ"~({fYr0mCN.!xN ,A^#y;9ѵgs(?l-A!ԥG#%#%(#6Cۢ OI[BY=+4ks]B_F*N#.6pJqTE3oYwfӧm3,M/-80aw<}8fJ$ o]ax`H$Y@zn= i~1^#.Jz(LPc薪"|xg?I~"]B@& -#<== -#-----BEGIN PGP SIGNATURE-----\n\niQIzBAABCgAdFiEEivIt5aBoIuNHTzxwSbTGfAUneqoFAl3aW3cACgkQSbTGfAUn\neqruqA//Y9oJ46ZR8W7YB/e45bfrYxGbN7NnkvkwSPNziObYur+n1QpQEOaPTn/U\n5kFtPWHXRJzaG/A9poKn7pl1Xd7Edcu1aalfoEazZbuD37VOxIp9lnrefCAeICqj\nGv0SD96Zac91CbA+b20Q4xnqxKMi3LSI4NPjfFGy62FkSk3MS4p6Rdp0/WAKwwNj\nw7WEjQCNmLb37z+FGSzXg28aljYeteBZEthsVmGJ5QqVwMBwgj2+y5FOTzFfxmqB\nrWgjFYS0l85kgYRZv9yzdNmFs5SScwafwpT8Xmdr49tFn/+0LxXyRxX+rdODgrpV\nY4EOiQz0fd6mMMnaTDXlLSXls3JyVYmbTjeNL/9gcHmnStzJ851CJQfyQg7A+JoC\nc7nz0HbiFyTgB+PUZr1OhGj3A7287o8XQ0tqR3oa7jXIOX0OynrGplMQKr++0jE1\nBgKzjLoE9CTbjkQfICLG+aUy3S1ZyDk/BcO+5+Ytbru+qXuDsIgAdVosMfNSv9jJ\nXvOINsbRMekdejYMZv8fIkn5OEjCFHVhNpobEsCb768bjB3p7alQGECBvjHCm6dy\nXZPzl9cBMWIXcBjPTS+GZj+PIXGcu76pbsx6HBHWf+uJ+4xgOsUCVu//0AV09jvA\n0MjtLWwQ8mdRH6Wt4hsp4HKtSvQrhmljf2OnuYBgaFmcdJkN1zI=\n=C0oT\n-----END PGP SIGNATURE-----\n diff --git a/waf_patches/README b/waf_patches/README deleted file mode 100644 index 806898130..000000000 --- a/waf_patches/README +++ /dev/null @@ -1,20 +0,0 @@ -# NOTE: This is no longer necessary as g77 is discontinued since -# gcc 4.x (J. Hunkeler). -# -# Applying STSCI patches to waf -# -# - adds g77 FORTRAN compiler on linux -# - -bzip2 -d < /eng/ssb/src/waf-1.6.4.tar.bz2 | tar xf - - -cp g77.py waf-1.6.4/waflib/Tools/g77.py - -patch -p0 < patch-compiler_fc.py.patch - -cd waf-1.6.4 - -./waf-light --zip-type=gz configure build - -cp waf ../../ - diff --git a/waf_patches/g77.py b/waf_patches/g77.py deleted file mode 100644 index 2406ba742..000000000 --- a/waf_patches/g77.py +++ /dev/null @@ -1,90 +0,0 @@ -#! /usr/bin/env python -# encoding: utf-8 -# -# Provenance: This file was copied from waf-1.6.4/waflib/Tools/gfortran.py -# and modified to run g77. They are similar enough that only minor changes -# were needed. - -import re -from waflib import Utils -from waflib.Tools import fc, fc_config, fc_scan -from waflib.Configure import conf - -@conf -def find_g77(conf): - """Find the g77 program (will look in the environment variable 'FC')""" - fc = conf.find_program('g77', var='FC') - fc = conf.cmd_to_list(fc) - conf.get_g77_version(fc) - conf.env.FC_NAME = 'g77' - -@conf -def g77_flags(conf): - v = conf.env - v['FCFLAGS_fcshlib'] = ['-fPIC'] - v['FCFLAGS_DEBUG'] = ['-Werror'] # why not - -@conf -def g77_modifier_win32(conf): - fc_config.fortran_modifier_win32(conf) - -@conf -def g77_modifier_cygwin(conf): - fc_config.fortran_modifier_cygwin(conf) - -@conf -def g77_modifier_darwin(conf): - fc_config.fortran_modifier_darwin(conf) - -@conf -def g77_modifier_platform(conf): - dest_os = conf.env['DEST_OS'] or Utils.unversioned_sys_platform() - g77_modifier_func = getattr(conf, 'g77_modifier_' + dest_os, None) - if g77_modifier_func: - g77_modifier_func() - -@conf -def get_g77_version(conf, fc): - """Get the compiler version""" - - # ensure this is actually g77, not an imposter. - version_re = re.compile(r"GNU\s*Fortran", re.I).search - cmd = fc + ['--version'] - out, err = fc_config.getoutput(conf, cmd, stdin=False) - if out: match = version_re(out) - else: match = version_re(err) - if not match: - conf.fatal('Could not determine the compiler type') - - # --- now get more detailed info -- see c_config.get_cc_version - cmd = fc + ['-dM', '-E', '-'] - out, err = fc_config.getoutput(conf, cmd, stdin=True) - - if out.find('__GNUC__') < 0: - conf.fatal('Could not determine the compiler type') - - k = {} - out = out.split('\n') - import shlex - - for line in out: - lst = shlex.split(line) - if len(lst)>2: - key = lst[1] - val = lst[2] - k[key] = val - - def isD(var): - return var in k - - def isT(var): - return var in k and k[var] != '0' - - conf.env['FC_VERSION'] = (k['__GNUC__'], k['__GNUC_MINOR__'], k['__GNUC_PATCHLEVEL__']) - -def configure(conf): - conf.find_g77() - conf.find_ar() - conf.fc_flags() - conf.g77_flags() - conf.g77_modifier_platform() diff --git a/waf_patches/patch-compiler_fc.py.patch b/waf_patches/patch-compiler_fc.py.patch deleted file mode 100644 index ce4181e11..000000000 --- a/waf_patches/patch-compiler_fc.py.patch +++ /dev/null @@ -1,27 +0,0 @@ -*** waf-1.6.4/waflib/Tools/compiler_fc.py.orig Sun Apr 17 06:02:48 2011 ---- waf-1.6.4/waflib/Tools/compiler_fc.py Thu May 5 11:12:04 2011 -*************** -*** 6,16 **** - from waflib.Tools import fc - - fc_compiler = { - 'win32' : ['gfortran','ifort'], - 'darwin' : ['gfortran', 'g95', 'ifort'], -! 'linux' : ['gfortran', 'g95', 'ifort'], - 'java' : ['gfortran', 'g95', 'ifort'], - 'default': ['gfortran'], - 'aix' : ['gfortran'] - } - ---- 6,16 ---- - from waflib.Tools import fc - - fc_compiler = { - 'win32' : ['gfortran','ifort'], - 'darwin' : ['gfortran', 'g95', 'ifort'], -! 'linux' : ['gfortran', 'g95', 'ifort', 'g77' ], - 'java' : ['gfortran', 'g95', 'ifort'], - 'default': ['gfortran'], - 'aix' : ['gfortran'] - } - diff --git a/wscript b/wscript deleted file mode 100644 index 6fae7e841..000000000 --- a/wscript +++ /dev/null @@ -1,626 +0,0 @@ -# vim: set syntax=python: - -import os, platform, shutil, sys, subprocess - -from waflib import Configure -from waflib import Errors -from waflib import Logs -from waflib import Options -from waflib import Scripting -from waflib import Task -from waflib import Utils -from waflib import TaskGen - -top = '.' -out = 'build.' + platform.platform() -out_include_dir = os.path.abspath(os.path.join(out, 'include')) - -APPNAME = "hstcal" -VERSION = "UNKNOWN" -BRANCH = "UNKNOWN" -COMMIT = "UNKNOWN" - -# DISTINFO controls distribution archive versioning -DISTINFO = os.path.abspath(os.path.join(top, "DISTINFO")) -DISTINFO_KEYS = [ - "APPNAME", - "VERSION", - "BRANCH", - "COMMIT", -] - -# A list of subdirectories to recurse into -SUBDIRS = [ - 'applib', - 'cvos', - 'hstio', - 'hstio/test', - 'include', - 'lib', - 'ctegen2', - 'pkg', - 'tables', - ] - -# Have gcc supersede clang -from waflib.Tools.compiler_c import c_compiler -c_compiler['darwin'] = ['gcc', 'clang'] -c_compiler['default'] = ['gcc', 'clang'] - -option_parser = None -def options(opt): - # We want to store - # the option parser object so we can use it later (during the - # configuration phase) to parse options stored in a file. - global option_parser - option_parser = opt.parser - - opt.load('compiler_c') - opt.load('compiler_fc') - - opt.add_option( - '--disable-openmp', action='store_true', default=False, - help="Disable OpenMP") - - opt.add_option( - '--debug', action='store_true', default=False, - help="Create a debug build") - - opt.add_option( - '--release-with-symbols', dest='releaseWithSymbols', action='store_true', default=False, - help='Create a Release build with debug symbols, i.e. with "-g"') - - opt.add_option( - '--O3', dest='optO3', action='store_true', default=False, - help='Create a Release build with full optimization, i.e. with "-O3". \033[91m\033[1mWARNING! This option may produce unvalidated results!\033[0m') - - opt.add_option( - '--with-cfitsio', - help='Path to CFITSIO installation directory') - - -def _setup_openmp(conf): - """ - Detects openmp flags and sets the OPENMP ``CFLAGS``/``LINKFLAGS`` - """ - msg = 'Checking for OpenMP:' - - if conf.options.disable_openmp: - conf.msg(msg, 'disabled', color='YELLOW') - return - - for x in ('-fopenmp','-openmp','-mp','-xopenmp','-omp','-qsmp=omp'): - try: - conf.check_cc( - msg = ' '.join([msg, x]), - fragment = '''#include \nint main() { return omp_get_num_threads(); }''', - errmsg = 'no', - cflags = x, - linkflags = x, - uselib_store = 'OPENMP' - ) - - # intel - if x == '-openmp' and conf.env.CC_NAME == 'icc': - conf.env.append_value('LDFLAGS', '-lpthread') - - except conf.errors.ConfigurationError: - continue - else: - break - - -def _ok_color(var, val): - if var == val: - return "GREEN" - else: - return "YELLOW" - -def _warn_color(var, val): - if var == val: - return "YELLOW" - else: - return "GREEN" - -def _err_color(var, val): - if var == val: - return "RED" - else: - return "GREEN" - -def call(cmd): - try: - results = subprocess.run(cmd, shell=True, check=False, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - if not results.returncode: - return results.stdout.rstrip() - except AttributeError: - try: - results = subprocess.check_output(cmd, shell=True, universal_newlines=True, stderr=subprocess.PIPE) - return str(results).rstrip() - except subprocess.CalledProcessError: - return None - except: - return None - - return None - - -def _gen_distinfo(ctx): - """Generates a DISTINFO file - ctx.git_data: [["key", "value"], ["key", "value"], ...] - """ - - # Generate DISTINFO file UNLESS we are building from an archive - if not os.path.exists('.git') and os.path.exists(DISTINFO): - print("Building from distribution archive") - return - - # Remove previous edition of the file - if os.path.exists(DISTINFO): - os.unlink(DISTINFO) - - # Write data pairs to DISTINFO file - print("Generating DISTINFO file") - with open(DISTINFO, 'w+') as fp: - for key_dist in DISTINFO_KEYS: - for name, value in ctx.git_data: - if name == key_dist: - fp.write("{}:{}\n".format(name, value)) - - -def _get_distinfo(): - """Extract data from the DISTINFO file - """ - global APPNAME - global VERSION - global BRANCH - global COMMIT - - # Die silently when there's nothing to do - if not os.path.exists(DISTINFO): - return - - with open(DISTINFO, 'r') as fp: - for record in fp: - record = record.strip() - if not record: - continue - - name, value = record.split(":", 1) - for key_dist in DISTINFO_KEYS: - if name == key_dist: - if name == "APPNAME": - APPNAME = value - if name == "VERSION": - VERSION = value - if name == "BRANCH": - BRANCH = value - if name == "COMMIT": - COMMIT = value - - -def _get_git_details(ctx): - global APPNAME - global VERSION - global BRANCH - global COMMIT - - # Handle building from a archive - if not os.path.exists(".git") and os.path.exists(DISTINFO): - print("Using DISTINFO file") - _get_distinfo() - _gen_version_header(ctx) - return - - cmd_describe = 'git describe --dirty --abbrev=7' - cmd_hash = 'git rev-parse HEAD' - cmd_branch = 'git rev-parse --abbrev-ref HEAD' - - # Report a shadowed release tag if one exists, otherwise fallback to - # the generic description method. The generic method does NOT - # account for shadows. This might return a release candidate tag if the point - # release tag shares the same commit hash. This is purely aesthetic. - # - # To avoid this scenario one must commit a change to the repository prior to - # tagging a final point release. - tmp = call(cmd_describe + ' --contains') or \ - call(cmd_describe) - if tmp: - VERSION = tmp - - tmp = call(cmd_hash) - if tmp: - COMMIT = tmp - - tmp = call(cmd_branch) - if tmp: - BRANCH = tmp - - _gen_version_header(ctx) - _gen_distinfo(ctx) - - -def _gen_version_header(ctx): - """Generate a C header to provide versioning data to hstcal's programs - """ - filename = os.path.join(out_include_dir, 'version.h') - label = "HEADER_" + os.path.basename(filename).replace(".", "_").upper() - ctx.git_data = [ - ["APPNAME", APPNAME], - ["VERSION", VERSION], - ["BRANCH", BRANCH], - ["COMMIT", COMMIT], - ] - - os.makedirs(out_include_dir, exist_ok=True) - with open(filename, 'w+') as hdr: - hdr.write("#ifndef {}\n".format(label)) - hdr.write("#define {}\n".format(label)) - for key, value in ctx.git_data: - hdr.write("#define {} \"{}\"\n".format(key, value)) - hdr.write("#endif /* {} */\n".format(label)) - - -def _use_git_details(ctx): - _get_git_details(ctx) - - # Include generated header(s) - ctx.env.append_value('CFLAGS', '-I{}'.format(out_include_dir)) - - # Inform user - ctx.start_msg("Building app") - ctx.end_msg(APPNAME, _warn_color(APPNAME, "UNKNOWN")) - ctx.start_msg("Version") - ctx.end_msg(VERSION, _warn_color(VERSION, "UNKNOWN")) - ctx.start_msg("git HEAD commit") - ctx.end_msg(COMMIT, _warn_color(COMMIT, "UNKNOWN")) - ctx.start_msg("git branch") - ctx.end_msg(BRANCH, _warn_color(BRANCH, "UNKNOWN")) - - -def _check_mac_osx_version(floor_version): - ''' - Purpose: - Converts the semantic version of the operating system to a 24-bit integer, then - compares the result against the user-defined `floor_version`. Returns true if - `osx_version` is greater than or equal to `floor_version`. - - Summary: - Checks whether the operation system meets the minimum version requirements. - - Example: - # Assume `sw_vers -ProductVersion` returns 10.11.0 - - # Is 10.11.0 (0x0A0B00) greater than 10.5.0 (0x0A0500)? - >>> _determine_mac_osx_floor(0x0A0500) - True - - # Is 10.11.0 (0x0A0B00) equal to 10.11.0 (0x0A0B00)? - >>> _determine_mac_osx_floor(0x0A0B00) - True - - # Is 10.11.0 (0x0A0B00) greater than 10.12.1 (0x0A0C01)? - >>> _determine_mac_osx_floor(0x0A0C01) - False - - # Failed to execute `sw_vers -ProductVersion` - >>> _determine_mac_osx_floor(0x0A0500) - None - - Encoding: - OS Version Encoded Version - ----------- --------------- - 10.5.0 == 0x0A0500 - ^ ^ ^ ^ ^ ^ - | | | | | | - major major - | | | | - minor minor - | | - patch patch - - ''' - - assert isinstance(floor_version, int) - s = call("/usr/bin/sw_vers -productVersion") - - # Shell call failed - if s is None: - return None - - # Extract the integer values between the '.'s - osx_version_data = tuple(int(x) for x in s.strip().split('.')) - osx_version_major = osx_version_data[0] - osx_version_minor = osx_version_data[1] - osx_version_patch = 0 - - if len(osx_version_data) > 2: - osx_version_patch = osx_version_data[2] - - # Convert major/minor/patch values into a single 24-bit integer - osx_version = (osx_version_major & 0xff) << 16 | (osx_version_minor & 0xff) << 8 | (osx_version_patch & 0xff ) - - # If the operating system version does meet or exceed the minimum - if osx_version < floor_version: - return False - - return True - -def _determine_mac_osx_fortran_flags(conf): - # On Mac OS-X, we need to know the specific version in order to - # send some compile flags to the Fortran compiler. - import platform - conf.env.MAC_OS_NAME = None - if platform.system() == 'Darwin' : - conf.start_msg('Checking Mac OS-X version') - - acceptable = _check_mac_osx_version(0x0A0500) - if acceptable: - conf.end_msg('done', 'GREEN') - elif acceptable is None: - conf.end_msg( - "Failed to detect operating system version", - 'RED') - exit(1) - else: - conf.end_msg( - "Unsupported OS X version detected (<10.5.0)", - 'RED') - exit(1) - - conf.env.append_value('FCFLAGS', '-m64') - -def _determine_sizeof_int(conf): - conf.check( - fragment='#include \nint main() { printf("%d", sizeof(int)); return 0; }\n', - define_name="SIZEOF_INT", - define_ret=True, - quote=False, - execute=True, - msg='Checking for sizeof(int)') - - -def _use_cfitsio(conf): - conf.load('compiler_c') - - if conf.options.with_cfitsio: - # Manual override of CFITSIO root path via --with-cfitsio - base = os.path.abspath(conf.options.with_cfitsio) - conf.env.INCLUDES_CFITSIO = os.path.join(base, 'include') - conf.env.LIBPATH_CFITSIO = os.path.join(base, 'lib') - conf.env.LIB_CFITSIO = ['cfitsio', 'pthread', 'curl'] - conf.env.DEFINES += ['HAVE_CFITSIO=1'] - else: - # Let pkg-config figure it out (default behavior) - conf.check_cfg(package='cfitsio', args='--cflags --libs', uselib_store='CFITSIO') - - -def configure(conf): - # NOTE: All of the variables in conf.env are defined for use by - # wscript files in subdirectories. - - # Read in options from a file. The file is just a set of - # commandline arguments in the same syntax. May be spread across - # multiple lines. - if os.path.exists('build.cfg'): - fd = open('build.cfg', 'r') - for line in fd.readlines(): - tokens = line.split() - options, args = option_parser.parse_args(tokens) - for key, val in options.__dict__.items(): - if Options.options.__dict__.get(key) is None: - Options.options.__dict__[key] = val - fd.close() - - _use_git_details(conf) - - # Load C compiler support - conf.load('compiler_c') - - # Check for the existence of a Fortran compiler - conf.load('compiler_fc') - conf.check_fortran() - - # Check for cfitsio - _use_cfitsio(conf) - - # Set the location of the hstcal include directory - conf.env.INCLUDES = [os.path.abspath('include')] # the hstcal include directory - - # A list of the local (hstcal) libraries that are typically linked - # with the executables - conf.env.LOCAL_LIBS = [ - 'applib', 'xtables', 'hstio', 'cvos', 'CFITSIO'] - - # A list of external libraries that are typically linked with the - # executables - conf.env.EXTERNAL_LIBS = ['m'] - - if sys.platform.startswith('sunos'): - conf.env.EXTERNAL_LIBS += ['socket', 'nsl'] - elif sys.platform.startswith('linux'): - conf.env.EXTERNAL_LIBS += ['rt'] - - # A list of paths in which to search for external libraries - conf.env.LIBPATH = [] - - _determine_mac_osx_fortran_flags(conf) - - _setup_openmp(conf) - - #_determine_sizeof_int(conf) - - if conf.check_cc(cflags='-std=gnu99'): - conf.env.append_value('CFLAGS', '-std=gnu99') - - # check whether the compiler supports -02 and add it to CFLAGS if it does - if conf.options.debug: - if conf.check_cc(cflags='-g'): - conf.env.append_value('CFLAGS', '-g') - if conf.check_cc(cflags='-O0'): - conf.env.append_value('CFLAGS', '-O0') - if conf.check_cc(cflags='-Wall'): - conf.env.append_value('CFLAGS','-Wall') - else: - if not conf.options.optO3: - if conf.check_cc(cflags='-O2'): - conf.env.append_value('CFLAGS','-O2') - else: - msg = """\033[91m\033[1mWARNING! -The configure option \'--O3\' has been specified. -Use of this option is untested and may result in unvalidated results. -Press any key to continue or Ctrl+c to abort...\033[0m""" - print(msg) - try: - raw_input() - except NameError: - input() - if conf.check_cc(cflags='-O3'): - conf.env.append_value('CFLAGS','-O3') - if conf.check_cc(cflags='-Wall'): - conf.env.append_value('CFLAGS','-Wall') - if conf.check_cc(cflags='-fstack-protector-all'): - conf.env.append_value('CFLAGS','-fstack-protector-all') - - if conf.options.releaseWithSymbols and not conf.options.debug: - if conf.check_cc(cflags='-g'): - conf.env.append_value('CFLAGS', '-g') - - conf.start_msg('C compiler flags (CFLAGS)') - conf.end_msg(' '.join(conf.env['CFLAGS']) or None) - - conf.start_msg('Fortran compiler flags (FCFLAGS)') - conf.end_msg(' '.join(conf.env['FCFLAGS']) or None) - - conf.start_msg('Linker flags (LDFLAGS)') - conf.end_msg(' '.join(conf.env['LDFLAGS']) or None) - - -def _dist_setup(ctx): - ctx.algo = 'tar.gz' - - # Manually include project files in the archive - ctx.files = ctx.path.ant_glob('**/*', excl=[ - '.git*', - '.waf*', - '.lock-*', - 'Makefile', - '__pycache__', - '**/__pycache__', - '.cache', - '**/.cache', - out, - 'bin.*', - '*.tar.*', - '*.zip']) - - # Update version information - _get_git_details(ctx) - - -def dist(ctx): - _dist_setup(ctx) - - # call 'waf dist' directly to generate an archive - Scripting.dist(ctx) - - -def distcheck(ctx): - _dist_setup(ctx) - - # call 'waf distcheck' directly to smoke test building from an archive - Scripting.distcheck(ctx) - - -def build(bld): - bld(name='lib', always=True) - bld(name='test', always=True) - - targets = [x.strip() for x in bld.targets.split(',')] - - if not len(targets): - targets = ['lib', 'test'] - - if 'lib' in targets: - bld.env.INSTALL_LIB = True - targets.remove('lib') - else: - bld.env.INSTALL_LIB = None - - if 'test' in targets: - bld.env.INSTALL_TEST = True - targets.remove('test') - else: - bld.env.INSTALL_TEST = None - - bld.targets = ','.join(targets) - - # Recurse into all of the libraries - for library in SUBDIRS: - bld.recurse(library) - - if bld.cmd == 'clean': - return clean(bld) - - # Add a post-build callback function - bld.add_post_fun(post_build) - -def post_build(bld): - # WAF has its own way of dealing with build products. We want to - # emulate the old stsdas way of creating a flat directory full of - # .a and .e files. This simply runs through the build tree and - # copies such files to the bin.* directory. - src_root = os.path.join( - bld.srcnode.abspath(), - 'build.' + platform.platform()) - dst_root = os.path.join( - bld.srcnode.abspath(), - 'bin.' + platform.platform()) - - if not os.path.exists(dst_root): - os.mkdir(dst_root) - - for root, dirs, files in os.walk(src_root): - for file in files: - base, ext = os.path.splitext(file) - if ext in ('.e', '.a'): - src_path = os.path.join(root, file) - dst_path = os.path.join(dst_root, file) - shutil.copy(src_path, dst_path) - -def clean(ctx): - # Clean the bin.* directory - bin_root = 'bin.' + platform.platform() - if os.path.exists(bin_root): - shutil.rmtree(bin_root) - -def test(ctx): - # Recurse into all of the libraries - # Just to check that nose is installed - try: - import nose - except ImportError: - raise ImportError("nose must be installed to run hstcal tests.") - - for library in SUBDIRS: - if library.endswith('test'): - if os.system('nosetests %s' % library): - raise Exception("Tests failed") - -def distclean(ctx): - # call 'waf clean' - Scripting.run_command('clean') - - # call 'waf distclean' - Scripting.distclean(ctx) - -# This is a little recipe from the waf docs to produce abstract -# targets that define what to build and install. -from waflib.TaskGen import feature, before_method -@feature("*") -@before_method('process_rule') -def post_the_other(self): - deps = getattr(self, 'depends_on', []) - for name in self.to_list(deps): - other = self.bld.get_tgen_by_name(name) - other.post()