Index: /branches/pap_branch_070920/ippconfig/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/.cvsignore (revision 14957) @@ -0,0 +1,13 @@ +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +dvo.site +install-sh +ippconfig-0.0.1.tar.bz2 +ippconfig-0.0.1.tar.gz +missing +ipprc.config Index: /branches/pap_branch_070920/ippconfig/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/Makefile.am (revision 14957) @@ -0,0 +1,49 @@ +SUBDIRS = \ + recipes \ + isp \ + cfh12k \ + ctio_mosaic2 \ + megacam \ + simple \ + simmosaic \ + simtest \ + tc3 \ + skycell \ + sdss + +install_files = \ + GSCregions.tbl \ + dvo.photcodes + +built_sources = \ + ipprc.config.in \ + dvo.site.in + +built_files = \ + ipprc.config \ + dvo.site + +installdir = $(datadir)/ippconfig + +install_DATA = $(install_files) $(built_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) $(built_sources) + +BUILT_SOURCES = $(built_files) + +#ACLOCAL_AMFLAGS = -I m4 + +# From the autoconf manual, section 4.7.2 "Installation Directory Variables" +edit = sed \ + -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ + -e 's|@prefix[@]|$(prefix)|g' + +ipprc.config dvo.site: Makefile + rm -f $@ + $(edit) '$(srcdir)/$@.in' > $@ + +ipprc.config: $(srcdir)/ipprc.config.in +dvo.site: $(srcdir)/dvo.site.in Index: /branches/pap_branch_070920/ippconfig/README =================================================================== --- /branches/pap_branch_070920/ippconfig/README (revision 14957) +++ /branches/pap_branch_070920/ippconfig/README (revision 14957) @@ -0,0 +1,18 @@ + +Please read installation section of the IPP User's Guide for more details. + +To build and install the IPP configuration scripts, run the following: + +configure +make +make install + +After installation: + +Copy dvo.site to ~/.ptolemyrc + +Copy ipprc.config to ~/.ipprc + +Edit this file: + - Set the DBUSER and DBPASSWORD to your mysql username and password + Index: /branches/pap_branch_070920/ippconfig/autogen.sh =================================================================== --- /branches/pap_branch_070920/ippconfig/autogen.sh (revision 14957) +++ /branches/pap_branch_070920/ippconfig/autogen.sh (revision 14957) @@ -0,0 +1,103 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +PROJECT=ippConfig +TEST_TYPE=-f +# change this to be a unique filename in the top level dir +FILE=autogen.sh + +DIE=0 + +LIBTOOLIZE=libtoolize +ACLOCAL="aclocal $ACLOCAL_FLAGS" +AUTOHEADER=autoheader +AUTOMAKE=automake +AUTOCONF=autoconf + +#($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { +# echo +# echo "You must have $LIBTOOlIZE installed to compile $PROJECT." +# echo "Download the appropriate package for your distribution," +# echo "or get the source tarball at http://ftp.gnu.org/gnu/libtool/" +# DIE=1 +#} + +($ACLOCAL --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have $ACLOCAL installed to compile $PROJECT." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" + DIE=1 +} + +#($AUTOHEADER --version) < /dev/null > /dev/null 2>&1 || { +# echo +# echo "You must have $AUTOHEADER installed to compile $PROJECT." +# echo "Download the appropriate package for your distribution," +# echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" +# DIE=1 +#} + +($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have $AUTOMAKE installed to compile $PROJECT." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/" + DIE=1 +} + +($AUTOCONF --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have $AUTOCONF installed to compile $PROJECT." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at http://ftp.gnu.org/gnu/autoconf/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +test $TEST_TYPE $FILE || { + echo "You must run this script in the top-level $PROJECT directory" + exit 1 +} + +if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." +fi + +#$LIBTOOLIZE --copy --force || echo "$LIBTOOlIZE failed" +$ACLOCAL || echo "$ACLOCAL failed" +#$AUTOHEADER || echo "$AUTOHEADER failed" +$AUTOMAKE --add-missing --force-missing --copy || echo "$AUTOMAKE failed" +$AUTOCONF || echo "$AUTOCONF failed" + +cd $ORIGDIR + +run_configure=true +for arg in $*; do + case $arg in + --no-configure) + run_configure=false + ;; + *) + ;; + esac +done + +if $run_configure; then + $srcdir/configure --enable-maintainer-mode "$@" + echo + echo "Now type 'make' to compile $PROJECT." +else + echo + echo "Now run 'configure' and 'make' to compile $PROJECT." +fi Index: /branches/pap_branch_070920/ippconfig/cfh12k/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/cfh12k/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/Makefile.am (revision 14957) @@ -0,0 +1,24 @@ + +installdir = $(datadir)/ippconfig/cfh12k + +install_files = \ + dvo.config \ + dvo.layout \ + camera.config \ + format_mef.config \ + format_mef_early.config \ + format_split.config \ + ppImage.config \ + ppMerge.config \ + psastro.config \ + psphot.config \ + dark.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/cfh12k/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/camera.config (revision 14957) @@ -0,0 +1,262 @@ +# Camera configuration file for Cfh12k: describes the camera + +# File formats that we know about +FORMATS METADATA + EARLY STR cfh12k/format_mef_early.config + MEF STR cfh12k/format_mef.config + SPLIT STR cfh12k/format_split.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + ccd00 STR Amp + ccd01 STR Amp + ccd02 STR Amp + ccd03 STR Amp + ccd04 STR Amp + ccd05 STR Amp + ccd06 STR Amp + ccd07 STR Amp + ccd08 STR Amp + ccd09 STR Amp + ccd10 STR Amp + ccd11 STR Amp +END + +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + B STR B + V STR V + R STR R + I STR I + + Z MULTI + Z STR Z + Z STR Zp + Z STR Zprime + + Ha MULTI + Ha STR Ha + Ha STR Ha.MP7605 + Ha STR Halpha + Ha STR Haalpha.on + + HaOff MULTI + HaOff STR HaOFF + HaOff STR HaOFF.MP7604 + HaOff STR Halpha.off + + Hb STR Hb + HbOff STR HbOff + + CN MULTI + CN STR CN + CN STR CN.MP780 + CN STR cn.MP7803 + CN STR CN.MP7803 + + TiO MULTI + TiO STR TiO + TiO STR TiO.MP77 + TiO STR tio.MP7701 + TiO STR TiO.MP7701 + + NB920 STR NB920 + + B2F MULTI + B2F STR B2F + B2F STR UKN:B2F +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + fpa STR fpa + chip STR {CHIP.NAME} + cell STR {CHIP.NAME}:{CELL.NAME} +END + +DARK.NORM STR cfh12k/dark.config +DARK.NORM.KEY STR fpa_{CHIP.NAME}_Amp +# DARK.NORM.KEY STR BASIC ## rough version from global stats + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + # Other recipes + PSPHOT STR cfh12k/psphot.config # psphot details + PSASTRO STR cfh12k/psastro.config # psastro details + PPIMAGE STR cfh12k/ppImage.config # ppImage recipe + REJECTIONS STR cfh12k/rejections.config # rejection recipe +END + +# Reduction classes +REDUCTION METADATA + # Detrend processing + DETREND METADATA + BIAS_PROCESS STR PPIMAGE_O + BIAS_RESID STR PPIMAGE_B + BIAS_VERIFY STR PPIMAGE_OB + BIAS_STACK STR PPMERGE_BIAS + DARK_PROCESS STR PPIMAGE_OB + DARK_RESID STR PPIMAGE_D + DARK_VERIFY STR PPIMAGE_OBD + DARK_STACK STR PPMERGE_DARK + SHUTTER_PROCESS STR PPIMAGE_OBD + SHUTTER_RESID STR PPIMAGE_S + SHUTTER_VERIFY STR PPIMAGE_OBDS + SHUTTER_STACK STR PPMERGE_SHUTTER + FLAT_PROCESS STR PPIMAGE_OBDS + FLAT_RESID STR PPIMAGE_F + FLAT_VERIFY STR PPIMAGE_OBDSF + FLAT_STACK STR PPMERGE_FLAT + FRINGE_PROCESS STR PPIMAGE_OBDSF + FRINGE_RESID STR PPIMAGE_R + FRINGE_VERIFY STR PPIMAGE_OBDSFR + FRINGE_STACK STR PPMERGE_FRINGE + END + # Processing raw data + DEFAULT METADATA + CHIP STR PPIMAGE_OBDSFRA + END +END + +FILERULES METADATA + ### Redirections + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.MEF + PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF + PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.MEF + PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF + PPIMAGE.BIN1 STR PPIMAGE.BIN1.MEF + PPIMAGE.BIN2 STR PPIMAGE.BIN2.MEF + DVOCORR.OUTPUT STR DVOCORR.MEF.OUTPUT + DVOFLAT.OUTPUT STR DVOFLAT.MEF.OUTPUT + PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.MEF + PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF + + ### input file definitions + ### use @DETDB entries to get the detrend images from the database + ### replace @DETDB with @FILES if you want to require it from the + ### command line, or with an explicit name to require a specific file + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + + ## files used by ppImage + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE + PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE + + ## files used to build and apply the flat-field correction images + DVOCORR.INPUT INPUT @FILES CHIP IMAGE + DVOCORR.REFHEAD INPUT @FILES CHIP HEADER + DVOFLAT.INPUT INPUT @FILES CHIP IMAGE + DVOFLAT.CORR INPUT @DETDB CHIP IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES CHIP IMAGE + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSPHOT.MASK INPUT @FILES CHIP MASK + PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT + PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF + PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF + + ## files used by psastro + PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + ## files used by pswarp + PSWARP.INPUT INPUT @FILES CHIP IMAGE + PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT + PSWARP.MASK INPUT @FILES CHIP MASK + PSWARP.SKYCELL INPUT @FILES CHIP IMAGE + PSWARP.ASTROM INPUT @FILES CHIP CMF + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE CHIP TRUE MEF + PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK CHIP TRUE SPLIT + PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT + PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF + PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF + PPIMAGE.CHIP OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE MEF + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE MEF + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE MEF + + PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE CHIP TRUE MEF + PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE CHIP TRUE MEF + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE CHIP TRUE MEF + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE CHIP TRUE MEF + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE SPLIT + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE CHIP TRUE MEF + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE CHIP TRUE MEF + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE CHIP TRUE MEF + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE CHIP TRUE MEF + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ CHIP TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE NONE + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF CHIP TRUE MEF + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE NONE + PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE NONE + PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END + +EXTNAME.RULES METADATA + CMF.HEAD STR {CHIP.NAME}.hdr + CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT? + + PSF.HEAD STR {CHIP.NAME}.hdr + PSF.TABLE STR {CHIP.NAME}.psf_model + PSF.RESID STR {CHIP.NAME}.psf_resid +END + +BLANK.HEADERS METADATA + FPA.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + FPA.AIRMASS STR AIRMASS +END Index: /branches/pap_branch_070920/ippconfig/cfh12k/dark.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/dark.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/dark.config (revision 14957) @@ -0,0 +1,106 @@ + +# basic fit to mosaic-level bg +BASIC METADATA + NORDER_X S32 2 # number of x orders + VAL_X00 F64 -1.366 + VAL_X01 F64 8.974e-03 + VAL_X02 F64 7.864e-06 + NELEMENTS S32 3 # number of unmasked components +END + +fpa_ccd00_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -2.42585939637 + VAL_X01 F64 0.0218932386738 + VAL_X02 F64 1.63910422999e-05 + NELEMENTS S32 3 +END + +fpa_ccd01_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -0.673311998929 + VAL_X01 F64 0.00351724865032 + VAL_X02 F64 3.82106321907e-06 + NELEMENTS S32 3 +END + +fpa_ccd02_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -0.516624899086 + VAL_X01 F64 0.002322522999 + VAL_X02 F64 3.24144163863e-06 + NELEMENTS S32 3 +END + +fpa_ccd03_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -0.571626302054 + VAL_X01 F64 0.00233441005459 + VAL_X02 F64 2.35198601494e-06 + NELEMENTS S32 3 +END + +fpa_ccd04_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -2.06687190434 + VAL_X01 F64 0.00214124485304 + VAL_X02 F64 2.26141245447e-06 + NELEMENTS S32 3 +END + +fpa_ccd05_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -0.938425768984 + VAL_X01 F64 0.00787794459813 + VAL_X02 F64 6.18544058024e-06 + NELEMENTS S32 3 +END + +fpa_ccd06_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -1.01351177035 + VAL_X01 F64 0.00665585528024 + VAL_X02 F64 6.34327926043e-06 + NELEMENTS S32 3 +END + +fpa_ccd07_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -0.475706521997 + VAL_X01 F64 0.00151765156459 + VAL_X02 F64 3.19325558938e-06 + NELEMENTS S32 3 +END + +fpa_ccd08_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -0.555167026441 + VAL_X01 F64 0.00287603928732 + VAL_X02 F64 4.31016033628e-06 + NELEMENTS S32 3 +END + +fpa_ccd09_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -0.999503837142 + VAL_X01 F64 0.00530642880692 + VAL_X02 F64 5.64208407175e-06 + NELEMENTS S32 3 +END + +fpa_ccd10_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -1.66026335274 + VAL_X01 F64 0.0163728070101 + VAL_X02 F64 1.28840808261e-05 + NELEMENTS S32 3 +END + +fpa_ccd11_Amp METADATA + NORDER_X S32 2 + VAL_X00 F64 -4.47794069907 + VAL_X01 F64 0.0347579009973 + VAL_X02 F64 2.78713468204e-05 + NELEMENTS S32 3 +END + Index: /branches/pap_branch_070920/ippconfig/cfh12k/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/dvo.config (revision 14957) @@ -0,0 +1,63 @@ + +# location of DVO database tables +CATDIR /data/alala.0/eugene/isp/catdir + +# keywords used by DVO to interpret the headers + +# keyword abstractions: +DATE-KEYWORD DATE-OBS +DATE-MODE yyyy-mm-dd +UT-KEYWORD UTC-OBS +JD-KEYWORD NONE +MJD-KEYWORD NONE + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX 0 +CAL_INSTMAG_MIN 0 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 1.0 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 + +IMAGE_SCATTER 0.075 # mark images POOR if stdev(Mcal) > IMAGE_SCATTER +STAR_SCATTER 0.005 # mark stars POOR if stdev(Mrel) > STAR_SCATTER +IMAGE_OFFSET 0.100 # mark images POOR if abs(delta(Mcal)) > IMAGE_OFFSET +STAR_CHISQ 10.0 # mark stars POOR if Xm > STAR_CHISQ +STAR_TOOFEW 3 # mark star FEW if N(good) < STAR_TOOFEW +IMAGE_TOOFEW 10 # mark image FEW if N(good) < IMAGE_TOOFEW +IMAGE_GOOD_FRACTION 0.05 # mark image FEW if N(good) < IMAGE_GOOD_FRACTION * Nstars + +SCATTER_LIM 15.0 +MAG_LIM 20.0 # select stars brighter than this for relphot analysis +SIGMA_LIM 0.015 # select measurements with dM < SIGMA_LIM for relphot analysis +# INST_MAG_MIN -17 # optional constraints on magnitude ranges +# INST_MAG_MAX -13 # optional constraints on magnitude ranges + +RELPHOT_GRID_BINNING 256 +RELPHOT_GRID_X 6 +RELPHOT_GRID_Y 14 + Index: /branches/pap_branch_070920/ippconfig/cfh12k/dvo.layout =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/dvo.layout (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/dvo.layout (revision 14957) @@ -0,0 +1,29 @@ +# this file defines the layout of the mosaic imager: + +NCCD 12 +NAXIS1 2080 +NAXIS2 4128 + +MOSAIC_X 6 +MOSAIC_Y 2 + +# lines need to contain: + +CHIPID_KEYWORD CHIPID + +# ID CHIPID xoffset yoffset xflip yflip datasec biassec Xo Yo theta +CCD.0 chip00 0 0 0 0 [6:2049,5:4100] [2050:2080,2:4128] 0.0 0.0 0.00 +CCD.1 chip01 1 0 0 0 [6:2049,5:4100] [2050:2080,2:4128] 2000.0 0.0 0.00 +CCD.2 chip02 2 0 1 0 [6:2049,5:4100] [2050:2080,2:4128] 6000.0 0.0 0.00 +CCD.3 chip03 3 0 1 0 [6:2049,5:4100] [2050:2080,2:4128] 8000.0 0.0 0.00 +CCD.4 chip04 4 0 0 0 [6:2049,5:4100] [2050:2080,2:4128] 8000.0 0.0 0.00 +CCD.5 chip05 5 0 0 0 [6:2049,5:4100] [2050:2080,2:4128] 10000.0 0.0 0.00 +CCD.6 chip06 0 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 0.0 8000.0 1.00 +CCD.7 chip07 1 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 2000.0 8000.0 0.00 +CCD.8 chip08 2 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 4000.0 8000.0 0.00 +CCD.9 chip09 3 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 6000.0 8000.0 0.00 +CCD.10 chip10 4 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 8000.0 8000.0 0.00 +CCD.11 chip11 5 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 10000.0 8000.0 0.00 + +# can we use header to find biassec +USE_BIASSEC 1 Index: /branches/pap_branch_070920/ippconfig/cfh12k/format_mef.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/format_mef.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/format_mef.config (revision 14957) @@ -0,0 +1,165 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. +# The spliced MecaCam data is stored in single extensions for each chip + +# How to recognise this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR CFH12K + INSTRUME STR CFH12K Mosaic + EXTEND BOOL T +END + +FILE METADATA + # How to read this data + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CHIP # The extensions represent chips + FPA.NAME STR EXPNUM # A PHU keyword for unique identifier + CHIP.NAME STR EXTNAME # An extension keyword for unique identifie +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chip name:component cell + chip00 STR ccd00:MIT-LL + chip01 STR ccd01:MIT-LL + chip02 STR ccd02:MIT-LL + chip03 STR ccd03:MIT-LL + chip04 STR ccd04:MIT-LL + chip05 STR ccd05:MIT-LL + chip06 STR ccd06:MIT-LL + chip07 STR ccd07:MIT-LL + chip08 STR ccd08:MIT-LL + chip09 STR ccd09:MIT-LL + chip10 STR ccd10:MIT-LL + chip11 STR ccd11:MIT-LL +END + +# Specify the chips +CHIPS METADATA + # Chip type, cellName:cellType + MIT-LL STR Amp:cell +END + +# Specify the cells +CELLS METADATA + cell METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + CELL.X0 S32 0 + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.FOCUS STR TELFOCUS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + FPA.TEMP STR DETTEM + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.SATURATION STR SATURATE + CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR CFHT + FPA.INSTRUMENT STR CFH12K # this value is used in ipprc.config to find the recipes + FPA.DETECTOR STR CFH12K + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 4096 + CELL.XSIZE S32 2048 + CELL.YSIZE S32 4096 + CELL.READNOISE F32 10.0 + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + ccd00 S32 10240 + ccd01 S32 8192 + ccd02 S32 6144 + ccd03 S32 4096 + ccd04 S32 2048 + ccd05 S32 0 + ccd06 S32 10240 + ccd07 S32 8192 + ccd08 S32 6144 + ccd09 S32 4096 + ccd10 S32 2048 + ccd11 S32 0 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + ccd00 S32 0 + ccd01 S32 0 + ccd02 S32 0 + ccd03 S32 0 + ccd04 S32 0 + ccd05 S32 0 + ccd06 S32 0 + ccd07 S32 0 + ccd08 S32 0 + ccd09 S32 0 + ccd10 S32 0 + ccd11 S32 0 + END + CHIP.XPARITY S32 -1 + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + ccd00 S32 -1 + ccd01 S32 -1 + ccd02 S32 -1 + ccd03 S32 -1 + ccd04 S32 -1 + ccd05 S32 -1 + ccd06 S32 +1 + ccd07 S32 +1 + ccd08 S32 +1 + ccd09 S32 +1 + ccd10 S32 +1 + ccd11 S32 +1 + END +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + Index: /branches/pap_branch_070920/ippconfig/cfh12k/format_mef_early.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/format_mef_early.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/format_mef_early.config (revision 14957) @@ -0,0 +1,167 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. +# The spliced MecaCam data is stored in single extensions for each chip + +# How to recognise this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR CFH12K + INSTRUME STR CFH12K Mosaic + EXTEND BOOL T + IMAGESWV STR CFHT DetCom v3.25 (Jun 13 2001) +END + +FILE METADATA + # How to read this data + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CHIP # The extensions represent chips + FPA.NAME STR EXPNUM # A PHU keyword for unique identifier + CHIP.NAME STR CHIPID # An extension keyword for unique identifie + EXTWORD STR CHIPID +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chip name:component cell + 0 STR ccd00:MIT-LL + 1 STR ccd01:MIT-LL + 2 STR ccd02:MIT-LL + 3 STR ccd03:MIT-LL + 4 STR ccd04:MIT-LL + 5 STR ccd05:MIT-LL + 6 STR ccd06:MIT-LL + 7 STR ccd07:MIT-LL + 8 STR ccd08:MIT-LL + 9 STR ccd09:MIT-LL + 10 STR ccd10:MIT-LL + 11 STR ccd11:MIT-LL +END + +# Specify the chips +CHIPS METADATA + # Chip type, cellName:cellType + MIT-LL STR Amp:cell +END + +# Specify the cells +CELLS METADATA + cell METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + CELL.X0 S32 0 + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.FOCUS STR TELFOCUS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + FPA.TEMP STR DETTEM + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.SATURATION STR SATURATE + CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR CFHT + FPA.INSTRUMENT STR CFH12K # this value is used in ipprc.config to find the recipes + FPA.DETECTOR STR CFH12K + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 4096 + CELL.XSIZE S32 2048 + CELL.YSIZE S32 4096 + CELL.READNOISE F32 10.0 + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + ccd00 S32 10 + ccd01 S32 2048 + ccd02 S32 4096 + ccd03 S32 6144 + ccd04 S32 8192 + ccd05 S32 10240 + ccd06 S32 0 + ccd07 S32 2048 + ccd08 S32 4096 + ccd09 S32 6144 + ccd10 S32 8192 + ccd11 S32 10240 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + ccd00 S32 10 + ccd01 S32 10 + ccd02 S32 10 + ccd03 S32 10 + ccd04 S32 10 + ccd05 S32 10 + ccd06 S32 4128 + ccd07 S32 4128 + ccd08 S32 4128 + ccd09 S32 4128 + ccd10 S32 4128 + ccd11 S32 4128 + END + CHIP.XPARITY S32 1 + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + ccd00 S32 +1 + ccd01 S32 +1 + ccd02 S32 +1 + ccd03 S32 +1 + ccd04 S32 +1 + ccd05 S32 +1 + ccd06 S32 -1 + ccd07 S32 -1 + ccd08 S32 -1 + ccd09 S32 -1 + ccd10 S32 -1 + ccd11 S32 -1 + END +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + Index: /branches/pap_branch_070920/ippconfig/cfh12k/format_split.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/format_split.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/format_split.config (revision 14957) @@ -0,0 +1,159 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. +# The spliced MecaCam data is stored in single extensions for each chip + +# How to recognise this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR CFH12K + INSTRUME STR CFH12K Mosaic + NAXIS S32 2 +END + +FILE METADATA + # How to read this data + PHU STR CHIP # The FITS file represents an entire FPA + EXTENSIONS STR NONE # The extensions represent chips + FPA.NAME STR EXPNUM # A PHU keyword for unique identifier + CHIP.NAME STR EXTNAME # An extension keyword for unique identifie + CONTENT STR {CHIP.NAME} # Key to the CONTENTS menu +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chip name:component cell + chip00 STR ccd00:Amp:cell + chip01 STR ccd01:Amp:cell + chip02 STR ccd02:Amp:cell + chip03 STR ccd03:Amp:cell + chip04 STR ccd04:Amp:cell + chip05 STR ccd05:Amp:cell + chip06 STR ccd06:Amp:cell + chip07 STR ccd07:Amp:cell + chip08 STR ccd08:Amp:cell + chip09 STR ccd09:Amp:cell + chip10 STR ccd10:Amp:cell + chip11 STR ccd11:Amp:cell +END + +# Specify the cells +CELLS METADATA + cell METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAIN + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FOCUS STR TELFOCUS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + FPA.TEMP STR DETTEM + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.SATURATION STR SATURATE + CELL.TIME STR MJD-OBS + CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR CFHT + FPA.INSTRUMENT STR CFH12K # this value is used in ipprc.config to find the recipes + FPA.DETECTOR STR CFH12K + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 4096 + CELL.XSIZE S32 2048 + CELL.YSIZE S32 4096 + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + chip00 S32 0 + chip01 S32 2048 + chip02 S32 4096 + chip03 S32 6144 + chip04 S32 8192 + chip05 S32 10240 + chip06 S32 0 + chip07 S32 2048 + chip08 S32 4096 + chip09 S32 6144 + chip10 S32 8192 + chip11 S32 10240 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + chip00 S32 0 + chip01 S32 0 + chip02 S32 0 + chip03 S32 0 + chip04 S32 0 + chip05 S32 0 + chip06 S32 4128 + chip07 S32 4128 + chip08 S32 4128 + chip09 S32 4128 + chip10 S32 4128 + chip11 S32 4128 + END + CHIP.XPARITY S32 1 + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + chip00 S32 +1 + chip01 S32 +1 + chip02 S32 +1 + chip03 S32 +1 + chip04 S32 +1 + chip05 S32 +1 + chip06 S32 -1 + chip07 S32 -1 + chip08 S32 -1 + chip09 S32 -1 + chip10 S32 -1 + chip11 S32 -1 + END +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + Index: /branches/pap_branch_070920/ippconfig/cfh12k/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/ppImage.config (revision 14957) @@ -0,0 +1,59 @@ +### ppImage recipe configuration file for cfh12k + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 3 # Order of polynomial fit +OVERSCAN.STAT STR MEDIAN # MEAN | MEDIAN + +# for a test, turn off selected detrend types +OVERSCAN BOOL FALSE # Overscan subtraction +BIAS BOOL FALSE # Bias subtraction +DARK BOOL TRUE # Dark subtraction +FLAT BOOL TRUE # Flat-field normalisation + +# binned output image options +BIN1.XBIN S32 12 +BIN1.YBIN S32 12 +BIN2.XBIN S32 96 +BIN2.YBIN S32 96 + +# cfh12k needs fringe subtraction +FRINGE BOOL TRUE # Fringe subtraction + +# this table lists extra constraints which should be applied when +# selecting the detrend images. +# note: camera and time are always applied + +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA +# EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + FILTER STR FPA.FILTERID +# DETTYPE STR DOMEFLAT.RAW +# VERSION STR SKYFLAT.RAW +# VERSION STR DOMEFLAT.CORR.XX +# VERSION STR SKYFLAT.CORR + END + FLAT_CORRECTION METADATA + FILTER STR FPA.FILTER + END + FRINGE METADATA + FILTER STR FPA.FILTER +# AIRMASS STR FPA.AIRMASS +# TWILIGHT STR FPA.TWILIGHT + END + SHUTTER METADATA + END +END + +# only apply the fringe for these filters +FRINGE.FILTERS MULTI +FRINGE.FILTERS STR r +FRINGE.FILTERS STR i +FRINGE.FILTERS STR z + +PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/cfh12k/ppMerge.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/ppMerge.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/ppMerge.config (revision 14957) @@ -0,0 +1,44 @@ + +# Bias combination --- don't want min/max rejection +PPMERGE_BIAS METADATA + REJ F32 3.0 # Rejection threshold (sigma) + ITER S32 2 # Number of rejection iterations + FRACHIGH F32 0.0 # Fraction of high pixels to reject immediately + FRACLOW F32 0.0 # Fraction of low pixels to reject immediately + WEIGHTS BOOL FALSE # Use image weights? + COMBINE STR CLIPPED # Statistic to use for combination: +END + +# Dark combination --- don't want min/max rejection +# More aggressive clipping than bias, so as to remove CRs +PPMERGE_DARK METADATA + REJ F32 2.0 # Rejection threshold (sigma) + ITER S32 4 # Number of rejection iterations + FRACHIGH F32 0.0 # Fraction of high pixels to reject immediately + FRACLOW F32 0.0 # Fraction of low pixels to reject immediately + WEIGHTS BOOL FALSE # Use image weights? + COMBINE STR CLIPPED # Statistic to use for combination: +END + +# Flat combination --- use min/max rejection +PPMERGE_FLAT METADATA + REJ F32 3.0 # Rejection threshold (sigma) + ITER S32 1 # Number of rejection iterations + FRACHIGH F32 0.3 # Fraction of high pixels to reject immediately + FRACLOW F32 0.1 # Fraction of low pixels to reject immediately + NKEEP S32 5 # Minimum number of pixels in stack to keep + MASKVAL S32 0xff # Mask value for input data + WEIGHTS BOOL TRUE # Use image weights? + COMBINE STR MEAN # Statistic to use for combination: +END + + +# Fringe combination --- already included in default, above +PPMERGE_FRINGE METADATA + FRACHIGH F32 0.1 # Fraction of high pixels to reject immediately + WEIGHTS BOOL TRUE # Use image weights? +END + +# Mask generation --- already included in default, above +PPMERGE_MASK METADATA +END Index: /branches/pap_branch_070920/ippconfig/cfh12k/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/psastro.config (revision 14957) @@ -0,0 +1,39 @@ + +# astrometry matching parameters + +# nominal plate scale (mm / pixel) +PSASTRO.PIXEL.SCALE F32 1.0 + +# pmAstromGridMatch: +PSASTRO.GRID.SEARCH BOOL TRUE +PSASTRO.GRID.MIN.ANGLE F32 -2.0 +PSASTRO.GRID.MAX.ANGLE F32 +2.0 +PSASTRO.GRID.DEL.ANGLE F32 0.5 +PSASTRO.GRID.MIN.SIGMA F32 5.0 + +# pmAstromGridAngle +# max grid offset in FP units (microns) +# use plate-scale to make this in pixels? +PSASTRO.GRID.OFFSET F32 1000.0 +PSASTRO.GRID.SCALE F32 50.0 + +# these tweak are in FP units (pixels, currently) +PSASTRO.TWEAK.SCALE F32 1 +PSASTRO.TWEAK.RANGE F32 75 +PSASTRO.TWEAK.SMOOTH F32 2 +PSASTRO.TWEAK.NSIGMA F32 3 + +# pmAstromRadiusMatch +# use plate-scale to make this in pixels? +PSASTRO.MATCH.RADIUS F32 8 + +# pmAstromMatchFit +PSASTRO.CHIP.ORDER S32 1 # fit order +PSASTRO.CHIP.NITER S32 3 # fit clipping iterations +PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas + +PSASTRO.MAX.ERROR F32 10.0 # max error in pixels +PSASTRO.MIN.NSTAR S32 10 # min fitted stars in solution + +MAG_MAX F32 20 +DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass Index: /branches/pap_branch_070920/ippconfig/cfh12k/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/psphot.config (revision 14957) @@ -0,0 +1,57 @@ + +# turn these on to see specific outputs +SAVE.OUTPUT BOOL TRUE +SAVE.BACKMDL BOOL TRUE +#SAVE.RESID BOOL TRUE +#SAVE.BACKGND BOOL TRUE +#SAVE.BACKSUB BOOL TRUE +SAVE.PSF BOOL TRUE +#LOAD.PSF BOOL FALSE +SAVE.PLOTS BOOL TRUE + +BACKGROUND.XBIN S32 64 # size of background superpixels +BACKGROUND.YBIN S32 64 # size of background superpixels + +# image background parameters +IMSTATS_NPIX S32 5000 # number of pixels to use for sky estimate boxes: +SKY_STAT STR FITTED_MEAN_V3 # statistic used to measure background +SKY_CLIP_SIGMA F32 2.0 # statistic used to measure background + +# SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEAN, ROBUST_QUARTILE, FITTED_MEAN +# FITTED_MEAN_V2, FITTED_MEAN_V3 + +PSF_SN_LIM F32 100 # minimum S/N for stars used for PSF model +PSF_MAX_NSTARS S32 300 # limit number of stars used for PSF model + +# PSF model parameters : choose the PSF model desired +PSF_MODEL STR PS_MODEL_QGAUSS + +MOMENTS_SN_MIN F32 20.0 # min S/N to measure moments +EXT_MIN_SN F32 50.0 # fit galaxies above this S/N limit +FULL_FIT_SN_LIM F32 50.0 +AP_MIN_SN F32 25.0 + +# BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE) +# BREAK_POINT STR ENSEMBLE + +# OUTPUT.FORMAT STR SMPDATA +OUTPUT.FORMAT STR PS1_DEV_0 + +# masking parameters (XXX EAM : rework this to use psRegion like ANALYSIS_REGION) +XMIN F32 +10 # minimum valid x-coord +XMAX F32 -10 # maximum valid x-coord +YMIN F32 +10 # minimum valid y-coord +YMAX F32 -10 # maximum valid y-coord + +PSPHOT.FIXED.PSF METADATA + # PSF.TREND.MASK must be a 2D polynomial + # the specified values are ignored but define the active components of the polynomial + PSF.TREND.MASK METADATA + NORDER_X S32 0 # number of x orders + NORDER_Y S32 0 # number of y orders + VAL_X00_Y00 F64 1 # polynomial coefficient + NELEMENTS S32 1 # number of unmasked components + END # folder for 2D polynomial + + PSF_SN_LIM F32 20 # minimum S/N for stars used for PSF model +END Index: /branches/pap_branch_070920/ippconfig/cfh12k/rejections.config =================================================================== --- /branches/pap_branch_070920/ippconfig/cfh12k/rejections.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/cfh12k/rejections.config (revision 14957) @@ -0,0 +1,49 @@ + +BIAS METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 2.0 + IMFILE.STDEV F32 10.0 + IMFILE.MEANSTDEV F32 5.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 5.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 2.0 + EXP.STDEV F32 10.0 + EXP.MEANSTDEV F32 5.0 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 5.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + +DARK METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 10.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 2.0 + EXP.MEAN F32 2.0 + EXP.STDEV F32 10.0 + EXP.MEANSTDEV F32 2.0 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 2.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + Index: /branches/pap_branch_070920/ippconfig/configure.ac =================================================================== --- /branches/pap_branch_070920/ippconfig/configure.ac (revision 14957) +++ /branches/pap_branch_070920/ippconfig/configure.ac (revision 14957) @@ -0,0 +1,25 @@ +AC_PREREQ(2.59) + +AC_INIT([ippConfig], [1.1.0], [ipp-support@ifa.hawaii.edu]) +AC_CONFIG_SRCDIR([ipprc.config.in]) + +AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2]) +AM_MAINTAINER_MODE + +AC_PROG_INSTALL + +AC_CONFIG_FILES([ + Makefile + recipes/Makefile + isp/Makefile + ctio_mosaic2/Makefile + cfh12k/Makefile + megacam/Makefile + simple/Makefile + simmosaic/Makefile + simtest/Makefile + tc3/Makefile + skycell/Makefile + sdss/Makefile +]) +AC_OUTPUT Index: /branches/pap_branch_070920/ippconfig/ctio_mosaic2/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/ctio_mosaic2/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ctio_mosaic2/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/ctio_mosaic2/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/ctio_mosaic2/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ctio_mosaic2/Makefile.am (revision 14957) @@ -0,0 +1,19 @@ + +installdir = $(datadir)/ippconfig/ctio_mosaic2 + +install_files = \ + dvo.config \ + dvo.layout \ + camera.config \ + format.config \ + ppImage.config \ + psphot.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ctio_mosaic2/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ctio_mosaic2/camera.config (revision 14957) @@ -0,0 +1,216 @@ +# Camera configuration file for MegaCam: describes the camera + +# File formats that we know about +FORMATS METADATA + MEF STR ctio_mosaic2/format.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + ccd00 STR LeftAmp RightAmp + ccd01 STR LeftAmp RightAmp + ccd02 STR LeftAmp RightAmp + ccd03 STR LeftAmp RightAmp + ccd04 STR LeftAmp RightAmp + ccd05 STR LeftAmp RightAmp + ccd06 STR LeftAmp RightAmp + ccd07 STR LeftAmp RightAmp +END + +# menu of possible filter names: internal STR external name +FILTER.ID METADATA + VR MULTI + VR STR VR.Supermacho.c6027 + VR STR VR Supermacho c6027 + R STR R Harris c6004 + I STR I c6028 +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa +END + +DVO.CAMERADIR STR ctio_mosaic2 # Camera directory for DVO + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + # Recipes for ppImage + PPIMAGE STR ctio_mosaic2/ppImage.config # Default: all (normal) options on + PSPHOT STR ctio_mosaic2/psphot.config # Default: all (normal) options on +END + +# Reduction classes +REDUCTION METADATA + # Detrend processing + DETREND METADATA + BIAS_PROCESS STR PPIMAGE_O + BIAS_RESID STR PPIMAGE_B + BIAS_VERIFY STR PPIMAGE_OB + BIAS_STACK STR PPMERGE_BIAS + DARK_PROCESS STR PPIMAGE_OB + DARK_RESID STR PPIMAGE_D + DARK_VERIFY STR PPIMAGE_OBD + DARK_STACK STR PPMERGE_DARK + SHUTTER_PROCESS STR PPIMAGE_OBD + SHUTTER_RESID STR PPIMAGE_S + SHUTTER_VERIFY STR PPIMAGE_OBDS + SHUTTER_STACK STR PPMERGE_SHUTTER + FLAT_PROCESS STR PPIMAGE_OBDS + FLAT_RESID STR PPIMAGE_F + FLAT_VERIFY STR PPIMAGE_OBDSF + FLAT_STACK STR PPMERGE_FLAT + FRINGE_PROCESS STR PPIMAGE_OBDSF + FRINGE_RESID STR PPIMAGE_R + FRINGE_VERIFY STR PPIMAGE_OBDSFR + FRINGE_STACK STR PPMERGE_FRINGE + END + # Processing raw data + DEFAULT METADATA + CHIP STR PPIMAGE_OBDSFRA + END +END + +FILERULES METADATA + ### Redirections + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.MEF + PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF + PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.MEF + PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF + PPIMAGE.BIN1 STR PPIMAGE.BIN1.MEF + PPIMAGE.BIN2 STR PPIMAGE.BIN2.MEF + DVOCORR.OUTPUT STR DVOCORR.MEF.OUTPUT + DVOFLAT.OUTPUT STR DVOFLAT.MEF.OUTPUT + PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.MEF + PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF + + ### input file definitions + ### use @DETDB entries to get the detrend images from the database + ### replace @DETDB with @FILES if you want to require it from the + ### command line, or with an explicit name to require a specific file + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + + ## files used by ppImage + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE + PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE + + ## files used to build and apply the flat-field correction images + DVOCORR.INPUT INPUT @FILES CHIP IMAGE + DVOCORR.REFHEAD INPUT @FILES CHIP HEADER + DVOFLAT.INPUT INPUT @FILES CHIP IMAGE + DVOFLAT.CORR INPUT @DETDB CHIP IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES CHIP IMAGE + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSPHOT.MASK INPUT @FILES CHIP MASK + PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT + PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF + PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF + + ## files used by psastro + PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + ## files used by pswarp + PSWARP.INPUT INPUT @FILES CHIP IMAGE + PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT + PSWARP.MASK INPUT @FILES CHIP MASK + PSWARP.SKYCELL INPUT @FILES CHIP IMAGE + PSWARP.ASTROM INPUT @FILES CHIP CMF + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE CHIP TRUE MEF + PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK CHIP TRUE SPLIT + PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT + PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF + PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF + + PPIMAGE.CHIP OUTPUT {OUTPUT}.fits IMAGE CHIP TRUE MEF + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF + + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE MEF + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE MEF + + PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE CHIP TRUE MEF + PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE CHIP TRUE MEF + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE CHIP TRUE MEF + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE CHIP TRUE MEF + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE SPLIT + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE CHIP TRUE MEF + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE CHIP TRUE MEF + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE CHIP TRUE MEF + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE CHIP TRUE MEF + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ CHIP TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE NONE + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF CHIP TRUE MEF + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE NONE + PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE NONE + PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END + +EXTNAME.RULES METADATA + CMF.HEAD STR {CHIP.NAME}.hdr + CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT? + + PSF.HEAD STR {CHIP.NAME}.hdr + PSF.TABLE STR {CHIP.NAME}.psf_model + PSF.RESID STR {CHIP.NAME}.psf_resid +END + +BLANK.HEADERS METADATA + FPA.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + FPA.AIRMASS STR AIRMASS +END Index: /branches/pap_branch_070920/ippconfig/ctio_mosaic2/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ctio_mosaic2/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ctio_mosaic2/dvo.config (revision 14957) @@ -0,0 +1,63 @@ + +# location of DVO database tables +CATDIR /data/alala.0/eugene/isp/catdir + +# keywords used by DVO to interpret the headers + +# keyword abstractions: +DATE-KEYWORD DATE-OBS +DATE-MODE yyyy-mm-dd +UT-KEYWORD UTC-OBS +JD-KEYWORD NONE +MJD-KEYWORD NONE + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX 0 +CAL_INSTMAG_MIN 0 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 1.0 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 + +IMAGE_SCATTER 0.075 # mark images POOR if stdev(Mcal) > IMAGE_SCATTER +STAR_SCATTER 0.005 # mark stars POOR if stdev(Mrel) > STAR_SCATTER +IMAGE_OFFSET 0.100 # mark images POOR if abs(delta(Mcal)) > IMAGE_OFFSET +STAR_CHISQ 10.0 # mark stars POOR if Xm > STAR_CHISQ +STAR_TOOFEW 3 # mark star FEW if N(good) < STAR_TOOFEW +IMAGE_TOOFEW 10 # mark image FEW if N(good) < IMAGE_TOOFEW +IMAGE_GOOD_FRACTION 0.05 # mark image FEW if N(good) < IMAGE_GOOD_FRACTION * Nstars + +SCATTER_LIM 15.0 +MAG_LIM 20.0 # select stars brighter than this for relphot analysis +SIGMA_LIM 0.015 # select measurements with dM < SIGMA_LIM for relphot analysis +# INST_MAG_MIN -17 # optional constraints on magnitude ranges +# INST_MAG_MAX -13 # optional constraints on magnitude ranges + +RELPHOT_GRID_BINNING 256 +RELPHOT_GRID_X 6 +RELPHOT_GRID_Y 14 + Index: /branches/pap_branch_070920/ippconfig/ctio_mosaic2/dvo.layout =================================================================== --- /branches/pap_branch_070920/ippconfig/ctio_mosaic2/dvo.layout (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ctio_mosaic2/dvo.layout (revision 14957) @@ -0,0 +1,29 @@ +# this file defines the layout of the mosaic imager: + +NCCD 12 +NAXIS1 2080 +NAXIS2 4128 + +MOSAIC_X 6 +MOSAIC_Y 2 + +# lines need to contain: + +CHIPID_KEYWORD CHIPID + +# ID CHIPID xoffset yoffset xflip yflip datasec biassec Xo Yo theta +CCD.0 chip00 0 0 0 0 [6:2049,5:4100] [2050:2080,2:4128] 0.0 0.0 0.00 +CCD.1 chip01 1 0 0 0 [6:2049,5:4100] [2050:2080,2:4128] 2000.0 0.0 0.00 +CCD.2 chip02 2 0 1 0 [6:2049,5:4100] [2050:2080,2:4128] 6000.0 0.0 0.00 +CCD.3 chip03 3 0 1 0 [6:2049,5:4100] [2050:2080,2:4128] 8000.0 0.0 0.00 +CCD.4 chip04 4 0 0 0 [6:2049,5:4100] [2050:2080,2:4128] 8000.0 0.0 0.00 +CCD.5 chip05 5 0 0 0 [6:2049,5:4100] [2050:2080,2:4128] 10000.0 0.0 0.00 +CCD.6 chip06 0 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 0.0 8000.0 1.00 +CCD.7 chip07 1 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 2000.0 8000.0 0.00 +CCD.8 chip08 2 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 4000.0 8000.0 0.00 +CCD.9 chip09 3 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 6000.0 8000.0 0.00 +CCD.10 chip10 4 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 8000.0 8000.0 0.00 +CCD.11 chip11 5 1 0 1 [6:2049,5:4100] [2050:2080,2:4128] 10000.0 8000.0 0.00 + +# can we use header to find biassec +USE_BIASSEC 1 Index: /branches/pap_branch_070920/ippconfig/ctio_mosaic2/format.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ctio_mosaic2/format.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ctio_mosaic2/format.config (revision 14957) @@ -0,0 +1,162 @@ +# Format file for CTIO Mosaic2 camera used by ESSENCE + +# How to identify this type +RULE METADATA + TELESCOP STR CTIO 4.0 meter telescope + DETECTOR STR Mosaic2 + EXTEND BOOL T + NEXTEND S32 16 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CELL # The extensions represent cells + FPA.NAME STR FILENAME # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chip name:type + im1 STR ccd00:LeftAmp:left + im2 STR ccd00:RightAmp:right + im3 STR ccd01:LeftAmp:left + im4 STR ccd01:RightAmp:right + im5 STR ccd02:LeftAmp:left + im6 STR ccd02:RightAmp:right + im7 STR ccd03:LeftAmp:left + im8 STR ccd03:RightAmp:right + im9 STR ccd04:LeftAmp:left + im10 STR ccd04:RightAmp:right + im11 STR ccd05:LeftAmp:left + im12 STR ccd05:RightAmp:right + im13 STR ccd06:LeftAmp:left + im14 STR ccd06:RightAmp:right + im15 STR ccd07:LeftAmp:left + im16 STR ccd07:RightAmp:right +END + +# Specify the cell data +CELLS METADATA + left METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR TRIMSEC + CELL.XPARITY S32 1 + CELL.X0 S32 0 + END + right METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR TRIMSEC + CELL.XPARITY S32 1 + CELL.X0 S32 1024 + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.TIME STR MJD-OBS + CHIP.TEMP STR CCDTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.GAIN STR GAIN + CELL.READNOISE STR RDNOISE + CELL.SATURATION STR SATURATE + CELL.TIME STR MJD-OBS + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR BLANCO + FPA.INSTRUMENT STR MOSAIC2 + FPA.DETECTOR STR CTIO_MOSAIC2 + FPA.POSANGLE F32 0.0 + FPA.TIMESYS STR UTC # Header says "UTC approximate" + FPA.ALT F32 0.0 # Not present in header + FPA.AZ F32 0.0 # Not present in header + CELL.TIMESYS STR UTC # Header says "UTC approximate" + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 + + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + ccd00 S32 0 + ccd01 S32 2048 + ccd02 S32 4096 + ccd03 S32 6144 + ccd04 S32 0 + ccd05 S32 2048 + ccd06 S32 4096 + ccd07 S32 6144 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + ccd00 S32 0 + ccd01 S32 0 + ccd02 S32 0 + ccd03 S32 0 + ccd04 S32 4096 + ccd05 S32 4096 + ccd06 S32 4096 + ccd07 S32 4096 + END + CHIP.XPARITY S32 1 + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + ccd00 S32 1 + ccd01 S32 1 + ccd02 S32 1 + ccd03 S32 1 + ccd04 S32 1 + ccd05 S32 1 + ccd06 S32 1 + ccd07 S32 1 + END + +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# FPA.BIAS METADATA +# TABLE STR Camera +# COLUMN STR gain +# chipId STR {CHIP.NAME} +# cellId STR {CELL.NAME} +# time STR {CELL.TIME} +# END +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +# CHIP.X0 STR FORTRAN +# CHIP.Y0 STR FORTRAN +# CELL.X0 STR FORTRAN +# CELL.Y0 STR FORTRAN +END Index: /branches/pap_branch_070920/ippconfig/ctio_mosaic2/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ctio_mosaic2/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ctio_mosaic2/ppImage.config (revision 14957) @@ -0,0 +1,147 @@ +### ppImage recipe configuration file for CTIO MOSAIC2 + +# List of tasks to perform +SHUTTER BOOL FALSE # Shutter correction +DARK BOOL FALSE # Dark correction + +BASE.FITS BOOL FALSE # Save base detrended image? +CHIP.FITS BOOL TRUE # Save base detrended image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 3 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA +# EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + FILTER STR FPA.FILTERID +# DETTYPE STR DOMEFLAT.RAW +# VERSION STR SKYFLAT.RAW +# VERSION STR DOMEFLAT.CORR.XX +# VERSION STR SKYFLAT.CORR + END + FLAT_CORRECTION METADATA + FILTER STR FPA.FILTER + END + FRINGE METADATA + FILTER STR FPA.FILTER +# AIRMASS STR FPA.AIRMASS +# TWILIGHT STR FPA.TWILIGHT + END + SHUTTER METADATA + END + MASK METADATA + END +END + +#################################################################################### +# Need the following in order to turn off dark and shutter for the site-level recipe +#################################################################################### + +# Dark subtraction only +PPIMAGE_D METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Shutter correction only +PPIMAGE_S METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Overscan, bias, dark +PPIMAGE_OBD METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Overscan, bias, dark, shutter +PPIMAGE_OBDS METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Overscan, bias, dark, shutter, flat-field +PPIMAGE_OBDSF METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFR METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFRP METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFRA METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL TRUE # Astrometry for mosaic? +END Index: /branches/pap_branch_070920/ippconfig/ctio_mosaic2/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ctio_mosaic2/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ctio_mosaic2/psphot.config (revision 14957) @@ -0,0 +1,64 @@ + +# turn these on to see specific outputs +#SAVE.BACKMDL BOOL TRUE +#SAVE.BACKGND BOOL TRUE +#SAVE.BACKSUB BOOL TRUE +SAVE.RESID BOOL TRUE +#SAVE.PSF BOOL TRUE +#LOAD.PSF BOOL FALSE + +IMSTATS_NPIX S32 1000 # number of pixels to use for sky estimate boxes: + +PSF_SN_LIM F32 100 # minimum S/N for stars used for PSF model +PSF_MAX_NSTARS S32 300 # limit number of stars used for PSF model + +# PSF model parameters : choose the PSF model +# list as many PSF_MODEL options as desired +# if you want to list multiple entries, uncomment 'MULTI' here +# PSF_MODEL MULTI +PSF_MODEL STR PS_MODEL_QGAUSS +# PSF_MODEL STR PS_MODEL_GAUSS +# PSF_MODEL STR PS_MODEL_PGAUSS +# PSF_MODEL STR PS_MODEL_TGAUSS ## not well tested, not very successful + +MOMENTS_SN_MIN F32 20.0 # min S/N to measure moments +EXT_MIN_SN F32 20.0 # fit galaxies above this S/N limit +FULL_FIT_SN_LIM F32 20.0 +AP_MIN_SN F32 25.0 + + +## gene's overrides for testing: +PEAKS_NSIGMA_LIMIT_2 F32 15.0 # peak significance threshold + +EXT_MODEL STR PS_MODEL_SERSIC + +TEST_FIT BOOL FALSE +#TEST_FIT_X F32 803 +#TEST_FIT_Y F32 238 + +#TEST_FIT_X F32 803 +#TEST_FIT_Y F32 321 + +#TEST_FIT_X F32 783 +#TEST_FIT_Y F32 401 + +#TEST_FIT_X F32 850 +#TEST_FIT_Y F32 566 + +TEST_FIT_X F32 781 +TEST_FIT_Y F32 830 + +# a star +#TEST_FIT_MODE STR PSF +#TEST_FIT_X F32 696 +#TEST_FIT_Y F32 1073 + +#TEST_FIT_MODEL STR PS_MODEL_SERSIC +TEST_FIT_MODEL STR PS_MODEL_QGAUSS +TEST_MOMENTS_RADIUS F32 9.0 + +TEST_FIT_MODE STR CONV +# TEST_FIT_MODE STR EXT +#TEST_FIT_X F32 803 +#TEST_FIT_Y F32 321 + Index: /branches/pap_branch_070920/ippconfig/dvo.photcodes =================================================================== --- /branches/pap_branch_070920/ippconfig/dvo.photcodes (revision 14957) +++ /branches/pap_branch_070920/ippconfig/dvo.photcodes (revision 14957) @@ -0,0 +1,445 @@ + +# this file contains the list of valid photometry codes. there should +# be one code for each combination of CCD, filter, and telescope (and +# possibly additional ones if filter transmission reduces with time). +# The code on each line is a unique number, while the name is a +# representative name. The type defines how the photometry is +# treated. There can only be one primary photcode. There should only +# be a few secondary photcodes: these are the calibrated values for +# stars. The dependent photcodes are those which are equivalent to a +# primary or secondary photcode, and are equated after photometric +# solutions. Reference photcodes are for anything without a dynamic +# solution: the reference values are provided externally. + +# NOTE: the photcodes defined below supplement CFHT Elixir values. +# Do not use this photcode file with old CFHT DVO databases. + +# camera ranges used in this file: +# megacam: u: 100-139, g: 200-239, r: 300-339, i: 400-439, z: 500-539 +# cfh12k: B: 140-152, V: 240-252, R: 340-352, I: 440-452, Z: 540-552, NB: 600-693 +# PS1 ISP: g: 3200, r: 3300, i: 3400, z: 3500, y: 3600 +# PS1 TC3: g: 3280-3296, r: 3380-3396, i: 3480-3496, z: 3580-3596, y: 3680-3696, +# PS1 GPC1: g: 3201-3264, r: 3301-3364, i: 3401-3464, z: 3501-3564, y: 3601-3664 + +# external references: 1000 - 2999 + +# code name type zero airmass offset c1 c2 slope equivalence + 1 g pri 0.0 - - 1003 1004 0.016 - 1050 + 2 r sec 0.0 - - 1003 1004 0.008 - 1050 + 3 i sec 0.0 - - 1003 1004 0.028 - 1050 + 4 z sec 0.0 - - 1003 1004 0.107 - 1050 + 5 y sec 0.0 - - - - - - 1050 + + 1010 U_L92 ref - - - - - - - - + 1011 B_L92 ref - - - - - - - - + 1012 V_L92 ref - - - - - - - - + 1013 R_L92 ref - - - - - - - - + 1014 I_L92 ref - - - - - - - - + + 1020 U_STET ref - - - - - - - - + 1021 B_STET ref - - - - - - - - + 1022 V_STET ref - - - - - - - - + 1023 R_STET ref - - - - - - - - + 1024 I_STET ref - - - - - - - - + + 1051 u_SDSS ref - - - - - - - - + 1052 g_SDSS ref - - - - - - - - + 1053 r_SDSS ref - - - - - - - - + 1054 i_SDSS ref - - - - - - - - + 1055 z_SDSS ref - - - - - - - - + + 1000 USNO_BLUE ref - - - - - - - - + 1001 USNO_RED ref - - - - - - - - + 1002 USNO_J ref - - - - - - - - + 1003 USNO_F ref - - - - - - - - + 1004 USNO_N ref - - - - - - - - + + 1100 GSC ref - - - - - - - - + + 2020 TYCHO_B ref - - - - - - - - + 2021 TYCHO_V ref - - - - - - - - + + 2011 2MASS_J ref - - - - - - - - + 2012 2MASS_H ref - - - - - - - - + 2013 2MASS_K ref - - - - - - - - + + 3001 PS_g ref - - - - - - - 1 + 3002 PS_r ref - - - - - - - 2 + 3003 PS_i ref - - - - - - - 3 + 3004 PS_z ref - - - - - - - 4 + 3005 PS_y ref - - - - - - - 5 + +### megacam photcodes: + 100 MEGACAM.u.00 dep 25.280 -0.35 - - - - - 0 + 101 MEGACAM.u.01 dep 25.280 -0.35 - - - - - 0 + 102 MEGACAM.u.02 dep 25.280 -0.35 - - - - - 0 + 103 MEGACAM.u.03 dep 25.280 -0.35 - - - - - 0 + 104 MEGACAM.u.04 dep 25.280 -0.35 - - - - - 0 + 105 MEGACAM.u.05 dep 25.280 -0.35 - - - - - 0 + 106 MEGACAM.u.06 dep 25.280 -0.35 - - - - - 0 + 107 MEGACAM.u.07 dep 25.280 -0.35 - - - - - 0 + 108 MEGACAM.u.08 dep 25.280 -0.35 - - - - - 0 + 109 MEGACAM.u.09 dep 25.280 -0.35 - - - - - 0 + 110 MEGACAM.u.10 dep 25.280 -0.35 - - - - - 0 + 111 MEGACAM.u.11 dep 25.280 -0.35 - - - - - 0 + 112 MEGACAM.u.12 dep 25.280 -0.35 - - - - - 0 + 113 MEGACAM.u.13 dep 25.280 -0.35 - - - - - 0 + 114 MEGACAM.u.14 dep 25.280 -0.35 - - - - - 0 + 115 MEGACAM.u.15 dep 25.280 -0.35 - - - - - 0 + 116 MEGACAM.u.16 dep 25.280 -0.35 - - - - - 0 + 117 MEGACAM.u.17 dep 25.280 -0.35 - - - - - 0 + 118 MEGACAM.u.18 dep 25.280 -0.35 - - - - - 0 + 119 MEGACAM.u.19 dep 25.280 -0.35 - - - - - 0 + 120 MEGACAM.u.20 dep 25.280 -0.35 - - - - - 0 + 121 MEGACAM.u.21 dep 25.280 -0.35 - - - - - 0 + 122 MEGACAM.u.22 dep 25.280 -0.35 - - - - - 0 + 123 MEGACAM.u.23 dep 25.280 -0.35 - - - - - 0 + 124 MEGACAM.u.24 dep 25.280 -0.35 - - - - - 0 + 125 MEGACAM.u.25 dep 25.280 -0.35 - - - - - 0 + 126 MEGACAM.u.26 dep 25.280 -0.35 - - - - - 0 + 127 MEGACAM.u.27 dep 25.280 -0.35 - - - - - 0 + 128 MEGACAM.u.28 dep 25.280 -0.35 - - - - - 0 + 129 MEGACAM.u.29 dep 25.280 -0.35 - - - - - 0 + 130 MEGACAM.u.30 dep 25.280 -0.35 - - - - - 0 + 131 MEGACAM.u.31 dep 25.280 -0.35 - - - - - 0 + 132 MEGACAM.u.32 dep 25.280 -0.35 - - - - - 0 + 133 MEGACAM.u.33 dep 25.280 -0.35 - - - - - 0 + 134 MEGACAM.u.34 dep 25.280 -0.35 - - - - - 0 + 135 MEGACAM.u.35 dep 25.280 -0.35 - - - - - 0 + 136 MEGACAM.u.36 dep 25.280 -0.35 - - - - - 0 + 137 MEGACAM.u.37 dep 25.280 -0.35 - - - - - 0 + 138 MEGACAM.u.38 dep 25.280 -0.35 - - - - - 0 + 139 MEGACAM.u.39 dep 25.280 -0.35 - - - - - 0 + + 200 MEGACAM.g.00 dep 26.460 -0.15 - - - - - 1 + 201 MEGACAM.g.01 dep 26.460 -0.15 - - - - - 1 + 202 MEGACAM.g.02 dep 26.460 -0.15 - - - - - 1 + 203 MEGACAM.g.03 dep 26.460 -0.15 - - - - - 1 + 204 MEGACAM.g.04 dep 26.460 -0.15 - - - - - 1 + 205 MEGACAM.g.05 dep 26.460 -0.15 - - - - - 1 + 206 MEGACAM.g.06 dep 26.460 -0.15 - - - - - 1 + 207 MEGACAM.g.07 dep 26.460 -0.15 - - - - - 1 + 208 MEGACAM.g.08 dep 26.460 -0.15 - - - - - 1 + 209 MEGACAM.g.09 dep 26.460 -0.15 - - - - - 1 + 210 MEGACAM.g.10 dep 26.460 -0.15 - - - - - 1 + 211 MEGACAM.g.11 dep 26.460 -0.15 - - - - - 1 + 212 MEGACAM.g.12 dep 26.460 -0.15 - - - - - 1 + 213 MEGACAM.g.13 dep 26.460 -0.15 - - - - - 1 + 214 MEGACAM.g.14 dep 26.460 -0.15 - - - - - 1 + 215 MEGACAM.g.15 dep 26.460 -0.15 - - - - - 1 + 216 MEGACAM.g.16 dep 26.460 -0.15 - - - - - 1 + 217 MEGACAM.g.17 dep 26.460 -0.15 - - - - - 1 + 218 MEGACAM.g.18 dep 26.460 -0.15 - - - - - 1 + 219 MEGACAM.g.19 dep 26.460 -0.15 - - - - - 1 + 220 MEGACAM.g.20 dep 26.460 -0.15 - - - - - 1 + 221 MEGACAM.g.21 dep 26.460 -0.15 - - - - - 1 + 222 MEGACAM.g.22 dep 26.460 -0.15 - - - - - 1 + 223 MEGACAM.g.23 dep 26.460 -0.15 - - - - - 1 + 224 MEGACAM.g.24 dep 26.460 -0.15 - - - - - 1 + 225 MEGACAM.g.25 dep 26.460 -0.15 - - - - - 1 + 226 MEGACAM.g.26 dep 26.460 -0.15 - - - - - 1 + 227 MEGACAM.g.27 dep 26.460 -0.15 - - - - - 1 + 228 MEGACAM.g.28 dep 26.460 -0.15 - - - - - 1 + 229 MEGACAM.g.29 dep 26.460 -0.15 - - - - - 1 + 230 MEGACAM.g.30 dep 26.460 -0.15 - - - - - 1 + 231 MEGACAM.g.31 dep 26.460 -0.15 - - - - - 1 + 232 MEGACAM.g.32 dep 26.460 -0.15 - - - - - 1 + 233 MEGACAM.g.33 dep 26.460 -0.15 - - - - - 1 + 234 MEGACAM.g.34 dep 26.460 -0.15 - - - - - 1 + 235 MEGACAM.g.35 dep 26.460 -0.15 - - - - - 1 + 236 MEGACAM.g.36 dep 26.460 -0.15 - - - - - 1 + 237 MEGACAM.g.37 dep 26.460 -0.15 - - - - - 1 + 238 MEGACAM.g.38 dep 26.460 -0.15 - - - - - 1 + 239 MEGACAM.g.39 dep 26.460 -0.15 - - - - - 1 + + 300 MEGACAM.r.00 dep 25.978 -0.10 - - - - - 2 + 301 MEGACAM.r.01 dep 25.978 -0.10 - - - - - 2 + 302 MEGACAM.r.02 dep 25.978 -0.10 - - - - - 2 + 303 MEGACAM.r.03 dep 25.978 -0.10 - - - - - 2 + 304 MEGACAM.r.04 dep 25.978 -0.10 - - - - - 2 + 305 MEGACAM.r.05 dep 25.978 -0.10 - - - - - 2 + 306 MEGACAM.r.06 dep 25.978 -0.10 - - - - - 2 + 307 MEGACAM.r.07 dep 25.978 -0.10 - - - - - 2 + 308 MEGACAM.r.08 dep 25.978 -0.10 - - - - - 2 + 309 MEGACAM.r.09 dep 25.978 -0.10 - - - - - 2 + 310 MEGACAM.r.10 dep 25.978 -0.10 - - - - - 2 + 311 MEGACAM.r.11 dep 25.978 -0.10 - - - - - 2 + 312 MEGACAM.r.12 dep 25.978 -0.10 - - - - - 2 + 313 MEGACAM.r.13 dep 25.978 -0.10 - - - - - 2 + 314 MEGACAM.r.14 dep 25.978 -0.10 - - - - - 2 + 315 MEGACAM.r.15 dep 25.978 -0.10 - - - - - 2 + 316 MEGACAM.r.16 dep 25.978 -0.10 - - - - - 2 + 317 MEGACAM.r.17 dep 25.978 -0.10 - - - - - 2 + 318 MEGACAM.r.18 dep 25.978 -0.10 - - - - - 2 + 319 MEGACAM.r.19 dep 25.978 -0.10 - - - - - 2 + 320 MEGACAM.r.20 dep 25.978 -0.10 - - - - - 2 + 321 MEGACAM.r.21 dep 25.978 -0.10 - - - - - 2 + 322 MEGACAM.r.22 dep 25.978 -0.10 - - - - - 2 + 323 MEGACAM.r.23 dep 25.978 -0.10 - - - - - 2 + 324 MEGACAM.r.24 dep 25.978 -0.10 - - - - - 2 + 325 MEGACAM.r.25 dep 25.978 -0.10 - - - - - 2 + 326 MEGACAM.r.26 dep 25.978 -0.10 - - - - - 2 + 327 MEGACAM.r.27 dep 25.978 -0.10 - - - - - 2 + 328 MEGACAM.r.28 dep 25.978 -0.10 - - - - - 2 + 329 MEGACAM.r.29 dep 25.978 -0.10 - - - - - 2 + 330 MEGACAM.r.30 dep 25.978 -0.10 - - - - - 2 + 331 MEGACAM.r.31 dep 25.978 -0.10 - - - - - 2 + 332 MEGACAM.r.32 dep 25.978 -0.10 - - - - - 2 + 333 MEGACAM.r.33 dep 25.978 -0.10 - - - - - 2 + 334 MEGACAM.r.34 dep 25.978 -0.10 - - - - - 2 + 335 MEGACAM.r.35 dep 25.978 -0.10 - - - - - 2 + 336 MEGACAM.r.36 dep 25.978 -0.10 - - - - - 2 + 337 MEGACAM.r.37 dep 25.978 -0.10 - - - - - 2 + 338 MEGACAM.r.38 dep 25.978 -0.10 - - - - - 2 + 339 MEGACAM.r.39 dep 25.978 -0.10 - - - - - 2 + + 400 MEGACAM.i.00 dep 25.744 -0.04 - - - - - 3 + 401 MEGACAM.i.01 dep 25.744 -0.04 - - - - - 3 + 402 MEGACAM.i.02 dep 25.744 -0.04 - - - - - 3 + 403 MEGACAM.i.03 dep 25.744 -0.04 - - - - - 3 + 404 MEGACAM.i.04 dep 25.744 -0.04 - - - - - 3 + 405 MEGACAM.i.05 dep 25.744 -0.04 - - - - - 3 + 406 MEGACAM.i.06 dep 25.744 -0.04 - - - - - 3 + 407 MEGACAM.i.07 dep 25.744 -0.04 - - - - - 3 + 408 MEGACAM.i.08 dep 25.744 -0.04 - - - - - 3 + 409 MEGACAM.i.09 dep 25.744 -0.04 - - - - - 3 + 410 MEGACAM.i.10 dep 25.744 -0.04 - - - - - 3 + 411 MEGACAM.i.11 dep 25.744 -0.04 - - - - - 3 + 412 MEGACAM.i.12 dep 25.744 -0.04 - - - - - 3 + 413 MEGACAM.i.13 dep 25.744 -0.04 - - - - - 3 + 414 MEGACAM.i.14 dep 25.744 -0.04 - - - - - 3 + 415 MEGACAM.i.15 dep 25.744 -0.04 - - - - - 3 + 416 MEGACAM.i.16 dep 25.744 -0.04 - - - - - 3 + 417 MEGACAM.i.17 dep 25.744 -0.04 - - - - - 3 + 418 MEGACAM.i.18 dep 25.744 -0.04 - - - - - 3 + 419 MEGACAM.i.19 dep 25.744 -0.04 - - - - - 3 + 420 MEGACAM.i.20 dep 25.744 -0.04 - - - - - 3 + 421 MEGACAM.i.21 dep 25.744 -0.04 - - - - - 3 + 422 MEGACAM.i.22 dep 25.744 -0.04 - - - - - 3 + 423 MEGACAM.i.23 dep 25.744 -0.04 - - - - - 3 + 424 MEGACAM.i.24 dep 25.744 -0.04 - - - - - 3 + 425 MEGACAM.i.25 dep 25.744 -0.04 - - - - - 3 + 426 MEGACAM.i.26 dep 25.744 -0.04 - - - - - 3 + 427 MEGACAM.i.27 dep 25.744 -0.04 - - - - - 3 + 428 MEGACAM.i.28 dep 25.744 -0.04 - - - - - 3 + 429 MEGACAM.i.29 dep 25.744 -0.04 - - - - - 3 + 430 MEGACAM.i.30 dep 25.744 -0.04 - - - - - 3 + 431 MEGACAM.i.31 dep 25.744 -0.04 - - - - - 3 + 432 MEGACAM.i.32 dep 25.744 -0.04 - - - - - 3 + 433 MEGACAM.i.33 dep 25.744 -0.04 - - - - - 3 + 434 MEGACAM.i.34 dep 25.744 -0.04 - - - - - 3 + 435 MEGACAM.i.35 dep 25.744 -0.04 - - - - - 3 + 436 MEGACAM.i.36 dep 25.744 -0.04 - - - - - 3 + 437 MEGACAM.i.37 dep 25.744 -0.04 - - - - - 3 + 438 MEGACAM.i.38 dep 25.744 -0.04 - - - - - 3 + 439 MEGACAM.i.39 dep 25.744 -0.04 - - - - - 3 + + 500 MEGACAM.z.00 dep 24.800 -0.03 - - - - - 4 + 501 MEGACAM.z.01 dep 24.800 -0.03 - - - - - 4 + 502 MEGACAM.z.02 dep 24.800 -0.03 - - - - - 4 + 503 MEGACAM.z.03 dep 24.800 -0.03 - - - - - 4 + 504 MEGACAM.z.04 dep 24.800 -0.03 - - - - - 4 + 505 MEGACAM.z.05 dep 24.800 -0.03 - - - - - 4 + 506 MEGACAM.z.06 dep 24.800 -0.03 - - - - - 4 + 507 MEGACAM.z.07 dep 24.800 -0.03 - - - - - 4 + 508 MEGACAM.z.08 dep 24.800 -0.03 - - - - - 4 + 509 MEGACAM.z.09 dep 24.800 -0.03 - - - - - 4 + 510 MEGACAM.z.10 dep 24.800 -0.03 - - - - - 4 + 511 MEGACAM.z.11 dep 24.800 -0.03 - - - - - 4 + 512 MEGACAM.z.12 dep 24.800 -0.03 - - - - - 4 + 513 MEGACAM.z.13 dep 24.800 -0.03 - - - - - 4 + 514 MEGACAM.z.14 dep 24.800 -0.03 - - - - - 4 + 515 MEGACAM.z.15 dep 24.800 -0.03 - - - - - 4 + 516 MEGACAM.z.16 dep 24.800 -0.03 - - - - - 4 + 517 MEGACAM.z.17 dep 24.800 -0.03 - - - - - 4 + 518 MEGACAM.z.18 dep 24.800 -0.03 - - - - - 4 + 519 MEGACAM.z.19 dep 24.800 -0.03 - - - - - 4 + 520 MEGACAM.z.20 dep 24.800 -0.03 - - - - - 4 + 521 MEGACAM.z.21 dep 24.800 -0.03 - - - - - 4 + 522 MEGACAM.z.22 dep 24.800 -0.03 - - - - - 4 + 523 MEGACAM.z.23 dep 24.800 -0.03 - - - - - 4 + 524 MEGACAM.z.24 dep 24.800 -0.03 - - - - - 4 + 525 MEGACAM.z.25 dep 24.800 -0.03 - - - - - 4 + 526 MEGACAM.z.26 dep 24.800 -0.03 - - - - - 4 + 527 MEGACAM.z.27 dep 24.800 -0.03 - - - - - 4 + 528 MEGACAM.z.28 dep 24.800 -0.03 - - - - - 4 + 529 MEGACAM.z.29 dep 24.800 -0.03 - - - - - 4 + 530 MEGACAM.z.30 dep 24.800 -0.03 - - - - - 4 + 531 MEGACAM.z.31 dep 24.800 -0.03 - - - - - 4 + 532 MEGACAM.z.32 dep 24.800 -0.03 - - - - - 4 + 533 MEGACAM.z.33 dep 24.800 -0.03 - - - - - 4 + 534 MEGACAM.z.34 dep 24.800 -0.03 - - - - - 4 + 535 MEGACAM.z.35 dep 24.800 -0.03 - - - - - 4 + 536 MEGACAM.z.36 dep 24.800 -0.03 - - - - - 4 + 537 MEGACAM.z.37 dep 24.800 -0.03 - - - - - 4 + 538 MEGACAM.z.38 dep 24.800 -0.03 - - - - - 4 + 539 MEGACAM.z.39 dep 24.800 -0.03 - - - - - 4 + +# cfh12k photcodes + 140 CFH12K.B.00 dep 26.000 -0.15 - - - - - 1 + 141 CFH12K.B.01 dep 26.000 -0.15 - - - - - 1 + 142 CFH12K.B.02 dep 26.000 -0.15 - - - - - 1 + 143 CFH12K.B.03 dep 26.000 -0.15 - - - - - 1 + 144 CFH12K.B.04 dep 26.000 -0.15 - - - - - 1 + 145 CFH12K.B.05 dep 26.000 -0.15 - - - - - 1 + 146 CFH12K.B.06 dep 26.000 -0.15 - - - - - 1 + 147 CFH12K.B.07 dep 26.000 -0.15 - - - - - 1 + 148 CFH12K.B.08 dep 26.000 -0.15 - - - - - 1 + 149 CFH12K.B.09 dep 26.000 -0.15 - - - - - 1 + 150 CFH12K.B.10 dep 26.000 -0.15 - - - - - 1 + 151 CFH12K.B.11 dep 26.000 -0.15 - - - - - 1 + + 240 CFH12K.V.00 dep 26.150 -0.12 - - - - - 1 + 241 CFH12K.V.01 dep 26.150 -0.12 - - - - - 1 + 242 CFH12K.V.02 dep 26.150 -0.12 - - - - - 1 + 243 CFH12K.V.03 dep 26.150 -0.12 - - - - - 1 + 244 CFH12K.V.04 dep 26.150 -0.12 - - - - - 1 + 245 CFH12K.V.05 dep 26.150 -0.12 - - - - - 1 + 246 CFH12K.V.06 dep 26.150 -0.12 - - - - - 1 + 247 CFH12K.V.07 dep 26.150 -0.12 - - - - - 1 + 248 CFH12K.V.08 dep 26.150 -0.12 - - - - - 1 + 249 CFH12K.V.09 dep 26.150 -0.12 - - - - - 1 + 250 CFH12K.V.10 dep 26.150 -0.12 - - - - - 1 + 251 CFH12K.V.11 dep 26.150 -0.12 - - - - - 1 + + 340 CFH12K.R.00 dep 26.190 -0.09 - - - - - 2 + 341 CFH12K.R.01 dep 26.190 -0.09 - - - - - 2 + 342 CFH12K.R.02 dep 26.190 -0.09 - - - - - 2 + 343 CFH12K.R.03 dep 26.190 -0.09 - - - - - 2 + 344 CFH12K.R.04 dep 26.190 -0.09 - - - - - 2 + 345 CFH12K.R.05 dep 26.190 -0.09 - - - - - 2 + 346 CFH12K.R.06 dep 26.190 -0.09 - - - - - 2 + 347 CFH12K.R.07 dep 26.190 -0.09 - - - - - 2 + 348 CFH12K.R.08 dep 26.190 -0.09 - - - - - 2 + 349 CFH12K.R.09 dep 26.190 -0.09 - - - - - 2 + 350 CFH12K.R.10 dep 26.190 -0.09 - - - - - 2 + 351 CFH12K.R.11 dep 26.190 -0.09 - - - - - 2 + + 440 CFH12K.I.00 dep 26.135 -0.04 - - - - - 3 + 441 CFH12K.I.01 dep 26.135 -0.04 - - - - - 3 + 442 CFH12K.I.02 dep 26.135 -0.04 - - - - - 3 + 443 CFH12K.I.03 dep 26.135 -0.04 - - - - - 3 + 444 CFH12K.I.04 dep 26.135 -0.04 - - - - - 3 + 445 CFH12K.I.05 dep 26.135 -0.04 - - - - - 3 + 446 CFH12K.I.06 dep 26.135 -0.04 - - - - - 3 + 447 CFH12K.I.07 dep 26.135 -0.04 - - - - - 3 + 448 CFH12K.I.08 dep 26.135 -0.04 - - - - - 3 + 449 CFH12K.I.09 dep 26.135 -0.04 - - - - - 3 + 450 CFH12K.I.10 dep 26.135 -0.04 - - - - - 3 + 451 CFH12K.I.11 dep 26.135 -0.04 - - - - - 3 + + 540 CFH12K.Z.00 dep 25.83 -0.03 - - - - - 4 + 541 CFH12K.Z.01 dep 25.83 -0.03 - - - - - 4 + 542 CFH12K.Z.02 dep 25.83 -0.03 - - - - - 4 + 543 CFH12K.Z.03 dep 25.83 -0.03 - - - - - 4 + 544 CFH12K.Z.04 dep 25.83 -0.03 - - - - - 4 + 545 CFH12K.Z.05 dep 25.83 -0.03 - - - - - 4 + 546 CFH12K.Z.06 dep 25.83 -0.03 - - - - - 4 + 547 CFH12K.Z.07 dep 25.83 -0.03 - - - - - 4 + 548 CFH12K.Z.08 dep 25.83 -0.03 - - - - - 4 + 549 CFH12K.Z.09 dep 25.83 -0.03 - - - - - 4 + 550 CFH12K.Z.10 dep 25.83 -0.03 - - - - - 4 + 551 CFH12K.Z.11 dep 25.83 -0.03 - - - - - 4 + + 600 CFH12K.Ha.00 dep 25.000 0.04 - - - - - 0 + 601 CFH12K.Ha.01 dep 25.000 0.04 - - - - - 0 + 602 CFH12K.Ha.02 dep 25.000 0.04 - - - - - 0 + 603 CFH12K.Ha.03 dep 25.000 0.04 - - - - - 0 + 604 CFH12K.Ha.04 dep 25.000 0.04 - - - - - 0 + 605 CFH12K.Ha.05 dep 25.000 0.04 - - - - - 0 + 606 CFH12K.Ha.06 dep 25.000 0.04 - - - - - 0 + 607 CFH12K.Ha.07 dep 25.000 0.04 - - - - - 0 + 608 CFH12K.Ha.08 dep 25.000 0.04 - - - - - 0 + 609 CFH12K.Ha.09 dep 25.000 0.04 - - - - - 0 + 610 CFH12K.Ha.10 dep 25.000 0.04 - - - - - 0 + 611 CFH12K.Ha.11 dep 25.000 0.04 - - - - - 0 + + 612 CFH12K.HaOff.00 dep 25.000 0.04 - - - - - 0 + 613 CFH12K.HaOff.01 dep 25.000 0.04 - - - - - 0 + 614 CFH12K.HaOff.02 dep 25.000 0.04 - - - - - 0 + 615 CFH12K.HaOff.03 dep 25.000 0.04 - - - - - 0 + 616 CFH12K.HaOff.04 dep 25.000 0.04 - - - - - 0 + 617 CFH12K.HaOff.05 dep 25.000 0.04 - - - - - 0 + 618 CFH12K.HaOff.06 dep 25.000 0.04 - - - - - 0 + 619 CFH12K.HaOff.07 dep 25.000 0.04 - - - - - 0 + 620 CFH12K.HaOff.08 dep 25.000 0.04 - - - - - 0 + 621 CFH12K.HaOff.09 dep 25.000 0.04 - - - - - 0 + 622 CFH12K.HaOff.10 dep 25.000 0.04 - - - - - 0 + 623 CFH12K.HaOff.11 dep 25.000 0.04 - - - - - 0 + 624 CFH12K.CN.00 dep 25.000 0.04 - - - - - 0 + 625 CFH12K.CN.01 dep 25.000 0.04 - - - - - 0 + 626 CFH12K.CN.02 dep 25.000 0.04 - - - - - 0 + 627 CFH12K.CN.03 dep 25.000 0.04 - - - - - 0 + 628 CFH12K.CN.04 dep 25.000 0.04 - - - - - 0 + 629 CFH12K.CN.05 dep 25.000 0.04 - - - - - 0 + 630 CFH12K.CN.06 dep 25.000 0.04 - - - - - 0 + 631 CFH12K.CN.07 dep 25.000 0.04 - - - - - 0 + 632 CFH12K.CN.08 dep 25.000 0.04 - - - - - 0 + 633 CFH12K.CN.09 dep 25.000 0.04 - - - - - 0 + 634 CFH12K.CN.10 dep 25.000 0.04 - - - - - 0 + 635 CFH12K.CN.11 dep 25.000 0.04 - - - - - 0 + 636 CFH12K.TiO.00 dep 25.000 0.04 - - - - - 0 + 637 CFH12K.TiO.01 dep 25.000 0.04 - - - - - 0 + 638 CFH12K.TiO.02 dep 25.000 0.04 - - - - - 0 + 639 CFH12K.TiO.03 dep 25.000 0.04 - - - - - 0 + 640 CFH12K.TiO.04 dep 25.000 0.04 - - - - - 0 + 641 CFH12K.TiO.05 dep 25.000 0.04 - - - - - 0 + 642 CFH12K.TiO.06 dep 25.000 0.04 - - - - - 0 + 643 CFH12K.TiO.07 dep 25.000 0.04 - - - - - 0 + 644 CFH12K.TiO.08 dep 25.000 0.04 - - - - - 0 + 645 CFH12K.TiO.09 dep 25.000 0.04 - - - - - 0 + 646 CFH12K.TiO.10 dep 25.000 0.04 - - - - - 0 + 647 CFH12K.TiO.11 dep 25.000 0.04 - - - - - 0 + 648 CFH12K.NB920.00 dep 25.000 0.04 - - - - - 0 + 649 CFH12K.NB920.01 dep 25.000 0.04 - - - - - 0 + 650 CFH12K.NB920.02 dep 25.000 0.04 - - - - - 0 + 651 CFH12K.NB920.03 dep 25.000 0.04 - - - - - 0 + 652 CFH12K.NB920.04 dep 25.000 0.04 - - - - - 0 + 653 CFH12K.NB920.05 dep 25.000 0.04 - - - - - 0 + 654 CFH12K.NB920.06 dep 25.000 0.04 - - - - - 0 + 655 CFH12K.NB920.07 dep 25.000 0.04 - - - - - 0 + 678 CFH12K.NB920.08 dep 25.000 0.04 - - - - - 0 + 679 CFH12K.NB920.09 dep 25.000 0.04 - - - - - 0 + 680 CFH12K.NB920.10 dep 25.000 0.04 - - - - - 0 + 681 CFH12K.NB920.11 dep 25.000 0.04 - - - - - 0 + 682 CFH12K.B2F.00 dep 25.000 0.04 - - - - - 0 + 683 CFH12K.B2F.01 dep 25.000 0.04 - - - - - 0 + 684 CFH12K.B2F.02 dep 25.000 0.04 - - - - - 0 + 685 CFH12K.B2F.03 dep 25.000 0.04 - - - - - 0 + 686 CFH12K.B2F.04 dep 25.000 0.04 - - - - - 0 + 687 CFH12K.B2F.05 dep 25.000 0.04 - - - - - 0 + 688 CFH12K.B2F.06 dep 25.000 0.04 - - - - - 0 + 689 CFH12K.B2F.07 dep 25.000 0.04 - - - - - 0 + 690 CFH12K.B2F.08 dep 25.000 0.04 - - - - - 0 + 691 CFH12K.B2F.09 dep 25.000 0.04 - - - - - 0 + 692 CFH12K.B2F.10 dep 25.000 0.04 - - - - - 0 + 693 CFH12K.B2F.11 dep 25.000 0.04 - - - - - 0 + + 3200 ISP-Apogee-01.g dep 19.25 0.00 - - - - - 1 + 3300 ISP-Apogee-01.r dep 19.15 0.00 - - - - - 2 + 3400 ISP-Apogee-01.i dep 18.50 0.00 - - - - - 3 + 3500 ISP-Apogee-01.z dep 17.25 0.00 - - - - - 4 + 3600 ISP-Apogee-01.y dep 14.15 0.00 - - - - - 5 + + 4100 SIMTEST.g dep 25.00 0.00 - - - - - 1 + 4200 SIMTEST.r dep 25.00 0.00 - - - - - 2 + 4300 SIMTEST.i dep 25.00 0.00 - - - - - 3 + 4400 SIMTEST.z dep 25.00 0.00 - - - - - 4 + + 4101 SIMMOSAIC.g.00 dep 25.00 0.00 - - - - - 1 + 4102 SIMMOSAIC.g.01 dep 25.00 0.00 - - - - - 1 + 4103 SIMMOSAIC.g.02 dep 25.00 0.00 - - - - - 1 + 4104 SIMMOSAIC.g.03 dep 25.00 0.00 - - - - - 1 + 4201 SIMMOSAIC.r.00 dep 25.00 0.00 - - - - - 2 + 4202 SIMMOSAIC.r.01 dep 25.00 0.00 - - - - - 2 + 4203 SIMMOSAIC.r.02 dep 25.00 0.00 - - - - - 2 + 4204 SIMMOSAIC.r.03 dep 25.00 0.00 - - - - - 2 + 4301 SIMMOSAIC.i.00 dep 25.00 0.00 - - - - - 3 + 4302 SIMMOSAIC.i.01 dep 25.00 0.00 - - - - - 3 + 4303 SIMMOSAIC.i.02 dep 25.00 0.00 - - - - - 3 + 4304 SIMMOSAIC.i.03 dep 25.00 0.00 - - - - - 3 + 4401 SIMMOSAIC.z.00 dep 25.00 0.00 - - - - - 4 + 4402 SIMMOSAIC.z.01 dep 25.00 0.00 - - - - - 4 + 4403 SIMMOSAIC.z.02 dep 25.00 0.00 - - - - - 4 + 4404 SIMMOSAIC.z.03 dep 25.00 0.00 - - - - - 4 + Index: /branches/pap_branch_070920/ippconfig/dvo.site.in =================================================================== --- /branches/pap_branch_070920/ippconfig/dvo.site.in (revision 14957) +++ /branches/pap_branch_070920/ippconfig/dvo.site.in (revision 14957) @@ -0,0 +1,35 @@ + +CONFDIR @pkgdatadir@ +CAMERA default + +# location of DVO database tables +CATDIR default + +# location of possible data sources +2MASS_DIR_AS NONE +2MASS_DIR_DR2 NONE +GSCDIR NONE +USNO_A_DIR NONE +USNO_B_DIR NONE +TYCHO_DIR NONE + +PHOTCODE_FILE $CONFDIR/dvo.photcodes +GSCFILE $CONFDIR/GSCregions.tbl +CATMODE SPLIT +CATFORMAT PANSTARRS_DEV_1 +SKY_DEPTH 3 +# SKY_TABLE this may be used to override GSCFILE +ZERO_PT 25.0 + +# access control for client/server addstar mode +# PASSWORD +# HOSTNAME +# VALID_IP + +# camera dependent parameter files: +FILTER_LIST $CONFDIR/$CAMERA/dvo.filters +CAMERA_CONFIG $CONFDIR/$CAMERA/dvo.layout +DETREND_RECIPES $CONFDIR/$CAMERA/dvo.recipe + +# load the camera-specific configuration files +input $CONFDIR/$CAMERA/dvo.config Index: /branches/pap_branch_070920/ippconfig/gpc1/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/gpc1/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/gpc1/camera.config (revision 14957) @@ -0,0 +1,297 @@ +# Camera configuration file for GPC1: describes the camera + +# File formats that we know about +FORMATS METADATA + RAW STR gpc1/format_raw.config +END + + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + CCID58-2-13a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-01a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-15a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-04a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-22a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-12a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-04b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-19a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-14a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-02a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-13a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-02a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-17a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-01a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-18a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-09a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-13b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-01b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-16b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-01b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-09a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-04a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-09a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-04a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-10b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-16b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-04b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-18b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-09b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-02b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-09b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-07b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-14a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-07a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-05a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-10a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-16a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-21a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-04b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-12a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-07a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-05a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-18a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-09a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-17a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-21a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-16a1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-12a2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-23b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-07b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-14b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-04b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-02b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-11b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-25b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-05b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-22b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-18b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-04b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-17b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-03b1 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-1-03b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-04b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID58-2-09b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# 64 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY01 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY02 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY03 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY04 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY05 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY06 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY07 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY10 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY11 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY12 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY13 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY14 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY15 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY16 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY17 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY20 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY21 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY22 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY23 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY24 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY25 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY26 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY27 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY30 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY31 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY32 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY33 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY34 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY35 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY36 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY37 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY40 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY41 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY42 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY43 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY44 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY45 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY46 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY47 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY50 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY51 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY52 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY53 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY54 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY55 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY56 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY57 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY60 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY61 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY62 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY63 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY64 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY65 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY66 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY67 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY70 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY71 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY72 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY73 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY74 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY75 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY76 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +# XY77 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +END + + +# Recipe options +RECIPES METADATA + PPIMAGE STR gpc1/ppImage.config # psphot details +# PSPHOT STR gpc1/psphot.config # psphot details +END + +# Reduction classes +REDUCTION METADATA + # Detrend processing + DETREND METADATA + BIAS_PROCESS STR PPIMAGE_O + BIAS_RESID STR PPIMAGE_B + BIAS_VERIFY STR PPIMAGE_OB + BIAS_STACK STR PPMERGE_BIAS + DARK_PROCESS STR PPIMAGE_OB + DARK_RESID STR PPIMAGE_D + DARK_VERIFY STR PPIMAGE_OBD + DARK_STACK STR PPMERGE_DARK + SHUTTER_PROCESS STR PPIMAGE_OBD + SHUTTER_RESID STR PPIMAGE_S + SHUTTER_VERIFY STR PPIMAGE_OBDS + SHUTTER_STACK STR PPMERGE_SHUTTER + FLAT_PROCESS STR PPIMAGE_OBDS + FLAT_RESID STR PPIMAGE_F + FLAT_VERIFY STR PPIMAGE_OBDSF + FLAT_STACK STR PPMERGE_FLAT + FRINGE_PROCESS STR PPIMAGE_OBDSF + FRINGE_RESID STR PPIMAGE_R + FRINGE_VERIFY STR PPIMAGE_OBDSFR + FRINGE_STACK STR PPMERGE_FRINGE + END + # Processing raw data + DEFAULT METADATA + CHIP STR PPIMAGE_OBDSFRA + END +END + +FILERULES METADATA + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.SPL + PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF + PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.SPL + + ### input file definitions + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT none.fits CHIP IMAGE + INPUT.MASK INPUT none.fits CHIP MASK + INPUT.WEIGHT INPUT none.fits CHIP WEIGHT + INPUT.PSF INPUT none.fits CHIP PSF + INPUT.SRC INPUT none.fits CHIP CMF + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES CHIP IMAGE + PSPHOT.INPUT INPUT none.fits CHIP IMAGE + + PSWARP.INPUT INPUT none.fits FPA IMAGE + PSWARP.WEIGHT INPUT none.fits FPA WEIGHT + PSWARP.MASK INPUT none.fits FPA MASK + PSWARP.SKYCELL INPUT none.fits FPA IMAGE + PSWARP.ASTROM INPUT none.fits FPA CMF + + PSASTRO.INPUT.CMP INPUT none.fits CHIP CMP + PSASTRO.INPUT.CMF INPUT none.fits CHIP CMF + PSPHOT.PSF.LOAD INPUT none.psf CHIP PSF + PSPHOT.INPUT.CMF INPUT none.fits CHIP CMF + + PPSUB.INPUT INPUT none.fits FPA IMAGE + PPSUB.INPUT.MASK INPUT none.fits FPA MASK + PPSUB.INPUT.WEIGHT INPUT none.fits FPA WEIGHT + PPSUB.REF INPUT none.fits FPA IMAGE + PPSUB.REF.MASK INPUT none.fits FPA MASK + PPSUB.REF.WEIGHT INPUT none.fits FPA WEIGHT + + PPSTACK.INPUT INPUT none.fits FPA IMAGE + PPSTACK.INPUT.MASK INPUT none.fits FPA MASK + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK CHIP TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE NONE + + PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE CHIP TRUE NONE + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK CHIP TRUE NONE + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT CHIP TRUE NONE + + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE NONE + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE CHIP TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits IMAGE CHIP TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits IMAGE CHIP TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE CHIP TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ CHIP TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE NONE + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA CHIP TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png KAPA CHIP TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png KAPA CHIP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE NONE + PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE NONE + PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE SIMTEST + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END + +EXTNAME.RULES METADATA + CMF.HEAD STR {CHIP.NAME}.hdr + CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT? + + PSF.HEAD STR {CHIP.NAME}.hdr + PSF.TABLE STR {CHIP.NAME}.psf_model + PSF.RESID STR {CHIP.NAME}.psf_resid +END + +TESSELLATIONS METADATA + # Tessellation name with corresponding DVO catdir + Skycells STR path://SIMTEST/skycells +END Index: /branches/pap_branch_070920/ippconfig/gpc1/chips-layout.txt =================================================================== --- /branches/pap_branch_070920/ippconfig/gpc1/chips-layout.txt (revision 14957) +++ /branches/pap_branch_070920/ippconfig/gpc1/chips-layout.txt (revision 14957) @@ -0,0 +1,62 @@ +# 1st: from focal-plane layout gif +# 2nd: from filename (*NM.fits) + CCID58-1-01b1 2 5 CCID58-1-01b1 2 5 + CCID58-1-01b2 3 5 CCID58-1-01b2 3 5 + CCID58-1-02a1 2 3 CCID58-1-02a1 2 3 + CCID58-1-02a2 3 3 CCID58-1-02a2 3 3 + CCID58-1-02b1 3 6 CCID58-1-02b1 3 6 + CCID58-1-02b2 6 3 CCID58-1-02b2 6 3 + CCID58-1-03b1 6 1 CCID58-1-03b1 6 1 + CCID58-1-03b2 4 1 CCID58-1-03b2 4 1 + CCID58-1-04a1 2 1 CCID58-1-04a1 2 1 + CCID58-1-04a2 2 4 CCID58-1-04a2 2 4 ** (not same as GIF) + CCID58-1-04b1 5 2 CCID58-1-04b1 5 2 + CCID58-1-05a2 4 4 CCID58-1-05a2 4 4 + CCID58-1-05b2 5 3 CCID58-1-05b2 5 3 + CCID58-1-07a1 6 4 CCID58-1-07a1 6 4 + CCID58-1-07b1 4 2 CCID58-1-07b1 4 2 + CCID58-1-09a1 0 4 CCID58-1-09a1 0 4 + CCID58-1-09a2 1 4 CCID58-1-09a2 1 4 + CCID58-1-09b1 1 6 CCID58-1-09b1 1 6 + CCID58-1-10a2 5 6 CCID58-1-10a2 5 6 + CCID58-1-12a1 3 0 CCID58-1-12a1 3 0 + CCID58-1-13a1 0 3 CCID58-1-13a1 0 3 + CCID58-1-14a2 1 3 CCID58-1-14a2 1 3 + CCID58-1-14b1 7 2 CCID58-1-14b1 7 2 + CCID58-1-17a2 1 2 CCID58-1-17a2 1 2 + CCID58-1-17b1 5 0 CCID58-1-17b1 5 0 + CCID58-1-18a1 7 4 CCID58-1-18a1 7 4 + CCID58-1-18b1 2 7 CCID58-1-18b1 2 7 + CCID58-1-19a1 2 0 CCID58-1-19a1 2 0 + CCID58-1-21a1 4 7 CCID58-1-21a1 4 7 + CCID58-1-21a2 4 5 CCID58-1-21a2 4 5 + CCID58-1-25b1 7 3 CCID58-1-25b1 7 3 + CCID58-2-01a1 3 1 CCID58-2-01a1 3 1 + CCID58-2-01a2 3 2 CCID58-2-01a2 3 2 + CCID58-2-04a1 3 4 CCID58-2-04a1 3 4 + CCID58-2-04b2 7 1 CCID58-2-04b2 7 1 + CCID58-2-05a1 7 6 CCID58-2-05a1 7 6 + CCID58-2-07a2 4 6 CCID58-2-07a2 4 6 + CCID58-2-07b2 2 6 CCID58-2-07b2 2 6 + CCID58-2-09a1 5 4 CCID58-2-09a1 5 4 + CCID58-2-09a2 2 2 CCID58-2-09a2 2 2 + CCID58-2-09b1 0 6 CCID58-2-09b1 0 6 + CCID58-2-09b2 5 1 CCID58-2-09b2 5 1 + CCID58-2-10b2 1 7 CCID58-2-10b2 3 7 ** + CCID58-2-11b2 4 3 CCID58-2-11b2 4 3 + CCID58-2-12a1 5 7 CCID58-2-12a1 5 7 + CCID58-2-12a2 5 5 CCID58-2-12a2 5 5 + CCID58-2-13a2 1 1 CCID58-2-13a2 1 1 + CCID58-2-13b1 1 5 CCID58-2-13b1 1 5 + CCID58-2-14a1 6 6 CCID58-2-14a1 6 6 + CCID58-2-15a1 0 1 CCID58-2-15a1 0 1 + CCID58-2-16a1 7 5 CCID58-2-16a1 7 5 + CCID58-2-16a2 6 7 CCID58-2-16a2 6 7 + CCID58-2-16b1 0 5 CCID58-2-16b1 0 5 + CCID58-2-16b2 3 7 CCID58-2-16b2 1 7 ** + CCID58-2-17a2 6 5 CCID58-2-17a2 6 5 + CCID58-2-18a1 0 2 CCID58-2-18a1 0 2 + CCID58-2-18b2 4 0 CCID58-2-18b2 4 0 + CCID58-2-22a1 1 0 CCID58-2-22a1 1 0 + CCID58-2-22b2 6 0 CCID58-2-22b2 6 0 + CCID58-2-23b2 6 2 CCID58-2-23b2 6 2 Index: /branches/pap_branch_070920/ippconfig/gpc1/chips-script.txt =================================================================== --- /branches/pap_branch_070920/ippconfig/gpc1/chips-script.txt (revision 14957) +++ /branches/pap_branch_070920/ippconfig/gpc1/chips-script.txt (revision 14957) @@ -0,0 +1,6 @@ + +awk '{x=$2}{dx=157}($2 < 4){{x=$2+1}{dx=0}}(NR>2){printf " %s S32 %d\n", $1, x*4971+dx}' chips-layout.txt > tmp +awk '{y=$3}{dy=306}($2 < 4){{y=$3+1}{dy=0}}(NR>2){printf " %s S32 %d\n", $1, y*5143+dy}' chips-layout.txt > tmp + +awk '{x=1}($2 < 4){x=-1}(NR>2){printf " %s S32 %d\n", $1, x}' chips-layout.txt > tmp +awk '{y=1}($2 < 4){y=-1}(NR>2){printf " %s S32 %d\n", $1, y}' chips-layout.txt > tmp Index: /branches/pap_branch_070920/ippconfig/gpc1/format_raw.config =================================================================== --- /branches/pap_branch_070920/ippconfig/gpc1/format_raw.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/gpc1/format_raw.config (revision 14957) @@ -0,0 +1,495 @@ +# The raw GPC data comes off the telescope with each of the chips stored in separate files + +# How to identify this type +RULE METADATA +# TELESCOP STR PS1 +# DETECTOR STR GPC1 + CONTROLR STR STARGRASP + EXTEND BOOL T + NEXTEND S32 64 + NAMPS S32 64 +END + +# How to read this data +FILE METADATA + PHU STR CHIP # The FITS file represents a single chip + EXTENSIONS STR CELL # The extensions represent cells + FPA.NAME STR CONTROLR # A PHU keyword for unique identifier within the hierarchy level + CHIP.NAME STR DETECTOR # An extension keyword for unique identifier + CONTENT STR {CHIP.NAME} # How to determine content of FITS file +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, type + CCID58-2-13a2 STR GPCChip + CCID58-2-01a1 STR GPCChip + CCID58-2-15a1 STR GPCChip + CCID58-1-04a1 STR GPCChip + CCID58-2-22a1 STR GPCChip + CCID58-1-12a1 STR GPCChip + CCID58-2-04b2 STR GPCChip + CCID58-1-19a1 STR GPCChip + CCID58-1-14a2 STR GPCChip + CCID58-1-02a2 STR GPCChip + CCID58-1-13a1 STR GPCChip + CCID58-1-02a1 STR GPCChip + CCID58-1-17a2 STR GPCChip + CCID58-2-01a2 STR GPCChip + CCID58-2-18a1 STR GPCChip + CCID58-2-09a2 STR GPCChip + CCID58-2-13b1 STR GPCChip + CCID58-1-01b2 STR GPCChip + CCID58-2-16b1 STR GPCChip + CCID58-1-01b1 STR GPCChip + CCID58-1-09a2 STR GPCChip + CCID58-2-04a1 STR GPCChip + CCID58-1-09a1 STR GPCChip + CCID58-1-04a2 STR GPCChip + CCID58-2-10b2 STR GPCChip + CCID58-2-16b2 STR GPCChip + CCID58-2-04b2 STR GPCChip + CCID58-1-18b1 STR GPCChip + CCID58-1-09b1 STR GPCChip + CCID58-1-02b1 STR GPCChip + CCID58-2-09b1 STR GPCChip + CCID58-2-07b2 STR GPCChip + CCID58-2-14a1 STR GPCChip + CCID58-2-07a2 STR GPCChip + CCID58-2-05a1 STR GPCChip + CCID58-1-10a2 STR GPCChip + CCID58-2-16a2 STR GPCChip + CCID58-1-21a1 STR GPCChip + CCID58-2-04b2 STR GPCChip + CCID58-2-12a1 STR GPCChip + CCID58-1-07a1 STR GPCChip + CCID58-1-05a2 STR GPCChip + CCID58-1-18a1 STR GPCChip + CCID58-2-09a1 STR GPCChip + CCID58-2-17a2 STR GPCChip + CCID58-1-21a2 STR GPCChip + CCID58-2-16a1 STR GPCChip + CCID58-2-12a2 STR GPCChip + CCID58-2-23b2 STR GPCChip + CCID58-1-07b1 STR GPCChip + CCID58-1-14b1 STR GPCChip + CCID58-1-04b1 STR GPCChip + CCID58-1-02b2 STR GPCChip + CCID58-2-11b2 STR GPCChip + CCID58-1-25b1 STR GPCChip + CCID58-1-05b2 STR GPCChip + CCID58-2-22b2 STR GPCChip + CCID58-2-18b2 STR GPCChip + CCID58-2-04b2 STR GPCChip + CCID58-1-17b1 STR GPCChip + CCID58-1-03b1 STR GPCChip + CCID58-1-03b2 STR GPCChip + CCID58-2-04b2 STR GPCChip + CCID58-2-09b2 STR GPCChip +END + +CHIPS METADATA + GPCChip METADATA + # Extension name, cellName:cellType + xy00 STR xy00:GPCCell + xy10 STR xy10:GPCCell + xy20 STR xy20:GPCCell + xy30 STR xy30:GPCCell + xy40 STR xy40:GPCCell + xy50 STR xy50:GPCCell + xy60 STR xy60:GPCCell + xy70 STR xy70:GPCCell + xy01 STR xy01:GPCCell + xy11 STR xy11:GPCCell + xy21 STR xy21:GPCCell + xy31 STR xy31:GPCCell + xy41 STR xy41:GPCCell + xy51 STR xy51:GPCCell + xy61 STR xy61:GPCCell + xy71 STR xy71:GPCCell + xy02 STR xy02:GPCCell + xy12 STR xy12:GPCCell + xy22 STR xy22:GPCCell + xy32 STR xy32:GPCCell + xy42 STR xy42:GPCCell + xy52 STR xy52:GPCCell + xy62 STR xy62:GPCCell + xy72 STR xy72:GPCCell + xy03 STR xy03:GPCCell + xy13 STR xy13:GPCCell + xy23 STR xy23:GPCCell + xy33 STR xy33:GPCCell + xy43 STR xy43:GPCCell + xy53 STR xy53:GPCCell + xy63 STR xy63:GPCCell + xy73 STR xy73:GPCCell + xy04 STR xy04:GPCCell + xy14 STR xy14:GPCCell + xy24 STR xy24:GPCCell + xy34 STR xy34:GPCCell + xy44 STR xy44:GPCCell + xy54 STR xy54:GPCCell + xy64 STR xy64:GPCCell + xy74 STR xy74:GPCCell + xy05 STR xy05:GPCCell + xy15 STR xy15:GPCCell + xy25 STR xy25:GPCCell + xy35 STR xy35:GPCCell + xy45 STR xy45:GPCCell + xy55 STR xy55:GPCCell + xy65 STR xy65:GPCCell + xy75 STR xy75:GPCCell + xy06 STR xy06:GPCCell + xy16 STR xy16:GPCCell + xy26 STR xy26:GPCCell + xy36 STR xy36:GPCCell + xy46 STR xy46:GPCCell + xy56 STR xy56:GPCCell + xy66 STR xy66:GPCCell + xy76 STR xy76:GPCCell + xy07 STR xy07:GPCCell + xy17 STR xy17:GPCCell + xy27 STR xy27:GPCCell + xy37 STR xy37:GPCCell + xy47 STR xy47:GPCCell + xy57 STR xy57:GPCCell + xy67 STR xy67:GPCCell + xy77 STR xy77:GPCCell + END +END + +# Specify the cell data +CELLS METADATA + GPCCell METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC STR DATASEC + CELL.BIASSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + END +END + + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM + CELL.X0 STR IMNPIX1 + CELL.Y0 STR IMNPIX2 + CELL.XPARITY STR LTM1_1 + CELL.YPARITY STR LTM2_2 +# CELL.SATURATION STR SATURATE +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR PS1 + FPA.INSTRUMENT STR GPC1 + FPA.DETECTOR STR GPC1 + FPA.AIRMASS F32 0.0 + FPA.FILTER STR NONE + FPA.POSANGLE F32 0.0 + FPA.RA STR 0:0:0 + FPA.DEC STR 0:0:0 + FPA.RADECSYS STR ICRS + FPA.NAME S32 12345 + FPA.TIME STR 2005-11-23T12:34:56.78 +# FPA.TIMESYS STR TIMESYS + FPA.OBSTYPE STR BIAS + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + CCID58-1-01b1 S32 14913 + CCID58-1-01b2 S32 19884 + CCID58-1-02a1 S32 14913 + CCID58-1-02a2 S32 19884 + CCID58-1-02b1 S32 19884 + CCID58-1-02b2 S32 29983 + CCID58-1-03b1 S32 29983 + CCID58-1-03b2 S32 20041 + CCID58-1-04a1 S32 14913 + CCID58-1-04a2 S32 14913 + CCID58-1-04b1 S32 25012 + CCID58-1-05a2 S32 20041 + CCID58-1-05b2 S32 25012 + CCID58-1-07a1 S32 29983 + CCID58-1-07b1 S32 20041 + CCID58-1-09a1 S32 4971 + CCID58-1-09a2 S32 9942 + CCID58-1-09b1 S32 9942 + CCID58-1-10a2 S32 25012 + CCID58-1-12a1 S32 19884 + CCID58-1-13a1 S32 4971 + CCID58-1-14a2 S32 9942 + CCID58-1-14b1 S32 34954 + CCID58-1-17a2 S32 9942 + CCID58-1-17b1 S32 25012 + CCID58-1-18a1 S32 34954 + CCID58-1-18b1 S32 14913 + CCID58-1-19a1 S32 14913 + CCID58-1-21a1 S32 20041 + CCID58-1-21a2 S32 20041 + CCID58-1-25b1 S32 34954 + CCID58-2-01a1 S32 19884 + CCID58-2-01a2 S32 19884 + CCID58-2-04a1 S32 19884 + CCID58-2-04b2 S32 34954 + CCID58-2-05a1 S32 34954 + CCID58-2-07a2 S32 20041 + CCID58-2-07b2 S32 14913 + CCID58-2-09a1 S32 25012 + CCID58-2-09a2 S32 14913 + CCID58-2-09b1 S32 4971 + CCID58-2-09b2 S32 25012 + CCID58-2-10b2 S32 9942 + CCID58-2-11b2 S32 20041 + CCID58-2-12a1 S32 25012 + CCID58-2-12a2 S32 25012 + CCID58-2-13a2 S32 9942 + CCID58-2-13b1 S32 9942 + CCID58-2-14a1 S32 29983 + CCID58-2-15a1 S32 4971 + CCID58-2-16a1 S32 34954 + CCID58-2-16a2 S32 29983 + CCID58-2-16b1 S32 4971 + CCID58-2-16b2 S32 19884 + CCID58-2-17a2 S32 29983 + CCID58-2-18a1 S32 4971 + CCID58-2-18b2 S32 20041 + CCID58-2-22a1 S32 9942 + CCID58-2-22b2 S32 29983 + CCID58-2-23b2 S32 29983 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + CCID58-1-01b1 S32 30858 + CCID58-1-01b2 S32 30858 + CCID58-1-02a1 S32 20572 + CCID58-1-02a2 S32 20572 + CCID58-1-02b1 S32 36001 + CCID58-1-02b2 S32 15735 + CCID58-1-03b1 S32 5449 + CCID58-1-03b2 S32 5449 + CCID58-1-04a1 S32 10286 + CCID58-1-04a2 S32 25715 + CCID58-1-04b1 S32 10592 + CCID58-1-05a2 S32 20878 + CCID58-1-05b2 S32 15735 + CCID58-1-07a1 S32 20878 + CCID58-1-07b1 S32 10592 + CCID58-1-09a1 S32 25715 + CCID58-1-09a2 S32 25715 + CCID58-1-09b1 S32 36001 + CCID58-1-10a2 S32 31164 + CCID58-1-12a1 S32 5143 + CCID58-1-13a1 S32 20572 + CCID58-1-14a2 S32 20572 + CCID58-1-14b1 S32 10592 + CCID58-1-17a2 S32 15429 + CCID58-1-17b1 S32 306 + CCID58-1-18a1 S32 20878 + CCID58-1-18b1 S32 41144 + CCID58-1-19a1 S32 5143 + CCID58-1-21a1 S32 36307 + CCID58-1-21a2 S32 26021 + CCID58-1-25b1 S32 15735 + CCID58-2-01a1 S32 10286 + CCID58-2-01a2 S32 15429 + CCID58-2-04a1 S32 25715 + CCID58-2-04b2 S32 5449 + CCID58-2-05a1 S32 31164 + CCID58-2-07a2 S32 31164 + CCID58-2-07b2 S32 36001 + CCID58-2-09a1 S32 20878 + CCID58-2-09a2 S32 15429 + CCID58-2-09b1 S32 36001 + CCID58-2-09b2 S32 5449 + CCID58-2-10b2 S32 41144 + CCID58-2-11b2 S32 15735 + CCID58-2-12a1 S32 36307 + CCID58-2-12a2 S32 26021 + CCID58-2-13a2 S32 10286 + CCID58-2-13b1 S32 30858 + CCID58-2-14a1 S32 31164 + CCID58-2-15a1 S32 10286 + CCID58-2-16a1 S32 26021 + CCID58-2-16a2 S32 36307 + CCID58-2-16b1 S32 30858 + CCID58-2-16b2 S32 41144 + CCID58-2-17a2 S32 26021 + CCID58-2-18a1 S32 15429 + CCID58-2-18b2 S32 306 + CCID58-2-22a1 S32 5143 + CCID58-2-22b2 S32 306 + CCID58-2-23b2 S32 10592 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + CCID58-2-13a2 S32 -1 + CCID58-2-01a1 S32 -1 + CCID58-2-15a1 S32 -1 + CCID58-1-04a1 S32 -1 + CCID58-2-22a1 S32 -1 + CCID58-1-12a1 S32 -1 + CCID58-1-19a1 S32 -1 + CCID58-1-14a2 S32 -1 + CCID58-1-02a2 S32 -1 + CCID58-1-13a1 S32 -1 + CCID58-1-02a1 S32 -1 + CCID58-1-17a2 S32 -1 + CCID58-2-01a2 S32 -1 + CCID58-2-18a1 S32 -1 + CCID58-2-09a2 S32 -1 + CCID58-2-13b1 S32 -1 + CCID58-1-01b2 S32 -1 + CCID58-2-16b1 S32 -1 + CCID58-1-01b1 S32 -1 + CCID58-1-09a2 S32 -1 + CCID58-2-04a1 S32 -1 + CCID58-1-09a1 S32 -1 + CCID58-1-04a2 S32 -1 + CCID58-2-10b2 S32 -1 + CCID58-2-16b2 S32 -1 + CCID58-1-18b1 S32 -1 + CCID58-1-09b1 S32 -1 + CCID58-1-02b1 S32 -1 + CCID58-2-09b1 S32 -1 + CCID58-2-07b2 S32 -1 + CCID58-2-14a1 S32 1 + CCID58-2-07a2 S32 1 + CCID58-2-05a1 S32 1 + CCID58-1-10a2 S32 1 + CCID58-2-16a2 S32 1 + CCID58-1-21a1 S32 1 + CCID58-2-12a1 S32 1 + CCID58-1-07a1 S32 1 + CCID58-1-05a2 S32 1 + CCID58-1-18a1 S32 1 + CCID58-2-09a1 S32 1 + CCID58-2-17a2 S32 1 + CCID58-1-21a2 S32 1 + CCID58-2-16a1 S32 1 + CCID58-2-12a2 S32 1 + CCID58-2-23b2 S32 1 + CCID58-1-07b1 S32 1 + CCID58-1-14b1 S32 1 + CCID58-1-04b1 S32 1 + CCID58-1-02b2 S32 1 + CCID58-2-11b2 S32 1 + CCID58-1-25b1 S32 1 + CCID58-1-05b2 S32 1 + CCID58-2-22b2 S32 1 + CCID58-2-18b2 S32 1 + CCID58-1-17b1 S32 1 + CCID58-1-03b1 S32 1 + CCID58-1-03b2 S32 1 + CCID58-2-04b2 S32 1 + CCID58-2-09b2 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + CCID58-2-13a2 S32 -1 + CCID58-2-01a1 S32 -1 + CCID58-2-15a1 S32 -1 + CCID58-1-04a1 S32 -1 + CCID58-2-22a1 S32 -1 + CCID58-1-12a1 S32 -1 + CCID58-1-19a1 S32 -1 + CCID58-1-14a2 S32 -1 + CCID58-1-02a2 S32 -1 + CCID58-1-13a1 S32 -1 + CCID58-1-02a1 S32 -1 + CCID58-1-17a2 S32 -1 + CCID58-2-01a2 S32 -1 + CCID58-2-18a1 S32 -1 + CCID58-2-09a2 S32 -1 + CCID58-2-13b1 S32 -1 + CCID58-1-01b2 S32 -1 + CCID58-2-16b1 S32 -1 + CCID58-1-01b1 S32 -1 + CCID58-1-09a2 S32 -1 + CCID58-2-04a1 S32 -1 + CCID58-1-09a1 S32 -1 + CCID58-1-04a2 S32 -1 + CCID58-2-10b2 S32 -1 + CCID58-2-16b2 S32 -1 + CCID58-1-18b1 S32 -1 + CCID58-1-09b1 S32 -1 + CCID58-1-02b1 S32 -1 + CCID58-2-09b1 S32 -1 + CCID58-2-07b2 S32 -1 + CCID58-2-14a1 S32 1 + CCID58-2-07a2 S32 1 + CCID58-2-05a1 S32 1 + CCID58-1-10a2 S32 1 + CCID58-2-16a2 S32 1 + CCID58-1-21a1 S32 1 + CCID58-2-12a1 S32 1 + CCID58-1-07a1 S32 1 + CCID58-1-05a2 S32 1 + CCID58-1-18a1 S32 1 + CCID58-2-09a1 S32 1 + CCID58-2-17a2 S32 1 + CCID58-1-21a2 S32 1 + CCID58-2-16a1 S32 1 + CCID58-2-12a2 S32 1 + CCID58-2-23b2 S32 1 + CCID58-1-07b1 S32 1 + CCID58-1-14b1 S32 1 + CCID58-1-04b1 S32 1 + CCID58-1-02b2 S32 1 + CCID58-2-11b2 S32 1 + CCID58-1-25b1 S32 1 + CCID58-1-05b2 S32 1 + CCID58-2-22b2 S32 1 + CCID58-2-18b2 S32 1 + CCID58-1-17b1 S32 1 + CCID58-1-03b1 S32 1 + CCID58-1-03b2 S32 1 + CCID58-2-04b2 S32 1 + CCID58-2-09b2 S32 1 + END + CELL.EXPOSURE F32 0.0 + CELL.DARKTIME F32 0.0 + CELL.GAIN F32 1.0 + CELL.READNOISE F32 0.0 + CELL.READDIR S32 1 + CELL.BAD S32 0 + CELL.TIMESYS STR UTC + CELL.TIME STR 2005-11-23T12:34:56.78 +# CELL.SATURATION STR 60000 +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP,CELL +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP,CELL + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). + +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + CELL.BINNING STR TOGETHER + CELL.X0 STR FORTRAN + CELL.Y0 STR FORTRAN +END + +# Recipe options +RECIPES METADATA +END + +# How to get the supplementary stuff: mask and weight +SUPPLEMENTARY METADATA + MASK.SOURCE STR FILE # Source type for mask: EXT | FILE + MASK.NAME STR %a_mask.fits # Name for mask extension or filename + WEIGHT.SOURCE STR FILE # Source type for weight: EXT | FILE + WEIGHT.NAME STR %a_weight.fits # Name for weight extension or filename +END Index: /branches/pap_branch_070920/ippconfig/gpc1/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/gpc1/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/gpc1/ppImage.config (revision 14957) @@ -0,0 +1,9 @@ + +# binned output image options +BIN1.XBIN S32 16 +BIN1.YBIN S32 16 +BIN2.XBIN S32 150 +BIN2.YBIN S32 150 + +OVERSCAN.STAT STR MEDIAN +OVERSCAN.BOXCAR S32 5 Index: /branches/pap_branch_070920/ippconfig/ipprc.config.in =================================================================== --- /branches/pap_branch_070920/ippconfig/ipprc.config.in (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ipprc.config.in (revision 14957) @@ -0,0 +1,102 @@ +### Example .ipprc file + +# Default search path for configuration files (add $HOME if desired) +# PATH STR @pkgdatadir@:$HOME/.ipp:. +PATH STR @pkgdatadir@:. +# note: do not include $HOME in the distributed copy used by ippMonitor + +# place your data directories here and refer to as path://PATH/remainder +DATAPATH METADATA + ALALA STR /data/alala.0/ + ISP STR /data/ipp000.0/isp + ISP_V2 STR /data/ipp000.0/isp_v2 + ISP_V3 STR /data/ipp000.0/isp_v3 + ISP_TEST STR /data/ipp000.0/isp_test + EAMTEST STR /data/alala.0/eugene/simtest + CFH12K STR /data/ipp003.0/eugene/cfh12k + DATA1 STR /data/alala.0/ + SRESS1 STR /data/ipp003.0/SM_W/sm030927/ + SRESSWORK STR /data/ipp003.0/rodney/sresswork + SIMTEST STR /data/po05.0/rodney/sim/ + SIMWORK STR /data/po05.0/rodney/simwork/ + MOPS STR /data/ipp003.0/MOPS/ + TALCS STR /data/ipp003.0/TALCS/ +END + +NEB_SERVER STR http://alala:80/nebulous # Nebulous server + +### Database configuration +DBSERVER STR alala # Database host name (for psDBInit) +DBNAME STR ipp # Database name (for psDBInit) +DBUSER STR XXX # Database user name (for psDBInit) +DBPASSWORD STR XXX # Database password (for psDBInit) + +### Setups for each camera system +CAMERAS METADATA + MEGACAM STR megacam/camera.config + CFH12K STR cfh12k/camera.config + ISP-Apogee STR isp/camera.config + TC3 STR tc3/camera.config # Pan-STARRS Test Camera III + CTIO_MOSAIC2 STR ctio_mosaic2/camera.config # CTIO MOSAIC2 camera, for ESSENCE + SDSS STR sdss/camera.config # Sloan Digital Sky Survey +# UCAM STR ucam/camera.config +# GPC1 STR gpc1/camera.config +# LRIS_BLUE STR lris_blue/camera.config +# LRIS_RED STR lris_red/camera.config + SIMMOSAIC STR simmosaic/camera.config # Simulated mosaic, for testing + SIMTEST STR simtest/camera.config + SIMPLE STR simple/camera.config +END + +### camera names as expected by DVO +DVO.CAMERAS METADATA + MEGACAM STR megacam + CFH12K STR cfh12k + ISP-Apogee STR isp + TC3 STR tc3 + CTIO_MOSAIC2 STR ctio_mosaic2 + SDSS STR sdss +# UCAM STR ucam +# GPC1 STR gpc1 +# LRIS_BLUE STR lris_blue +# LRIS_RED STR lris_red + SIMMOSAIC STR simmosaic + SIMTEST STR simtest + SIMPLE STR simple +END + +### psLib setup +#TIME STR /home/mithrandir/price/pan-starrs/jhroot/i686-pc-linux-gnu/etc/pslib/psTime.config # Time configuration file +LOGLEVEL S32 9 # Logging level; 3=INFO +LOGFORMAT STR THLNM # Log format +LOGDEST STR STDERR # Log destination +TRACEDEST STR STDERR # Trace destination +TRACE METADATA # Trace levels + err S32 10 +# place default trace lines here +# example: +# psLib.db S32 10 +END + +RECIPES METADATA # Site-level recipes + MASKS STR recipes/masks.config # Mask values + REJECTIONS STR recipes/rejections.config # Rejection for detrend creation + PPIMAGE STR recipes/ppImage.config # Image reduction + PPMERGE STR recipes/ppMerge.config # Image combination + PPSTATS STR recipes/ppStats.config # Image statistics + PSPHOT STR recipes/psphot.config # Photometry + PSASTRO STR recipes/psastro.config # Astrometry + PPSTACK STR recipes/ppStack.config # Combination + PSWARP STR recipes/pswarp.config # Warping + PPSIM STR recipes/ppSim.config # Simulations + PPSUB STR recipes/ppSub.config # Subtraction +END + +# Header keywords for skycell concepts; required because DVO doesn't read HIERARCH +SKYCELLS METADATA + FPA.TIME STR MJD-OBS + CELL.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + CELL.EXPOSURE STR EXPTIME + FPA.AIRMASS STR AIRMASS +END Index: /branches/pap_branch_070920/ippconfig/isp/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/isp/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/Makefile.am (revision 14957) @@ -0,0 +1,24 @@ + +installdir = $(datadir)/ippconfig/isp + +install_files = \ + dvo.config \ + dvo.layout \ + camera.config \ + format.config \ + cmp.config \ + cmf.config \ + ppImage.config \ + ppMerge.config \ + psastro.config \ + psphot.config \ + rejections.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/isp/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/camera.config (revision 14957) @@ -0,0 +1,239 @@ +# Camera configuration file for the Pan-STARRS Imaging Sky Probe + +# File formats that we know about +FORMATS METADATA + ISP STR isp/format.config + CMP STR isp/cmp.config + CMF STR isp/cmf.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + Chip STR Cell +END + +# valid filter names and corresponding IDs +FILTER.ID METADATA + g STR g + r STR r + i STR i + z STR z + y STR y +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa +END + +DVO.CAMERADIR STR isp # Camera directory for DVO + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + PSPHOT STR isp/psphot.config # psphot details + PSASTRO STR isp/psastro.config # psastro details + PPIMAGE STR isp/ppImage.config # Recipes for ppImage + PPMERGE STR isp/ppMerge.config # Recipes for ppMerge + REJECTIONS STR isp/rejections.config +END + +# Reduction classes +REDUCTION METADATA + # Detrend processing + DETREND METADATA + BIAS_PROCESS STR PPIMAGE_O + BIAS_RESID STR PPIMAGE_B + BIAS_VERIFY STR PPIMAGE_OB + BIAS_STACK STR PPMERGE_BIAS + DARK_PROCESS STR PPIMAGE_OB + DARK_RESID STR PPIMAGE_D + DARK_VERIFY STR PPIMAGE_OBD + DARK_STACK STR PPMERGE_DARK + SHUTTER_PROCESS STR PPIMAGE_OBD + SHUTTER_RESID STR PPIMAGE_S + SHUTTER_VERIFY STR PPIMAGE_OBDS + SHUTTER_STACK STR PPMERGE_SHUTTER + FLAT_PROCESS STR PPIMAGE_OBDS + FLAT_RESID STR PPIMAGE_F + FLAT_VERIFY STR PPIMAGE_OBDSF + FLAT_STACK STR PPMERGE_FLAT + FRINGE_PROCESS STR PPIMAGE_OBDSF + FRINGE_RESID STR PPIMAGE_R + FRINGE_VERIFY STR PPIMAGE_OBDSFR + FRINGE_STACK STR PPMERGE_FRINGE + + JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B + JPEG_BIN1_IMAGE_DARK STR PPIMAGE_J1_IMAGE_B + JPEG_BIN1_IMAGE_SHUTTER STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_FLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_DOMEFLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_SKYFLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_FRINGE STR PPIMAGE_J1_IMAGE_R + JPEG_BIN2_IMAGE_BIAS STR PPIMAGE_J2_IMAGE_B + JPEG_BIN2_IMAGE_DARK STR PPIMAGE_J2_IMAGE_B + JPEG_BIN2_IMAGE_SHUTTER STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_FLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_DOMEFLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_SKYFLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_FRINGE STR PPIMAGE_J2_IMAGE_R + + JPEG_BIN1_RESID_BIAS STR PPIMAGE_J1_RESID_B + JPEG_BIN1_RESID_DARK STR PPIMAGE_J1_RESID_B + JPEG_BIN1_RESID_SHUTTER STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_FLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_DOMEFLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_SKYFLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_FRINGE STR PPIMAGE_J1_RESID_R + JPEG_BIN2_RESID_BIAS STR PPIMAGE_J2_RESID_B + JPEG_BIN2_RESID_DARK STR PPIMAGE_J2_RESID_B + JPEG_BIN2_RESID_SHUTTER STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_FLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_DOMEFLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_SKYFLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R + END + # Processing raw data + DEFAULT METADATA + CHIP STR PPIMAGE_OBDSFRA + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + END + + # Detrend Processing only for raw data + DETREND_ONLY METADATA + CHIP STR PPIMAGE_DET_ONLY + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + END +END + +FILERULES METADATA + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMF + PSASTRO.OUTPUT.MEF STR PSASTRO.OUTPUT.CMF + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + + ### input file definitions + ### use @DETDB entries to get the detrend images from the database + ### replace @DETDB with @FILES if you want to require it from the + ### command line, or with an explicit name to require a specific file + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + + ## files used by ppImage + PPIMAGE.INPUT INPUT @FILES FPA IMAGE + PPIMAGE.MASK INPUT mask.fits FPA IMAGE + PPIMAGE.BIAS INPUT @DETDB FPA IMAGE + PPIMAGE.DARK INPUT @DETDB FPA IMAGE + PPIMAGE.FLAT INPUT @DETDB FPA IMAGE + PPIMAGE.FRINGE INPUT @DETDB FPA FRINGE + PPIMAGE.SHUTTER INPUT @DETDB FPA IMAGE + + ## files used to build and apply the flat-field correction images + DVOCORR.INPUT INPUT @FILES FPA IMAGE + DVOCORR.REFHEAD INPUT @FILES FPA HEADER + DVOFLAT.INPUT INPUT @FILES FPA IMAGE + DVOFLAT.CORR INPUT @DETDB FPA IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES FPA IMAGE + PSPHOT.INPUT INPUT @FILES FPA IMAGE + PSPHOT.MASK INPUT @FILES FPA MASK + PSPHOT.WEIGHT INPUT @FILES FPA WEIGHT + PSPHOT.PSF.LOAD INPUT @FILES FPA PSF + + ## files used by psastro + PSASTRO.INPUT.CMP INPUT @FILES FPA CMP + PSASTRO.INPUT.CMF INPUT @FILES FPA CMF + + ## files used by pswarp + PSWARP.INPUT INPUT @FILES FPA IMAGE + PSWARP.WEIGHT INPUT @FILES FPA WEIGHT + PSWARP.MASK INPUT @FILES FPA MASK + PSWARP.SKYCELL INPUT @FILES FPA IMAGE + PSWARP.ASTROM INPUT @FILES FPA CMF + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.isp.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PPIMAGE.CHIP OUTPUT {OUTPUT}.chip.fits IMAGE FPA TRUE NONE + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.chip.mask.fits MASK FPA TRUE NONE + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.chip.wt.fits WEIGHT FPA TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE NONE + + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1c.fits IMAGE FPA TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2c.fits IMAGE FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE FPA TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE FPA TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE FPA TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE FPA TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE FPA TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE FPA TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE ISP + PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END + +EXTNAME.RULES METADATA + CMF.HEAD STR cmf.hdr + CMF.DATA STR cmf.psf # use .PSF and .EXT? + + PSF.HEAD STR hdr + PSF.TABLE STR psf_model + PSF.RESID STR psf_resid +END + +BLANK.HEADERS METADATA + FPA.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + FPA.AIRMASS STR AIRMASS +END + +TESSELLATIONS METADATA + # Tessellation name with corresponding DVO catdir + Skycells STR path://ISP/skycells +END Index: /branches/pap_branch_070920/ippconfig/isp/cmf.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/cmf.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/cmf.config (revision 14957) @@ -0,0 +1,84 @@ +# Pan-STARRS Imaging Sky Probe + +# How to identify this type +RULE METADATA + SIMPLE BOOL TRUE + NAXIS S32 0 + TELESCOP STR ISP-1 + INSTRUME STR ISP-Apogee + DETECTOR STR ISP-Apogee-01 + ISPCAMER STR Apogee U42 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR SEQID # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC STR TRIMSEC + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FILTER STR FILTNAME + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.POSANGLE STR ROTANGLE + FPA.AIRMASS STR AIRMASS + FPA.TIME STR MJD-OBS + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.READNOISE STR RDNOISE + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? + CELL.BAD STR BADLEVEL +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TIMESYS STR UTC + CELL.SATURATION F32 65535 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/isp/cmp.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/cmp.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/cmp.config (revision 14957) @@ -0,0 +1,84 @@ +# Pan-STARRS Imaging Sky Probe + +# How to identify this type +RULE METADATA + SIMPLE BOOL FALSE + NAXIS S32 0 + TELESCOP STR ISP-1 + INSTRUME STR ISP-Apogee + DETECTOR STR ISP-Apogee-01 + ISPCAMER STR Apogee U42 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR SEQID # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC STR TRIMSEC + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FILTER STR FILTNAME + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.POSANGLE STR ROTANGLE + FPA.AIRMASS STR AIRMASS + FPA.TIME STR MJD-OBS + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.READNOISE STR RDNOISE + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? + CELL.BAD STR BADLEVEL +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TIMESYS STR UTC + CELL.SATURATION F32 65535 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/isp/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/dvo.config (revision 14957) @@ -0,0 +1,50 @@ + +# location of DVO database tables +CATDIR /data/alala/eugene/isp/catdir + +# keywords used by DVO to interpret the headers + +# used by parse_time to find time-related keywords +MJD-KEYWORD MJD-OBS +DATE-KEYWORD NONE +DATE-MODE NONE +UT-KEYWORD NONE +JD-KEYWORD NONE + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX -7.0 +CAL_INSTMAG_MIN -9.5 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# allowed astrometry error (arcseconds) +ADDSTAR_MAX_CERROR 5.0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 5.0 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 + +CATMODE MEF +CATFORMAT PANSTARRS_DEV_0 Index: /branches/pap_branch_070920/ippconfig/isp/dvo.layout =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/dvo.layout (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/dvo.layout (revision 14957) @@ -0,0 +1,58 @@ +# this file defines the layout of the mosaic imager: + +# NCCD 40 # this needs work: sometimes 36, sometimes 40 +NCCD 36 +NAXIS1 2112 +NAXIS2 4644 + +MOSAIC_X 11 +MOSAIC_Y 4 + +# lines need to contain: + +CHIPID_KEYWORD EXTNAME + +# ID CHIPID xoffset yoffset xflip yflip datasec biassec Xo Yo theta +CCD.0 ccd00 1 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.1 ccd01 2 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.2 ccd02 3 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.3 ccd03 4 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.4 ccd04 5 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.5 ccd05 6 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.6 ccd06 7 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.7 ccd07 8 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.8 ccd08 9 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.9 ccd09 1 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.10 ccd10 2 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.11 ccd11 3 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.12 ccd12 4 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.13 ccd13 5 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.14 ccd14 6 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.15 ccd15 7 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.16 ccd16 8 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.17 ccd17 9 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.18 ccd18 1 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.19 ccd19 2 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.20 ccd20 3 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.21 ccd21 4 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.22 ccd22 5 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.23 ccd23 6 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.24 ccd24 7 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.25 ccd25 8 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.26 ccd26 9 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.27 ccd27 1 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.28 ccd28 2 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.29 ccd29 3 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.30 ccd30 4 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.31 ccd31 5 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.32 ccd32 6 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.33 ccd33 7 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.34 ccd34 8 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.35 ccd35 9 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.36 ccd36 0 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.37 ccd37 10 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.38 ccd38 0 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.39 ccd39 10 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 + +# can we use header to find biassec +USE_BIASSEC 1 Index: /branches/pap_branch_070920/ippconfig/isp/format.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/format.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/format.config (revision 14957) @@ -0,0 +1,101 @@ +# Pan-STARRS Imaging Sky Probe + +# How to identify this type +RULE METADATA + SIMPLE BOOL TRUE + NAXIS S32 2 + TELESCOP STR ISP-1 + INSTRUME STR ISP-Apogee + DETECTOR STR ISP-Apogee-01 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR SEQID # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC STR TRIMSEC + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR INSTRUME + FPA.DETECTOR STR DETECTOR + FPA.AIRMASS STR AIRMASS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS +# FPA.FOCUS STR TELFOCUS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.TEMP STR CCDTEMP + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.READNOISE STR RDNOISE +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? +# CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +# these were used for some early data +# CELL.XBIN STR XBIN +# CELL.YBIN STR YBIN + CELL.BAD STR BADLEVEL +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 2048 + CELL.XSIZE S32 2048 + CELL.YSIZE S32 2048 + FPA.TIMESYS STR UTC + CELL.SATURATION F32 60000 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +# CELL.XBIN S32 1 +# CELL.YBIN S32 1 +END + +FORMATS METADATA + FPA.RA STR DEGREES + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/isp/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/ppImage.config (revision 14957) @@ -0,0 +1,120 @@ +### ppImage recipe configuration file + +# Inherit everything from the top-level recipe file, except for what's below. + +PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID} + +FRINGE.FILTERS MULTI +FRINGE.FILTERS STR z +FRINGE.FILTERS STR y + +# apply the following constraints when selecting a detrend image +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + END + SHUTTER METADATA + END + FLAT METADATA + FILTER STR FPA.FILTERID +# VERSION STR RAW + END + FRINGE METADATA + FILTER STR FPA.FILTERID +# AIRMASS STR FPA.AIRMASS +# TWILIGHT STR TWILIGHT:FPA.TIME + END +END + +## these science-image analysis recipes are placed here set MASK = FALSE + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_DET_ONLY METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, photometry, astrometry +PPIMAGE_OA METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save base detrended image? + CHIP.WEIGHT.FITS BOOL FALSE # Save base detrended image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END Index: /branches/pap_branch_070920/ippconfig/isp/ppMerge.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/ppMerge.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/ppMerge.config (revision 14957) @@ -0,0 +1,3 @@ +### ppImage recipe configuration file + +# Inherit everything from the top-level recipe file, except for what's below. Index: /branches/pap_branch_070920/ippconfig/isp/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/psastro.config (revision 14957) @@ -0,0 +1,38 @@ + +# astrometry matching parameters + +# nominal plate scale (microns / pixel) +PSASTRO.PIXEL.SCALE F32 10.0 + +# pmAstromGridMatch: +PSASTRO.GRID.MIN.ANGLE F32 -2.0 +PSASTRO.GRID.MAX.ANGLE F32 +2.0 +PSASTRO.GRID.DEL.ANGLE F32 0.25 +PSASTRO.GRID.MIN.SIGMA F32 5.0 + +# pmAstromGridAngle +# max grid offset in FP units (microns) +# use plate-scale to make this in pixels? +PSASTRO.GRID.OFFSET F32 10000. +PSASTRO.GRID.SCALE F32 500 + +# these tweak are in FP units (pixels, currently) +PSASTRO.TWEAK.SCALE F32 1 +PSASTRO.TWEAK.RANGE F32 75 +PSASTRO.TWEAK.SMOOTH F32 2 +PSASTRO.TWEAK.NSIGMA F32 3 + +# match radius in pixels for CHIP astrometry +PSASTRO.MATCH.RADIUS F32 8 + +# pmAstromMatchFit +PSASTRO.CHIP.ORDER S32 3 # fit order +PSASTRO.CHIP.NITER S32 3 # fit clipping iterations +PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas + +PSASTRO.MAX.ERROR F32 10.0 # max error in pixels +PSASTRO.MIN.NSTAR S32 10 # min fitted stars in solution + +MAG_MAX F32 10 +DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.synth.bright +PSASTRO.MATCH.LUMFUNC BOOL TRUE Index: /branches/pap_branch_070920/ippconfig/isp/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/psphot.config (revision 14957) @@ -0,0 +1,71 @@ + +# turn these on to see specific outputs +SAVE.BACKMDL BOOL TRUE +SAVE.BACKGND BOOL TRUE +SAVE.BACKSUB BOOL TRUE +SAVE.RESID BOOL TRUE +SAVE.PSF BOOL TRUE +SAVE.PLOTS BOOL TRUE + +# image statistics parameters +IMSTATS_NPIX S32 5000 # number of pixels to use for sky estimate boxes: +SKY_STAT STR FITTED_MEAN_V4 # statistic used to measure background + +PSF_SN_LIM F32 10 # minimum S/N for stars used for PSF model +PSF_MAX_NSTARS S32 300 # limit number of stars used for PSF model + +PSF_MODEL STR PS_MODEL_PGAUSS + +MOMENTS_SN_MIN F32 10.0 +#EXT_MIN_SN F32 50.0 # fit galaxies above this S/N limit +#FULL_FIT_SN_LIM F32 50.0 +#AP_MIN_SN F32 20.0 +PSF_CLUMP_NSIGMA F32 2.5 # region of Sx,Sy plane to use for selecting PSF stars + +# PSFTREND must be a 2D polynomial +# the specified values are ignored but define the active components of the polynomial +PSF.TREND.MASK METADATA + NORDER_X S32 3 # number of x orders + NORDER_Y S32 3 # number of y orders + VAL_X00_Y00 F64 1 # polynomial coefficient + + VAL_X01_Y00 F64 1 # polynomial coefficient + VAL_X00_Y01 F64 1 # polynomial coefficient + + VAL_X02_Y00 F64 1 # polynomial coefficient + VAL_X01_Y01 F64 1 # polynomial coefficient + VAL_X00_Y02 F64 1 # polynomial coefficient + + VAL_X03_Y00 F64 1 # polynomial coefficient + VAL_X02_Y01 F64 1 # polynomial coefficient + VAL_X01_Y02 F64 1 # polynomial coefficient + VAL_X00_Y03 F64 1 # polynomial coefficient + NELEMENTS S32 10 # number of unmasked components +END # folder for 4D polynomial + +XMIN F32 15 + +PSF.RESIDUALS BOOL true +PSF.RESIDUALS.SPATIAL_ORDER S32 1 + +BREAK_POINT STR ENSEMBLE +OUTPUT.FORMAT STR PS1_DEV_0 + +PSPHOT.SUMMIT METADATA + PEAKS_SMOOTH_SIGMA F32 0.8 # peak significance threshold + PEAKS_NSIGMA_LIMIT F32 50.0 # peak significance threshold + PEAKS_NMAX S32 1000 + SAVE.RESID BOOL FALSE + PSF_SN_LIM F32 25 # minimum S/N for stars used for PSF model + MOMENTS_SN_MIN F32 25.0 + PSF_MODEL STR PS_MODEL_PGAUSS +END + +DIAGNOSTIC.PLOTS METADATA + IMAGE.BACKGROUND.CELL.HISTOGRAM BOOL FALSE + IMAGE.BACKGROUND.CELL.HISTOGRAM.X S32 4 + IMAGE.BACKGROUND.CELL.HISTOGRAM.Y S32 7 +END + +SKY_BIAS F32 0.5 +AP_MIN_SN F32 100.0 Index: /branches/pap_branch_070920/ippconfig/isp/rejections.config =================================================================== --- /branches/pap_branch_070920/ippconfig/isp/rejections.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/isp/rejections.config (revision 14957) @@ -0,0 +1,49 @@ + +DARK METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 2.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 2.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + +FRINGE METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 10.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 0.0 + ENSEMBLE.STDEV F32 0.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + Index: /branches/pap_branch_070920/ippconfig/lris_blue/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/lris_blue/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/lris_blue/camera.config (revision 14957) @@ -0,0 +1,20 @@ +# Camera configuration file for LRIS Blue: describes the camera + +# File formats that we know about +FORMATS METADATA + RAW STR lris_blue/format_raw.config + MEF STR lris_blue/format_mef.config +END + + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + LeftChip STR LeftAmp RightAmp + RightChip STR LeftAmp RightAmp +END + + +# Recipe options +RECIPES METADATA +# PSPHOT STR psphot.config # psphot details +END Index: /branches/pap_branch_070920/ippconfig/lris_blue/format_mef.config =================================================================== --- /branches/pap_branch_070920/ippconfig/lris_blue/format_mef.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/lris_blue/format_mef.config (revision 14957) @@ -0,0 +1,79 @@ +# The Low Resolution Imager and Spectrograph (LRIS) blue side + +# How to identify this type +RULE METADATA + TELESCOP STR Keck I + INSTRUME STR LRISBLUE + FORMAT STR MEF +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CHIP # There are no extensions + FPA.NAME STR OBSNUM # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS METADATA + ccd1 STR LeftChip:LeftAmp:left LeftChip:RightAmp:right + ccd2 STR RightChip:LeftAmp:left RightChip:RightAmp:right +END + +# Specify the cell data +CELLS METADATA + left METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.GAIN.SOURCE STR HEADER + CELL.BIASSEC STR BSECL1 BSECL2 + CELL.TRIMSEC STR TSECL + CELL.GAIN STR GAINL + CELL.X0 S32 0 + END + + right METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.GAIN.SOURCE STR HEADER + CELL.BIASSEC STR BSECR1 BSECR2 + CELL.TRIMSEC STR TSECR + CELL.GAIN STR GAINR + CELL.X0 S32 1024 + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR BLUFILT + FPA.POSANGLE STR ROTPOSN + FPA.RA STR RA + FPA.DEC STR DEC + CELL.EXPOSURE STR EXPOSURE + CELL.DARKTIME STR EXPOSURE # No special darktime header; use exposure time + CELL.TIME STR MJD-OBS + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.RADECSYS STR ICRS + CELL.TIMESYS STR UTC + CELL.READDIR S32 1 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 + CELL.READNOISE F32 2.5 + CELL.SATURATION F32 65536 + CELL.BAD F32 0 +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + CELL.TIME STR MJD +END Index: /branches/pap_branch_070920/ippconfig/lris_blue/format_raw.config =================================================================== --- /branches/pap_branch_070920/ippconfig/lris_blue/format_raw.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/lris_blue/format_raw.config (revision 14957) @@ -0,0 +1,113 @@ +# The Low Resolution Imager and Spectrograph (LRIS) blue side + +# We have no choice but to hard-code the various regions, because Keck +# only stores them as: +# WINDOW = '1,0,0,2048,4096' +# PREPIX = 51 +# POSTPIX = 80 +# BINNING = '1,1 ' +# AMPPSIZE= '[1:1024,1:4096]' + +# I don't know how we would get the IPP to react to changes in the +# windowing on the fly --- we have no mechanism for setting the region +# sizes on the basis of the above keywords. Therefore, we hard-code +# the regions and assert on our assumptions in the RULE. + + +# How to identify this type +RULE METADATA + TELESCOP STR Keck I + INSTRUME STR LRISBLUE + AMPLIST STR 1,4,0,0 + WINDOW STR 1,0,0,2048,4096 + PREPIX S32 51 + POSTPIX S32 80 + BINNING STR 1,1 + AMPPSIZE STR [1:1024,1:4096] + NAXIS1 S32 4620 + NAXIS2 S32 4096 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR OBSNUM # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR LeftChip:LeftAmp:amp1 LeftChip:RightAmp:amp2 RightChip:LeftAmp:amp3 RightChip:RightAmp:amp4 + +# Specify the cell data +CELLS METADATA + amp1 METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [1:51,1:4096];[4301:4380,1:4096] + CELL.TRIMSEC STR [205:1228,1:4096] + CELL.GAIN F32 1.542 + CELL.X0 S32 0 + END + + amp2 METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [52:102,1:4096];[4381:4460,1:4096] + CELL.TRIMSEC STR [1229:2252,1:4096] + CELL.GAIN F32 1.546 + CELL.X0 S32 1024 + END + + amp3 METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [103:153,1:4096];[4461:4540,1:4096] + CELL.TRIMSEC STR [2253:3276,1:4096] + CELL.GAIN F32 1.632 + CELL.X0 S32 0 + END + + amp4 METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [154:204,1:4096];[4541:4620,1:4096] + CELL.TRIMSEC STR [3277:4300,1:4096] + CELL.GAIN F32 1.633 + CELL.X0 S32 1024 + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR BLUFILT + FPA.POSANGLE STR ROTPOSN + FPA.RA STR RA + FPA.DEC STR DEC + CELL.EXPOSURE STR EXPOSURE + CELL.DARKTIME STR EXPOSURE # No special darktime header; use exposure time + CELL.TIME STR MJD-OBS + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.RADECSYS STR ICRS + CELL.TIMESYS STR UTC + CELL.READDIR S32 1 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 + CELL.READNOISE F32 2.5 + CELL.SATURATION F32 65536 + CELL.BAD F32 0 +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + CELL.TIME STR MJD +END Index: /branches/pap_branch_070920/ippconfig/lris_red/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/lris_red/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/lris_red/camera.config (revision 14957) @@ -0,0 +1,19 @@ +# Camera configuration file for LRIS-Red: describes the camera + +# File formats that we know about +FORMATS METADATA + RAW STR lris_red/format_raw.config + SPEC STR lris_red/format_spec.config +END + + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + RedChip STR LeftSide RightSide +END + + +# Recipes to use when processing this camera +RECIPES METADATA + PPMERGE STR ppMerge.config # Recipe to use for ppMerge +END Index: /branches/pap_branch_070920/ippconfig/lris_red/format_raw.config =================================================================== --- /branches/pap_branch_070920/ippconfig/lris_red/format_raw.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/lris_red/format_raw.config (revision 14957) @@ -0,0 +1,95 @@ +# The Low Resolution Imager and Spectrograph (LRIS) red side + +# We have no choice but to hard-code the various regions, because Keck +# only stores them as: +# WINDOW = '0,0,0,2048,2048' +# PREPIX = 20 +# POSTPIX = 80 +# BINNING = '1,1 ' +# AMPPSIZE= '[1:1024,1:4096]' + +# I don't know how we would get the IPP to react to changes in the +# windowing on the fly --- we have no mechanism for setting the region +# sizes on the basis of the above keywords. Therefore, we hard-code +# the regions and assert on our assumptions in the RULE. + + +# How to identify this type +RULE METADATA + TELESCOP STR Keck I + INSTRUME STR LRIS + AMPLIST STR 2,1,0,0 + WINDOW STR 0,0,0,2048,2048 + PREPIX S32 20 + POSTPIX S32 80 + BINNING STR 1, 1 + CCDPSIZE STR [1:2048,1:2048] + NAXIS1 S32 2248 + NAXIS2 S32 2048 + IMTYPE STR TWOAMPTOP +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents a single chip + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR OBSNUM # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR RedChip:LeftSide:left RedChip:RightSide:right + +# Specify the cell data +CELLS METADATA + left METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [1:20,1:2048];[2089:2168,1:2048] + CELL.TRIMSEC STR [41:1064,1:2048] + CELL.GAIN F32 1.98 + CELL.READNOISE F32 6.1 + CELL.X0 S32 0 + END + + right METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [21:40,1:2048];[2169:2248,1:2048] + CELL.TRIMSEC STR [1065:2088,1:2048] + CELL.GAIN F32 2.17 + CELL.READNOISE F32 6.3 + CELL.X0 S32 1023 + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.POSANGLE STR POSANG + FPA.RA STR OBJ-RA + FPA.DEC STR OBJ-DEC + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.RADECSYS STR ICRS + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.SATURATION F32 65535 + CELL.BAD F32 0 + CELL.XBIN S32 1 + CELL.YBIN S32 1 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC +END + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + CELL.TIME STR MJD +END Index: /branches/pap_branch_070920/ippconfig/lris_red/format_spec.config =================================================================== --- /branches/pap_branch_070920/ippconfig/lris_red/format_spec.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/lris_red/format_spec.config (revision 14957) @@ -0,0 +1,96 @@ +# The Low Resolution Imager and Spectrograph (LRIS) red side + +# We have no choice but to hard-code the various regions, because Keck +# only stores them as: +# WINDOW = '0,0,550,2048,1000' +# PREPIX = 20 +# POSTPIX = 80 +# BINNING = '1,1 ' +# AMPPSIZE= '[1:1024,1:4096]' + +# I don't know how we would get the IPP to react to changes in the +# windowing on the fly --- we have no mechanism for setting the region +# sizes on the basis of the above keywords. Therefore, we hard-code +# the regions and assert on our assumptions in the RULE. + + +# How to identify this type +RULE METADATA + TELESCOP STR Keck I + INSTRUME STR LRIS + AMPLIST STR 2,1,0,0 + WINDOW STR 0,0,550,2048,1000 # Narrow spectroscopy format + PREPIX S32 20 + POSTPIX S32 80 + BINNING STR 1, 1 + CCDPSIZE STR [1:2048,1:2048] + NAXIS1 S32 2248 + NAXIS2 S32 1000 + IMTYPE STR TWOAMPTOP +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents a single chip + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR OBSNUM # A PHU keyword for unique identifier within the hierarchy level + CHIP.NAME STR INSTRUME # An extension keyword for unique identifier +END + +# What's in the FITS file? +CONTENTS STR RedChip:LeftSide:left RedChip:RightSide:right + +# Specify the cell data +CELLS METADATA + left METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [1:20,1:1000];[2089:2168,1:1000] + CELL.TRIMSEC STR [41:1064,1:1000] + CELL.GAIN F32 1.98 + CELL.READNOISE F32 6.1 + CELL.X0 S32 0 + END + + right METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [21:40,1:1000];[2169:2248,1:1000] + CELL.TRIMSEC STR [1065:2088,1:1000] + CELL.GAIN F32 2.17 + CELL.READNOISE F32 6.3 + CELL.X0 S32 1023 + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.POSANGLE STR POSANG + FPA.RA STR OBJ-RA + FPA.DEC STR OBJ-DEC + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.RADECSYS STR ICRS + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.SATURATION F32 65535 + CELL.BAD F32 0 + CELL.XBIN S32 1 + CELL.YBIN S32 1 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC +END + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + CELL.TIME STR MJD +END Index: /branches/pap_branch_070920/ippconfig/mcshort/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/mcshort/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/mcshort/camera.config (revision 14957) @@ -0,0 +1,155 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. +# Camera configuration file for MegaCam: describes the camera + +# File formats that we know about +FORMATS METADATA + RAW STR mcshort/format_raw.config + SPLICED STR mcshort/format_spliced.config + SPLIT STR mcshort/format_split.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA +# ccd00 STR LeftAmp RightAmp +# ccd01 STR LeftAmp RightAmp +# ccd02 STR LeftAmp RightAmp +# ccd03 STR LeftAmp RightAmp +# ccd04 STR LeftAmp RightAmp +# ccd05 STR LeftAmp RightAmp +# ccd06 STR LeftAmp RightAmp +# ccd07 STR LeftAmp RightAmp +# ccd08 STR LeftAmp RightAmp +# ccd09 STR LeftAmp RightAmp +# ccd10 STR LeftAmp RightAmp +# ccd11 STR LeftAmp RightAmp + ccd12 STR LeftAmp RightAmp + ccd13 STR LeftAmp RightAmp + ccd14 STR LeftAmp RightAmp +# ccd15 STR LeftAmp RightAmp +# ccd16 STR LeftAmp RightAmp +# ccd17 STR LeftAmp RightAmp +# ccd18 STR LeftAmp RightAmp +# ccd19 STR LeftAmp RightAmp +# ccd20 STR LeftAmp RightAmp + ccd21 STR LeftAmp RightAmp + ccd22 STR LeftAmp RightAmp + ccd23 STR LeftAmp RightAmp +# ccd24 STR LeftAmp RightAmp +# ccd25 STR LeftAmp RightAmp +# ccd26 STR LeftAmp RightAmp +# ccd27 STR LeftAmp RightAmp +# ccd28 STR LeftAmp RightAmp +# ccd29 STR LeftAmp RightAmp +# ccd30 STR LeftAmp RightAmp +# ccd31 STR LeftAmp RightAmp +# ccd32 STR LeftAmp RightAmp +# ccd33 STR LeftAmp RightAmp +# ccd34 STR LeftAmp RightAmp +# ccd35 STR LeftAmp RightAmp +END + +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + u STR u.MP9301 + g STR g.MP9401 + r STR r.MP9601 + i STR i.MP9701 + z MULTI + z STR z.MP9801 + z STR Zp + z STR Zprime + + Ha MULTI + Ha STR Ha.MP7605 + Ha STR Halpha + Ha STR Haalpha.on + HaOff STR HaOFF.MP7604 + + CN MULTI + CN STR CN.MP780 + CN STR cn.MP7803 + CN STR CN.MP7803 + + TiO MULTI + TiO STR TiO.MP77 + TiO STR tio.MP7701 + TiO STR TiO.MP7701 + NB920 STR NB920 + + B2F STR B2F + Bj STR Bj + Vj STR Vj + Rj STR Rj + Ij STR Ij + Hb STR Hb + HbOff STR HbOff +END + +# Recipe options +RECIPES METADATA + # Other recipes + PSPHOT STR megacam/psphot.config # psphot details + PSASTRO STR megacam/psastro.config # psastro details + PPSTATS STR megacam/ppStats.config # ppStats recipe + PPIMAGE STR megacam/ppImage.config # ppImage recipe +END + + +FILERULES METADATA + ### Redirections + PSASTRO.INPUT STR PSASTRO.INPUT.CMP + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + + ### input file definitions + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE + + ### use these entries to get the detrend images from specific files + PPIMAGE.MASK INPUT mcshort/mask.{CHIP.NAME}.fits CHIP MASK + PPIMAGE.BIAS INPUT path://somewhere/MCSHORT.bias.norm.1.2.{CHIP.NAME}.fits CHIP IMAGE + PPIMAGE.DARK INPUT path://somewhere/MCSHORT.dark.norm.2.1.{CHIP.NAME}.fits CHIP IMAGE + PPIMAGE.FLAT INPUT path://somewhere/MCSHORT.flat.norm.3.1.{CHIP.NAME}.fits CHIP IMAGE + PPIMAGE.FRINGE INPUT path://somewhere/fringe.fits CHIP FRINGE + + ### use these entries to get the detrend images from the database + #PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + #PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + #PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + #PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + + PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + ### output file definitions + TYPE OUTPUT FILENAME.RULE DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT +# PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits CHIP IMAGE TRUE SPLICED + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits CHIP MASK FALSE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits CHIP WEIGHT FALSE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits CHIP IMAGE TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits CHIP IMAGE TRUE NONE + + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits FPA IMAGE TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg FPA JPEG TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg FPA JPEG TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits CHIP IMAGE TRUE SPLICED + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits CHIP IMAGE TRUE SPLICED + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits CHIP IMAGE TRUE SPLICED + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits CHIP IMAGE TRUE SPLICED + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} CHIP RAW TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx CHIP SX TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj CHIP OBJ TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CHIP CMF TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CHIP CMP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CHIP CMP TRUE NONE + +END Index: /branches/pap_branch_070920/ippconfig/mcshort/format_raw.config =================================================================== --- /branches/pap_branch_070920/ippconfig/mcshort/format_raw.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/mcshort/format_raw.config (revision 14957) @@ -0,0 +1,336 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. +# The raw MegaCam data comes off the telescope with each of the chips stored in extensions of a MEF file. + +# How to identify this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR MegaCam + EXTEND BOOL T + NEXTEND S32 72 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CELL # The extensions represent cells + FPA.NAME STR EXPNUM # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chip name:type +# amp00 STR ccd00:LeftAmp:left +# amp01 STR ccd00:RightAmp:right +# amp02 STR ccd01:LeftAmp:left +# amp03 STR ccd01:RightAmp:right +# amp04 STR ccd02:LeftAmp:left +# amp05 STR ccd02:RightAmp:right +# amp06 STR ccd03:LeftAmp:left +# amp07 STR ccd03:RightAmp:right +# amp08 STR ccd04:LeftAmp:left +# amp09 STR ccd04:RightAmp:right +# amp10 STR ccd05:LeftAmp:left +# amp11 STR ccd05:RightAmp:right +# amp12 STR ccd06:LeftAmp:left +# amp13 STR ccd06:RightAmp:right +# amp14 STR ccd07:LeftAmp:left +# amp15 STR ccd07:RightAmp:right +# amp16 STR ccd08:LeftAmp:left +# amp17 STR ccd08:RightAmp:right +# amp18 STR ccd09:LeftAmp:left +# amp19 STR ccd09:RightAmp:right +# amp20 STR ccd10:LeftAmp:left +# amp21 STR ccd10:RightAmp:right +# amp22 STR ccd11:LeftAmp:left +# amp23 STR ccd11:RightAmp:right + amp24 STR ccd12:LeftAmp:left + amp25 STR ccd12:RightAmp:right + amp26 STR ccd13:LeftAmp:left + amp27 STR ccd13:RightAmp:right + amp28 STR ccd14:LeftAmp:left + amp29 STR ccd14:RightAmp:right +# amp30 STR ccd15:LeftAmp:left +# amp31 STR ccd15:RightAmp:right +# amp32 STR ccd16:LeftAmp:left +# amp33 STR ccd16:RightAmp:right +# amp34 STR ccd17:LeftAmp:left +# amp35 STR ccd17:RightAmp:right +# amp36 STR ccd18:LeftAmp:left +# amp37 STR ccd18:RightAmp:right +# amp38 STR ccd19:LeftAmp:left +# amp39 STR ccd19:RightAmp:right +# amp40 STR ccd20:LeftAmp:left +# amp41 STR ccd20:RightAmp:right + amp42 STR ccd21:LeftAmp:left + amp43 STR ccd21:RightAmp:right + amp44 STR ccd22:LeftAmp:left + amp45 STR ccd22:RightAmp:right + amp46 STR ccd23:LeftAmp:left + amp47 STR ccd23:RightAmp:right +# amp48 STR ccd24:LeftAmp:left +# amp49 STR ccd24:RightAmp:right +# amp50 STR ccd25:LeftAmp:left +# amp51 STR ccd25:RightAmp:right +# amp52 STR ccd26:LeftAmp:left +# amp53 STR ccd26:RightAmp:right +# amp54 STR ccd27:LeftAmp:left +# amp55 STR ccd27:RightAmp:right +# amp56 STR ccd28:LeftAmp:left +# amp57 STR ccd28:RightAmp:right +# amp58 STR ccd29:LeftAmp:left +# amp59 STR ccd29:RightAmp:right +# amp60 STR ccd30:LeftAmp:left +# amp61 STR ccd30:RightAmp:right +# amp62 STR ccd31:LeftAmp:left +# amp63 STR ccd31:RightAmp:right +# amp64 STR ccd32:LeftAmp:left +# amp65 STR ccd32:RightAmp:right +# amp66 STR ccd33:LeftAmp:left +# amp67 STR ccd33:RightAmp:right +# amp68 STR ccd34:LeftAmp:left +# amp69 STR ccd34:RightAmp:right +# amp70 STR ccd35:LeftAmp:left +# amp71 STR ccd35:RightAmp:right +END + +# Specify the cell data +CELLS METADATA + left METADATA # Left amplifier + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + CELL.XPARITY S32 1 # We could have specified this as a DEFAULT, but this works + CELL.X0 S32 1 + CELL.Y0 S32 1 + END + right METADATA # Right amplifier + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + CELL.XPARITY S32 -1 # This cell is read out in the opposite direction + CELL.X0 S32 2048 + CELL.Y0 S32 1 + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.NAME STR EXPNUM + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR CMMTOBS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.GAIN STR GAIN + CELL.READNOISE STR RDNOISE + CELL.SATURATION STR SATURATE + CELL.TIME STR MJD-OBS + CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + CELL.YPARITY S32 1 + + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA +# ccd00 S32 0 +# ccd01 S32 2048 +# ccd02 S32 4096 +# ccd03 S32 6144 +# ccd04 S32 8192 +# ccd05 S32 10240 +# ccd06 S32 12288 +# ccd07 S32 14336 +# ccd08 S32 16384 +# ccd09 S32 0 +# ccd10 S32 2048 +# ccd11 S32 4096 + ccd12 S32 6144 + ccd13 S32 8192 + ccd14 S32 10240 +# ccd15 S32 12288 +# ccd16 S32 14336 +# ccd17 S32 16384 +# ccd18 S32 0 +# ccd19 S32 2048 +# ccd20 S32 4096 + ccd21 S32 6144 + ccd22 S32 8192 + ccd23 S32 10240 +# ccd24 S32 12288 +# ccd25 S32 14336 +# ccd26 S32 16384 +# ccd27 S32 0 +# ccd28 S32 2048 +# ccd29 S32 4096 +# ccd30 S32 6144 +# ccd31 S32 8192 +# ccd32 S32 10240 +# ccd33 S32 12288 +# ccd34 S32 14336 +# ccd35 S32 16384 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA +# ccd00 S32 18447 +# ccd01 S32 18447 +# ccd02 S32 18447 +# ccd03 S32 18447 +# ccd04 S32 18447 +# ccd05 S32 18447 +# ccd06 S32 18447 +# ccd07 S32 18447 +# ccd08 S32 18447 +# ccd09 S32 13835 +# ccd10 S32 13835 +# ccd11 S32 13835 + ccd12 S32 13835 + ccd13 S32 13835 + ccd14 S32 13835 +# ccd15 S32 13835 +# ccd16 S32 13835 +# ccd17 S32 13835 +# ccd18 S32 13835 +# ccd19 S32 4612 +# ccd20 S32 4612 + ccd21 S32 4612 + ccd22 S32 4612 + ccd23 S32 4612 +# ccd24 S32 4612 +# ccd25 S32 4612 +# ccd26 S32 4612 +# ccd27 S32 0 +# ccd28 S32 0 +# ccd29 S32 0 +# ccd30 S32 0 +# ccd31 S32 0 +# ccd32 S32 0 +# ccd33 S32 0 +# ccd34 S32 0 +# ccd35 S32 0 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA +# ccd00 S32 1 +# ccd01 S32 1 +# ccd02 S32 1 +# ccd03 S32 1 +# ccd04 S32 1 +# ccd05 S32 1 +# ccd06 S32 1 +# ccd07 S32 1 +# ccd08 S32 1 +# ccd09 S32 1 +# ccd10 S32 1 +# ccd11 S32 1 + ccd12 S32 1 + ccd13 S32 1 + ccd14 S32 1 +# ccd15 S32 1 +# ccd16 S32 1 +# ccd17 S32 1 +# ccd18 S32 1 +# ccd19 S32 1 +# ccd20 S32 1 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 +# ccd24 S32 1 +# ccd25 S32 1 +# ccd26 S32 1 +# ccd27 S32 1 +# ccd28 S32 1 +# ccd29 S32 1 +# ccd30 S32 1 +# ccd31 S32 1 +# ccd32 S32 1 +# ccd33 S32 1 +# ccd34 S32 1 +# ccd35 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA +# ccd00 S32 -1 +# ccd01 S32 -1 +# ccd02 S32 -1 +# ccd03 S32 -1 +# ccd04 S32 -1 +# ccd05 S32 -1 +# ccd06 S32 -1 +# ccd07 S32 -1 +# ccd08 S32 -1 +# ccd09 S32 -1 +# ccd10 S32 -1 +# ccd11 S32 -1 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 +# ccd15 S32 -1 +# ccd16 S32 -1 +# ccd17 S32 -1 +# ccd18 S32 1 +# ccd19 S32 1 +# ccd20 S32 1 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 +# ccd24 S32 1 +# ccd25 S32 1 +# ccd26 S32 1 +# ccd27 S32 1 +# ccd28 S32 1 +# ccd29 S32 1 +# ccd30 S32 1 +# ccd31 S32 1 +# ccd32 S32 1 +# ccd33 S32 1 +# ccd34 S32 1 +# ccd35 S32 1 + END +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# FPA.BIAS METADATA +# TABLE STR Camera +# COLUMN STR gain +# chipId STR {CHIP.NAME} +# cellId STR {CELL.NAME} +# time STR {CELL.TIME} +# END +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD + CELL.X0 STR FORTRAN + CELL.Y0 STR FORTRAN +END Index: /branches/pap_branch_070920/ippconfig/mcshort/format_spliced.config =================================================================== --- /branches/pap_branch_070920/ippconfig/mcshort/format_spliced.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/mcshort/format_spliced.config (revision 14957) @@ -0,0 +1,304 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. +# The spliced MecaCam data is stored in single extensions for each chip + +# How to recognise this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR MegaCam + EXTEND BOOL T + NEXTEND S32 36 +END + +FILE METADATA + # How to read this data + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CHIP # The extensions represent chips + FPA.NAME STR EXPNUM # A PHU keyword for unique identifier + CHIP.NAME STR EXTNAME # An extension keyword for unique identifie +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chipName:chipType +# ccd00 STR ccd00:CCD42-90 +# ccd01 STR ccd01:CCD42-90 +# ccd02 STR ccd02:CCD42-90 +# ccd03 STR ccd03:CCD42-90 +# ccd04 STR ccd04:CCD42-90 +# ccd05 STR ccd05:CCD42-90 +# ccd06 STR ccd06:CCD42-90 +# ccd07 STR ccd07:CCD42-90 +# ccd08 STR ccd08:CCD42-90 +# ccd09 STR ccd09:CCD42-90 +# ccd10 STR ccd10:CCD42-90 +# ccd11 STR ccd11:CCD42-90 + ccd12 STR ccd12:CCD42-90 + ccd13 STR ccd13:CCD42-90 + ccd14 STR ccd14:CCD42-90 +# ccd15 STR ccd15:CCD42-90 +# ccd16 STR ccd16:CCD42-90 +# ccd17 STR ccd17:CCD42-90 +# ccd18 STR ccd18:CCD42-90 +# ccd19 STR ccd19:CCD42-90 +# ccd20 STR ccd20:CCD42-90 + ccd21 STR ccd21:CCD42-90 + ccd22 STR ccd22:CCD42-90 + ccd23 STR ccd23:CCD42-90 +# ccd24 STR ccd24:CCD42-90 +# ccd25 STR ccd25:CCD42-90 +# ccd26 STR ccd26:CCD42-90 +# ccd27 STR ccd27:CCD42-90 +# ccd28 STR ccd28:CCD42-90 +# ccd29 STR ccd29:CCD42-90 +# ccd30 STR ccd30:CCD42-90 +# ccd31 STR ccd31:CCD42-90 +# ccd32 STR ccd32:CCD42-90 +# ccd33 STR ccd33:CCD42-90 +# ccd34 STR ccd34:CCD42-90 +# ccd35 STR ccd35:CCD42-90 +END + +# Specify the chips +CHIPS METADATA + # Chip type, cellName:cellType + CCD42-90 STR LeftAmp:left RightAmp:right +END + +# Specify the cells +CELLS METADATA + left METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECA + CELL.TRIMSEC STR TSECA + CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINA + END + + right METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECB + CELL.TRIMSEC STR TSECB + CELL.X0 S32 1024 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINB + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.NAME STR EXPNUM + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR CMMTOBS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.READNOISE STR RDNOISE + CELL.SATURATION STR SATURATE + CELL.TIME STR MJD-OBS + CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TIMESYS STR UTC + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 +# PPMERGE.SCALE F32 1.0 +# PPMERGE.ZERO F32 0.0 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 0 + ccd13 S32 2048 + ccd14 S32 4096 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 0 + ccd22 S32 2048 + ccd23 S32 4096 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 9223 + ccd13 S32 9223 + ccd14 S32 9223 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 0 + ccd22 S32 0 + ccd23 S32 0 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 1 + ccd13 S32 1 + ccd14 S32 1 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END +END + + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + Index: /branches/pap_branch_070920/ippconfig/mcshort/format_split.config =================================================================== --- /branches/pap_branch_070920/ippconfig/mcshort/format_split.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/mcshort/format_split.config (revision 14957) @@ -0,0 +1,302 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. +# The spliced MecaCam data is stored in single extensions for each chip + +# How to recognise this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR MegaCam +END + +FILE METADATA + # How to read this data + PHU STR CHIP # The FITS file represents an entire FPA + EXTENSIONS STR NONE # The extensions represent chips + FPA.NAME STR EXPNUM # A PHU keyword for unique identifier + CHIP.NAME STR EXTNAME # An extension keyword for unique identifie + CONTENT STR {CHIP.NAME} # Key to the CONTENTS menu +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chip name:component cell +# ccd00 STR ccd00:CCD42-90 +# ccd01 STR ccd01:CCD42-90 +# ccd02 STR ccd02:CCD42-90 +# ccd03 STR ccd03:CCD42-90 +# ccd04 STR ccd04:CCD42-90 +# ccd05 STR ccd05:CCD42-90 +# ccd06 STR ccd06:CCD42-90 +# ccd07 STR ccd07:CCD42-90 +# ccd08 STR ccd08:CCD42-90 +# ccd09 STR ccd09:CCD42-90 +# ccd10 STR ccd10:CCD42-90 +# ccd11 STR ccd11:CCD42-90 + ccd12 STR ccd12:CCD42-90 + ccd13 STR ccd13:CCD42-90 + ccd14 STR ccd14:CCD42-90 +# ccd15 STR ccd15:CCD42-90 +# ccd16 STR ccd16:CCD42-90 +# ccd17 STR ccd17:CCD42-90 +# ccd18 STR ccd18:CCD42-90 +# ccd19 STR ccd19:CCD42-90 +# ccd20 STR ccd20:CCD42-90 + ccd21 STR ccd21:CCD42-90 + ccd22 STR ccd22:CCD42-90 + ccd23 STR ccd23:CCD42-90 +# ccd24 STR ccd24:CCD42-90 +# ccd25 STR ccd25:CCD42-90 +# ccd26 STR ccd26:CCD42-90 +# ccd27 STR ccd27:CCD42-90 +# ccd28 STR ccd28:CCD42-90 +# ccd29 STR ccd29:CCD42-90 +# ccd30 STR ccd30:CCD42-90 +# ccd31 STR ccd31:CCD42-90 +# ccd32 STR ccd32:CCD42-90 +# ccd33 STR ccd33:CCD42-90 +# ccd34 STR ccd34:CCD42-90 +# ccd35 STR ccd35:CCD42-90 +END + +# Specify the chips +CHIPS METADATA + # Chip type, cellName:cellType + CCD42-90 STR LeftAmp:left RightAmp:right +END + +# Specify the cells +CELLS METADATA + left METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECA + CELL.TRIMSEC STR TSECA + CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINA + END + + right METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECB + CELL.TRIMSEC STR TSECB + CELL.X0 S32 1024 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINB + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.NAME STR EXPNUM + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR CMMTOBS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.READNOISE STR RDNOISE + CELL.SATURATION STR SATURATE + CELL.TIME STR MJD-OBS + CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 +# PPMERGE.SCALE F32 1.0 +# PPMERGE.ZERO F32 0.0 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 0 + ccd13 S32 2048 + ccd14 S32 4096 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 0 + ccd22 S32 2048 + ccd23 S32 4096 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 9223 + ccd13 S32 9223 + ccd14 S32 9223 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 0 + ccd22 S32 0 + ccd23 S32 0 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 1 + ccd13 S32 1 + ccd14 S32 1 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA +# ccd00 S32 +# ccd01 S32 +# ccd02 S32 +# ccd03 S32 +# ccd04 S32 +# ccd05 S32 +# ccd06 S32 +# ccd07 S32 +# ccd08 S32 +# ccd09 S32 +# ccd10 S32 +# ccd11 S32 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 +# ccd15 S32 +# ccd16 S32 +# ccd17 S32 +# ccd18 S32 +# ccd19 S32 +# ccd20 S32 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 +# ccd24 S32 +# ccd25 S32 +# ccd26 S32 +# ccd27 S32 +# ccd28 S32 +# ccd29 S32 +# ccd30 S32 +# ccd31 S32 +# ccd32 S32 +# ccd33 S32 +# ccd34 S32 +# ccd35 S32 + END +END + + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + Index: /branches/pap_branch_070920/ippconfig/megacam/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/megacam/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/Makefile.am (revision 14957) @@ -0,0 +1,24 @@ + +installdir = $(datadir)/ippconfig/megacam + +install_files = \ + dvo.config \ + dvo.layout \ + camera.config \ + format_raw.config \ + format_split.config \ + format_mef.config \ + ppImage.config \ + ppMerge.config \ + psastro.config \ + psphot.config \ + rejections.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/megacam/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/camera.config (revision 14957) @@ -0,0 +1,351 @@ +# Camera configuration file for MegaCam: describes the camera + +# File formats that we know about +FORMATS METADATA + RAW STR megacam/format_raw.config + MEF STR megacam/format_mef.config + SPLIT STR megacam/format_split.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + ccd00 STR LeftAmp RightAmp + ccd01 STR LeftAmp RightAmp + ccd02 STR LeftAmp RightAmp + ccd03 STR LeftAmp RightAmp + ccd04 STR LeftAmp RightAmp + ccd05 STR LeftAmp RightAmp + ccd06 STR LeftAmp RightAmp + ccd07 STR LeftAmp RightAmp + ccd08 STR LeftAmp RightAmp + ccd09 STR LeftAmp RightAmp + ccd10 STR LeftAmp RightAmp + ccd11 STR LeftAmp RightAmp + ccd12 STR LeftAmp RightAmp + ccd13 STR LeftAmp RightAmp + ccd14 STR LeftAmp RightAmp + ccd15 STR LeftAmp RightAmp + ccd16 STR LeftAmp RightAmp + ccd17 STR LeftAmp RightAmp + ccd18 STR LeftAmp RightAmp + ccd19 STR LeftAmp RightAmp + ccd20 STR LeftAmp RightAmp + ccd21 STR LeftAmp RightAmp + ccd22 STR LeftAmp RightAmp + ccd23 STR LeftAmp RightAmp + ccd24 STR LeftAmp RightAmp + ccd25 STR LeftAmp RightAmp + ccd26 STR LeftAmp RightAmp + ccd27 STR LeftAmp RightAmp + ccd28 STR LeftAmp RightAmp + ccd29 STR LeftAmp RightAmp + ccd30 STR LeftAmp RightAmp + ccd31 STR LeftAmp RightAmp + ccd32 STR LeftAmp RightAmp + ccd33 STR LeftAmp RightAmp + ccd34 STR LeftAmp RightAmp + ccd35 STR LeftAmp RightAmp +END + +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + u STR u.MP9301 + g STR g.MP9401 + r STR r.MP9601 + i STR i.MP9701 + z MULTI + z STR z.MP9801 + z STR Zp + z STR Zprime + + Ha MULTI + Ha STR Ha.MP7605 + Ha STR Halpha + Ha STR Haalpha.on + HaOff STR HaOFF.MP7604 + + CN MULTI + CN STR CN.MP780 + CN STR cn.MP7803 + CN STR CN.MP7803 + + TiO MULTI + TiO STR TiO.MP77 + TiO STR tio.MP7701 + TiO STR TiO.MP7701 + NB920 STR NB920 + + B2F STR B2F + Bj STR Bj + Vj STR Vj + Rj STR Rj + Ij STR Ij + Hb STR Hb + HbOff STR HbOff +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa + CHIP STR {CHIP.NAME} + CELL STR {CHIP.NAME}:{CELL.NAME} +END + +DVO.CAMERADIR STR isp # Camera directory for DVO + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + # Other recipes + PSPHOT STR megacam/psphot.config # psphot details + PSASTRO STR megacam/psastro.config # psastro details + PPIMAGE STR megacam/ppImage.config # ppImage recipe + REJECTIONS STR megacam/rejections.config # rejection recipe +END + +REDUCTION METADATA + DETREND METADATA + BIAS_PROCESS STR PPIMAGE_O + BIAS_RESID STR PPIMAGE_B + BIAS_VERIFY STR PPIMAGE_OB + DARK_PROCESS STR PPIMAGE_OB + DARK_RESID STR PPIMAGE_D + DARK_VERIFY STR PPIMAGE_OBD + SHUTTER_PROCESS STR PPIMAGE_OBD + SHUTTER_RESID STR PPIMAGE_S + SHUTTER_VERIFY STR PPIMAGE_OBDS + FLAT_PROCESS STR PPIMAGE_OBDS + FLAT_RESID STR PPIMAGE_F + FLAT_VERIFY STR PPIMAGE_OBDSF + FRINGE_PROCESS STR PPIMAGE_OBDSF + FRINGE_RESID STR PPIMAGE_R + FRINGE_VERIFY STR PPIMAGE_OBDSFR + + JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B + JPEG_BIN1_IMAGE_DARK STR PPIMAGE_J1_IMAGE_B + JPEG_BIN1_IMAGE_SHUTTER STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_FLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_DOMEFLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_SKYFLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_FRINGE STR PPIMAGE_J1_IMAGE_R + JPEG_BIN2_IMAGE_BIAS STR PPIMAGE_J2_IMAGE_B + JPEG_BIN2_IMAGE_DARK STR PPIMAGE_J2_IMAGE_B + JPEG_BIN2_IMAGE_SHUTTER STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_FLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_DOMEFLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_SKYFLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_FRINGE STR PPIMAGE_J2_IMAGE_R + + JPEG_BIN1_RESID_BIAS STR PPIMAGE_J1_RESID_B + JPEG_BIN1_RESID_DARK STR PPIMAGE_J1_RESID_B + JPEG_BIN1_RESID_SHUTTER STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_FLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_DOMEFLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_SKYFLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_FRINGE STR PPIMAGE_J1_RESID_R + JPEG_BIN2_RESID_BIAS STR PPIMAGE_J2_RESID_B + JPEG_BIN2_RESID_DARK STR PPIMAGE_J2_RESID_B + JPEG_BIN2_RESID_SHUTTER STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_FLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_DOMEFLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_SKYFLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R + END + + # basic science analysis + DEFAULT METADATA + CHIP STR PPIMAGE_OBDSFRA + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + END + + # photometry & astrometry for pre-detrended images + PROCESSED METADATA + CHIP STR PPIMAGE_PA + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + + END + + # Detrend Processing only for raw data + DETREND_ONLY METADATA + CHIP STR PPIMAGE_DET_ONLY + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + END +END + +FILERULES METADATA + ### Redirections + PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT.MEF + PPIMAGE.OUTPUT.MASK STR PPIMAGE.OUT.MK.MEF + PPIMAGE.OUTPUT.WEIGHT STR PPIMAGE.OUT.WT.MEF + PPIMAGE.CHIP STR PPIMAGE.CHIP.MEF + PPIMAGE.CHIP.MASK STR PPIMAGE.CHIP.MK.MEF + PPIMAGE.CHIP.WEIGHT STR PPIMAGE.CHIP.WT.MEF + PPIMAGE.OUTPUT.FPA1 STR PPIMAGE.OUTPUT.FPA1.MEF + PPIMAGE.OUTPUT.FPA2 STR PPIMAGE.OUTPUT.FPA2.MEF + PPIMAGE.BIN1 STR PPIMAGE.BIN1.MEF + PPIMAGE.BIN2 STR PPIMAGE.BIN2.MEF + + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.MEF + PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF + PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.MEF + DVOCORR.OUTPUT STR DVOCORR.MEF.OUTPUT + DVOFLAT.OUTPUT STR DVOFLAT.MEF.OUTPUT + + ### input file definitions + ### use @DETDB entries to get the detrend images from the database + ### replace @DETDB with @FILES if you want to require it from the + ### command line, or with an explicit name to require a specific file + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + + ## files used by ppImage + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE + PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE + + ## files used to build and apply the flat-field correction images + DVOCORR.INPUT INPUT @FILES CHIP IMAGE + DVOCORR.REFHEAD INPUT @FILES CHIP HEADER + DVOFLAT.INPUT INPUT @FILES CHIP IMAGE + DVOFLAT.CORR INPUT @DETDB CHIP IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES CHIP IMAGE + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSPHOT.MASK INPUT @FILES CHIP MASK + PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT + PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF + + ## files used by psastro + PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + ## files used by pswarp + PSWARP.INPUT INPUT @FILES CHIP IMAGE + PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT + PSWARP.MASK INPUT @FILES CHIP MASK + PSWARP.SKYCELL INPUT @FILES CHIP IMAGE + PSWARP.ASTROM INPUT @FILES CHIP CMF + + PPSUB.INPUT INPUT @FILES FPA IMAGE + PPSUB.INPUT.MASK INPUT @FILES FPA MASK + PPSUB.INPUT.WEIGHT INPUT @FILES FPA WEIGHT + PPSUB.REF INPUT @FILES FPA IMAGE + PPSUB.REF.MASK INPUT @FILES FPA MASK + PPSUB.REF.WEIGHT INPUT @FILES FPA WEIGHT + PPSUB.SOURCES INPUT @FILES FPA CMF + + PPSTACK.INPUT INPUT @FILES FPA IMAGE + PPSTACK.INPUT.MASK INPUT @FILES FPA MASK + PPSTACK.INPUT.WEIGHT INPUT @FILES FPA WEIGHT + PPSTACK.SOURCES INPUT @FILES FPA CMF + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT.MEF OUTPUT {OUTPUT}.b0.fits IMAGE CHIP TRUE MEF + PPIMAGE.OUT.MK.MEF OUTPUT {OUTPUT}.mk.fits MASK CHIP TRUE MEF + PPIMAGE.OUT.WT.MEF OUTPUT {OUTPUT}.wt.fits WEIGHT CHIP TRUE MEF + PPIMAGE.OUTPUT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b0.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.OUT.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.mk.fits MASK CHIP TRUE SPLIT + PPIMAGE.OUT.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT + + PPIMAGE.CHIP.MEF OUTPUT {OUTPUT}.ch.fits IMAGE CHIP TRUE MEF + PPIMAGE.CHIP.MK.MEF OUTPUT {OUTPUT}.ch.mk.fits MASK CHIP TRUE MEF + PPIMAGE.CHIP.WT.MEF OUTPUT {OUTPUT}.ch.wt.fits WEIGHT CHIP TRUE MEF + PPIMAGE.CHIP.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.CHIP.MK.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mk.fits MASK CHIP TRUE SPLIT + PPIMAGE.CHIP.WT.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT CHIP TRUE SPLIT + + PPIMAGE.OUTPUT.FPA1.MEF OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE MEF + PPIMAGE.OUTPUT.FPA2.MEF OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE MEF + PPIMAGE.OUTPUT.FPA1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE FPA TRUE SPLIT + PPIMAGE.OUTPUT.FPA2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE FPA TRUE SPLIT + + PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE MEF + + PPIMAGE.BIN1.MEF OUTPUT {OUTPUT}.b1c.fits IMAGE CHIP TRUE MEF + PPIMAGE.BIN2.MEF OUTPUT {OUTPUT}.b2c.fits IMAGE CHIP TRUE MEF + PPIMAGE.BIN1.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.BIN2.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE SPLIT + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE CHIP TRUE MEF + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE SPLIT + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE CHIP TRUE MEF + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE SPLIT + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE FPA TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE FPA TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE FPA TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE FPA TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CMP CHIP TRUE NONE + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE SPLIT + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF CHIP TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF CHIP TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE NONE + PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE NONE + PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.OUTPUT.SOURCES OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END + +EXTNAME.RULES METADATA + CMF.HEAD STR {CHIP.NAME}.hdr + CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT? + + PSF.HEAD STR {CHIP.NAME}.hdr + PSF.TABLE STR {CHIP.NAME}.psf_model + PSF.RESID STR {CHIP.NAME}.psf_resid +END + +TESSELLATIONS METADATA + MOPS STR path://MOPS/skycells/ +END Index: /branches/pap_branch_070920/ippconfig/megacam/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/dvo.config (revision 14957) @@ -0,0 +1,67 @@ + +# location of DVO database tables +CATDIR /data/alala.0/eugene/isp/catdir + +# keywords used by DVO to interpret the headers + +# keyword abstractions: +#DATE-KEYWORD DATE-OBS +#DATE-MODE yyyy-mm-dd +#UT-KEYWORD UTC-OBS +JD-KEYWORD NONE +MJD-KEYWORD MJD-OBS + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX 0 +CAL_INSTMAG_MIN 0 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 1.0 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 + +IMAGE_SCATTER 0.075 # mark images POOR if stdev(Mcal) > IMAGE_SCATTER +STAR_SCATTER 0.005 # mark stars POOR if stdev(Mrel) > STAR_SCATTER +IMAGE_OFFSET 0.100 # mark images POOR if abs(delta(Mcal)) > IMAGE_OFFSET +STAR_CHISQ 10.0 # mark stars POOR if Xm > STAR_CHISQ +STAR_TOOFEW 3 # mark star FEW if N(good) < STAR_TOOFEW +IMAGE_TOOFEW 10 # mark image FEW if N(good) < IMAGE_TOOFEW +IMAGE_GOOD_FRACTION 0.05 # mark image FEW if N(good) < IMAGE_GOOD_FRACTION * Nstars + +SCATTER_LIM 15.0 +MAG_LIM 20.0 # select stars brighter than this for relphot analysis +SIGMA_LIM 0.015 # select measurements with dM < SIGMA_LIM for relphot analysis +# INST_MAG_MIN -17 # optional constraints on magnitude ranges +# INST_MAG_MAX -13 # optional constraints on magnitude ranges + +RELPHOT_GRID_BINNING 256 +RELPHOT_GRID_X 6 +RELPHOT_GRID_Y 14 + +PM_DT_MIN 0.25 +PM_TOOFEW 4 +POS_TOOFEW 1 + Index: /branches/pap_branch_070920/ippconfig/megacam/dvo.layout =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/dvo.layout (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/dvo.layout (revision 14957) @@ -0,0 +1,58 @@ +# this file defines the layout of the mosaic imager: + +# NCCD 40 # this needs work: sometimes 36, sometimes 40 +NCCD 36 +NAXIS1 2112 +NAXIS2 4644 + +MOSAIC_X 11 +MOSAIC_Y 4 + +# lines need to contain: + +CHIPID_KEYWORD EXTNAME + +# ID CHIPID xoffset yoffset xflip yflip datasec biassec Xo Yo theta +CCD.0 ccd00 1 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.1 ccd01 2 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.2 ccd02 3 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.3 ccd03 4 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.4 ccd04 5 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.5 ccd05 6 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.6 ccd06 7 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.7 ccd07 8 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.8 ccd08 9 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.9 ccd09 1 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.10 ccd10 2 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.11 ccd11 3 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.12 ccd12 4 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.13 ccd13 5 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.14 ccd14 6 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.15 ccd15 7 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.16 ccd16 8 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.17 ccd17 9 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.18 ccd18 1 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.19 ccd19 2 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.20 ccd20 3 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.21 ccd21 4 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.22 ccd22 5 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.23 ccd23 6 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.24 ccd24 7 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.25 ccd25 8 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.26 ccd26 9 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.27 ccd27 1 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.28 ccd28 2 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.29 ccd29 3 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.30 ccd30 4 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.31 ccd31 5 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.32 ccd32 6 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.33 ccd33 7 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.34 ccd34 8 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.35 ccd35 9 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.36 ccd36 0 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.37 ccd37 10 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.38 ccd38 0 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.39 ccd39 10 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 + +# can we use header to find biassec +USE_BIASSEC 1 Index: /branches/pap_branch_070920/ippconfig/megacam/format_mef.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/format_mef.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/format_mef.config (revision 14957) @@ -0,0 +1,314 @@ +# The spliced MecaCam data is stored in single extensions for each chip + +# How to recognise this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR MegaCam + NAXIS S32 0 + EXTEND BOOL T +END + +FILE METADATA + # How to read this data + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CHIP # The extensions represent chips + FPA.NAME STR EXPNUM # A PHU keyword for unique identifier + CHIP.NAME STR EXTNAME # An extension keyword for unique identifie +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chipName:chipType + ccd00 STR ccd00:CCD42-90 + ccd01 STR ccd01:CCD42-90 + ccd02 STR ccd02:CCD42-90 + ccd03 STR ccd03:CCD42-90 + ccd04 STR ccd04:CCD42-90 + ccd05 STR ccd05:CCD42-90 + ccd06 STR ccd06:CCD42-90 + ccd07 STR ccd07:CCD42-90 + ccd08 STR ccd08:CCD42-90 + ccd09 STR ccd09:CCD42-90 + ccd10 STR ccd10:CCD42-90 + ccd11 STR ccd11:CCD42-90 + ccd12 STR ccd12:CCD42-90 + ccd13 STR ccd13:CCD42-90 + ccd14 STR ccd14:CCD42-90 + ccd15 STR ccd15:CCD42-90 + ccd16 STR ccd16:CCD42-90 + ccd17 STR ccd17:CCD42-90 + ccd18 STR ccd18:CCD42-90 + ccd19 STR ccd19:CCD42-90 + ccd20 STR ccd20:CCD42-90 + ccd21 STR ccd21:CCD42-90 + ccd22 STR ccd22:CCD42-90 + ccd23 STR ccd23:CCD42-90 + ccd24 STR ccd24:CCD42-90 + ccd25 STR ccd25:CCD42-90 + ccd26 STR ccd26:CCD42-90 + ccd27 STR ccd27:CCD42-90 + ccd28 STR ccd28:CCD42-90 + ccd29 STR ccd29:CCD42-90 + ccd30 STR ccd30:CCD42-90 + ccd31 STR ccd31:CCD42-90 + ccd32 STR ccd32:CCD42-90 + ccd33 STR ccd33:CCD42-90 + ccd34 STR ccd34:CCD42-90 + ccd35 STR ccd35:CCD42-90 +END + +# Specify the chips +CHIPS METADATA + # Chip type, cellName:cellType + CCD42-90 STR LeftAmp:left RightAmp:right +END + + +# Specify the cells +CELLS METADATA + # Cell type, concepts to use + left METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECA + CELL.TRIMSEC STR TSECA + CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINA + END + + right METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECB + CELL.TRIMSEC STR TSECB + CELL.X0 S32 1024 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINB + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.FOCUS STR TELFOCUS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + FPA.TEMP STR DETTEM + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.READNOISE STR RDNOISE + CELL.TIME STR MJD-OBS + CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR CFHT + FPA.INSTRUMENT STR MEGACAM # this value is used in ipprc.config to find the recipes + FPA.DETECTOR STR MEGACAM + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 4612 + CELL.XSIZE S32 1024 + CELL.YSIZE S32 4612 + CELL.XWINDOW S32 0 + CELL.YWINDOW S32 0 + CELL.READDIR S32 1 # Cell is read in x direction + CELL.SATURATION F32 50000.0 + CELL.BAD F32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + ccd00 S32 0 + ccd01 S32 2048 + ccd02 S32 4096 + ccd03 S32 6144 + ccd04 S32 8192 + ccd05 S32 10240 + ccd06 S32 12288 + ccd07 S32 14336 + ccd08 S32 16384 + ccd09 S32 0 + ccd10 S32 2048 + ccd11 S32 4096 + ccd12 S32 6144 + ccd13 S32 8192 + ccd14 S32 10240 + ccd15 S32 12288 + ccd16 S32 14336 + ccd17 S32 16384 + ccd18 S32 -2048 + ccd19 S32 0 + ccd20 S32 2048 + ccd21 S32 4096 + ccd22 S32 6144 + ccd23 S32 8192 + ccd24 S32 10240 + ccd25 S32 12288 + ccd26 S32 14336 + ccd27 S32 -2048 + ccd28 S32 0 + ccd29 S32 2048 + ccd30 S32 4096 + ccd31 S32 6144 + ccd32 S32 8192 + ccd33 S32 10240 + ccd34 S32 12288 + ccd35 S32 14336 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + ccd00 S32 18447 + ccd01 S32 18447 + ccd02 S32 18447 + ccd03 S32 18447 + ccd04 S32 18447 + ccd05 S32 18447 + ccd06 S32 18447 + ccd07 S32 18447 + ccd08 S32 18447 + ccd09 S32 13835 + ccd10 S32 13835 + ccd11 S32 13835 + ccd12 S32 13835 + ccd13 S32 13835 + ccd14 S32 13835 + ccd15 S32 13835 + ccd16 S32 13835 + ccd17 S32 13835 + ccd18 S32 4612 + ccd19 S32 4612 + ccd20 S32 4612 + ccd21 S32 4612 + ccd22 S32 4612 + ccd23 S32 4612 + ccd24 S32 4612 + ccd25 S32 4612 + ccd26 S32 4612 + ccd27 S32 0 + ccd28 S32 0 + ccd29 S32 0 + ccd30 S32 0 + ccd31 S32 0 + ccd32 S32 0 + ccd33 S32 0 + ccd34 S32 0 + ccd35 S32 0 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + ccd00 S32 -1 + ccd01 S32 -1 + ccd02 S32 -1 + ccd03 S32 -1 + ccd04 S32 -1 + ccd05 S32 -1 + ccd06 S32 -1 + ccd07 S32 -1 + ccd08 S32 -1 + ccd09 S32 -1 + ccd10 S32 -1 + ccd11 S32 -1 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 + ccd15 S32 -1 + ccd16 S32 -1 + ccd17 S32 -1 + ccd18 S32 1 + ccd19 S32 1 + ccd20 S32 1 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 + ccd24 S32 1 + ccd25 S32 1 + ccd26 S32 1 + ccd27 S32 1 + ccd28 S32 1 + ccd29 S32 1 + ccd30 S32 1 + ccd31 S32 1 + ccd32 S32 1 + ccd33 S32 1 + ccd34 S32 1 + ccd35 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + ccd00 S32 -1 + ccd01 S32 -1 + ccd02 S32 -1 + ccd03 S32 -1 + ccd04 S32 -1 + ccd05 S32 -1 + ccd06 S32 -1 + ccd07 S32 -1 + ccd08 S32 -1 + ccd09 S32 -1 + ccd10 S32 -1 + ccd11 S32 -1 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 + ccd15 S32 -1 + ccd16 S32 -1 + ccd17 S32 -1 + ccd18 S32 1 + ccd19 S32 1 + ccd20 S32 1 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 + ccd24 S32 1 + ccd25 S32 1 + ccd26 S32 1 + ccd27 S32 1 + ccd28 S32 1 + ccd29 S32 1 + ccd30 S32 1 + ccd31 S32 1 + ccd32 S32 1 + ccd33 S32 1 + ccd34 S32 1 + ccd35 S32 1 + END +END + + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + Index: /branches/pap_branch_070920/ippconfig/megacam/format_raw.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/format_raw.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/format_raw.config (revision 14957) @@ -0,0 +1,349 @@ +# "mcshort" is a MegaCam camera with only the central six chips --- it's faster than the entire FPA. +# The raw MegaCam data comes off the telescope with each of the chips stored in extensions of a MEF file. + +# How to identify this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR MegaCam + EXTEND BOOL T + NEXTEND S32 72 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CELL # The extensions represent cells + FPA.NAME STR EXPNUM # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name, chip name:type + amp00 STR ccd00:LeftAmp:left + amp01 STR ccd00:RightAmp:right + amp02 STR ccd01:LeftAmp:left + amp03 STR ccd01:RightAmp:right + amp04 STR ccd02:LeftAmp:left + amp05 STR ccd02:RightAmp:right + amp06 STR ccd03:LeftAmp:left + amp07 STR ccd03:RightAmp:right + amp08 STR ccd04:LeftAmp:left + amp09 STR ccd04:RightAmp:right + amp10 STR ccd05:LeftAmp:left + amp11 STR ccd05:RightAmp:right + amp12 STR ccd06:LeftAmp:left + amp13 STR ccd06:RightAmp:right + amp14 STR ccd07:LeftAmp:left + amp15 STR ccd07:RightAmp:right + amp16 STR ccd08:LeftAmp:left + amp17 STR ccd08:RightAmp:right + amp18 STR ccd09:LeftAmp:left + amp19 STR ccd09:RightAmp:right + amp20 STR ccd10:LeftAmp:left + amp21 STR ccd10:RightAmp:right + amp22 STR ccd11:LeftAmp:left + amp23 STR ccd11:RightAmp:right + amp24 STR ccd12:LeftAmp:left + amp25 STR ccd12:RightAmp:right + amp26 STR ccd13:LeftAmp:left + amp27 STR ccd13:RightAmp:right + amp28 STR ccd14:LeftAmp:left + amp29 STR ccd14:RightAmp:right + amp30 STR ccd15:LeftAmp:left + amp31 STR ccd15:RightAmp:right + amp32 STR ccd16:LeftAmp:left + amp33 STR ccd16:RightAmp:right + amp34 STR ccd17:LeftAmp:left + amp35 STR ccd17:RightAmp:right + amp36 STR ccd18:LeftAmp:left + amp37 STR ccd18:RightAmp:right + amp38 STR ccd19:LeftAmp:left + amp39 STR ccd19:RightAmp:right + amp40 STR ccd20:LeftAmp:left + amp41 STR ccd20:RightAmp:right + amp42 STR ccd21:LeftAmp:left + amp43 STR ccd21:RightAmp:right + amp44 STR ccd22:LeftAmp:left + amp45 STR ccd22:RightAmp:right + amp46 STR ccd23:LeftAmp:left + amp47 STR ccd23:RightAmp:right + amp48 STR ccd24:LeftAmp:left + amp49 STR ccd24:RightAmp:right + amp50 STR ccd25:LeftAmp:left + amp51 STR ccd25:RightAmp:right + amp52 STR ccd26:LeftAmp:left + amp53 STR ccd26:RightAmp:right + amp54 STR ccd27:LeftAmp:left + amp55 STR ccd27:RightAmp:right + amp56 STR ccd28:LeftAmp:left + amp57 STR ccd28:RightAmp:right + amp58 STR ccd29:LeftAmp:left + amp59 STR ccd29:RightAmp:right + amp60 STR ccd30:LeftAmp:left + amp61 STR ccd30:RightAmp:right + amp62 STR ccd31:LeftAmp:left + amp63 STR ccd31:RightAmp:right + amp64 STR ccd32:LeftAmp:left + amp65 STR ccd32:RightAmp:right + amp66 STR ccd33:LeftAmp:left + amp67 STR ccd33:RightAmp:right + amp68 STR ccd34:LeftAmp:left + amp69 STR ccd34:RightAmp:right + amp70 STR ccd35:LeftAmp:left + amp71 STR ccd35:RightAmp:right +END + +# Specify the cell data +CELLS METADATA + left METADATA # Left amplifier + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + CELL.XPARITY S32 1 # We could have specified this as a DEFAULT, but this works + CELL.X0 S32 1 + CELL.Y0 S32 1 + END + right METADATA # Right amplifier + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + CELL.XPARITY S32 -1 # This cell is read out in the opposite direction + CELL.X0 S32 2048 + CELL.Y0 S32 1 + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.NAME STR EXPNUM + FPA.AIRMASS STR AIRMASS + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.FOCUS STR TELFOCUS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + FPA.TEMP STR DETTEM + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.GAIN STR GAIN + CELL.READNOISE STR RDNOISE + CELL.TIME STR MJD-OBS + CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR CFHT + FPA.INSTRUMENT STR MEGACAM + FPA.DETECTOR STR MEGACAM + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 4612 + CELL.XSIZE S32 1024 + CELL.YSIZE S32 4612 + CELL.XWINDOW S32 0 + CELL.YWINDOW S32 0 + CELL.READDIR S32 1 # Cell is read in x direction + CELL.SATURATION F32 50000.0 + CELL.BAD F32 0 + CELL.YPARITY S32 1 + + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + ccd00 S32 0 + ccd01 S32 2048 + ccd02 S32 4096 + ccd03 S32 6144 + ccd04 S32 8192 + ccd05 S32 10240 + ccd06 S32 12288 + ccd07 S32 14336 + ccd08 S32 16384 + ccd09 S32 0 + ccd10 S32 2048 + ccd11 S32 4096 + ccd12 S32 6144 + ccd13 S32 8192 + ccd14 S32 10240 + ccd15 S32 12288 + ccd16 S32 14336 + ccd17 S32 16384 + ccd18 S32 -2048 + ccd19 S32 0 + ccd20 S32 2048 + ccd21 S32 4096 + ccd22 S32 6144 + ccd23 S32 8192 + ccd24 S32 10240 + ccd25 S32 12288 + ccd26 S32 14336 + ccd27 S32 -2048 + ccd28 S32 0 + ccd29 S32 2048 + ccd30 S32 4096 + ccd31 S32 6144 + ccd32 S32 8192 + ccd33 S32 10240 + ccd34 S32 12288 + ccd35 S32 14336 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + ccd00 S32 18447 + ccd01 S32 18447 + ccd02 S32 18447 + ccd03 S32 18447 + ccd04 S32 18447 + ccd05 S32 18447 + ccd06 S32 18447 + ccd07 S32 18447 + ccd08 S32 18447 + ccd09 S32 13835 + ccd10 S32 13835 + ccd11 S32 13835 + ccd12 S32 13835 + ccd13 S32 13835 + ccd14 S32 13835 + ccd15 S32 13835 + ccd16 S32 13835 + ccd17 S32 13835 + ccd18 S32 4612 + ccd19 S32 4612 + ccd20 S32 4612 + ccd21 S32 4612 + ccd22 S32 4612 + ccd23 S32 4612 + ccd24 S32 4612 + ccd25 S32 4612 + ccd26 S32 4612 + ccd27 S32 0 + ccd28 S32 0 + ccd29 S32 0 + ccd30 S32 0 + ccd31 S32 0 + ccd32 S32 0 + ccd33 S32 0 + ccd34 S32 0 + ccd35 S32 0 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + ccd00 S32 -1 + ccd01 S32 -1 + ccd02 S32 -1 + ccd03 S32 -1 + ccd04 S32 -1 + ccd05 S32 -1 + ccd06 S32 -1 + ccd07 S32 -1 + ccd08 S32 -1 + ccd09 S32 -1 + ccd10 S32 -1 + ccd11 S32 -1 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 + ccd15 S32 -1 + ccd16 S32 -1 + ccd17 S32 -1 + ccd18 S32 1 + ccd19 S32 1 + ccd20 S32 1 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 + ccd24 S32 1 + ccd25 S32 1 + ccd26 S32 1 + ccd27 S32 1 + ccd28 S32 1 + ccd29 S32 1 + ccd30 S32 1 + ccd31 S32 1 + ccd32 S32 1 + ccd33 S32 1 + ccd34 S32 1 + ccd35 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + ccd00 S32 -1 + ccd01 S32 -1 + ccd02 S32 -1 + ccd03 S32 -1 + ccd04 S32 -1 + ccd05 S32 -1 + ccd06 S32 -1 + ccd07 S32 -1 + ccd08 S32 -1 + ccd09 S32 -1 + ccd10 S32 -1 + ccd11 S32 -1 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 + ccd15 S32 -1 + ccd16 S32 -1 + ccd17 S32 -1 + ccd18 S32 1 + ccd19 S32 1 + ccd20 S32 1 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 + ccd24 S32 1 + ccd25 S32 1 + ccd26 S32 1 + ccd27 S32 1 + ccd28 S32 1 + ccd29 S32 1 + ccd30 S32 1 + ccd31 S32 1 + ccd32 S32 1 + ccd33 S32 1 + ccd34 S32 1 + ccd35 S32 1 + END +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# FPA.BIAS METADATA +# TABLE STR Camera +# COLUMN STR gain +# chipId STR {CHIP.NAME} +# cellId STR {CELL.NAME} +# time STR {CELL.TIME} +# END +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD + CELL.X0 STR FORTRAN + CELL.Y0 STR FORTRAN +END Index: /branches/pap_branch_070920/ippconfig/megacam/format_split.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/format_split.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/format_split.config (revision 14957) @@ -0,0 +1,316 @@ +# The split MecaCam data is stored as single files for each chip, each a simple fits image + +# How to recognise this type +RULE METADATA + TELESCOP STR CFHT 3.6m + DETECTOR STR MegaCam + NAXIS S32 2 +END + +FILE METADATA + # How to read this data + PHU STR CHIP # The FITS file represents an entire FPA + EXTENSIONS STR NONE # The extensions represent chips + FPA.NAME STR EXPNUM # A PHU keyword for unique identifier + CHIP.NAME STR EXTNAME # An extension keyword for unique identifier + CONTENT STR {CHIP.NAME} # Key to the CONTENTS menu +END + +# What's in the FITS file? +CONTENTS METADATA + # Content name, chipType + ccd00 STR CCD42-90 + ccd01 STR CCD42-90 + ccd02 STR CCD42-90 + ccd03 STR CCD42-90 + ccd04 STR CCD42-90 + ccd05 STR CCD42-90 + ccd06 STR CCD42-90 + ccd07 STR CCD42-90 + ccd08 STR CCD42-90 + ccd09 STR CCD42-90 + ccd10 STR CCD42-90 + ccd11 STR CCD42-90 + ccd12 STR CCD42-90 + ccd13 STR CCD42-90 + ccd14 STR CCD42-90 + ccd15 STR CCD42-90 + ccd16 STR CCD42-90 + ccd17 STR CCD42-90 + ccd18 STR CCD42-90 + ccd19 STR CCD42-90 + ccd20 STR CCD42-90 + ccd21 STR CCD42-90 + ccd22 STR CCD42-90 + ccd23 STR CCD42-90 + ccd24 STR CCD42-90 + ccd25 STR CCD42-90 + ccd26 STR CCD42-90 + ccd27 STR CCD42-90 + ccd28 STR CCD42-90 + ccd29 STR CCD42-90 + ccd30 STR CCD42-90 + ccd31 STR CCD42-90 + ccd32 STR CCD42-90 + ccd33 STR CCD42-90 + ccd34 STR CCD42-90 + ccd35 STR CCD42-90 +END + +# Specify the chips +CHIPS METADATA + # Chip type, cellName:cellType + CCD42-90 STR LeftAmp:left RightAmp:right +END + + +# Specify the cells +CELLS METADATA + # Cell type, concepts for this type + left METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECA + CELL.TRIMSEC STR TSECA + CELL.X0 S32 0 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINA + END + + right METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BSECB + CELL.TRIMSEC STR TSECB + CELL.X0 S32 1024 + CELL.GAIN.SOURCE STR HEADER + CELL.GAIN STR GAINB + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.NAME STR EXPNUM + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.FILTERID STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBJECT + FPA.FOCUS STR TELFOCUS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + FPA.TEMP STR DETTEM + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.READNOISE STR RDNOISE + CELL.TIME STR MJD-OBS + CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TELESCOPE STR CFHT + FPA.INSTRUMENT STR MEGACAM + FPA.DETECTOR STR MEGACAM + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 4612 + CELL.XSIZE S32 1024 + CELL.YSIZE S32 4612 + CELL.XWINDOW S32 0 + CELL.YWINDOW S32 0 + CELL.SATURATION S32 60000 + CELL.READDIR S32 1 # Cell is read in x direction + CELL.SATURATION F32 50000.0 + CELL.BAD F32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.Y0 S32 0 + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + ccd00 S32 0 + ccd01 S32 2048 + ccd02 S32 4096 + ccd03 S32 6144 + ccd04 S32 8192 + ccd05 S32 10240 + ccd06 S32 12288 + ccd07 S32 14336 + ccd08 S32 16384 + ccd09 S32 0 + ccd10 S32 2048 + ccd11 S32 4096 + ccd12 S32 6144 + ccd13 S32 8192 + ccd14 S32 10240 + ccd15 S32 12288 + ccd16 S32 14336 + ccd17 S32 16384 + ccd18 S32 -2048 + ccd19 S32 0 + ccd20 S32 2048 + ccd21 S32 4096 + ccd22 S32 6144 + ccd23 S32 8192 + ccd24 S32 10240 + ccd25 S32 12288 + ccd26 S32 14336 + ccd27 S32 -2048 + ccd28 S32 0 + ccd29 S32 2048 + ccd30 S32 4096 + ccd31 S32 6144 + ccd32 S32 8192 + ccd33 S32 10240 + ccd34 S32 12288 + ccd35 S32 14336 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + ccd00 S32 18447 + ccd01 S32 18447 + ccd02 S32 18447 + ccd03 S32 18447 + ccd04 S32 18447 + ccd05 S32 18447 + ccd06 S32 18447 + ccd07 S32 18447 + ccd08 S32 18447 + ccd09 S32 13835 + ccd10 S32 13835 + ccd11 S32 13835 + ccd12 S32 13835 + ccd13 S32 13835 + ccd14 S32 13835 + ccd15 S32 13835 + ccd16 S32 13835 + ccd17 S32 13835 + ccd18 S32 4612 + ccd19 S32 4612 + ccd20 S32 4612 + ccd21 S32 4612 + ccd22 S32 4612 + ccd23 S32 4612 + ccd24 S32 4612 + ccd25 S32 4612 + ccd26 S32 4612 + ccd27 S32 0 + ccd28 S32 0 + ccd29 S32 0 + ccd30 S32 0 + ccd31 S32 0 + ccd32 S32 0 + ccd33 S32 0 + ccd34 S32 0 + ccd35 S32 0 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + ccd00 S32 -1 + ccd01 S32 -1 + ccd02 S32 -1 + ccd03 S32 -1 + ccd04 S32 -1 + ccd05 S32 -1 + ccd06 S32 -1 + ccd07 S32 -1 + ccd08 S32 -1 + ccd09 S32 -1 + ccd10 S32 -1 + ccd11 S32 -1 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 + ccd15 S32 -1 + ccd16 S32 -1 + ccd17 S32 -1 + ccd18 S32 1 + ccd19 S32 1 + ccd20 S32 1 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 + ccd24 S32 1 + ccd25 S32 1 + ccd26 S32 1 + ccd27 S32 1 + ccd28 S32 1 + ccd29 S32 1 + ccd30 S32 1 + ccd31 S32 1 + ccd32 S32 1 + ccd33 S32 1 + ccd34 S32 1 + ccd35 S32 1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + ccd00 S32 -1 + ccd01 S32 -1 + ccd02 S32 -1 + ccd03 S32 -1 + ccd04 S32 -1 + ccd05 S32 -1 + ccd06 S32 -1 + ccd07 S32 -1 + ccd08 S32 -1 + ccd09 S32 -1 + ccd10 S32 -1 + ccd11 S32 -1 + ccd12 S32 -1 + ccd13 S32 -1 + ccd14 S32 -1 + ccd15 S32 -1 + ccd16 S32 -1 + ccd17 S32 -1 + ccd18 S32 1 + ccd19 S32 1 + ccd20 S32 1 + ccd21 S32 1 + ccd22 S32 1 + ccd23 S32 1 + ccd24 S32 1 + ccd25 S32 1 + ccd26 S32 1 + ccd27 S32 1 + ccd28 S32 1 + ccd29 S32 1 + ccd30 S32 1 + ccd31 S32 1 + ccd32 S32 1 + ccd33 S32 1 + ccd34 S32 1 + ccd35 S32 1 + END +END + + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + Index: /branches/pap_branch_070920/ippconfig/megacam/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/ppImage.config (revision 14957) @@ -0,0 +1,60 @@ +### ppImage recipe configuration file for Megacam + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +OVERSCAN.FIT STR NONE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 0 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# for a test, turn off selected detrend types +OVERSCAN BOOL FALSE # Overscan subtraction +BIAS BOOL FALSE # Bias subtraction +DARK BOOL TRUE # Dark subtraction +FLAT BOOL TRUE # Flat-field normalisation + +# binned output image options +BIN1.XBIN S32 18 +BIN1.YBIN S32 18 +BIN2.XBIN S32 144 +BIN2.YBIN S32 144 + +# megacam needs fringe subtraction +FRINGE BOOL TRUE # Fringe subtraction + +# this table lists extra constraints which should be applied when +# selecting the detrend images. +# note: camera and time are always applied + +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA +# EXPTIME STR FPA.EXPOSURE + END + FLAT METADATA + FILTER STR FPA.FILTERID +# DETTYPE STR DOMEFLAT.RAW +# VERSION STR SKYFLAT.RAW +# VERSION STR DOMEFLAT.CORR.XX +# VERSION STR SKYFLAT.CORR + END + FLAT_CORRECTION METADATA + FILTER STR FPA.FILTER + END + FRINGE METADATA + FILTER STR FPA.FILTER +# AIRMASS STR FPA.AIRMASS +# TWILIGHT STR FPA.TWILIGHT + END + SHUTTER METADATA + END + MASK METADATA + END +END + +# only apply the fringe for these filters +FRINGE.FILTERS MULTI +FRINGE.FILTERS STR i +FRINGE.FILTERS STR z + +PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/megacam/ppMerge.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/ppMerge.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/ppMerge.config (revision 14957) @@ -0,0 +1,44 @@ + +# Bias combination --- don't want min/max rejection +PPMERGE_BIAS METADATA + REJ F32 3.0 # Rejection threshold (sigma) + ITER S32 2 # Number of rejection iterations + FRACHIGH F32 0.0 # Fraction of high pixels to reject immediately + FRACLOW F32 0.0 # Fraction of low pixels to reject immediately + WEIGHTS BOOL FALSE # Use image weights? + COMBINE STR CLIPPED # Statistic to use for combination: +END + +# Dark combination --- don't want min/max rejection +# More aggressive clipping than bias, so as to remove CRs +PPMERGE_DARK METADATA + REJ F32 2.0 # Rejection threshold (sigma) + ITER S32 4 # Number of rejection iterations + FRACHIGH F32 0.0 # Fraction of high pixels to reject immediately + FRACLOW F32 0.0 # Fraction of low pixels to reject immediately + WEIGHTS BOOL FALSE # Use image weights? + COMBINE STR CLIPPED # Statistic to use for combination: +END + +# Flat combination --- use min/max rejection +PPMERGE_FLAT METADATA + REJ F32 3.0 # Rejection threshold (sigma) + ITER S32 1 # Number of rejection iterations + FRACHIGH F32 0.3 # Fraction of high pixels to reject immediately + FRACLOW F32 0.1 # Fraction of low pixels to reject immediately + NKEEP S32 5 # Minimum number of pixels in stack to keep + MASKVAL S32 0xff # Mask value for input data + WEIGHTS BOOL TRUE # Use image weights? + COMBINE STR MEAN # Statistic to use for combination: +END + + +# Fringe combination --- already included in default, above +PPMERGE_FRINGE METADATA + FRACHIGH F32 0.1 # Fraction of high pixels to reject immediately + WEIGHTS BOOL TRUE # Use image weights? +END + +# Mask generation --- already included in default, above +PPMERGE_MASK METADATA +END Index: /branches/pap_branch_070920/ippconfig/megacam/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/psastro.config (revision 14957) @@ -0,0 +1,35 @@ + +# astrometry matching parameters + +# nominal plate scale (microns / pixel) +PSASTRO.PIXEL.SCALE F32 1.0 + +# pmAstromGridAngle +# max grid offset in FP units (microns) +# use plate-scale to make this in pixels? +PSASTRO.GRID.OFFSET F32 200. +PSASTRO.GRID.SCALE F32 15. + +# XXX Test for taurus +PSASTRO.GRID.MIN.SIGMA F32 3.0 + +# these tweak are in FP units (pixels, currently) +PSASTRO.TWEAK.SCALE F32 1 +PSASTRO.TWEAK.RANGE F32 75 +PSASTRO.TWEAK.SMOOTH F32 2 +PSASTRO.TWEAK.NSIGMA F32 3 + +DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass + +# Mosaic Astrometry options +PSASTRO.MOSAIC.MODE BOOL TRUE +PSASTRO.MOSAIC.MAX.ERROR.N0 F32 0.50 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.MAX.ERROR.N1 F32 0.10 # max allow error for valid solution (arcsec) +PSASTRO.MOSAIC.RADIUS.N1 F32 3 +PSASTRO.MOSAIC.RADIUS.N2 F32 1 + +# DVO.GETSTAR STR /home/kiawe/eugene/psconfig/dev.lin64/bin/getstar + +# we need to allow a loose fit if we are fitting to 2mass (50mas internal error -> 100mas limit?) +# if we are fitting against quality digital data, we can require tighter constraints + Index: /branches/pap_branch_070920/ippconfig/megacam/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/psphot.config (revision 14957) @@ -0,0 +1,36 @@ + +# turn these on to see specific outputs +SAVE.OUTPUT BOOL TRUE +SAVE.BACKMDL BOOL TRUE +#SAVE.RESID BOOL TRUE +#SAVE.BACKGND BOOL TRUE +#SAVE.BACKSUB BOOL TRUE +SAVE.PSF BOOL TRUE +#LOAD.PSF BOOL FALSE +SAVE.PLOTS BOOL TRUE + +BACKGROUND.XBIN S32 128 # size of background superpixels +BACKGROUND.YBIN S32 128 # size of background superpixels + +# image background parameters +IMSTATS_NPIX S32 10000 # number of pixels to use for sky estimate boxes: +SKY_STAT STR FITTED_MEAN_V4 # statistic used to measure background +SKY_CLIP_SIGMA F32 2.0 # statistic used to measure background + +PSF_SN_LIM F32 100 # minimum S/N for stars used for PSF model +PSF_MAX_NSTARS S32 300 # limit number of stars used for PSF model + +# PSF model parameters : choose the PSF model desired +PSF_MODEL STR PS_MODEL_QGAUSS + +MOMENTS_SN_MIN F32 30.0 +EXT_MIN_SN F32 50.0 # fit galaxies above this S/N limit +FULL_FIT_SN_LIM F32 50.0 +AP_MIN_SN F32 50.0 + +# OUTPUT.FORMAT STR SMPDATA +OUTPUT.FORMAT STR PS1_DEV_0 + +PSF_SHAPE_NSIGMA F32 3.0 # max significance for shape variation +PSF_MAX_CHI F32 50.0 # reject objects worse that this + Index: /branches/pap_branch_070920/ippconfig/megacam/rejections.config =================================================================== --- /branches/pap_branch_070920/ippconfig/megacam/rejections.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/megacam/rejections.config (revision 14957) @@ -0,0 +1,38 @@ + +BIAS METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 2.0 + IMFILE.STDEV F32 10.0 + IMFILE.MEANSTDEV F32 0.5 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.5 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 1.0 + EXP.STDEV F32 10.0 + EXP.MEANSTDEV F32 0.5 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + +# FILTER is an additional qualifier, and may be "*" (or absent!), in which case it matches everything +# EXPECTED is the expected mean value +# IMFILE.MEAN is the maximum permitted mean value for an imfile, relative to the standard deviation +# IMFILE.STDEV is the maximum permitted standard deviation for an imfile +# EXP.MEAN is the maximum permitted mean value for an exposure, relative to the standard deviation +# EXP.STDEV is the maximum permitted standard deviation for an exposure +# EXP.MEANSTDEV is the maximum permitted mean standard deviation for an exposure relative to the mean +# ENSEMBLE.MEAN is the maximum permitted mean for an ensemble of exposures +# ENSEMBLE.STDEV is the maximum permitted standard deviation for an ensemble of exposures +# ENSEMBLE.MEANSTDEV is the maximum permitted mean standard deviation for an ensemble of exposures +# IMFILE.SNR is the minimum permitted signal-to-noise for an imfile +# EXP.SNR is the minimum permitted signal-to-noise for an exposure +# These values (all except FILTER) may be zero, in which case no clipping is applied. Index: /branches/pap_branch_070920/ippconfig/notes.txt =================================================================== --- /branches/pap_branch_070920/ippconfig/notes.txt (revision 14957) +++ /branches/pap_branch_070920/ippconfig/notes.txt (revision 14957) @@ -0,0 +1,16 @@ + +creating a new camera: + +* add the camera to the CAMERAS list (ipp/ippconfig/ipprc.config) +* create the camera directory (ipp/ippconfig/CAMERA) +* copy example recipe files from a similar camera (eg, ipp/ippconfig/megacam) +* copy Makefile.am from a similar camera (eg, ipp/ippconfig/megacam) +* edit camera.config to describe your camera + - list the ccds and chips in FPA METADATA + - list the filters of interest (header name STR internal name) + give all varients used in the headers + - fix paths which refer to the original paths. +* edit the format*.config files to match your camera: + - set up a rule to recognize the camera + - define keywords which will uniquely recognize your headers + Index: /branches/pap_branch_070920/ippconfig/recipes/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/recipes/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/Makefile.am (revision 14957) @@ -0,0 +1,24 @@ + +installdir = $(datadir)/ippconfig/recipes + +install_files = \ + masks.config \ + rejections.config \ + ppImage.config \ + ppMerge.config \ + ppStack.config \ + ppStats.config \ + psastro.config \ + psphot.config \ + pswarp.config \ + ppSim.config \ + ppSub.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/recipes/masks.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/masks.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/masks.config (revision 14957) @@ -0,0 +1,10 @@ +### Recipe specifying values for various mask concepts +BLANK U8 0x01 # The pixel is blank or has no (valid) data +FLAT U8 0x02 # The pixel is non-positive in the flat-field +DETECTOR U8 0x02 # The detector pixel is bad (e.g., bad column, charge trap) +SAT U8 0x04 # The pixel is saturated in the image of interest +BAD U8 0x04 # The pixel is low in the image of interest +RANGE U8 0x04 # The pixel is out of range in the image of interest +CR U8 0x08 # The pixel is probably a CR +SUSPECT U8 0x40 # The pixel is suspected of being bad, but may not be +MARK U8 0x80 # The pixel is marked as temporarily ignored Index: /branches/pap_branch_070920/ippconfig/recipes/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/ppImage.config (revision 14957) @@ -0,0 +1,1018 @@ +### ppImage recipe configuration file +### Here we have turned on our 'best guess' defaults for a simple camera +### Camera-specific options may be turned on by recipes in the camera configuration + +# List of tasks to perform +NONLIN BOOL FALSE # Non-linearity correction; not implemented +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction +DARK BOOL TRUE # Dark subtraction +SHUTTER BOOL FALSE # Shutter correction +FLAT BOOL TRUE # Flat-field normalisation +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE STR SAT,BAD # Mask pixels with these attributes +MASK.BUILD BOOL FALSE # Build internal mask image +WEIGHT.BUILD BOOL FALSE # Build internal weight image +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE # Astrometry per chip? +ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + +# output data formats to save +BASE.FITS BOOL FALSE # Save base detrended image? +BASE.MASK.FITS BOOL FALSE # Save base detrended image? +BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? +CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? +CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? +CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL FALSE # Save 1st binned chip image? +BIN2.FITS BOOL FALSE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +NONLIN.DATA STR nonlin.dat # Filename for lookup table + +# examples of other possible non-linearity correction representations +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL TRUE # Reduce overscan to a single value? +OVERSCAN.FIT STR NONE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN +OVERSCAN.BOXCAR S32 0 # Boxcar smoothing radius +OVERSCAN.GAUSS F32 0.0 # Gaussian smoothing sigma +OVERSCAN.CONSTANT BOOL FALSE # Apply a known, fixed value? +OVERSCAN.VALUE F32 0.0 # value to apply, if requested + +# Fringe subtraction options +FRINGE.ITER S32 10 # Number of rejection iterations for fringe solution +FRINGE.REJ F32 2.0 # Rejection threshold for fringe solution +FRINGE.KEEP F32 0.5 # Minimum fraction to keep in fringe solution + +# binned output image options +BIN1.XBIN S32 4 +BIN1.YBIN S32 4 +BIN2.XBIN S32 16 +BIN2.YBIN S32 16 + +PPIMAGE.JPEG1 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +10.0 +END + +PPIMAGE.JPEG2 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN STR -5.0 + SCALE.MAX STR +10.0 +END + +PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID}.{CHIP.N} + +FRINGE.FILTERS MULTI +FRINGE.FILTERS STR UNDEF + +DETREND.CONSTRAINTS METADATA +END + +################################################################################ +# Diffferent processing options, which may be loaded symbolically +################################################################################ + +# No operation except potential normalisation +PPIMAGE_N METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan subtraction only +PPIMAGE_O METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Bias subtraction only +PPIMAGE_B METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Dark subtraction only +PPIMAGE_D METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Shutter correction only +PPIMAGE_S METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Flat-fielding only +PPIMAGE_F METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Fringe correction only +PPIMAGE_R METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Photometry only +PPIMAGE_P METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Photometry & Astrometry +PPIMAGE_A METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astromtery per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias +PPIMAGE_OB METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark +PPIMAGE_OBD METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter +PPIMAGE_OBDS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field +PPIMAGE_OBDSF METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFR METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_DET_ONLY METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL TRUE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Save JPEG from BIN1 +PPIMAGE_JPEG METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? +END + +# Save JPEG from BIN1 +PPIMAGE_J1 METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned +END + +# Save JPEG from BIN2 +PPIMAGE_J2 METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned +END + +# Overscan, bias, photometry, astrometry (for, eg, summit ISP analysis) +PPIMAGE_OA METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, photometry (for quick analysis) +PPIMAGE_OP METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Photometry and astrometry only (for pre-reduced data) +PPIMAGE_PA METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# JPEG images for different types of residual images +# Save JPEG from BIN1 for bias +PPIMAGE_J1_RESID_B METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG1 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR VALUE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +5.0 + END +END + +# Save JPEG from BIN2 for bias +PPIMAGE_J2_RESID_B METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG2 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR VALUE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +5.0 + END +END + +# Save JPEG from BIN1 for flat +PPIMAGE_J1_RESID_F METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG1 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR FRACTION + SCALE.MIN F32 0.95 + SCALE.MAX F32 1.05 + END +END + +# Save JPEG from BIN2 for flat +PPIMAGE_J2_RESID_F METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG2 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR FRACTION + SCALE.MIN F32 0.95 + SCALE.MAX F32 1.05 + END +END + +# Save JPEG from BIN1 for flat +PPIMAGE_J1_RESID_R METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG1 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -2.0 + SCALE.MAX F32 +3.0 + END +END + +# Save JPEG from BIN2 for flat +PPIMAGE_J2_RESID_R METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG2 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -2.0 + SCALE.MAX F32 +3.0 + END +END + +# JPEG images for different types of positive images +# Save JPEG from BIN1 for bias +PPIMAGE_J1_IMAGE_B METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG1 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +5.0 + END +END + +# Save JPEG from BIN2 for bias +PPIMAGE_J2_IMAGE_B METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG2 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +5.0 + END +END + +# Save JPEG from BIN1 for flat +PPIMAGE_J1_IMAGE_F METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG1 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +5.0 + END +END + +# Save JPEG from BIN2 for flat +PPIMAGE_J2_IMAGE_F METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG2 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -5.0 + SCALE.MAX F32 +5.0 + END +END + +# Save JPEG from BIN1 for flat +PPIMAGE_J1_IMAGE_R METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG1 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -2.0 + SCALE.MAX F32 +3.0 + END +END + +# Save JPEG from BIN2 for flat +PPIMAGE_J2_IMAGE_R METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned + + PPIMAGE.JPEG2 METADATA + COLORMAP STR -greyscale + SCALE.MODE STR RANGE + SCALE.MIN F32 -2.0 + SCALE.MAX F32 +3.0 + END +END + Index: /branches/pap_branch_070920/ippconfig/recipes/ppMerge.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/ppMerge.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/ppMerge.config (revision 14957) @@ -0,0 +1,73 @@ +# Recipe configuration for ppMerge + +ROWS S32 512 # Number of rows to read at once +ELECTRONS F32 100.0 # Minimum number of electrons for useful signal +SAMPLE S32 100 # Sampling factor for measuring the background +REJ F32 3.0 # Rejection threshold (sigma) +ITER S32 1 # Number of rejection iterations +FRACHIGH F32 0.0 # Fraction of high pixels to reject immediately +FRACLOW F32 0.0 # Fraction of low pixels to reject immediately +NKEEP S32 5 # Minimum number of pixels in stack to keep +WEIGHTS BOOL FALSE # Use image weights in combination? +FRINGE.NUM S32 10000 # Number of fringe regions +FRINGE.SIZE S32 5 # Half-size of fringe regions +FRINGE.XSMOOTH S32 5 # Number of smoothing regions in x +FRINGE.YSMOOTH S32 11 # Number of smoothing regions in y +SHUTTER.SIZE S32 128 # Size for shutter measurement regions +SHUTTER.ITER S32 1 # Number of iterations for shutter measurement +SHUTTER.REJECT F32 2 # Rejection limit for shutter measurement +MASK.SUSPECT F32 5.0 # Threshold for suspect pixels (sigma) +MASK.BAD F32 -4.0 # Threshold for bad pixels (sigma) +MASKVAL STR SAT,BAD # Mask value for input data +COMBINE STR CLIPPED # Statistic to use for combination +MEAN STR ROBUST_MEDIAN # Statistic to use to measure the mean +STDEV STR ROBUST_STDEV # Statistic to use to measure the stdev + + +# Bias combination --- don't want min/max rejection +PPMERGE_BIAS METADATA + REJ F32 3.0 # Rejection threshold (sigma) + ITER S32 2 # Number of rejection iterations + FRACHIGH F32 0.0 # Fraction of high pixels to reject immediately + FRACLOW F32 0.0 # Fraction of low pixels to reject immediately + WEIGHTS BOOL FALSE # Use image weights? + COMBINE STR CLIPPED # Statistic to use for combination: +END + + +# Dark combination --- don't want min/max rejection +# More aggressive clipping than bias, so as to remove CRs +PPMERGE_DARK METADATA + REJ F32 2.0 # Rejection threshold (sigma) + ITER S32 4 # Number of rejection iterations + FRACHIGH F32 0.0 # Fraction of high pixels to reject immediately + FRACLOW F32 0.0 # Fraction of low pixels to reject immediately + WEIGHTS BOOL FALSE # Use image weights? + COMBINE STR CLIPPED # Statistic to use for combination: +END + +# Flat combination --- use min/max rejection +PPMERGE_FLAT METADATA + REJ F32 3.0 # Rejection threshold (sigma) + ITER S32 1 # Number of rejection iterations + FRACHIGH F32 0.3 # Fraction of high pixels to reject immediately + FRACLOW F32 0.1 # Fraction of low pixels to reject immediately + NKEEP S32 5 # Minimum number of pixels in stack to keep + WEIGHTS BOOL TRUE # Use image weights? + COMBINE STR MEAN # Statistic to use for combination: +END + + +# Fringe combination --- already included in default, above +PPMERGE_FRINGE METADATA + FRACHIGH F32 0.1 # Fraction of high pixels to reject immediately + WEIGHTS BOOL TRUE # Use image weights? +END + +# Mask generation --- already included in default, above +PPMERGE_MASK METADATA +END + +# Shutter generation --- already included in default, above +PPMERGE_SHUTTER METADATA +END Index: /branches/pap_branch_070920/ippconfig/recipes/ppSim.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/ppSim.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/ppSim.config (revision 14957) @@ -0,0 +1,45 @@ +### Recipe values for ppSim, the Pan-STARRS data simulator + +BIAS.LEVEL F32 1000.0 # Bias level (e) +BIAS.RANGE F32 20.0 # Range of bias values (e) +BIAS.ORDER S32 7 # Order for overscan polynomial +DARK.RATE F32 5.0 # Dark current (e/s) +FLAT.SIGMA F32 3.0 # Flat gaussian width (FPA sizes) +FLAT.RATE F32 2000.0 # Flat illumination rate (e/s) +SHUTTER.TIME F32 1.0 # Time for shutter to fully open +SKY.RATE F32 10.0 # Sky illumination rate (e/s) + +STARS.REAL BOOL TRUE # Add stars from a catalogue? + +STARS.FAKE BOOL TRUE # Add fake stars, randomly distributed? +STARS.LUM F32 -1.5 # Stellar luminosity function slope +STARS.MAG F32 15.5 # Brightest magnitude for fake stars +STARS.DENSITY F32 1.0 # Stellar density (per square degree) at the brightest magnitude + +GALAXY.FAKE BOOL FALSE # Generate fake galaxies? + +GALAXY.LUM F32 -0.8 # Stellar luminosity function slope +GALAXY.MAG F32 11.0 # Brightest magnitude for fake stars +GALAXY.DENSITY F32 6.0 # Galaxy density (per square degree) at the brightest magnitude + +GALAXY.RMAJOR.MAX F32 10.0 # Maximum semi-major axis for galaxy models +GALAXY.RMAJOR.MIN F32 2.0 # Minimum semi-major axis for galaxy models + +GALAXY.ARATIO.MAX F32 0.2 # Maximum axis ratio for galaxy models +GALAXY.ARATIO.MIN F32 1.0 # Minimum axis ratio for galaxy models + +GALAXY.INDEX.MIN F32 0.25 # Maximum Sersic index for galaxy models +GALAXY.INDEX.MAX F32 0.500 # Minimum Sersic index for galaxy models + +GALAXY.THETA.MIN F32 0.0 # Maximum position angle for galaxy models +GALAXY.THETA.MAX F32 3.14 # Minimum position angle for galaxy models + +GALAXY.GRID BOOL FALSE # Generate a (regular) grid of galaxy models? +GALAXY.GRID.DX S32 200 # Spacing between galaxies in grid in x +GALAXY.GRID.DY S32 200 # Spacing between galaxies in grid in y + +### The following options are used if not defined by the concepts (e.g., usually read from headers) +GAIN F32 1.0 # Default gain (e/ADU) +READNOISE F32 10.0 # Default read noise (e) +OVERSCAN.SIZE S32 32 # Default overscan columns +SATURATION F32 65535 # Default saturation level (ADU) Index: /branches/pap_branch_070920/ippconfig/recipes/ppStack.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/ppStack.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/ppStack.config (revision 14957) @@ -0,0 +1,9 @@ +# Recipe configuration for ppStack (image combination) + +ITER S32 1 # Number of rejection iterations +COMBINE.REJ F32 5.0 # Rejection threshold in combination (sigma) +CONVOLVE.REJ F32 10.0 # Rejection threshold in convolution (sigma) +EXTENT F32 3.0 # Extent of Gaussian convolution (sigma) +MASK.BAD STR BLANK,SAT,BAD # Mask value of bad pixels +MASK.BLANK STR BLANK # Mask value to give blank pixels +THRESHOLD.MASK F32 0.8 # Threshold for mask deconvolution (0..1) Index: /branches/pap_branch_070920/ippconfig/recipes/ppStats.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/ppStats.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/ppStats.config (revision 14957) @@ -0,0 +1,92 @@ +### Default ppStats recipe + +# Options governing statistics +SAMPLE F32 0.1 # Fraction of cell to sample +MASKVAL STR SAT,BAD # Mask value to use for statistics + +# Define the outputs as MULTI +HEADER MULTI +CONCEPT MULTI +STAT MULTI +SUMMARY MULTI + +# Add dummy values, to define the MULTI --- due to limitations in the MDC language +HEADER STR _UNDEF +CONCEPT STR _UNDEF +STAT STR _UNDEF +SUMMARY STR _UNDEF +ANALYSIS STR _UNDEF + +# basic stats for output images +CHIPSTATS METADATA + STAT MULTI + STAT STR ROBUST_MEDIAN + STAT STR ROBUST_STDEV # Background statistics estimators + + HEADER MULTI + HEADER STR OVER_VAL + HEADER STR FWHM_X # major axis FWHM (in pixels) + HEADER STR FWHM_Y # minor axis FWHM (in pixels) + HEADER STR APMIFIT + HEADER STR DAPMIFIT + HEADER STR CERROR + HEADER STR NSTARS + HEADER STR NASTRO + + ANALYSIS MULTI # metadata blocks to search in chip/cell/readout->analysis + ANALYSIS STR PSPHOT.HEADER + ANALYSIS STR PSASTRO.HEADER +END + +# basic stats for residual images +RESIDUAL METADATA + STAT MULTI + STAT STR ROBUST_MEDIAN + STAT STR ROBUST_STDEV # Background statistics estimators + STAT STR SAMPLE_SKEWNESS + STAT STR SAMPLE_KURTOSIS + HEADER MULTI + HEADER STR FRNG_00 # fringe amplitude, if measured + HEADER STR FRNG_00D # fringe error, if measured + HEADER STR FRNG_01 # fringe amplitude, if measured + HEADER STR FRNG_01D # fringe error, if measured + HEADER STR FRNG_02 # fringe amplitude, if measured + HEADER STR FRNG_02D # fringe error, if measured +END + +### ppStats recipe for Phase 0 +INJECT METADATA + CONCEPT MULTI +END + +### ppStats recipe for Phase 0 +REGISTER METADATA + CONCEPT MULTI + STAT MULTI + SUMMARY MULTI + + CONCEPT STR FPA.OBJECT # Object name + CONCEPT STR FPA.OBSTYPE # Observation type + CONCEPT STR FPA.FILTER # Filter + CONCEPT STR FPA.RA FPA.DEC # Telescope pointing + CONCEPT STR FPA.AIRMASS # Airmass + CONCEPT STR FPA.ALT FPA.AZ # Telescopy alt/az + CONCEPT STR FPA.POSANGLE # Rotator angle + CONCEPT STR FPA.TIME # Time of exposure + CONCEPT STR FPA.TELESCOPE # Telescope (eg, CFHT) + CONCEPT STR FPA.INSTRUMENT # Instrument (eg, CFH12K) + CONCEPT STR CHIP.TEMP # Detector temperature + CONCEPT STR CELL.EXPOSURE # Exposure time + STAT STR ROBUST_MEDIAN # Background estimator + STAT STR ROBUST_STDEV # Background standard deviation estimator + SUMMARY STR SAT_PIXEL_NUM + SUMMARY STR SAT_PIXEL_FRAC +END + + +# basic stats for warped images +WARPSTATS METADATA + STAT MULTI + STAT STR ROBUST_MEDIAN + STAT STR ROBUST_STDEV # Background statistics estimators +END Index: /branches/pap_branch_070920/ippconfig/recipes/ppSub.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/ppSub.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/ppSub.config (revision 14957) @@ -0,0 +1,30 @@ +### Recipe file for ppSub + +KERNEL.TYPE STR ISIS # Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS) +KERNEL.SIZE S32 20 # Kernel half-size (pixels) +SPATIAL.ORDER S32 2 # Spatial polynomial order +REGION.SIZE F32 0 # Iso-kernel region size (pixels) +STAMP.SPACING F32 400 # Typical spacing between stamps (pixels) +STAMP.FOOTPRINT S32 20 # Size of stamps (pixels) +STAMP.THRESHOLD F32 0 # Flux threshold for stamps (ADU) +ITER S32 10 # Number of rejection iterations +REJ F32 1.5 # Rejection level (std dev) +MASK.BAD STR BLANK,BAD,SAT # Mask value for bad pixels +MASK.BLANK STR BLANK # Mask value to give blank pixels +@ISIS.WIDTHS F32 1 3 5 # Gaussian FWHMs for ISIS kernels +@ISIS.ORDERS S32 2 2 2 # Polynomial orders for ISIS kernels +SPAM.BINNING S32 2 # Binning in outer region for SPAM kernels +INNER S32 5 # Inner half-size for SPAM and FRIES kernels +RINGS.ORDER S32 2 # Polynomial order for RINGS kernels + +OPTIMUM BOOL FALSE # Derive optimum parameters for ISIS and GUNK kernels +OPTIMUM.MIN F32 1.0 # Minimum width for optimum FWHM search +OPTIMUM.MAX F32 20 # Maximum width for optimum FWHM search +OPTIMUM.STEP F32 0.5 # Step in width for optimum FWHM search +OPTIMUM.TOL F32 3.0e-3 # Maximum difference in chi^2 between iterations to settle for +OPTIMUM.ORDER S32 2 # Maximum polynomial order for optimum search + +### Modifications to use when stacking data +STACK METADATA + KERNEL.TYPE STR RINGS # Kernel type to use (POIS|ISIS|SPAM|FRIES|GUNK|RINGS) +END Index: /branches/pap_branch_070920/ippconfig/recipes/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/psastro.config (revision 14957) @@ -0,0 +1,67 @@ + +# perform single-chip astrometry? +PSASTRO.CHIP.MODE BOOL TRUE + +# nominal plate scale (microns / pixel) +PSASTRO.PIXEL.SCALE F32 13.5 + +# pmAstromGridMatch: +PSASTRO.GRID.SEARCH BOOL TRUE +PSASTRO.GRID.MIN.ANGLE F32 -2.0 # start angle (degrees) +PSASTRO.GRID.MAX.ANGLE F32 +2.0 +PSASTRO.GRID.DEL.ANGLE F32 0.5 +PSASTRO.GRID.MIN.SIGMA F32 5.0 + +# pmAstromGridAngle +# max grid offset in FP units (microns) +# use plate-scale to make this in pixels? +PSASTRO.GRID.OFFSET F32 10000. +PSASTRO.GRID.SCALE F32 500. + +# these tweak are in FP units (pixels, currently) +PSASTRO.TWEAK.SCALE F32 1 +PSASTRO.TWEAK.RANGE F32 75 +PSASTRO.TWEAK.SMOOTH F32 2 +PSASTRO.TWEAK.NSIGMA F32 3 + +# single-chip radius match in pixels +PSASTRO.MATCH.RADIUS F32 8 + +# pmAstromMatchFit +PSASTRO.CHIP.ORDER S32 1 # fit order +PSASTRO.CHIP.NITER S32 3 # fit clipping iterations +PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas + +PSASTRO.MAX.ERROR F32 1.5 # max allow error for valid solution (UNITS?) +PSASTRO.MIN.NSTAR S32 3 # min fitted stars in solution +PSASTRO.MAX.NSTAR S32 300 # max stars accepted for fitting + +PSASTRO.MATCH.LUMFUNC BOOL FALSE + +MAG_MAX F32 23.0 ## XXX change name to PSASTRO.something? + +# option may be MAX, MIN, or VALUE. for VALUE, look up +# plate scale for each chip in the concepts +PSASTRO.COMMON.SCALE.OPTION STR MAX + +# mosaic-mode radius match in pixels? +PSASTRO.MOSAIC.RADIUS.N0 F32 8 +PSASTRO.MOSAIC.RADIUS.N1 F32 6 +PSASTRO.MOSAIC.RADIUS.N2 F32 4 + +# Mosaic Astrometry options +PSASTRO.MOSAIC.MODE BOOL FALSE +PSASTRO.MOSAIC.CHIP.ORDER S32 3 # fit order +PSASTRO.MOSAIC.ORDER S32 3 # fit order +PSASTRO.MOSAIC.CHIP.NITER S32 3 # fit clipping iterations +PSASTRO.MOSAIC.CHIP.NSIGMA F32 3 # fit clipping sigmas + +PSASTRO.MOSAIC.MAX.ERROR.N0 F32 1.5 # max allow error for valid solution (UNITS?) +PSASTRO.MOSAIC.MAX.ERROR.N1 F32 1.5 # max allow error for valid solution (UNITS?) +PSASTRO.MOSAIC.MIN.NSTAR S32 6 # min fitted stars in solution + +PSASTRO.MOSAIC.GRADIENT.NX S32 2 # number of x-dir cells per chip +PSASTRO.MOSAIC.GRADIENT.NY S32 2 # number of y-dir cells per chip + +DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.2mass +DVO.GETSTAR STR getstar Index: /branches/pap_branch_070920/ippconfig/recipes/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/psphot.config (revision 14957) @@ -0,0 +1,191 @@ + +# these options turn on different inputs and/or outputs +SAVE.OUTPUT BOOL TRUE +SAVE.BACKMDL BOOL FALSE +SAVE.BACKMDL.STDEV BOOL FALSE +SAVE.BACKGND BOOL FALSE +SAVE.BACKSUB BOOL FALSE +SAVE.RESID BOOL FALSE +SAVE.PSF BOOL FALSE +LOAD.PSF BOOL FALSE +SAVE.PLOTS BOOL FALSE + +# the zero point is used to set a basic scale for DVO +# XXX it may not currently be read : double check this (EAM) +ZERO_POINT F32 25.000 # zero point used by DVO +ZERO_PT F32 25.000 # zero point used by DVO + +MASKVAL STR SAT,BAD,BLANK # Mask these types of pixels + +OUTPUT.FORMAT STR SMPDATA + +# these parameter govern how the background is measured +BACKGROUND.XBIN S32 128 # size of background superpixels +BACKGROUND.YBIN S32 128 # size of background superpixels +IMSTATS_NPIX S32 10000 # number of pixels to use for sky estimate boxes: + +SKY_BIAS F32 0.0 # offset applied to measured sky (FOR TESTING) +SKY_FIT_ORDER S32 0 +SKY_FIT_LINEAR BOOL FALSE +SKY_STAT STR FITTED_MEAN_V4 # statistic used to measure background +SKY_CLIP_SIGMA F32 2.0 # statistic used to measure background +SKY_SIG F32 1.0 # optional sky error for + +# allowed values for SKY_STAT: +# SAMPLE_MEAN, SAMPLE_MEDIAN, CLIPPED_MEAN, ROBUST_MEAN, ROBUST_QUARTILE, FITTED_MEAN + +# masking parameters (XXX EAM : rework this to use psRegion like ANALYSIS_REGION) +XMIN F32 0 # minimum valid x-coord +XMAX F32 0 # maximum valid x-coord +YMIN F32 0 # minimum valid y-coord +YMAX F32 0 # maximum valid y-coord + +# peak finding +PEAKS_SMOOTH_SIGMA F32 1.0 # smoothing kernel sigma in pixels +PEAKS_SMOOTH_NSIGMA F32 2.0 # smoothing kernel width in sigmas +PEAKS_NSIGMA_LIMIT F32 25.0 # peak significance threshold +PEAKS_NSIGMA_LIMIT_2 F32 5.0 # peak significance threshold +PEAKS_NMAX S32 0 # on first pass, only keep NMAX peaks (0 == all) + +# parameters to control the selection of the peak in the Sx,Sy plane +MOMENTS_SCALE F32 0.1 +MOMENTS_SN_MIN F32 100.0 # min S/N to measure moments +MOMENTS_SX_MAX F32 3.0 +MOMENTS_SY_MAX F32 3.0 +MOMENTS_AR_MAX F32 1.5 # maximum axial ratio: 1 / AR < (sx / sy) < AR + +# basic object statistics +SKY_INNER_RADIUS F32 15 # square annulus for local sky measurement +SKY_OUTER_RADIUS F32 25 # square annulus for local sky measurement +PSF_MOMENTS_RADIUS F32 3 # calculate initial source moments with this radius +PSF_SN_LIM F32 50 # minimum S/N for stars used for PSF model +PSF_MAX_NSTARS S32 200 # limit number of stars used for PSF model +PSF_CLUMP_NSIGMA F32 1.5 # region of Sx,Sy plane to use for selecting PSF stars +PSF_MIN_DS F32 0.01 +PSF_PARAM_WEIGHTS BOOL FALSE + +# PSF model parameters : choose the PSF model +# list as many PSF_MODEL options as desired +# PSF_MODEL MULTI +PSF_MODEL STR PS_MODEL_GAUSS +# PSF_MODEL STR PS_MODEL_PGAUSS +# PSF_MODEL STR PS_MODEL_QGAUSS +# PSF_MODEL STR PS_MODEL_TGAUSS ## not well tested, not very successful + +# PSF.TREND.MASK must be a 2D polynomial +# the specified values are ignored but define the active components of the polynomial +PSF.TREND.MASK METADATA + NORDER_X S32 0 # number of x orders + NORDER_Y S32 0 # number of y orders + VAL_X00_Y00 F64 1 # polynomial coefficient + NELEMENTS S32 1 # number of unmasked components +END # folder for 2D polynomial + +PSF_FIT_RADIUS F32 15.0 # fitting radius for test PSF model +PSF_REF_RADIUS F32 25.0 # aperture magnitudes are scaled via + # curve-of-growth to this radius +# PSF-like source model parameters +PSF_FIT_NSIGMA F32 1.0 # significance for pixel included in fit +PSF_FIT_PADDING F32 2.0 # extra annulus to use for fit +PSF_SHAPE_NSIGMA F32 3.0 # max significance for shape variation +PSF_MIN_SN F32 2.0 # reject objects below this significance +PSF_MAX_CHI F32 50.0 # reject objects worse that this +FULL_FIT_SN_LIM F32 50.0 + +PSF.RESIDUALS BOOL TRUE +PSF.RESIDUALS.XBIN S32 1 +PSF.RESIDUALS.YBIN S32 1 +PSF.RESIDUALS.NSIGMA F32 3.0 +PSF.RESIDUALS.INTERPOLATION STR BILINEAR +PSF.RESIDUALS.STATISTIC STR ROBUST_MEDIAN +PSF.RESIDUALS.SPATIAL_ORDER S32 0 + +# EXTended source model parameters +EXT_MODEL STR PS_MODEL_PGAUSS +EXT_MIN_SN F32 50.0 # fit galaxies above this S/N limit +EXT_FIT_NSIGMA F32 1 # significance for pixel included in fit +EXT_FIT_PADDING F32 5 # extra annulus to use for fit +EXT_MOMENTS_RADIUS F32 9 + +# Extended source fit parameters +EXTENDED_SOURCE_FITS BOOL FALSE +EXTENDED_SOURCE_SN_LIM F32 20.0 +EXTENDED_SOURCE_PSF_CONVOLVED BOOL FALSE + +FITMODE STR BLEND +DEBLEND_PEAK_FRACTION F32 0.1 +DEBLEND_SKY_NSIGMA F32 10.0 + +# APTREND STR NONE, CONSTANT, SKYBIAS, SKYSAT, XY_LIN, SKY_XY_LIN, SKYSAT_XY_LIN, ALL +APTREND STR CONSTANT +AP_MIN_SN F32 25.0 + +# test options +# BREAK_POINT may be one of (PEAKS, MOMENTS, PSFMODEL, ENSEMBLE) +BREAK_POINT STR NONE +# PEAKS_OUTPUT_FILE STR peaks.dat +# MOMENTS_OUTPUT_FILE STR moments.dat +# ANALYSIS_REGION STR [1000:1600,2800:3400] + +# optional parameter to limit the actual analysis to a fraction of the image +# do not uncomment this in the master psphot.config file +# ANALYSIS_REGION STR [1000:1600,2800:3400] + +IGNORE_GROWTH BOOL FALSE +CONSTANT_PHOTOMETRIC_WEIGHTS BOOL TRUE # Should the photometric code [currently only ensemblePSF] refuse to weight each pixel by it's significance? +INTERPOLATE_AP BOOL TRUE +POISSON_ERRORS BOOL TRUE + +PCM_BOX_SIZE S32 2 + +OUTPUT.FORMAT STR SMPDATA +NOISE.FACTOR F32 5.0 +NOISE.SIZE F32 2.0 + +USE_FOOTPRINTS BOOL F # use new pmFootprint peak packaging +FOOTPRINT_NPIXMIN S32 5 # Minimum size of a pmFootprint +FOOTPRINT_NSIGMA_LIMIT F32 20 # threshold for bright pmFootprint detection +FOOTPRINT_NSIGMA_LIMIT_2 F32 4 # threshold for faint pmFootprint detection +FOOTPRINT_GROW_RADIUS S32 3 # How much to grow bright footprints +FOOTPRINT_GROW_RADIUS_2 S32 5 # How much to grow faint footprints +FOOTPRINT_CULL_NSIGMA_DELTA F32 4 # Cull peaks that aren't nsigma above coll to neighbour +FOOTPRINT_CULL_NSIGMA_MIN F32 1 # Minimum height of colls in units of skyStdev + +# alternate PSPHOT-type recipes +PSPHOT.FIXED.PSF METADATA +END + +# alternate PSPHOT-type recipes +PSPHOT.SUMMIT METADATA +END + +# alternate PSPHOT-type recipes +PSPHOT.SEEING METADATA +END + +TEST_FIT BOOL FALSE +TEST_FIT_MODE STR DEFAULT +TEST_FIT_MODEL STR DEFAULT +TEST_FIT_INNER_RADIUS F32 NAN +TEST_FIT_OUTER_RADIUS F32 NAN +TEST_FIT_RADIUS F32 NAN +TEST_MOMENTS_RADIUS F32 NAN +TEST_FIT_X F32 NAN +TEST_FIT_Y F32 NAN + +TEST_FIT_PAR0 F32 NAN +TEST_FIT_PAR1 F32 NAN +TEST_FIT_PAR2 F32 NAN +TEST_FIT_PAR3 F32 NAN +TEST_FIT_PAR4 F32 NAN +TEST_FIT_PAR5 F32 NAN +TEST_FIT_PAR6 F32 NAN +TEST_FIT_PAR7 F32 NAN +TEST_FIT_PAR8 F32 NAN +TEST_FIT_PAR F32 NAN + +DIAGNOSTIC.PLOTS METADATA + IMAGE.BACKGROUND.CELL.HISTOGRAM BOOL FALSE + IMAGE.BACKGROUND.CELL.HISTOGRAM.X S32 35 + IMAGE.BACKGROUND.CELL.HISTOGRAM.Y S32 -1 +END Index: /branches/pap_branch_070920/ippconfig/recipes/pswarp.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/pswarp.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/pswarp.config (revision 14957) @@ -0,0 +1,12 @@ +### Recipe for pswarp + +GRID.NX S32 128 # Iso-astrom grid size in x (pixels) +GRID.NY S32 128 # Iso-astrom grid size in y (pixels) +INTERPOLATION.MODE STR LANCZOS3 # Interpolation mode to use +MASK.IN STR BAD,SAT # Mask for input data +MASK.POOR STR SUSPECT # Mask for "poor" warped data +MASK.BAD STR BLANK # Mask for bad warped data +POOR.FRAC F32 0.01 # Max fraction of bad flux for a "poor" warped pixel +ASTROM.SOURCE STR PSASTRO.OUTPUT.MEF # Source file rule for astrometry, or NULL +ASTROM.ACCEPT BOOL FALSE # Accept astrometric solution unconditionally? +ASTROM.DEPTH STR MEF # Source file rule for astrometry, or NULL Index: /branches/pap_branch_070920/ippconfig/recipes/rejections.config =================================================================== --- /branches/pap_branch_070920/ippconfig/recipes/rejections.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/recipes/rejections.config (revision 14957) @@ -0,0 +1,134 @@ + +BIAS METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 2.0 + IMFILE.STDEV F32 10.0 + IMFILE.MEANSTDEV F32 0.5 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.5 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 1.0 + EXP.STDEV F32 10.0 + EXP.MEANSTDEV F32 0.5 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + +DARK METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 2.0 + IMFILE.STDEV F32 10.0 + IMFILE.MEANSTDEV F32 0.5 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 1.0 + EXP.STDEV F32 10.0 + EXP.MEANSTDEV F32 0.5 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + +SHUTTER METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SNR F32 20.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 0.0 + ENSEMBLE.STDEV F32 0.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + +FLAT METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 0.0 + ENSEMBLE.STDEV F32 0.0 + ENSEMBLE.MEANSTDEV F32 3.0 +END + +FRINGE METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 0.0 + ENSEMBLE.STDEV F32 0.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + +# FILTER is an additional qualifier, and may be "*" (or absent!), in which case it matches everything +# EXPECTED is the expected mean value +# IMFILE.MEAN is the maximum permitted mean value for an imfile, relative to the standard deviation +# IMFILE.STDEV is the maximum permitted standard deviation for an imfile +# EXP.MEAN is the maximum permitted mean value for an exposure, relative to the standard deviation +# EXP.STDEV is the maximum permitted standard deviation for an exposure +# EXP.MEANSTDEV is the maximum permitted mean standard deviation for an exposure relative to the mean +# ENSEMBLE.MEAN is the maximum permitted mean for an ensemble of exposures +# ENSEMBLE.STDEV is the maximum permitted standard deviation for an ensemble of exposures +# ENSEMBLE.MEANSTDEV is the maximum permitted mean standard deviation for an ensemble of exposures +# IMFILE.SNR is the minimum permitted signal-to-noise for an imfile +# EXP.SNR is the minimum permitted signal-to-noise for an exposure +# These values (all except FILTER) may be zero, in which case no clipping is applied. Index: /branches/pap_branch_070920/ippconfig/sdss/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/sdss/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/Makefile.am (revision 14957) @@ -0,0 +1,25 @@ + +installdir = $(datadir)/ippconfig/sdss + +install_files = \ + dvo.config \ + dvo.layout \ + camera.config \ + format.config \ + cmp.config \ + cmf.config \ + ppImage.config \ + ppMerge.config \ + psastro.config \ + psphot.config \ + pswarp.config \ + rejections.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/sdss/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/camera.config (revision 14957) @@ -0,0 +1,198 @@ +# Camera configuration file for co-adding reduced SDSS images of stripe82 +# Copied from ISP config files +# Sebastian Jester jester at mpia.de August 7, 2007 + +# File formats that we know about +FORMATS METADATA + SDSS STR sdss/format.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + Chip STR Cell +END + +# valid filter names and corresponding IDs +FILTER.ID METADATA + g STR g + r STR r + i STR i + z STR z + u STR u +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa +END + +DVO.CAMERADIR STR sdss # Camera directory for DVO + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + PSPHOT STR sdss/psphot.config # psphot details + PSASTRO STR sdss/psastro.config # psastro details + PPIMAGE STR sdss/ppImage.config # Recipes for ppImage + PPMERGE STR sdss/ppMerge.config # Recipes for ppMerge + PSWARP STR sdss/pswarp.config # Recipes for pswarp + REJECTIONS STR sdss/rejections.config +END + +# Reduction classes +REDUCTION METADATA + # Detrend processing not needed for these + # photometry & astrometry for pre-detrended images + PROCESSED METADATA + CHIP STR PPIMAGE_OP + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + END +END + +FILERULES METADATA + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMF + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + + ### input file definitions + ### use @DETDB entries to get the detrend images from the database + ### replace @DETDB with @FILES if you want to require it from the + ### command line, or with an explicit name to require a specific file + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + + ## files used by ppImage + PPIMAGE.INPUT INPUT @FILES FPA IMAGE + PPIMAGE.MASK INPUT @FILES FPA IMAGE + PPIMAGE.BIAS INPUT @DETDB FPA IMAGE + PPIMAGE.DARK INPUT @DETDB FPA IMAGE + PPIMAGE.FLAT INPUT @DETDB FPA IMAGE + PPIMAGE.FRINGE INPUT @DETDB FPA FRINGE + PPIMAGE.SHUTTER INPUT @DETDB FPA IMAGE + + ## files used to build and apply the flat-field correction images + DVOCORR.INPUT INPUT @FILES FPA IMAGE + DVOCORR.REFHEAD INPUT @FILES FPA HEADER + DVOFLAT.INPUT INPUT @FILES FPA IMAGE + DVOFLAT.CORR INPUT @DETDB FPA IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES FPA IMAGE + PSPHOT.INPUT INPUT @FILES FPA IMAGE + PSPHOT.MASK INPUT @FILES FPA MASK + PSPHOT.WEIGHT INPUT @FILES FPA WEIGHT + PSPHOT.PSF.LOAD INPUT @FILES FPA PSF + + ## files used by psastro + PSASTRO.INPUT.CMP INPUT @FILES FPA CMP + PSASTRO.INPUT.CMF INPUT @FILES FPA CMF + + ## files used by pswarp + PSWARP.INPUT INPUT @FILES FPA IMAGE + PSWARP.WEIGHT INPUT @FILES FPA WEIGHT + PSWARP.MASK INPUT @FILES FPA MASK + PSWARP.SKYCELL INPUT @FILES FPA IMAGE + PSWARP.ASTROM INPUT @FILES FPA CMF + + PPSUB.INPUT INPUT @FILES FPA IMAGE + PPSUB.INPUT.MASK INPUT @FILES FPA MASK + PPSUB.INPUT.WEIGHT INPUT @FILES FPA WEIGHT + PPSUB.REF INPUT @FILES FPA IMAGE + PPSUB.REF.MASK INPUT @FILES FPA MASK + PPSUB.REF.WEIGHT INPUT @FILES FPA WEIGHT + + PPSTACK.INPUT INPUT @FILES FPA IMAGE + PPSTACK.INPUT.MASK INPUT @FILES FPA MASK + PPSTACK.INPUT.WEIGHT INPUT @FILES FPA WEIGHT + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.sdss.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PPIMAGE.CHIP OUTPUT {OUTPUT}.chip.fits IMAGE FPA TRUE NONE + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.chip.mask.fits MASK FPA TRUE NONE + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.chip.wt.fits WEIGHT FPA TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE NONE + + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1c.fits IMAGE FPA TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2c.fits IMAGE FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE FPA TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE FPA TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE FPA TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE FPA TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE FPA TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE FPA TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END + +EXTNAME.RULES METADATA + CMF.HEAD STR cmf.hdr + CMF.DATA STR cmf.psf # use .PSF and .EXT? + + PSF.HEAD STR hdr + PSF.TABLE STR psf_model + PSF.RESID STR psf_resid +END + +BLANK.HEADERS METADATA + FPA.TIME STR TAI + FPA.EXPOSURE STR EXPTIME + FPA.AIRMASS STR AIRMASS +END + +TESSELLATIONS METADATA + # Tessellation name with corresponding DVO catdir + Skycells STR path://S82/skycells +END Index: /branches/pap_branch_070920/ippconfig/sdss/cmf.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/cmf.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/cmf.config (revision 14957) @@ -0,0 +1,84 @@ +# Pan-STARRS Imaging Sky Probe + +# How to identify this type +RULE METADATA + SIMPLE BOOL TRUE + NAXIS S32 0 + TELESCOP STR ISP-1 + INSTRUME STR ISP-Apogee + DETECTOR STR ISP-Apogee-01 + ISPCAMER STR Apogee U42 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR SEQID # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC STR TRIMSEC + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FILTER STR FILTNAME + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.POSANGLE STR ROTANGLE + FPA.AIRMASS STR AIRMASS + FPA.TIME STR MJD-OBS + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.READNOISE STR RDNOISE + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? + CELL.BAD STR BADLEVEL +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TIMESYS STR UTC + CELL.SATURATION F32 65535 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/sdss/cmp.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/cmp.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/cmp.config (revision 14957) @@ -0,0 +1,84 @@ +# Pan-STARRS Imaging Sky Probe + +# How to identify this type +RULE METADATA + SIMPLE BOOL FALSE + NAXIS S32 0 + TELESCOP STR ISP-1 + INSTRUME STR ISP-Apogee + DETECTOR STR ISP-Apogee-01 + ISPCAMER STR Apogee U42 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR SEQID # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC STR TRIMSEC + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FILTER STR FILTNAME + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.POSANGLE STR ROTANGLE + FPA.AIRMASS STR AIRMASS + FPA.TIME STR MJD-OBS + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.READNOISE STR RDNOISE + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? + CELL.BAD STR BADLEVEL +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TIMESYS STR UTC + CELL.SATURATION F32 65535 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/sdss/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/dvo.config (revision 14957) @@ -0,0 +1,50 @@ + +# location of DVO database tables +CATDIR /data/ipp001.0/jester/stripe82/coadd/catdir + +# keywords used by DVO to interpret the headers + +# used by parse_time to find time-related keywords +MJD-KEYWORD NONE +DATE-KEYWORD DATE-OBS +DATE-MODE YYYY-MM-DD +UT-KEYWORD TAIHMS +JD-KEYWORD NONE + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX -7.0 +CAL_INSTMAG_MIN -9.5 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# allowed astrometry error (arcseconds) +ADDSTAR_MAX_CERROR 5.0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 5.0 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 + +CATMODE MEF +CATFORMAT PANSTARRS_DEV_0 Index: /branches/pap_branch_070920/ippconfig/sdss/dvo.layout =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/dvo.layout (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/dvo.layout (revision 14957) @@ -0,0 +1,58 @@ +# this file defines the layout of the mosaic imager: + +# NCCD 40 # this needs work: sometimes 36, sometimes 40 +NCCD 36 +NAXIS1 2112 +NAXIS2 4644 + +MOSAIC_X 11 +MOSAIC_Y 4 + +# lines need to contain: + +CHIPID_KEYWORD EXTNAME + +# ID CHIPID xoffset yoffset xflip yflip datasec biassec Xo Yo theta +CCD.0 ccd00 1 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.1 ccd01 2 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.2 ccd02 3 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.3 ccd03 4 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.4 ccd04 5 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.5 ccd05 6 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.6 ccd06 7 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.7 ccd07 8 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.8 ccd08 9 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.9 ccd09 1 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.10 ccd10 2 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.11 ccd11 3 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.12 ccd12 4 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.13 ccd13 5 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.14 ccd14 6 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.15 ccd15 7 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.16 ccd16 8 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.17 ccd17 9 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.18 ccd18 1 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.19 ccd19 2 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.20 ccd20 3 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.21 ccd21 4 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.22 ccd22 5 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.23 ccd23 6 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.24 ccd24 7 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.25 ccd25 8 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.26 ccd26 9 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.27 ccd27 1 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.28 ccd28 2 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.29 ccd29 3 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.30 ccd30 4 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.31 ccd31 5 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.32 ccd32 6 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.33 ccd33 7 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.34 ccd34 8 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.35 ccd35 9 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.36 ccd36 0 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.37 ccd37 10 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.38 ccd38 0 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.39 ccd39 10 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 + +# can we use header to find biassec +USE_BIASSEC 1 Index: /branches/pap_branch_070920/ippconfig/sdss/format.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/format.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/format.config (revision 14957) @@ -0,0 +1,112 @@ +# SDSS camera, starting from Pan-STARRS Imaging Sky Probe +# Sebastian Jester jester at mpia.de August 7, 2007 + +# How to identify this type +RULE METADATA + SIMPLE BOOL TRUE +# NAXIS S32 2 + ORIGIN STR SDSS + TELESCOP STR 2.5m +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR FRAME # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA +# CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR VALUE +# CELL.BIASSEC.SOURCE STR HEADER +# CELL.TRIMSEC STR TRIMSEC + CELL.TRIMSEC STR [1:2048,1:1361] +# CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR ORIGIN +# Need the following? + FPA.DETECTOR STR CCDLOC +# FPA.AIRMASS STR AIRMASS + FPA.OBSTYPE STR FLAVOR + FPA.OBJECT STR OBJECT + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.POSANGLE STR IPA + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS +# FPA.FOCUS STR TELFOCUS + FPA.TIME STR DATE-OBS TAIHMS # Two values are interpreted as date and time + FPA.TIMESYS STR TIMESYS + FPA.ALT STR ALT + FPA.AZ STR AZ +# FPA.TEMP STR CCDTEMP + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR EXPTIME + CELL.TIME STR DATE-OBS TAIHMS +# CELL.GAIN STR GAIN +# CELL.READNOISE STR RDNOISE +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? +# CELL.TIMESYS STR TIMESYS + CELL.XBIN STR COLBIN + CELL.YBIN STR ROWBIN +# these were used for some early data +# CELL.XBIN STR XBIN +# CELL.YBIN STR YBIN +# CELL.BAD STR BADLEVEL +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA +# The gain is only roughly correct... + CELL.GAIN F32 5.0 +# readnoise is from http://www.sdss.org/dr6/instruments/imager/index.html +# Note that I have emails from Jim Gunn saying dark noise *is* important... + CELL.READNOISE F32 5.0 + FPA.AIRMASS F32 1.3 + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 1361 + CELL.XSIZE S32 2048 + CELL.YSIZE S32 2048 +# FPA.TIMESYS STR UTC + CELL.SATURATION F32 60000 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +# CELL.XBIN S32 1 +# CELL.YBIN S32 1 +END + +FORMATS METADATA + FPA.RA STR DEGREES + FPA.DEC STR DEGREES + FPA.TIME STR SEPARATE YEAR.FIRST +# FPA.TIME STR MJD + CELL.TIME STR SEPARATE YEAR.FIRST +# CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/sdss/format_skycell.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/format_skycell.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/format_skycell.config (revision 14957) @@ -0,0 +1,110 @@ +# SDSS camera, starting from Pan-STARRS Imaging Sky Probe +# Sebastian Jester jester at mpia.de August 7, 2007 + +# How to identify this type +RULE METADATA + SIMPLE BOOL TRUE +# NAXIS S32 2 + ORIGIN STR SDSS + TELESCOP STR 2.5m +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR FRAME # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA +# CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR VALUE +# CELL.BIASSEC.SOURCE STR HEADER +# CELL.TRIMSEC STR TRIMSEC + CELL.TRIMSEC STR [1:2048,1:1361] +# CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR ORIGIN +# Need the following? + FPA.DETECTOR STR CCDLOC +# FPA.AIRMASS STR AIRMASS + FPA.OBSTYPE STR FLAVOR + FPA.OBJECT STR OBJECT + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.POSANGLE STR IPA + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS +# FPA.FOCUS STR TELFOCUS + FPA.TIME STR TAI + FPA.TIMESYS STR TIMESYS + FPA.ALT STR ALT + FPA.AZ STR AZ +# FPA.TEMP STR CCDTEMP + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR EXPTIME + CELL.TIME STR TAI +# CELL.GAIN STR GAIN +# CELL.READNOISE STR RDNOISE +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? +# CELL.TIMESYS STR TIMESYS + CELL.XBIN STR COLBIN + CELL.YBIN STR ROWBIN +# these were used for some early data +# CELL.XBIN STR XBIN +# CELL.YBIN STR YBIN +# CELL.BAD STR BADLEVEL +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA +# The gain is only roughly correct... + CELL.GAIN F32 5.0 +# readnoise is from http://www.sdss.org/dr6/instruments/imager/index.html +# Note that I have emails from Jim Gunn saying dark noise *is* important... + CELL.READNOISE F32 5.0 + FPA.AIRMASS F32 1.3 + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 1361 + CELL.XSIZE S32 2048 + CELL.YSIZE S32 2048 +# FPA.TIMESYS STR UTC + CELL.SATURATION F32 60000 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +# CELL.XBIN S32 1 +# CELL.YBIN S32 1 +END + +FORMATS METADATA + FPA.RA STR DEGREES + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/sdss/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/ppImage.config (revision 14957) @@ -0,0 +1,147 @@ +### ppImage recipe configuration file + +# Inherit everything from the top-level recipe file, except for what's below. + +PHOTCODE.RULE STR SDSS.{FILTER.ID}.{DETECTOR} + +FRINGE.FILTERS MULTI +FRINGE.FILTERS STR z +FRINGE.FILTERS STR y + +# apply the following constraints when selecting a detrend image +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + END + SHUTTER METADATA + END + FLAT METADATA + FILTER STR FPA.FILTERID +# VERSION STR RAW + END + FRINGE METADATA + FILTER STR FPA.FILTERID +# AIRMASS STR FPA.AIRMASS +# TWILIGHT STR TWILIGHT:FPA.TIME + END +END + +## these science-image analysis recipes are placed here set MASK = FALSE + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_DET_ONLY METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# SDSS Softbias and photometry +PPIMAGE_OP METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save base detrended image? + CHIP.WEIGHT.FITS BOOL TRUE # Save base detrended image? + OVERSCAN BOOL TRUE # Overscan subtraction + OVERSCAN.CONSTANT BOOL TRUE + OVERSCAN.VALUE F32 1000.0 + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + + +# Overscan, bias, photometry, astrometry +PPIMAGE_OA METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save base detrended image? + CHIP.WEIGHT.FITS BOOL FALSE # Save base detrended image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END Index: /branches/pap_branch_070920/ippconfig/sdss/ppMerge.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/ppMerge.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/ppMerge.config (revision 14957) @@ -0,0 +1,3 @@ +### ppImage recipe configuration file + +# Inherit everything from the top-level recipe file, except for what's below. Index: /branches/pap_branch_070920/ippconfig/sdss/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/psastro.config (revision 14957) @@ -0,0 +1,38 @@ + +# astrometry matching parameters + +# nominal plate scale (microns / pixel) +PSASTRO.PIXEL.SCALE F32 10.0 + +# pmAstromGridMatch: +PSASTRO.GRID.MIN.ANGLE F32 -2.0 +PSASTRO.GRID.MAX.ANGLE F32 +2.0 +PSASTRO.GRID.DEL.ANGLE F32 0.25 +PSASTRO.GRID.MIN.SIGMA F32 5.0 + +# pmAstromGridAngle +# max grid offset in FP units (microns) +# use plate-scale to make this in pixels? +PSASTRO.GRID.OFFSET F32 10000. +PSASTRO.GRID.SCALE F32 500 + +# these tweak are in FP units (pixels, currently) +PSASTRO.TWEAK.SCALE F32 1 +PSASTRO.TWEAK.RANGE F32 75 +PSASTRO.TWEAK.SMOOTH F32 2 +PSASTRO.TWEAK.NSIGMA F32 3 + +# match radius in pixels for CHIP astrometry +PSASTRO.MATCH.RADIUS F32 8 + +# pmAstromMatchFit +PSASTRO.CHIP.ORDER S32 3 # fit order +PSASTRO.CHIP.NITER S32 3 # fit clipping iterations +PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas + +PSASTRO.MAX.ERROR F32 10.0 # max error in pixels +PSASTRO.MIN.NSTAR S32 10 # min fitted stars in solution + +MAG_MAX F32 10 +DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.synth.bright +PSASTRO.MATCH.LUMFUNC BOOL TRUE Index: /branches/pap_branch_070920/ippconfig/sdss/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/psphot.config (revision 14957) @@ -0,0 +1,61 @@ + +# turn these on to see specific outputs +SAVE.BACKMDL BOOL TRUE +#SAVE.BACKGND BOOL TRUE +#SAVE.BACKSUB BOOL TRUE +#SAVE.RESID BOOL TRUE +SAVE.PSF BOOL TRUE +SAVE.PLOTS BOOL TRUE + +# image statistics parameters +IMSTATS_NPIX S32 3000 # number of pixels to use for sky estimate boxes: + +PSF_SN_LIM F32 10 # minimum S/N for stars used for PSF model +PSF_MAX_NSTARS S32 300 # limit number of stars used for PSF model + +PSF_MODEL STR PS_MODEL_QGAUSS + +MOMENTS_SN_MIN F32 10.0 +#EXT_MIN_SN F32 50.0 # fit galaxies above this S/N limit +#FULL_FIT_SN_LIM F32 50.0 +#AP_MIN_SN F32 20.0 +PSF_CLUMP_NSIGMA F32 2.5 # region of Sx,Sy plane to use for selecting PSF stars + +# PSFTREND must be a 2D polynomial +# the specified values are ignored but define the active components of the polynomial +PSF.TREND.MASK METADATA + NORDER_X S32 3 # number of x orders + NORDER_Y S32 3 # number of y orders + VAL_X00_Y00 F64 1 # polynomial coefficient + + VAL_X01_Y00 F64 1 # polynomial coefficient + VAL_X00_Y01 F64 1 # polynomial coefficient + + VAL_X02_Y00 F64 1 # polynomial coefficient + VAL_X01_Y01 F64 1 # polynomial coefficient + VAL_X00_Y02 F64 1 # polynomial coefficient + + VAL_X03_Y00 F64 1 # polynomial coefficient + VAL_X02_Y01 F64 1 # polynomial coefficient + VAL_X01_Y02 F64 1 # polynomial coefficient + VAL_X00_Y03 F64 1 # polynomial coefficient + NELEMENTS S32 10 # number of unmasked components +END # folder for 4D polynomial + +XMIN F32 15 + +PSF.RESIDUALS BOOL true +PSF.RESIDUALS.SPATIAL_ORDER S32 1 + +# BREAK_POINT STR ENSEMBLE +OUTPUT.FORMAT STR PS1_DEV_0 + +PSPHOT.SUMMIT METADATA + PEAKS_SMOOTH_SIGMA F32 0.8 # peak significance threshold + PEAKS_NSIGMA_LIMIT F32 50.0 # peak significance threshold + PEAKS_NMAX S32 1000 + SAVE.RESID BOOL FALSE + PSF_SN_LIM F32 25 # minimum S/N for stars used for PSF model + MOMENTS_SN_MIN F32 25.0 + PSF_MODEL STR PS_MODEL_PGAUSS +END Index: /branches/pap_branch_070920/ippconfig/sdss/pswarp.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/pswarp.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/pswarp.config (revision 14957) @@ -0,0 +1,2 @@ +ASTROM.SOURCE STR NULL # Source file rule for astrometry; NULL to use existing WCS +ASTROM.ACCEPT BOOL TRUE # Accept astrometric solution unconditionally? Index: /branches/pap_branch_070920/ippconfig/sdss/rejections.config =================================================================== --- /branches/pap_branch_070920/ippconfig/sdss/rejections.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/sdss/rejections.config (revision 14957) @@ -0,0 +1,49 @@ + +DARK METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SN F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SN F32 0.0 + IMFILE.FLUX F32 2.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SN F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SN F32 0.0 + EXP.FLUX F32 2.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + +FRINGE METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SN F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SN F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SN F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SN F32 10.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 0.0 + ENSEMBLE.STDEV F32 0.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + Index: /branches/pap_branch_070920/ippconfig/simmosaic/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/simmosaic/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/Makefile.am (revision 14957) @@ -0,0 +1,21 @@ + +installdir = $(datadir)/ippconfig/simmosaic + +install_files = \ + camera.config \ + format_split.config \ + format_together.config \ + ppImage.config \ + psastro.config \ + psphot.config \ + rejections.config \ + dvo.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/simmosaic/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/camera.config (revision 14957) @@ -0,0 +1,272 @@ +# Camera configuration file for simulated mosaic + +# File formats that we know about +FORMATS METADATA + TOGETHER STR simmosaic/format_together.config + SPLIT STR simmosaic/format_split.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + Chip00 STR Cell00 Cell01 Cell10 Cell11 + Chip01 STR Cell00 Cell01 Cell10 Cell11 + Chip10 STR Cell00 Cell01 Cell10 Cell11 + Chip11 STR Cell00 Cell01 Cell10 Cell11 +END + +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + NONE STR NONE + B STR B + V STR V + R STR R + I STR I + g STR g + r STR r + i STR i + z STR z +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa + CHIP STR {CHIP.NAME} + CELL STR {CHIP.NAME}.{CELL.NAME} + fpa STR fpa + chip STR {CHIP.NAME} + cell STR {CHIP.NAME}.{CELL.NAME} +END + +DVO.CAMERADIR STR simmosaic # Camera directory for DVO + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + PPIMAGE STR simmosaic/ppImage.config # Default: all (normal) options on + PSPHOT STR simmosaic/psphot.config # psphot details + PSASTRO STR simmosaic/psastro.config # psastro details + REJECTIONS STR simmosaic/rejections.config # Rejection limits +END + +# Reduction classes +REDUCTION METADATA + # Detrend processing + DETREND METADATA + BIAS_PROCESS STR PPIMAGE_O + BIAS_RESID STR PPIMAGE_B + BIAS_VERIFY STR PPIMAGE_OB + BIAS_STACK STR PPMERGE_BIAS + DARK_PROCESS STR PPIMAGE_OB + DARK_RESID STR PPIMAGE_D + DARK_VERIFY STR PPIMAGE_OBD + DARK_STACK STR PPMERGE_DARK + SHUTTER_PROCESS STR PPIMAGE_OBD + SHUTTER_RESID STR PPIMAGE_S + SHUTTER_VERIFY STR PPIMAGE_OBDS + SHUTTER_STACK STR PPMERGE_SHUTTER + FLAT_PROCESS STR PPIMAGE_OBDS + FLAT_RESID STR PPIMAGE_F + FLAT_VERIFY STR PPIMAGE_OBDSF + FLAT_STACK STR PPMERGE_FLAT + FRINGE_PROCESS STR PPIMAGE_OBDSF + FRINGE_RESID STR PPIMAGE_R + FRINGE_VERIFY STR PPIMAGE_OBDSFR + FRINGE_STACK STR PPMERGE_FRINGE + + JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B + JPEG_BIN1_IMAGE_DARK STR PPIMAGE_J1_IMAGE_B + JPEG_BIN1_IMAGE_SHUTTER STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_FLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_DOMEFLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_SKYFLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_FRINGE STR PPIMAGE_J1_IMAGE_R + JPEG_BIN2_IMAGE_BIAS STR PPIMAGE_J2_IMAGE_B + JPEG_BIN2_IMAGE_DARK STR PPIMAGE_J2_IMAGE_B + JPEG_BIN2_IMAGE_SHUTTER STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_FLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_DOMEFLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_SKYFLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_FRINGE STR PPIMAGE_J2_IMAGE_R + + JPEG_BIN1_RESID_BIAS STR PPIMAGE_J1_RESID_B + JPEG_BIN1_RESID_DARK STR PPIMAGE_J1_RESID_B + JPEG_BIN1_RESID_SHUTTER STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_FLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_DOMEFLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_SKYFLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_FRINGE STR PPIMAGE_J1_RESID_R + JPEG_BIN2_RESID_BIAS STR PPIMAGE_J2_RESID_B + JPEG_BIN2_RESID_DARK STR PPIMAGE_J2_RESID_B + JPEG_BIN2_RESID_SHUTTER STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_FLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_DOMEFLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_SKYFLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R + END + # Processing raw data + DEFAULT METADATA + CHIP STR PPIMAGE_OBDSFRA + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + END +END + +FILERULES METADATA + ### Redirections + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUT.CMF.SPL + PSASTRO.OUTPUT.MEF STR PSASTRO.OUT.CMF.MEF + PSPHOT.OUTPUT STR PSPHOT.OUT.CMF.SPL + + ### input file definitions + ### use @DETDB entries to get the detrend images from the database + ### replace @DETDB with @FILES if you want to require it from the + ### command line, or with an explicit name to require a specific file + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + + ## files used by ppImage + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE + PPIMAGE.MASK INPUT @DETDB CELL IMAGE + PPIMAGE.BIAS INPUT @DETDB CELL IMAGE + PPIMAGE.DARK INPUT @DETDB CELL IMAGE + PPIMAGE.FLAT INPUT @DETDB CELL IMAGE + PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE + PPIMAGE.SHUTTER INPUT @DETDB CELL IMAGE + + ## files used to build and apply the flat-field correction images + DVOCORR.INPUT INPUT @FILES CHIP IMAGE + DVOCORR.REFHEAD INPUT @FILES CHIP HEADER + DVOFLAT.INPUT INPUT @FILES CHIP IMAGE + DVOFLAT.CORR INPUT @DETDB CHIP IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES CHIP IMAGE + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSPHOT.MASK INPUT @FILES CHIP MASK + PSPHOT.WEIGHT INPUT @FILES CHIP WEIGHT + PSPHOT.PSF.LOAD INPUT @FILES CHIP PSF + PSPHOT.INPUT.CMF INPUT @FILES CHIP CMF + + ## files used by psastro + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + ## files used by pswarp + PSWARP.INPUT INPUT @FILES CHIP IMAGE + PSWARP.SKYCELL INPUT @FILES FPA IMAGE + PSWARP.WEIGHT INPUT @FILES CHIP WEIGHT + PSWARP.MASK INPUT @FILES CHIP MASK + PSWARP.ASTROM INPUT @FILES CHIP CMF + + PPSUB.INPUT INPUT none.fits FPA IMAGE + PPSUB.INPUT.MASK INPUT none.fits FPA MASK + PPSUB.INPUT.WEIGHT INPUT none.fits FPA WEIGHT + PPSUB.REF INPUT none.fits FPA IMAGE + PPSUB.REF.MASK INPUT none.fits FPA MASK + PPSUB.REF.WEIGHT INPUT none.fits FPA WEIGHT + + PPSTACK.INPUT INPUT none.fits FPA IMAGE + PPSTACK.INPUT.MASK INPUT none.fits FPA MASK + PPSTACK.INPUT.WEIGHT INPUT none.fits FPA WEIGHT + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits MASK CHIP TRUE SPLIT + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits WEIGHT CHIP TRUE SPLIT + PPIMAGE.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.ch.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.ch.mask.fits MASK CHIP TRUE SPLIT + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.ch.wt.fits WEIGHT CHIP TRUE SPLIT + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fits IMAGE FPA TRUE NONE + PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits IMAGE CHIP TRUE SPLIT + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits IMAGE CHIP TRUE SPLIT + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits IMAGE CHIP TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits IMAGE CHIP TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.{CHIP.NAME}.res.fits IMAGE CHIP TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.{CHIP.NAME}.bck.fits IMAGE CHIP TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.{CHIP.NAME}.sub.fits IMAGE CHIP TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.{CHIP.NAME}.mdl.fits IMAGE CHIP TRUE NONE + PSPHOT.BACKMDL.STDEV OUTPUT {OUTPUT}.{CHIP.NAME}.mdd.fits IMAGE CHIP TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} RAW CHIP TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.{CHIP.NAME}.sx SX CHIP TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.{CHIP.NAME}.obj OBJ CHIP TRUE NONE + PSPHOT.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.cmf CMF CHIP TRUE NONE + PSPHOT.OUT.CMF.MEF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.{CHIP.NAME}.psf PSF CHIP TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA CHIP TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.{CHIP.NAME}.psf.png KAPA CHIP TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.{CHIP.NAME}.dap.png KAPA CHIP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CMP CHIP TRUE SPLIT + PSASTRO.OUT.CMF.SPL OUTPUT {OUTPUT}.{CHIP.NAME}.smf CMF CHIP TRUE SPLIT + PSASTRO.OUT.CMF.MEF OUTPUT {OUTPUT}.smf CMF FPA TRUE TOGETHER + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits IMAGE CHIP TRUE SPLIT + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END + +# FPA file defines properties of a possible input|output object +# user can set the filename (I|O), filename rules (O), or abstract source (@FILES, @DETDB) (I) +# user can set the extension name, if used +# user can set the file type (IMAGE, JPEG, RAW, SX, OBJ, CMP, CMF) : but these are not variable in most cases! +# user can set the file depth: only valid for output files +# user can set the data depth: must be >= file depth +# user can set the file format: only valid for newly created FPAs +# user can set the colormap, scaling method, scaling range (JPEG only) +# user can set the extension name for the data and header segments (CMF only) + + +EXTNAME.RULES METADATA + CMF.HEAD STR {CHIP.NAME}.hdr + CMF.DATA STR {CHIP.NAME}.psf + PSF.HEAD STR {CHIP.NAME}.hdr + PSF.TABLE STR {CHIP.NAME}.psf_model + PSF.RESID STR {CHIP.NAME}.psf_resid +END + +TESSELLATIONS METADATA + # Tessellation name with corresponding DVO catdir + Skycells STR path://SIMTEST/skycells +END + +BLANK.HEADERS METADATA + FPA.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + FPA.AIRMASS STR AIRMASS +END Index: /branches/pap_branch_070920/ippconfig/simmosaic/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/dvo.config (revision 14957) @@ -0,0 +1,58 @@ + +# keywords used by DVO to interpret the headers + +# keyword abstractions: +DATE-KEYWORD NONE +UT-KEYWORD NONE +JD-KEYWORD NONE +MJD-KEYWORD MJD-OBS + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX 0 +CAL_INSTMAG_MIN 0 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 1.0 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 + +IMAGE_SCATTER 0.075 # mark images POOR if stdev(Mcal) > IMAGE_SCATTER +STAR_SCATTER 0.005 # mark stars POOR if stdev(Mrel) > STAR_SCATTER +IMAGE_OFFSET 0.100 # mark images POOR if abs(delta(Mcal)) > IMAGE_OFFSET +STAR_CHISQ 10.0 # mark stars POOR if Xm > STAR_CHISQ +STAR_TOOFEW 3 # mark star FEW if N(good) < STAR_TOOFEW +IMAGE_TOOFEW 10 # mark image FEW if N(good) < IMAGE_TOOFEW +IMAGE_GOOD_FRACTION 0.05 # mark image FEW if N(good) < IMAGE_GOOD_FRACTION * Nstars + +SCATTER_LIM 15.0 +MAG_LIM 20.0 # select stars brighter than this for relphot analysis +SIGMA_LIM 0.015 # select measurements with dM < SIGMA_LIM for relphot analysis +# INST_MAG_MIN -17 # optional constraints on magnitude ranges +# INST_MAG_MAX -13 # optional constraints on magnitude ranges + +RELPHOT_GRID_BINNING 256 +RELPHOT_GRID_X 6 +RELPHOT_GRID_Y 14 Index: /branches/pap_branch_070920/ippconfig/simmosaic/format_split.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/format_split.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/format_split.config (revision 14957) @@ -0,0 +1,124 @@ +# Simulation test camera with single chip with single cell + +# How to identify this type +RULE METADATA + TELESCOP STR SimScope + INSTRUME STR SIMMOSAIC + FORMAT STR SPLIT +END + +# How to read this data +FILE METADATA + PHU STR CHIP # The FITS file represents an entire FPA + EXTENSIONS STR CELL # There are no extensions + FPA.NAME STR FPANAME # A PHU keyword for unique FPA identifier + CHIP.NAME STR CHIPNAME # A PHU keyword for unique chip identifier + CONTENT STR {CHIP.NAME} # How to determine content of FITS file +END + +# What's in the FITS file? +CONTENTS METADATA + # File identifier with corresponding file layout name + Chip00 STR SimChip + Chip01 STR SimChip + Chip10 STR SimChip + Chip11 STR SimChip +END + +# Specify the layout +CHIPS METADATA + SimChip METADATA + # Extension name, cellName:cellType + Cell00 STR Cell00:SimCell + Cell01 STR Cell01:SimCell + Cell10 STR Cell10:SimCell + Cell11 STR Cell11:SimCell + END +END + +# Specify the cell data +CELLS METADATA + SimCell METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC STR TRIMSEC + CELL.BIASSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR INSTRUME + FPA.OBSTYPE STR OBSTYPE + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.FILTERID STR FILTER + FPA.POSANGLE STR POSANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.OBJECT STR OBJECT + FPA.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.DETECTOR STR SIMMOSAIC + FPA.TIMESYS STR UTC + FPA.RADECSYS STR ICRS + CELL.SATURATION F32 65535 + CELL.BAD F32 0 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CELL.X0.DEPEND STR CELL.NAME + CELL.X0 METADATA + Cell00 S32 0 + Cell01 S32 0 + Cell10 S32 1024 + Cell11 S32 1024 + END + CELL.Y0.DEPEND STR CELL.NAME + CELL.Y0 METADATA + Cell00 S32 0 + Cell01 S32 1024 + Cell10 S32 0 + Cell11 S32 1024 + END + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + Chip00 S32 0 + Chip01 S32 0 + Chip10 S32 2072 + Chip11 S32 2072 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + Chip00 S32 0 + Chip01 S32 2072 + Chip10 S32 0 + Chip11 S32 2072 + END + CELL.XSIZE S32 1000 + CELL.YSIZE S32 1000 + CELL.XWINDOW S32 0 + CELL.YWINDOW S32 0 + CELL.GAIN F32 1.0 + CELL.READNOISE F32 10.0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END Index: /branches/pap_branch_070920/ippconfig/simmosaic/format_together.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/format_together.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/format_together.config (revision 14957) @@ -0,0 +1,119 @@ +# Simulation test camera with single chip with single cell + +# How to identify this type +RULE METADATA + TELESCOP STR SimScope + INSTRUME STR SIMMOSAIC + FORMAT STR TOGETHER +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CHIP # There are no extensions + FPA.NAME STR FPANAME # A PHU keyword for unique FPA identifier + CONTENT STR {CHIP.NAME} # How to determine content of FITS file +END + +# What's in the FITS file? +CONTENTS METADATA + # Extension name ---> chip_name:chip_type + Chip00 STR Chip00:SimChip + Chip01 STR Chip01:SimChip + Chip10 STR Chip10:SimChip + Chip11 STR Chip11:SimChip +END + +# Specify the layout +CHIPS METADATA + # Chip type ---> cell_name:cell_type + SimChip STR Cell00:SimCell Cell01:SimCell Cell10:SimCell Cell11:SimCell +END + + +# Specify the cell data +CELLS METADATA + SimCell METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC STR TRIMSEC + CELL.BIASSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR INSTRUME + FPA.OBSTYPE STR OBSTYPE + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.FILTERID STR FILTER + FPA.POSANGLE STR POSANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.OBJECT STR OBJECT + FPA.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.DETECTOR STR SIMMOSAIC + FPA.TIMESYS STR UTC + FPA.RADECSYS STR ICRS + CELL.SATURATION F32 65535 + CELL.BAD F32 0 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CELL.X0.DEPEND STR CELL.NAME + CELL.X0 METADATA + Cell00 S32 0 + Cell01 S32 0 + Cell10 S32 1024 + Cell11 S32 1024 + END + CELL.Y0.DEPEND STR CELL.NAME + CELL.Y0 METADATA + Cell00 S32 0 + Cell01 S32 1024 + Cell10 S32 0 + Cell11 S32 1024 + END + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + Chip00 S32 0 + Chip01 S32 0 + Chip10 S32 2072 + Chip11 S32 2072 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + Chip00 S32 0 + Chip01 S32 2072 + Chip10 S32 0 + Chip11 S32 2072 + END + CELL.XSIZE S32 1000 + CELL.YSIZE S32 1000 + CELL.XWINDOW S32 0 + CELL.YWINDOW S32 0 + CELL.GAIN F32 1.0 + CELL.READNOISE F32 10.0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END Index: /branches/pap_branch_070920/ippconfig/simmosaic/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/ppImage.config (revision 14957) @@ -0,0 +1,222 @@ +### ppImage recipe configuration file for simulated test camera + +# List of tasks to perform + +BASE.FITS BOOL FALSE # Save base detrended image? +CHIP.FITS BOOL TRUE # Save chip-mosaicked image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 7 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# How to select the appropriate detrend image +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + MASK METADATA + END + DARK METADATA + END + FLAT METADATA + FILTER STR FPA.FILTER + END + FRINGE METADATA + FILTER STR FPA.FILTER + END + SHUTTER METADATA + END +END + +######################################################################################## +# Need the following in order to turn off overscan and shutter for the site-level recipe +######################################################################################## + +# Overscan subtraction only +PPIMAGE_O METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Dark subtraction only +PPIMAGE_D METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Shutter correction only +PPIMAGE_S METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark +PPIMAGE_OBD METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter +PPIMAGE_OBDS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field +PPIMAGE_OBDSF METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFR METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END Index: /branches/pap_branch_070920/ippconfig/simmosaic/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/psastro.config (revision 14957) @@ -0,0 +1,4 @@ +DVO.CATDIR STR path://SIMTEST/catdir.synth.simtest/ + +#PSASTRO.MOSAIC.GRADIENT.NX S32 1 # number of x-dir cells per chip +#PSASTRO.MOSAIC.GRADIENT.NY S32 1 # number of y-dir cells per chip Index: /branches/pap_branch_070920/ippconfig/simmosaic/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/psphot.config (revision 14957) @@ -0,0 +1,30 @@ + +SAVE.BACKMDL BOOL TRUE +SAVE.BACKMDL.STDEV BOOL TRUE +SAVE.BACKGND BOOL TRUE +SAVE.BACKSUB BOOL TRUE +SAVE.PLOTS BOOL FALSE +SAVE.RESID BOOL TRUE +SAVE.PSF BOOL TRUE +LOAD.PSF BOOL FALSE + +IMSTATS_NPIX S32 3000 # number of pixels to use for sky estimate boxes: + +#PSPHOT_TEST METADATA +# SAVE.BACKSUB BOOL FALSE +# SAVE.RESID BOOL TRUE +#END +# +#PEAKS_OUTPUT_FILE STR peaks.dat +#MOMENTS_OUTPUT_FILE STR moments.dat + +#PSF_SN_LIM F32 20.0 # minimum S/N for stars used for PSF model +MOMENTS_SN_MIN F32 20.0 # min S/N to measure moments +FULL_FIT_SN_LIM F32 100.0 +EXT_MIN_SN F32 100.0 # fit galaxies above this S/N limit + +PEAKS_NSIGMA_LIMIT F32 10.0 # peak significance threshold +BREAK_POINT STR ENSEMBLE # limit total processing for now (for speed) + + +SKY_STAT STR ROBUST_MEDIAN # statistic used to measure background Index: /branches/pap_branch_070920/ippconfig/simmosaic/rejections.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simmosaic/rejections.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simmosaic/rejections.config (revision 14957) @@ -0,0 +1,49 @@ + +DARK METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 2.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 1.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 1.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.5 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + + +SHUTTER METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 0.0 + ENSEMBLE.STDEV F32 0.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END Index: /branches/pap_branch_070920/ippconfig/simple/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/simple/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simple/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/simple/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/simple/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simple/Makefile.am (revision 14957) @@ -0,0 +1,18 @@ + +installdir = $(datadir)/ippconfig/simple + +install_files = \ + camera.config \ + format.config \ + ppImage.config \ + psastro.config \ + psphot.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/simple/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simple/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simple/camera.config (revision 14957) @@ -0,0 +1,184 @@ +# Camera configuration file for drop-dead boring camera, consisting of a single chip with single cell. + +# File formats that we know about +FORMATS METADATA + SIMPLE STR simple/format.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + Chip STR Cell +END + +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + B STR B + V STR V + R STR R + I STR I + z STR z +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa +END + +DVO.CAMERADIR STR megacam # Camera directory for DVO + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + PPIMAGE STR simple/ppImage.config # Default: all (normal) options on + PSPHOT STR simple/psphot.config # psphot details +END + +# Reduction classes +REDUCTION METADATA + # Detrend processing + DETREND METADATA + BIAS_PROCESS STR PPIMAGE_O + BIAS_RESID STR PPIMAGE_B + BIAS_VERIFY STR PPIMAGE_OB + BIAS_STACK STR PPMERGE_BIAS + DARK_PROCESS STR PPIMAGE_OB + DARK_RESID STR PPIMAGE_D + DARK_VERIFY STR PPIMAGE_OBD + DARK_STACK STR PPMERGE_DARK + SHUTTER_PROCESS STR PPIMAGE_OBD + SHUTTER_RESID STR PPIMAGE_S + SHUTTER_VERIFY STR PPIMAGE_OBDS + SHUTTER_STACK STR PPMERGE_SHUTTER + FLAT_PROCESS STR PPIMAGE_OBDS + FLAT_RESID STR PPIMAGE_F + FLAT_VERIFY STR PPIMAGE_OBDSF + FLAT_STACK STR PPMERGE_FLAT + FRINGE_PROCESS STR PPIMAGE_OBDSF + FRINGE_RESID STR PPIMAGE_R + FRINGE_VERIFY STR PPIMAGE_OBDSFR + FRINGE_STACK STR PPMERGE_FRINGE + END + # Processing raw data + DEFAULT METADATA + CHIP STR PPIMAGE_OBDSFRA + END +END + +FILERULES METADATA + PSASTRO.INPUT STR PSASTRO.INPUT.CMP + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + + ### input file definitions + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT none.fits FPA IMAGE + INPUT.MASK INPUT none.fits FPA MASK + INPUT.WEIGHT INPUT none.fits FPA WEIGHT + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSWARP.INPUT INPUT none.fits FPA IMAGE + PSWARP.SKYCELL INPUT none.fits FPA IMAGE + PSASTRO.INPUT.CMP INPUT none.fits CHIP CMP + PSASTRO.INPUT.CMF INPUT none.fits CHIP CMF + PSPHOT.LOAD INPUT none.fits CHIP IMAGE + PSPHOT.PSF.LOAD INPUT none.fits CHIP PSF + PSPHOT.INPUT.CMF INPUT none.fits CHIP CMF + + PPSUB.INPUT INPUT none.fits FPA IMAGE + PPSUB.INPUT.MASK INPUT none.fits FPA MASK + PPSUB.INPUT.WEIGHT INPUT none.fits FPA WEIGHT + PPSUB.REF INPUT none.fits FPA IMAGE + PPSUB.REF.MASK INPUT none.fits FPA MASK + PPSUB.REF.WEIGHT INPUT none.fits FPA WEIGHT + PPSUB.SOURCES INPUT none.fits FPA CMF + + PPSTACK.INPUT INPUT none.fits FPA IMAGE + PPSTACK.INPUT.MASK INPUT none.fits FPA MASK + PPSTACK.INPUT.WEIGHT INPUT none.fits FPA WEIGHT + PPSTACK.SOURCES INPUT none.fits FPA CMF + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE FPA TRUE SIMPLE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE SIMPLE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE SIMPLE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE SIMPLE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE SIMPLE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE SIMPLE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE SIMPLE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mk.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE FPA TRUE SIMPLE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE FPA TRUE SIMPLE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE FPA TRUE SIMPLE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE FPA TRUE SIMPLE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA TRUE NONE + + PSPHOT.MOMENT.PLT OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE SIMPLE + PSPHOT.PSFMODEL.PLT OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE SIMPLE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE + + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA FALSE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA FALSE NONE + + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE SIMTEST + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END + +# FPA file defines properties of a possible input|output object +# user can set the filename (I|O), filename rules (O), or abstract source (@FILES, @DETDB) (I) +# user can set the extension name, if used +# user can set the file type (IMAGE, JPEG, RAW, SX, OBJ, CMP, CMF) : but these are not variable in most cases! +# user can set the file mode (READ, WRITE), but these must be set by the programmer +# user can set the data depth: must be >= file depth + +EXTNAME.RULES METADATA + CMF.HEAD STR hdr + CMF.DATA STR psf + + PSF.HEAD STR hdr + PSF.TABLE STR psf_model + PSF.RESID STR psf_resid +END + Index: /branches/pap_branch_070920/ippconfig/simple/format.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simple/format.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simple/format.config (revision 14957) @@ -0,0 +1,76 @@ +# Drop-dead simple camera with single chip with single cell + +# How to identify this type +RULE METADATA + SIMPLE BOOL TRUE +### NAXIS S32 2 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR NAXIS # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR VALUE + CELL.TRIMSEC STR [0:0,0:0] + # alternatives for getting these from the headers + # CELL.TRIMSEC.SOURCE STR HEADER + # CELL.BIASSEC.SOURCE STR VALUE + # CELL.TRIMSEC STR DATASEC + # CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR INSTRUME + FPA.OBSTYPE STR OBSTYPE + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.POSANGLE STR POSANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.OBJECT STR OBJECT + FPA.TIME STR DATE-OBS UTC-OBS # Date and time + FPA.EXPOSURE STR EXPTIME + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME +# CELL.TIME STR DATE-OBS TIME-OBS # Date and time + CELL.XBIN STR CCDSUM + CELL.YBIN STR CCDSUM +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TIMESYS STR UTC + FPA.RADECSYS STR ICRS + CELL.GAIN F32 1.0 + CELL.READNOISE F32 2.0 + CELL.SATURATION F32 46000 + CELL.BAD F32 0 +# CELL.SATURATION F32 65535 +# CELL.BAD F32 -65535 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR SEPARATE,YEAR.FIRST +END Index: /branches/pap_branch_070920/ippconfig/simple/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simple/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simple/ppImage.config (revision 14957) @@ -0,0 +1,120 @@ +### ppImage recipe configuration file for drop-dead simple camera + +# List of tasks to perform +SHUTTER BOOL FALSE # Shutter correction +DARK BOOL TRUE # Dark correction + +BASE.FITS BOOL TRUE # Save base detrended image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 3 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# How to select the appropriate detrend image +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + MASK METADATA + END + DARK METADATA + END + FLAT METADATA + FILTER STR FPA.FILTER + END + FRINGE METADATA + FILTER STR FPA.FILTER + END + SHUTTER METADATA + END +END + +######################################################################################## +# Need the following in order to turn off overscan and shutter for the site-level recipe +######################################################################################## + +# Overscan subtraction only +PPIMAGE_O METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Dark subtraction only +PPIMAGE_D METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Shutter correction only +PPIMAGE_S METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Overscan, bias, dark +PPIMAGE_OBD METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Overscan, bias, dark, shutter +PPIMAGE_OBDS METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Overscan, bias, dark, shutter, flat-field +PPIMAGE_OBDSF METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFR METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction +END Index: /branches/pap_branch_070920/ippconfig/simple/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simple/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simple/psastro.config (revision 14957) @@ -0,0 +1,36 @@ + +# astrometry matching parameters + +# nominal plate scale (microns / pixel) +# PSASTRO.PLATE.SCALE F32 13.5 +PSASTRO.PLATE.SCALE F32 1.0 + +# pmAstromGridMatch: +PSASTRO.GRID.MIN.ANGLE F32 -0.0851 +PSASTRO.GRID.MAX.ANGLE F32 +0.0851 +PSASTRO.GRID.DEL.ANGLE F32 0.0170 + +# pmAstromGridAngle +# max grid offset in FP units (microns) +# use plate-scale to make this in pixels? +# PSASTRO.GRID.OFFSET F32 10000. +# PSASTRO.GRID.SCALE F32 500. +PSASTRO.GRID.OFFSET F32 1000. +PSASTRO.GRID.SCALE F32 50 + +# these tweak are in FP units (pixels, currently) +PSASTRO.TWEAK.SCALE F32 1 +PSASTRO.TWEAK.RANGE F32 75 +PSASTRO.TWEAK.SMOOTH F32 2 +PSASTRO.TWEAK.NSIGMA F32 3 + +# pmAstromRadiusMatch +# use plate-scale to make this in pixels? +PSASTRO.MATCH.RADIUS F32 8 + +# pmAstromMatchFit +PSASTRO.CHIP.NX S32 1 # fit order +PSASTRO.CHIP.NY S32 1 # fit order +PSASTRO.CHIP.NITER S32 3 # fit clipping iterations +PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas + Index: /branches/pap_branch_070920/ippconfig/simple/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simple/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simple/psphot.config (revision 14957) @@ -0,0 +1,16 @@ + +SAVE.BACKMDL BOOL TRUE +SAVE.BACKGND BOOL TRUE +SAVE.BACKSUB BOOL TRUE +SAVE.PLOTS BOOL TRUE +SAVE.RESID BOOL TRUE +SAVE.PSF BOOL TRUE +LOAD.PSF BOOL FALSE + +IMSTATS_NPIX S32 3000 # number of pixels to use for sky estimate boxes: + +MOMENTS_SN_MIN F32 20.0 # min S/N to measure moments +FULL_FIT_SN_LIM F32 100.0 +EXT_MIN_SN F32 100.0 # fit galaxies above this S/N limit + +PEAKS_NSIGMA_LIMIT F32 10.0 # peak significance threshold Index: /branches/pap_branch_070920/ippconfig/simtest/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simtest/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile.in +Makefile Index: /branches/pap_branch_070920/ippconfig/simtest/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simtest/Makefile.am (revision 14957) @@ -0,0 +1,20 @@ + +installdir = $(datadir)/ippconfig/simtest + +install_files = \ + camera.config \ + format.config \ + ppImage.config \ + psastro.config \ + psphot.config \ + rejections.config \ + dvo.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/simtest/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simtest/camera.config (revision 14957) @@ -0,0 +1,242 @@ +# Camera configuration file for simulation test + +# File formats that we know about +FORMATS METADATA + SIMTEST STR simtest/format.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + Chip STR Cell +END + +# valid filter names and corresponding IDs +FILTER.ID METADATA + NONE STR NONE + g STR g + r STR r + i STR i + z STR z +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa +END + +DVO.CAMERADIR STR simtest # Camera directory for DVO + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + PPIMAGE STR simtest/ppImage.config # Default: all (normal) options on + PSPHOT STR simtest/psphot.config # psphot details + PSASTRO STR simtest/psastro.config # psastro details + REJECTIONS STR simtest/rejections.config # Rejection for detrend creation +END + +REDUCTION METADATA + # Detrend processing + DETREND METADATA + BIAS_PROCESS STR PPIMAGE_O + BIAS_RESID STR PPIMAGE_B + BIAS_VERIFY STR PPIMAGE_OB + BIAS_STACK STR PPMERGE_BIAS + DARK_PROCESS STR PPIMAGE_OB + DARK_RESID STR PPIMAGE_D + DARK_VERIFY STR PPIMAGE_OBD + DARK_STACK STR PPMERGE_DARK + SHUTTER_PROCESS STR PPIMAGE_OBD + SHUTTER_RESID STR PPIMAGE_S + SHUTTER_VERIFY STR PPIMAGE_OBDS + SHUTTER_STACK STR PPMERGE_SHUTTER + FLAT_PROCESS STR PPIMAGE_OBDS + FLAT_RESID STR PPIMAGE_F + FLAT_VERIFY STR PPIMAGE_OBDSF + FLAT_STACK STR PPMERGE_FLAT + FRINGE_PROCESS STR PPIMAGE_OBDSF + FRINGE_RESID STR PPIMAGE_R + FRINGE_VERIFY STR PPIMAGE_OBDSFR + FRINGE_STACK STR PPMERGE_FRINGE + + JPEG_BIN1_IMAGE_BIAS STR PPIMAGE_J1_IMAGE_B + JPEG_BIN1_IMAGE_DARK STR PPIMAGE_J1_IMAGE_B + JPEG_BIN1_IMAGE_SHUTTER STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_FLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_DOMEFLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_SKYFLAT STR PPIMAGE_J1_IMAGE_F + JPEG_BIN1_IMAGE_FRINGE STR PPIMAGE_J1_IMAGE_R + JPEG_BIN2_IMAGE_BIAS STR PPIMAGE_J2_IMAGE_B + JPEG_BIN2_IMAGE_DARK STR PPIMAGE_J2_IMAGE_B + JPEG_BIN2_IMAGE_SHUTTER STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_FLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_DOMEFLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_SKYFLAT STR PPIMAGE_J2_IMAGE_F + JPEG_BIN2_IMAGE_FRINGE STR PPIMAGE_J2_IMAGE_R + + JPEG_BIN1_RESID_BIAS STR PPIMAGE_J1_RESID_B + JPEG_BIN1_RESID_DARK STR PPIMAGE_J1_RESID_B + JPEG_BIN1_RESID_SHUTTER STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_FLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_DOMEFLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_SKYFLAT STR PPIMAGE_J1_RESID_F + JPEG_BIN1_RESID_FRINGE STR PPIMAGE_J1_RESID_R + JPEG_BIN2_RESID_BIAS STR PPIMAGE_J2_RESID_B + JPEG_BIN2_RESID_DARK STR PPIMAGE_J2_RESID_B + JPEG_BIN2_RESID_SHUTTER STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_FLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_DOMEFLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_SKYFLAT STR PPIMAGE_J2_RESID_F + JPEG_BIN2_RESID_FRINGE STR PPIMAGE_J2_RESID_R + END + # Processing raw data + DEFAULT METADATA + CHIP STR PPIMAGE_OBDSFRA + JPEG_BIN1 STR PPIMAGE_J1 + JPEG_BIN2 STR PPIMAGE_J2 + END + NO_PHOTOM METADATA + CHIP STR PPIMAGE_OBDSF + END + # Photometry and astrometry of data that's already processed + PROCESSED METADATA + CHIP STR PPIMAGE_PA + END + +END + +FILERULES METADATA + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMF + PSASTRO.OUTPUT.MEF STR PSASTRO.OUTPUT.CMF + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + + ### input file definitions + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT none.fits FPA IMAGE + INPUT.MASK INPUT none.fits FPA MASK + INPUT.WEIGHT INPUT none.fits FPA WEIGHT + INPUT.PSF INPUT none.fits READOUT PSF + INPUT.SRC INPUT none.fits READOUT CMF + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES CHIP IMAGE + PSPHOT.INPUT INPUT none.fits CHIP IMAGE + + PSWARP.INPUT INPUT none.fits FPA IMAGE + PSWARP.WEIGHT INPUT none.fits FPA WEIGHT + PSWARP.MASK INPUT none.fits FPA MASK + PSWARP.SKYCELL INPUT none.fits FPA IMAGE + PSWARP.ASTROM INPUT none.fits FPA CMF + + PSASTRO.INPUT.CMP INPUT none.fits CHIP CMP + PSASTRO.INPUT.CMF INPUT none.fits CHIP CMF + PSPHOT.PSF.LOAD INPUT none.psf CHIP PSF + PSPHOT.INPUT.CMF INPUT none.fits CHIP CMF + + PPSUB.INPUT INPUT none.fits FPA IMAGE + PPSUB.INPUT.MASK INPUT none.fits FPA MASK + PPSUB.INPUT.WEIGHT INPUT none.fits FPA WEIGHT + PPSUB.REF INPUT none.fits FPA IMAGE + PPSUB.REF.MASK INPUT none.fits FPA MASK + PPSUB.REF.WEIGHT INPUT none.fits FPA WEIGHT + + PPSTACK.INPUT INPUT none.fits FPA IMAGE + PPSTACK.INPUT.MASK INPUT none.fits FPA MASK + PPSTACK.INPUT.WEIGHT INPUT none.fits FPA WEIGHT + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PPIMAGE.CHIP OUTPUT {OUTPUT}.ch.fits IMAGE FPA TRUE NONE + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.ch.mask.fits MASK FPA TRUE NONE + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.ch.wt.fits WEIGHT FPA TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + PPIMAGE.STATS OUTPUT {OUTPUT}.stats STATS FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE FPA TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE FPA TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE FPA TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE FPA TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE FPA TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE FPA TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + SOURCE.PLOT.APRESID OUTPUT {OUTPUT}.dap.png KAPA FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSTACK.OUTPUT.WEIGHT OUTPUT {OUTPUT}.weight.fits WEIGHT FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE SIMTEST + PPSIM.SOURCES OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + + LOG.IMFILE OUTPUT {OUTPUT}.imfile.log TEXT FPA TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.exp.log TEXT FPA TRUE NONE +END + +EXTNAME.RULES METADATA + CMF.HEAD STR {CHIP.NAME}.hdr + CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT? + + PSF.HEAD STR {CHIP.NAME}.hdr + PSF.TABLE STR {CHIP.NAME}.psf_model + PSF.RESID STR {CHIP.NAME}.psf_resid +END + +BLANK.HEADERS METADATA + FPA.TIME STR MJD-OBS + FPA.EXPOSURE STR EXPTIME + FPA.AIRMASS STR AIRMASS +END + +TESSELLATIONS METADATA + # Tessellation name with corresponding DVO catdir + Skycells STR path://SIMTEST/skycells +END Index: /branches/pap_branch_070920/ippconfig/simtest/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simtest/dvo.config (revision 14957) @@ -0,0 +1,59 @@ + +# keywords used by DVO to interpret the headers + +# keyword abstractions: +DATE-KEYWORD DATE-OBS +UT-KEYWORD UTC-OBS +DATE-MODE YYYY-MM-DD +JD-KEYWORD NONE +MJD-KEYWORD NONE + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX 0 +CAL_INSTMAG_MIN 0 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 1.0 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 + +IMAGE_SCATTER 0.075 # mark images POOR if stdev(Mcal) > IMAGE_SCATTER +STAR_SCATTER 0.005 # mark stars POOR if stdev(Mrel) > STAR_SCATTER +IMAGE_OFFSET 0.100 # mark images POOR if abs(delta(Mcal)) > IMAGE_OFFSET +STAR_CHISQ 10.0 # mark stars POOR if Xm > STAR_CHISQ +STAR_TOOFEW 3 # mark star FEW if N(good) < STAR_TOOFEW +IMAGE_TOOFEW 10 # mark image FEW if N(good) < IMAGE_TOOFEW +IMAGE_GOOD_FRACTION 0.05 # mark image FEW if N(good) < IMAGE_GOOD_FRACTION * Nstars + +SCATTER_LIM 15.0 +MAG_LIM 20.0 # select stars brighter than this for relphot analysis +SIGMA_LIM 0.015 # select measurements with dM < SIGMA_LIM for relphot analysis +# INST_MAG_MIN -17 # optional constraints on magnitude ranges +# INST_MAG_MAX -13 # optional constraints on magnitude ranges + +RELPHOT_GRID_BINNING 256 +RELPHOT_GRID_X 6 +RELPHOT_GRID_Y 14 Index: /branches/pap_branch_070920/ippconfig/simtest/format.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/format.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simtest/format.config (revision 14957) @@ -0,0 +1,80 @@ +# Simulation test camera with single chip with single cell + +# How to identify this type +RULE METADATA + INSTRUME STR SIMTEST + TELESCOP STR SimScope + SIMPLE BOOL TRUE +# NAXIS S32 2 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR NAXIS # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR HEADER + CELL.TRIMSEC STR TRIMSEC + CELL.BIASSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR INSTRUME + FPA.OBSTYPE STR OBSTYPE + FPA.AIRMASS STR AIRMASS + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.POSANGLE STR POSANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.OBJECT STR OBJECT + FPA.TIME STR DATE-OBS UTC-OBS # Date and time + FPA.EXPOSURE STR EXPTIME + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR DATE-OBS UTC-OBS # Date and time + CELL.XBIN STR XBIN + CELL.YBIN STR YBIN +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TIMESYS STR UTC + FPA.RADECSYS STR ICRS + FPA.DETECTOR STR SIMTEST + CELL.SATURATION F32 65535 + CELL.BAD F32 0 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 + CELL.XSIZE S32 2048 + CELL.YSIZE S32 2048 + CELL.XWINDOW S32 0 + CELL.YWINDOW S32 0 + CELL.GAIN F32 1.0 + CELL.READNOISE F32 10.0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR SEPARATE,YEAR.FIRST + CELL.TIME STR SEPARATE,YEAR.FIRST +END Index: /branches/pap_branch_070920/ippconfig/simtest/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simtest/ppImage.config (revision 14957) @@ -0,0 +1,225 @@ +### ppImage recipe configuration file for simulated test camera + +# List of tasks to perform + +BASE.FITS BOOL TRUE # Save base detrended image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 7 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# How to select the appropriate detrend image +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + MASK METADATA + END + DARK METADATA + END + FLAT METADATA + FILTER STR FPA.FILTER + END + FRINGE METADATA + FILTER STR FPA.FILTER + END + SHUTTER METADATA + END +END + +# Photometry code +PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID} + +######################################################################################## +# Need the following in order to turn off overscan and shutter for the site-level recipe +######################################################################################## + +# Overscan subtraction only +PPIMAGE_O METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Dark subtraction only +PPIMAGE_D METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Shutter correction only +PPIMAGE_S METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark +PPIMAGE_OBD METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter +PPIMAGE_OBDS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field +PPIMAGE_OBDSF METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFR METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL FALSE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.WEIGHT.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.WEIGHT.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL TRUE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + CHIP.MASK.FITS BOOL TRUE # Save mask +END Index: /branches/pap_branch_070920/ippconfig/simtest/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simtest/psastro.config (revision 14957) @@ -0,0 +1,4 @@ +# DVO.CATDIR STR path://SIMTEST/catdir.synth.simtest/ +DVO.CATDIR STR /data/alala.0/ipp/ippRefs/catdir.synth.grizy + +PSASTRO.MAX.NSTAR S32 50 # max stars accepted for fitting Index: /branches/pap_branch_070920/ippconfig/simtest/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simtest/psphot.config (revision 14957) @@ -0,0 +1,29 @@ + +SAVE.BACKMDL BOOL TRUE +SAVE.BACKGND BOOL TRUE +SAVE.BACKSUB BOOL TRUE +SAVE.PLOTS BOOL TRUE +SAVE.RESID BOOL TRUE +SAVE.PSF BOOL TRUE +LOAD.PSF BOOL FALSE + +IMSTATS_NPIX S32 3000 # number of pixels to use for sky estimate boxes: + +#PSPHOT_TEST METADATA +# SAVE.BACKSUB BOOL FALSE +# SAVE.RESID BOOL TRUE +#END +# +#PEAKS_OUTPUT_FILE STR peaks.dat +#MOMENTS_OUTPUT_FILE STR moments.dat + +#PSF_SN_LIM F32 20.0 # minimum S/N for stars used for PSF model +MOMENTS_SN_MIN F32 20.0 # min S/N to measure moments +FULL_FIT_SN_LIM F32 100.0 +EXT_MIN_SN F32 100.0 # fit galaxies above this S/N limit + +PEAKS_NSIGMA_LIMIT F32 10.0 # peak significance threshold +BREAK_POINT STR ENSEMBLE # limit total processing for now (for speed) + + +SKY_STAT STR ROBUST_MEDIAN # statistic used to measure background Index: /branches/pap_branch_070920/ippconfig/simtest/rejections.config =================================================================== --- /branches/pap_branch_070920/ippconfig/simtest/rejections.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/simtest/rejections.config (revision 14957) @@ -0,0 +1,49 @@ + +DARK METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 2.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 1.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 1.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.5 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + + +SHUTTER METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SNR F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SNR F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SNR F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SNR F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 0.0 + ENSEMBLE.STDEV F32 0.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END Index: /branches/pap_branch_070920/ippconfig/skycell/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/skycell/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/skycell/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/skycell/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/skycell/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/skycell/Makefile.am (revision 14957) @@ -0,0 +1,14 @@ + +installdir = $(datadir)/ippconfig/skycell + +install_files = \ + dvo.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/skycell/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/skycell/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/skycell/dvo.config (revision 14957) @@ -0,0 +1,15 @@ +# DVO configuration for skycells of all cameras +# Contains keywords used by DVO to interpret the headers + +# Date keyword abstractions: +DATE-KEYWORD NONE +UT-KEYWORD NONE +DATE-MODE YYYY-MM-DD +JD-KEYWORD NONE +MJD-KEYWORD MJD-OBS + +# Other important keyword abstractions: +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD NONE +ST-KEYWORD NONE Index: /branches/pap_branch_070920/ippconfig/tc3/.cvsignore =================================================================== --- /branches/pap_branch_070920/ippconfig/tc3/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tc3/.cvsignore (revision 14957) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /branches/pap_branch_070920/ippconfig/tc3/Makefile.am =================================================================== --- /branches/pap_branch_070920/ippconfig/tc3/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tc3/Makefile.am (revision 14957) @@ -0,0 +1,17 @@ + +installdir = $(datadir)/ippconfig/tc3 + +install_files = \ + dvo.config \ + camera.config \ + format.config \ + ppImage.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /branches/pap_branch_070920/ippconfig/tc3/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tc3/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tc3/camera.config (revision 14957) @@ -0,0 +1,132 @@ +# Camera configuration file for Cfh12k: describes the camera + +# File formats that we know about +FORMATS METADATA + RAW STR tc3/format.config +END + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + CCID58-1-06b2 STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID45-1-14A STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID45-1-11A STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID45-1-22A STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID45-1-04C STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID45-1-13A STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID45-1-05A STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 + CCID45-1-19A STR xy00 xy01 xy02 xy03 xy04 xy05 xy06 xy07 xy10 xy11 xy12 xy13 xy14 xy15 xy16 xy17 xy20 xy21 xy22 xy23 xy24 xy25 xy26 xy27 xy30 xy31 xy32 xy33 xy34 xy35 xy36 xy37 xy40 xy41 xy42 xy43 xy44 xy45 xy46 xy47 xy50 xy51 xy52 xy53 xy54 xy55 xy56 xy57 xy60 xy61 xy62 xy63 xy64 xy65 xy66 xy67 xy70 xy71 xy72 xy73 xy74 xy75 xy76 xy77 +END + +# ccd00 +# ccd01 +# ccd10 +# ccd11 +# ccd20 +# ccd21 +# ccd30 +# ccd31 + +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + NONE STR NONE + B STR B + V STR V +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa + CHIP STR {CHIP.NAME} + CELL STR {CHIP.NAME}:{CELL.NAME} + fpa STR fpa + chip STR {CHIP.NAME} + cell STR {CHIP.NAME}:{CELL.NAME} +END + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + # Other recipes +# PSPHOT STR tc3/psphot.config # psphot details +# PSASTRO STR tc3/psastro.config # psastro details +# PPSTATS STR tc3/ppStats.config # ppStats recipe + PPIMAGE STR tc3/ppImage.config # ppImage recipe +END + +FILERULES METADATA + ### Redirections + PSASTRO.INPUT STR PSASTRO.INPUT.CMP + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + DVOCORR.OUTPUT STR DVOCORR.MEF.OUTPUT + DVOFLAT.OUTPUT STR DVOFLAT.MEF.OUTPUT + + ### input file definitions + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE + + ## can we just use PPIMAGE.INPUT as the pmFPAfile name? + DVOCORR.INPUT INPUT @FILES CHIP IMAGE + DVOCORR.REFHEAD INPUT @FILES CHIP HEADER + + DVOFLAT.INPUT INPUT @FILES CHIP IMAGE + DVOFLAT.CORR INPUT @DETDB CHIP IMAGE + + ### use these entries to get the detrend images from the database + PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE + + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + + ### output file definitions + TYPE OUTPUT FILENAME.RULE DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fits CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.{CHIP.NAME}.mask.fits CHIP MASK TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.{CHIP.NAME}.wt.fits CHIP WEIGHT TRUE NONE + PPIMAGE.BIN1 OUTPUT {OUTPUT}.{CHIP.NAME}.b1.fits CHIP IMAGE TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.{CHIP.NAME}.b2.fits CHIP IMAGE TRUE NONE + DVOCORR.MEF.OUTPUT OUTPUT {OUTPUT}.fc.fits CHIP IMAGE TRUE NONE + DVOCORR.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fc.fits CHIP IMAGE TRUE NONE + DVOFLAT.MEF.OUTPUT OUTPUT {OUTPUT}.co.fits CHIP IMAGE TRUE NONE + DVOFLAT.SPL.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.co.fits CHIP IMAGE TRUE NONE + + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.{CHIP.NAME}.chip.fits CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits FPA IMAGE TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg FPA JPEG TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg FPA JPEG TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits CHIP IMAGE TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits CHIP IMAGE TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits CHIP IMAGE TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits CHIP IMAGE TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} CHIP RAW TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx CHIP SX TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj CHIP OBJ TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CHIP CMF TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CHIP CMP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CHIP CMP TRUE NONE + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END Index: /branches/pap_branch_070920/ippconfig/tc3/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tc3/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tc3/dvo.config (revision 14957) @@ -0,0 +1,63 @@ + +# location of DVO database tables +CATDIR /data/alala.0/eugene/isp/catdir + +# keywords used by DVO to interpret the headers + +# keyword abstractions: +DATE-KEYWORD DATE-OBS +DATE-MODE yyyy-mm-dd +UT-KEYWORD UTC-OBS +JD-KEYWORD NONE +MJD-KEYWORD NONE + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX 0 +CAL_INSTMAG_MIN 0 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 1.0 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 + +IMAGE_SCATTER 0.075 # mark images POOR if stdev(Mcal) > IMAGE_SCATTER +STAR_SCATTER 0.005 # mark stars POOR if stdev(Mrel) > STAR_SCATTER +IMAGE_OFFSET 0.100 # mark images POOR if abs(delta(Mcal)) > IMAGE_OFFSET +STAR_CHISQ 10.0 # mark stars POOR if Xm > STAR_CHISQ +STAR_TOOFEW 3 # mark star FEW if N(good) < STAR_TOOFEW +IMAGE_TOOFEW 10 # mark image FEW if N(good) < IMAGE_TOOFEW +IMAGE_GOOD_FRACTION 0.05 # mark image FEW if N(good) < IMAGE_GOOD_FRACTION * Nstars + +SCATTER_LIM 15.0 +MAG_LIM 20.0 # select stars brighter than this for relphot analysis +SIGMA_LIM 0.015 # select measurements with dM < SIGMA_LIM for relphot analysis +# INST_MAG_MIN -17 # optional constraints on magnitude ranges +# INST_MAG_MAX -13 # optional constraints on magnitude ranges + +RELPHOT_GRID_BINNING 256 +RELPHOT_GRID_X 6 +RELPHOT_GRID_Y 14 + Index: /branches/pap_branch_070920/ippconfig/tc3/format.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tc3/format.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tc3/format.config (revision 14957) @@ -0,0 +1,361 @@ +# Camera format configuration for Pan-STARRS Test Camera 3 + +# How to recognise this type +RULE METADATA +# IMAGESWV STR GPC DaqCom v2.05 (Mar 08 2007) + ORIGIN STR PS1 + CONTROLR STR STARGRASP + EXTEND BOOL T +END + +FILE METADATA + # How to read this data + PHU STR CHIP # The FITS file represents a chip + EXTENSIONS STR CELL # The extensions represent cells + FPA.NAME STR OBSTYPE # A PHU keyword for unique identifier + CHIP.NAME STR DETECTOR # An extension keyword for unique identifie + CONTENT STR {CHIP.NAME} # How to determine content of FITS file +END + +# What's in the FITS file? +CONTENTS METADATA + # File identifier with corresponding file layout name + CCID58-1-06b2 STR CCD_10u + CCID45-1-14A STR CCD_12u + CCID45-1-11A STR CCD_12u + CCID45-1-22A STR CCD_12u + CCID45-1-04C STR CCD_10u + CCID45-1-13A STR CCD_12u + CCID45-1-05A STR CCD_12u + CCID45-1-19A STR CCD_12u +END + +# Specify the layout +CHIPS METADATA + CCD_10u METADATA + # Extension name, cellName:cellType + xy00 STR xy00:pitch10u + xy01 STR xy01:pitch10u + xy02 STR xy02:pitch10u + xy03 STR xy03:pitch10u + xy04 STR xy04:pitch10u + xy05 STR xy05:pitch10u + xy06 STR xy06:pitch10u + xy07 STR xy07:pitch10u + xy10 STR xy10:pitch10u + xy11 STR xy11:pitch10u + xy12 STR xy12:pitch10u + xy13 STR xy13:pitch10u + xy14 STR xy14:pitch10u + xy15 STR xy15:pitch10u + xy16 STR xy16:pitch10u + xy17 STR xy17:pitch10u + xy20 STR xy20:pitch10u + xy21 STR xy21:pitch10u + xy22 STR xy22:pitch10u + xy23 STR xy23:pitch10u + xy24 STR xy24:pitch10u + xy25 STR xy25:pitch10u + xy26 STR xy26:pitch10u + xy27 STR xy27:pitch10u + xy30 STR xy30:pitch10u + xy31 STR xy31:pitch10u + xy32 STR xy32:pitch10u + xy33 STR xy33:pitch10u + xy34 STR xy34:pitch10u + xy35 STR xy35:pitch10u + xy36 STR xy36:pitch10u + xy37 STR xy37:pitch10u + xy40 STR xy40:pitch10u + xy41 STR xy41:pitch10u + xy42 STR xy42:pitch10u + xy43 STR xy43:pitch10u + xy44 STR xy44:pitch10u + xy45 STR xy45:pitch10u + xy46 STR xy46:pitch10u + xy47 STR xy47:pitch10u + xy50 STR xy50:pitch10u + xy51 STR xy51:pitch10u + xy52 STR xy52:pitch10u + xy53 STR xy53:pitch10u + xy54 STR xy54:pitch10u + xy55 STR xy55:pitch10u + xy56 STR xy56:pitch10u + xy57 STR xy57:pitch10u + xy60 STR xy60:pitch10u + xy61 STR xy61:pitch10u + xy62 STR xy62:pitch10u + xy63 STR xy63:pitch10u + xy64 STR xy64:pitch10u + xy65 STR xy65:pitch10u + xy66 STR xy66:pitch10u + xy67 STR xy67:pitch10u + xy70 STR xy70:pitch10u + xy71 STR xy71:pitch10u + xy72 STR xy72:pitch10u + xy73 STR xy73:pitch10u + xy74 STR xy74:pitch10u + xy75 STR xy75:pitch10u + xy76 STR xy76:pitch10u + xy77 STR xy77:pitch10u + END + CCD_12u METADATA + # Extension name, cellName:cellType + xy00 STR xy00:pitch12u + xy01 STR xy01:pitch12u + xy02 STR xy02:pitch12u + xy03 STR xy03:pitch12u + xy04 STR xy04:pitch12u + xy05 STR xy05:pitch12u + xy06 STR xy06:pitch12u + xy07 STR xy07:pitch12u + xy10 STR xy10:pitch12u + xy11 STR xy11:pitch12u + xy12 STR xy12:pitch12u + xy13 STR xy13:pitch12u + xy14 STR xy14:pitch12u + xy15 STR xy15:pitch12u + xy16 STR xy16:pitch12u + xy17 STR xy17:pitch12u + xy20 STR xy20:pitch12u + xy21 STR xy21:pitch12u + xy22 STR xy22:pitch12u + xy23 STR xy23:pitch12u + xy24 STR xy24:pitch12u + xy25 STR xy25:pitch12u + xy26 STR xy26:pitch12u + xy27 STR xy27:pitch12u + xy30 STR xy30:pitch12u + xy31 STR xy31:pitch12u + xy32 STR xy32:pitch12u + xy33 STR xy33:pitch12u + xy34 STR xy34:pitch12u + xy35 STR xy35:pitch12u + xy36 STR xy36:pitch12u + xy37 STR xy37:pitch12u + xy40 STR xy40:pitch12u + xy41 STR xy41:pitch12u + xy42 STR xy42:pitch12u + xy43 STR xy43:pitch12u + xy44 STR xy44:pitch12u + xy45 STR xy45:pitch12u + xy46 STR xy46:pitch12u + xy47 STR xy47:pitch12u + xy50 STR xy50:pitch12u + xy51 STR xy51:pitch12u + xy52 STR xy52:pitch12u + xy53 STR xy53:pitch12u + xy54 STR xy54:pitch12u + xy55 STR xy55:pitch12u + xy56 STR xy56:pitch12u + xy57 STR xy57:pitch12u + xy60 STR xy60:pitch12u + xy61 STR xy61:pitch12u + xy62 STR xy62:pitch12u + xy63 STR xy63:pitch12u + xy64 STR xy64:pitch12u + xy65 STR xy65:pitch12u + xy66 STR xy66:pitch12u + xy67 STR xy67:pitch12u + xy70 STR xy70:pitch12u + xy71 STR xy71:pitch12u + xy72 STR xy72:pitch12u + xy73 STR xy73:pitch12u + xy74 STR xy74:pitch12u + xy75 STR xy75:pitch12u + xy76 STR xy76:pitch12u + xy77 STR xy77:pitch12u + END +END + +# Specify the cell data +CELLS METADATA + pitch10u METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + CELL.XSIZE S32 590 + CELL.YSIZE S32 598 + END + + pitch12u METADATA + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + CELL.XSIZE S32 477 + CELL.YSIZE S32 496 + END + pitch10u METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [575:606,1:594] + CELL.TRIMSEC STR [1:574,1:594] + # CELL.BIASSEC STR BIASSEC + # CELL.TRIMSEC STR DATASEC + END + + # This is just in here for fun + pitch12u METADATA + CELL.BIASSEC.SOURCE STR VALUE + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC STR [1:10,1:512];[523:574,1:512] + CELL.TRIMSEC STR [11:522,1:512] + # CELL.BIASSEC STR BIASSEC + # CELL.TRIMSEC STR TRIMSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR INSTRUME + FPA.DETECTOR STR DETECTOR + FPA.AIRMASS STR AIRMASS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE +# FPA.OBJECT STR OBJECT # Not always available +# FPA.FILTERID STR FILTER # Not available from OTIS +# FPA.FILTER STR FILTER # Not available from OTIS + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.FOCUS STR TELFOCUS + FPA.TIME STR MJD-OBS + FPA.ALT STR TELALT + FPA.AZ STR TELAZ + FPA.TEMP STR DETTEM + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR DETTEM + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.SATURATION STR SATURATE + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +# CELL.BAD STR BADLEVEL + +#### How to get the cell coordiantes from readout coordinates +# READOUT.X0 STR CNPIX1 +# READOUT.Y0 STR CNPIX2 + +### How to get the chip coordinates from cell coordinates + CELL.X0 STR IMNPIX1 + CELL.Y0 STR IMNPIX2 + CELL.XPARITY STR IMTM1_1 + CELL.YPARITY STR IMTM2_2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + FPA.TIMESYS STR UTC + CELL.TIMESYS STR UTC + FPA.FILTERID STR NONE + FPA.FILTER STR NONE + CELL.GAIN F32 1.0 + CELL.READNOISE F32 10.0 + CELL.READDIR S32 1 # Cell is read in x direction + CELL.BAD S32 0 + + CHIP.XSIZE.DEPEND STR CHIP.NAME + CHIP.XSIZE METADATA + CCID58-1-06b2 S32 4837 # 10 micron pitch + CCID45-1-14A S32 4033 + CCID45-1-11A S32 4033 + CCID45-1-22A S32 4033 + CCID45-1-04C S32 4837 # 10 micron pitch + CCID45-1-13A S32 4033 + CCID45-1-05A S32 4033 + CCID45-1-19A S32 4033 + END + + CHIP.YSIZE.DEPEND STR CHIP.NAME + CHIP.YSIZE METADATA + CCID58-1-06b2 S32 4829 # 10 micron pitch + CCID45-1-14A S32 4031 + CCID45-1-11A S32 4031 + CCID45-1-22A S32 4031 + CCID45-1-04C S32 4829 # 10 micron pitch + CCID45-1-13A S32 4031 + CCID45-1-05A S32 4031 + CCID45-1-19A S32 4031 + END + +# CCID58-1-06b2 0,0 +# CCID45-1-14A 0,1 +# CCID45-1-11A 1,0 +# CCID45-1-22A 1,1 +# CCID45-1-04C 2,0 +# CCID45-1-13A 2,1 +# CCID45-1-05A 3,0 +# CCID45-1-19A 3,1 + + ### How to get FPA coordinates from chip coordinates + CHIP.X0.DEPEND STR CHIP.NAME + CHIP.X0 METADATA + CCID58-1-06b2 S32 0 + CCID45-1-14A S32 0 + CCID45-1-11A S32 4900 + CCID45-1-22A S32 4900 + CCID45-1-04C S32 9800 + CCID45-1-13A S32 9800 + CCID45-1-05A S32 14700 + CCID45-1-19A S32 14700 + END + CHIP.Y0.DEPEND STR CHIP.NAME + CHIP.Y0 METADATA + CCID58-1-06b2 S32 0 + CCID45-1-14A S32 4900 + CCID45-1-11A S32 0 + CCID45-1-22A S32 4900 + CCID45-1-04C S32 0 + CCID45-1-13A S32 4900 + CCID45-1-05A S32 0 + CCID45-1-19A S32 4900 + END + CHIP.XPARITY.DEPEND STR CHIP.NAME + CHIP.XPARITY METADATA + CCID58-1-06b2 S32 +1 + CCID45-1-14A S32 +1 + CCID45-1-11A S32 +1 + CCID45-1-22A S32 +1 + CCID45-1-04C S32 +1 + CCID45-1-13A S32 +1 + CCID45-1-05A S32 +1 + CCID45-1-19A S32 +1 + END + CHIP.YPARITY.DEPEND STR CHIP.NAME + CHIP.YPARITY METADATA + CCID58-1-06b2 S32 +1 + CCID45-1-14A S32 +1 + CCID45-1-11A S32 +1 + CCID45-1-22A S32 +1 + CCID45-1-04C S32 +1 + CCID45-1-13A S32 +1 + CCID45-1-05A S32 +1 + CCID45-1-19A S32 +1 + END +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# CELL.GAIN dbEntry Camera gain chipId,cellId CHIP.NAME,CELL.NAME +# CELL.READNOISE dbEntry Camera readNoise chipId,cellId CHIP.NAME,CELL.NAME + +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + Index: /branches/pap_branch_070920/ippconfig/tc3/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tc3/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tc3/ppImage.config (revision 14957) @@ -0,0 +1,303 @@ +### ppImage recipe configuration file for Megacam + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +OVERSCAN.FIT STR NONE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 0 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction +DARK BOOL TRUE # Dark subtraction +FLAT BOOL TRUE # Flat-field normalisation +SHUTTER BOOL FALSE # Shutter correction +FRINGE BOOL FALSE # Fringe subtraction + +# this table lists extra constraints which should be applied when +# selecting the detrend images. +# note: camera and time are always applied + +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + END + FLAT METADATA + FILTER STR FPA.FILTERID + END + FLAT_CORRECTION METADATA + FILTER STR FPA.FILTER + END + FRINGE METADATA + FILTER STR FPA.FILTER + END + SHUTTER METADATA + END +END + +# only apply the fringe for these filters +FRINGE.FILTERS MULTI +FRINGE.FILTERS STR r +FRINGE.FILTERS STR i +FRINGE.FILTERS STR z + +PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID}.{CHIP.N} + + + +################################################################################ +# Diffferent processing options, which may be loaded symbolically +################################################################################ + +# No operation except potential normalisation +PPIMAGE_N METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan subtraction only +PPIMAGE_O METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Bias subtraction only +PPIMAGE_B METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Dark subtraction only +PPIMAGE_D METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Shutter correction only +PPIMAGE_S METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Flat-fielding only +PPIMAGE_F METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Fringe correction only +PPIMAGE_R METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Photometry only +PPIMAGE_P METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry +END + +# Photometry & Astrometry +PPIMAGE_A METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Source identification and photometry +END + +# Overscan, bias +PPIMAGE_OB METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark +PPIMAGE_OBD METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter +PPIMAGE_OBDS METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field +PPIMAGE_OBDSF METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFR METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL TRUE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? +END + +# Save JPEG from BIN1 +PPIMAGE_J1 METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BASE.FITS BOOL FALSE # Save base image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? + BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned +END + +# Save JPEG from BIN2 +PPIMAGE_J2 METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BASE.FITS BOOL FALSE # Save base image? + BIN1.FITS BOOL FALSE # Save 1st binned chip image? + BIN2.FITS BOOL FALSE # Save 2nd binned chip image? + BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? + BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + BIN1.XBIN S32 1 # Image is already binned + BIN1.YBIN S32 1 # Image is already binned + BIN2.XBIN S32 1 # Image is already binned + BIN2.YBIN S32 1 # Image is already binned +END Index: /branches/pap_branch_070920/ippconfig/tek/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/camera.config (revision 14957) @@ -0,0 +1,181 @@ +# Camera configuration file for Tek + +# File formats that we know about +FORMATS METADATA + TEK STR tek/format.config + CMP STR tek/cmp.config + CMF STR tek/cmf.config +END + + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + Chip STR Cell +END + +# Recipe options +RECIPES METADATA + PSPHOT STR tek/psphot.config # psphot details + PSASTRO STR tek/psastro.config # psastro details + PPIMAGE STR tek/ppImage.config # Recipes for ppImage + PPMERGE STR tek/ppMerge.config # Recipes for ppMerge + REJECTIONS STR tek/rejections.config +END + +FILTER.ID METADATA + g STR g + r STR r + i STR i + z STR z + y STR y + R STR R +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + FPA STR fpa +END + +DVO.CAMERADIR STR tek # Camera directory for DVO + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +FILERULES METADATA + PSASTRO.INPUT STR PSASTRO.INPUT.CMF + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMF + PSASTRO.OUTPUT.MEF STR PSASTRO.OUTPUT.CMF + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + + ### input file definitions + ### use @DETDB entries to get the detrend images from the database + ### replace @DETDB with @FILES if you want to require it from the + ### command line, or with an explicit name to require a specific file + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + + ## files used by ppImage + PPIMAGE.INPUT INPUT @FILES FPA IMAGE + PPIMAGE.MASK INPUT mask.fits FPA IMAGE + PPIMAGE.BIAS INPUT @DETDB FPA IMAGE + PPIMAGE.DARK INPUT @DETDB FPA IMAGE + PPIMAGE.FLAT INPUT @DETDB FPA IMAGE + PPIMAGE.FRINGE INPUT @DETDB FPA FRINGE + PPIMAGE.SHUTTER INPUT @DETDB FPA IMAGE + + ## files used to build and apply the flat-field correction images + DVOCORR.INPUT INPUT @FILES FPA IMAGE + DVOCORR.REFHEAD INPUT @FILES FPA HEADER + DVOFLAT.INPUT INPUT @FILES FPA IMAGE + DVOFLAT.CORR INPUT @DETDB FPA IMAGE + + ## files used by psphot + PSPHOT.LOAD INPUT @FILES FPA IMAGE + PSPHOT.INPUT INPUT @FILES FPA IMAGE + PSPHOT.MASK INPUT @FILES FPA MASK + PSPHOT.WEIGHT INPUT @FILES FPA WEIGHT + PSPHOT.PSF.LOAD INPUT @FILES FPA PSF + + ## files used by psastro + PSASTRO.INPUT.CMP INPUT @FILES FPA CMP + PSASTRO.INPUT.CMF INPUT @FILES FPA CMF + + ## files used by pswarp + PSWARP.INPUT INPUT @FILES FPA IMAGE + PSWARP.WEIGHT INPUT @FILES FPA WEIGHT + PSWARP.MASK INPUT @FILES FPA MASK + PSWARP.SKYCELL INPUT @FILES FPA IMAGE + PSWARP.ASTROM INPUT @FILES FPA CMF + + + PPSUB.INPUT INPUT none.fits FPA IMAGE + PPSUB.INPUT.MASK INPUT none.fits FPA MASK + PPSUB.INPUT.WEIGHT INPUT none.fits FPA WEIGHT + PPSUB.REF INPUT none.fits FPA IMAGE + PPSUB.REF.MASK INPUT none.fits FPA MASK + PPSUB.REF.WEIGHT INPUT none.fits FPA WEIGHT + + PPSTACK.INPUT INPUT none.fits FPA IMAGE + PPSTACK.INPUT.MASK INPUT none.fits FPA MASK + + + + ### output file definitions + TYPE OUTPUT FILENAME.RULE FILE.TYPE DATA.LEVEL FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.tek.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPIMAGE.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PPIMAGE.CHIP OUTPUT {OUTPUT}.chip.fits IMAGE FPA TRUE NONE + PPIMAGE.CHIP.MASK OUTPUT {OUTPUT}.chip.mk.fits MASK FPA TRUE NONE + PPIMAGE.CHIP.WEIGHT OUTPUT {OUTPUT}.chip.wt.fits WEIGHT FPA TRUE NONE + + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + + PPIMAGE.BIN1 OUTPUT {OUTPUT}.b1c.fits IMAGE FPA TRUE NONE + PPIMAGE.BIN2 OUTPUT {OUTPUT}.b2c.fits IMAGE FPA TRUE NONE + + PPIMAGE.JPEG1 OUTPUT {OUTPUT}.b1.jpg JPEG FPA TRUE NONE + PPIMAGE.JPEG2 OUTPUT {OUTPUT}.b2.jpg JPEG FPA TRUE NONE + + DVOCORR.OUTPUT OUTPUT {OUTPUT}.fc.fits IMAGE FPA TRUE NONE + DVOFLAT.OUTPUT OUTPUT {OUTPUT}.co.fits IMAGE FPA TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits IMAGE FPA TRUE NONE + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits IMAGE FPA TRUE NONE + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits IMAGE FPA TRUE NONE + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits IMAGE FPA TRUE NONE + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT} RAW FPA TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx SX FPA TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj OBJ FPA TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.cmp CMP FPA TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CMF FPA TRUE NONE + + PSPHOT.PSF.SAVE OUTPUT {OUTPUT}.psf PSF FPA TRUE NONE + + SOURCE.PLOT.MOMENTS OUTPUT {OUTPUT}.mnt.png KAPA FPA TRUE NONE + SOURCE.PLOT.PSFMODEL OUTPUT {OUTPUT}.psf.png KAPA FPA TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.smp CMP FPA TRUE NONE + PSASTRO.OUTPUT.CMF OUTPUT {OUTPUT}.smf CMF FPA TRUE NONE + + PSWARP.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PSWARP.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PSWARP.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + PSWARP.BIN1 OUTPUT {OUTPUT}.b1.fits IMAGE FPA TRUE NONE + PSWARP.BIN2 OUTPUT {OUTPUT}.b2.fits IMAGE FPA TRUE NONE + PPSUB.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSUB.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + PPSUB.OUTPUT.WEIGHT OUTPUT {OUTPUT}.wt.fits WEIGHT FPA TRUE NONE + + PPSTACK.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + PPSTACK.OUTPUT.MASK OUTPUT {OUTPUT}.mask.fits MASK FPA TRUE NONE + + PPSIM.OUTPUT OUTPUT {OUTPUT}.fits IMAGE FPA TRUE NONE + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END + +EXTNAME.RULES METADATA + CMF.HEAD STR cmf.hdr + CMF.DATA STR cmf.psf # use .PSF and .EXT? + + PSF.HEAD STR hdr + PSF.TABLE STR psf_model + PSF.RESID STR psf_resid +END + +TESSELLATIONS METADATA + # Tessellation name with corresponding DVO catdir + Skycells STR /home/group12/jfang/TEK2DATA/skycells +END Index: /branches/pap_branch_070920/ippconfig/tek/cmf.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/cmf.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/cmf.config (revision 14957) @@ -0,0 +1,82 @@ +# Tek + +# How to identify this type +RULE METADATA + SIMPLE BOOL TRUE + NAXIS S32 0 + TELESCOP STR 2.2m-UH + INSTRUME STR TEK + DETECTOR STR Tektronix-2048^2-CCD +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR NAXIS # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC STR [21:2068,1:2048] CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FILTER STR FILTER + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.POSANGLE STR ROTANGLE + FPA.AIRMASS STR AIRMASS + FPA.TIME STR MJD-OBS + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + CELL.READNOISE S32 10 + CELL.BAD S32 0 + FPA.TIMESYS STR UTC + CELL.SATURATION F32 65535 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/tek/cmp.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/cmp.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/cmp.config (revision 14957) @@ -0,0 +1,82 @@ +# Pan-STARRS Imaging Sky Probe + +# How to identify this type +RULE METADATA + SIMPLE BOOL FALSE + NAXIS S32 0 + TELESCOP STR 2.2m-UH + INSTRUME STR TEK + DETECTOR STR Tektronix-2048^2-CCD +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR NAXIS # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC STR [21:2068,1:2048] CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FILTER STR FILTER + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.POSANGLE STR ROTANGLE + FPA.AIRMASS STR AIRMASS + FPA.TIME STR MJD-OBS + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +# CELL.SATURATION STR SATURATE ### Currently set to 0 ???L +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + CELL.READNOISE S32 10 + CELL.BAD S32 0 + FPA.TIMESYS STR UTC + CELL.SATURATION F32 65535 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +END + +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/tek/dvo.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/dvo.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/dvo.config (revision 14957) @@ -0,0 +1,50 @@ + +# location of DVO database tables +CATDIR /media/usbdisk/scr1/catdir.synth.grizy/ + +# keywords used by DVO to interpret the headers + +# used by parse_time to find time-related keywords +MJD-KEYWORD MJD-OBS +DATE-KEYWORD DATE-OBS +DATE-MODE YYYY-MM-DD +UT-KEYWORD UT +JD-KEYWORD JD + +# other keyword abstractions +EXPTIME-KEYWORD EXPTIME +AIRMASS-KEYWORD AIRMASS +CCDNUM-KEYWORD EXTNAME +ST-KEYWORD NONE +OBSERVATORY-LATITUDE NONE +OBSERVATORY-LONGITUDE NONE +SUBPIX_DATAFILE NONE + +# instrumental magnitude range for calibration mode +CAL_INSTMAG_MAX -7.0 +CAL_INSTMAG_MIN -9.5 + +# exclude overscan region from the dB image boundaries +XOVERSCAN 0 +YOVERSCAN 0 + +# only upload stars within region; a value of 0 means ignore the limit +ADDSTAR_XMIN 0 +ADDSTAR_XMAX 0 +ADDSTAR_YMIN 0 +ADDSTAR_YMAX 0 + +# exclude stars with SN > SNLIMIT (ADDSTAR_SNLIMIT overrides old name MIN_SN_FSTAT) +ADDSTAR_SNLIMIT 0 + +# allowed astrometry error (arcseconds) +ADDSTAR_MAX_CERROR 5.0 + +# correlation radius (arcseconds) +ADDSTAR_RADIUS 5.0 + +# scaled correlation radius +ADDSTAR_NSIGMA 0 + +CATMODE MEF +CATFORMAT PANSTARRS_DEV_0 Index: /branches/pap_branch_070920/ippconfig/tek/dvo.layout =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/dvo.layout (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/dvo.layout (revision 14957) @@ -0,0 +1,58 @@ +# this file defines the layout of the mosaic imager: + +# NCCD 40 # this needs work: sometimes 36, sometimes 40 +NCCD 36 +NAXIS1 2112 +NAXIS2 4644 + +MOSAIC_X 11 +MOSAIC_Y 4 + +# lines need to contain: + +CHIPID_KEYWORD EXTNAME + +# ID CHIPID xoffset yoffset xflip yflip datasec biassec Xo Yo theta +CCD.0 ccd00 1 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.1 ccd01 2 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.2 ccd02 3 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.3 ccd03 4 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.4 ccd04 5 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.5 ccd05 6 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.6 ccd06 7 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.7 ccd07 8 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.8 ccd08 9 3 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.9 ccd09 1 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.10 ccd10 2 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.11 ccd11 3 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.12 ccd12 4 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.13 ccd13 5 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.14 ccd14 6 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.15 ccd15 7 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.16 ccd16 8 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.17 ccd17 9 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.18 ccd18 1 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.19 ccd19 2 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.20 ccd20 3 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.21 ccd21 4 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.22 ccd22 5 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.23 ccd23 6 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.24 ccd24 7 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.25 ccd25 8 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.26 ccd26 9 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.27 ccd27 1 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.28 ccd28 2 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.29 ccd29 3 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.30 ccd30 4 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.31 ccd31 5 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.32 ccd32 6 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.33 ccd33 7 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.34 ccd34 8 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.35 ccd35 9 0 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.36 ccd36 0 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.37 ccd37 10 2 1 1 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.38 ccd38 0 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 +CCD.39 ccd39 10 1 0 0 [6:2049,5:4100] [2085:2110,2:4400] 0 0 0 + +# can we use header to find biassec +USE_BIASSEC 1 Index: /branches/pap_branch_070920/ippconfig/tek/format.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/format.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/format.config (revision 14957) @@ -0,0 +1,101 @@ +# Pan-STARRS Imaging Sky Probe + +# How to identify this type +RULE METADATA + SIMPLE BOOL TRUE + NAXIS S32 2 + TELESCOP STR 2.2m-UH + INSTRUME STR TEK + DETECTOR STR Tektronix-2048^2-CCD +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR NONE # There are no extensions + FPA.NAME STR NAXIS # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS STR Chip:Cell:amplifier + +# Specify the cell data +CELLS METADATA + amplifier METADATA + CELL.TRIMSEC.SOURCE STR VALUE + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC STR [21:2068,1:2048] + CELL.BIASSEC STR BIASSEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.TELESCOPE STR TELESCOP + FPA.INSTRUMENT STR INSTRUME + FPA.DETECTOR STR DETECTOR + FPA.AIRMASS STR AIRMASS + FPA.OBSTYPE STR OBSTYPE + FPA.OBJECT STR OBSTYPE + FPA.FILTERID STR FILTER + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS +# FPA.FOCUS STR TELFOCUS + FPA.TIME STR MJD-OBS + FPA.TIMESYS STR TIMESYS + FPA.ALT STR ALT + FPA.AZ STR AZ + FPA.TEMP STR CCDTEMP + FPA.EXPOSURE STR EXPTIME + CHIP.TEMP STR CCDTEMP + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.TIME STR MJD-OBS + CELL.GAIN STR GAIN +# CELL.SATURATION STR SATURATE ### Currently set to 0 ??? +# CELL.TIMESYS STR TIMESYS + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 +# these were used for some early data +# CELL.XBIN STR XBIN +# CELL.YBIN STR YBIN +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + CELL.READNOISE S32 10 + CELL.BAD S32 0 + CHIP.XSIZE S32 2048 + CHIP.YSIZE S32 2048 + CELL.XSIZE S32 2048 + CELL.YSIZE S32 2048 + FPA.TIMESYS STR UTC + CELL.SATURATION F32 60000 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CELL.XPARITY S32 1 + CELL.YPARITY S32 1 + CELL.X0 S32 0 + CELL.Y0 S32 0 +# CELL.XBIN S32 1 +# CELL.YBIN S32 1 +END + +FORMATS METADATA + FPA.RA STR DEGREES + FPA.DEC STR DEGREES + FPA.TIME STR MJD + CELL.TIME STR MJD +END + +# PS Concepts to get from the database +DATABASE METADATA +# None. +END Index: /branches/pap_branch_070920/ippconfig/tek/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/ppImage.config (revision 14957) @@ -0,0 +1,273 @@ +### ppImage recipe configuration file + +# List of tasks to perform +#NONLIN BOOL FALSE # Non-linearity correction; not implemented +#OVERSCAN BOOL TRUE # Overscan subtraction +#BIAS BOOL TRUE # Bias subtraction +#DARK BOOL FALSE # Dark subtraction +#SHUTTER BOOL FALSE # Shutter correction +#FLAT BOOL TRUE # Flat-field normalisation +#MASK BOOL FALSE # Mask bad pixels +#MASK.VALUE STR SAT,BAD # Mask pixels with these attributes +#FRINGE BOOL TRUE # Fringe subtraction +#PHOTOM BOOL TRUE # Source identification and photometry +#ASTROM.CHIP BOOL TRUE # Astrometry per chip? +#ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + +# Inherit everything from the top-level recipe file, except for what's below. + +PHOTCODE.RULE STR {DETECTOR}.{FILTER.ID} + +FRINGE.FILTERS MULTI +FRINGE.FILTERS STR z +FRINGE.FILTERS STR y + +# apply the following constraints when selecting a detrend image +DETREND.CONSTRAINTS METADATA + BIAS METADATA + END + DARK METADATA + END + SHUTTER METADATA + END + FLAT METADATA + FILTER STR FPA.FILTERID +# VERSION STR RAW + END + FRINGE METADATA + FILTER STR FPA.FILTERID +# AIRMASS STR FPA.AIRMASS +# TWILIGHT STR TWILIGHT:FPA.TIME + END +END + + +# Overscan subtraction only +PPIMAGE_O METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Bias subtraction only +PPIMAGE_B METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Dark subtraction only +PPIMAGE_D METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Shutter correction only +PPIMAGE_S METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Flat-fielding only +PPIMAGE_F METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Fringe correction only +PPIMAGE_R METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Photometry only +PPIMAGE_P METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + BASE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? +END + +# Photometry & Astrometry +PPIMAGE_A METADATA + OVERSCAN BOOL FALSE # Overscan subtraction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Source identification and photometry + BASE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? +END + +# Overscan, bias +PPIMAGE_OB METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark +PPIMAGE_OBD METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter +PPIMAGE_OBDS METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field +PPIMAGE_OBDSF METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field, fringe +PPIMAGE_OBDSFR METADATA + BASE.FITS BOOL TRUE # Save base detrended image? + CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom +PPIMAGE_OBDSFRP METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL TRUE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? +END + +# Overscan, bias, dark, shutter, flat-field, fringe, photom, astrom +PPIMAGE_OBDSFRA METADATA + OVERSCAN BOOL TRUE # Overscan subtraction + BIAS BOOL TRUE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL TRUE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL TRUE # Source identification and photometry + ASTROM.CHIP BOOL TRUE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BASE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? +END Index: /branches/pap_branch_070920/ippconfig/tek/ppMerge.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/ppMerge.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/ppMerge.config (revision 14957) @@ -0,0 +1,3 @@ +### ppImage recipe configuration file + +# Inherit everything from the top-level recipe file, except for what's below. Index: /branches/pap_branch_070920/ippconfig/tek/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/psastro.config (revision 14957) @@ -0,0 +1,39 @@ + +# astrometry matching parameters + +# nominal plate scale (microns / pixel) +PSASTRO.PIXEL.SCALE F32 10.0 + +# pmAstromGridMatch: +PSASTRO.GRID.MIN.ANGLE F32 -300.0 +PSASTRO.GRID.MAX.ANGLE F32 +300.0 +PSASTRO.GRID.DEL.ANGLE F32 0.5 +PSASTRO.GRID.MIN.SIGMA F32 5.0 + +# pmAstromGridAngle +# max grid offset in FP units (microns) +# use plate-scale to make this in pixels? +PSASTRO.GRID.OFFSET F32 300000. +PSASTRO.GRID.SCALE F32 500 + +# these tweak are in FP units (pixels, currently) +PSASTRO.TWEAK.SCALE F32 1 +PSASTRO.TWEAK.RANGE F32 75 +PSASTRO.TWEAK.SMOOTH F32 2 +PSASTRO.TWEAK.NSIGMA F32 3 + +# match radius in pixels for CHIP astrometry +PSASTRO.MATCH.RADIUS F32 8 + +# pmAstromMatchFit +PSASTRO.CHIP.ORDER S32 1 # fit order +PSASTRO.CHIP.NITER S32 3 # fit clipping iterations +PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas + +PSASTRO.MAX.ERROR F32 10.0 # max error in pixels +PSASTRO.MIN.NSTAR S32 0 # min fitted stars in solution +PSASTRO.MAX.NSTAR S32 300 # max stars accepted for fitting + +MAG_MAX F32 10 +DVO.CATDIR STR /media/usbdisk/scr1/catdir.synth.grizy/ +PSASTRO.MATCH.LUMFUNC BOOL TRUE Index: /branches/pap_branch_070920/ippconfig/tek/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/psphot.config (revision 14957) @@ -0,0 +1,57 @@ + +# turn these on to see specific outputs +#SAVE.BACKMDL BOOL TRUE +#SAVE.BACKGND BOOL TRUE +#SAVE.BACKSUB BOOL TRUE +SAVE.RESID BOOL TRUE +#SAVE.PSF BOOL TRUE + +# image statistics parameters +IMSTATS_NPIX S32 3000 # number of pixels to use for sky estimate boxes: + +PSF_SN_LIM F32 10 # minimum S/N for stars used for PSF model +PSF_MAX_NSTARS S32 300 # limit number of stars used for PSF model + +PSF_MODEL STR PS_MODEL_QGAUSS + +MOMENTS_SN_MIN F32 10.0 +#EXT_MIN_SN F32 50.0 # fit galaxies above this S/N limit +#FULL_FIT_SN_LIM F32 50.0 +#AP_MIN_SN F32 20.0 +PSF_CLUMP_NSIGMA F32 2.5 # region of Sx,Sy plane to use for selecting PSF stars + +# PSFTREND must be a 2D polynomial +# the specified values are ignored but define the active components of the polynomial +PSF.TREND.MASK METADATA + NORDER_X S32 3 # number of x orders + NORDER_Y S32 3 # number of y orders + VAL_X00_Y00 F64 1 # polynomial coefficient + + VAL_X01_Y00 F64 1 # polynomial coefficient + VAL_X00_Y01 F64 1 # polynomial coefficient + + VAL_X02_Y00 F64 1 # polynomial coefficient + VAL_X01_Y01 F64 1 # polynomial coefficient + VAL_X00_Y02 F64 1 # polynomial coefficient + + VAL_X03_Y00 F64 1 # polynomial coefficient + VAL_X02_Y01 F64 1 # polynomial coefficient + VAL_X01_Y02 F64 1 # polynomial coefficient + VAL_X00_Y03 F64 1 # polynomial coefficient + NELEMENTS S32 10 # number of unmasked components +END # folder for 4D polynomial + +XMIN F32 15 +PSF.RESIDUALS BOOL false +BREAK_POINT STR ENSEMBLE +OUTPUT.FORMAT STR PS1_DEV_0 + +PSPHOT.SUMMIT METADATA + PEAKS_SMOOTH_SIGMA F32 0.8 # peak significance threshold + PEAKS_NSIGMA_LIMIT F32 50.0 # peak significance threshold + PEAKS_NMAX S32 1000 + SAVE.RESID BOOL FALSE + PSF_SN_LIM F32 25 # minimum S/N for stars used for PSF model + MOMENTS_SN_MIN F32 25.0 + PSF_MODEL STR PS_MODEL_PGAUSS +END Index: /branches/pap_branch_070920/ippconfig/tek/rejections.config =================================================================== --- /branches/pap_branch_070920/ippconfig/tek/rejections.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/tek/rejections.config (revision 14957) @@ -0,0 +1,47 @@ +BIAS METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 2.0 + IMFILE.STDEV F32 10.0 + IMFILE.MEANSTDEV F32 0.5 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SN F32 0.0 + IMFILE.BIN.STDEV F32 5.0 + IMFILE.BIN.SN F32 0.0 + IMFILE.FLUX F32 0.0 + EXP.MEAN F32 1.0 + EXP.STDEV F32 10.0 + EXP.MEANSTDEV F32 0.5 + EXP.SN F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SN F32 0.0 + EXP.FLUX F32 0.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END + +DARK METADATA + FILTER STR * + EXPECTED F32 0.0 + IMFILE.MEAN F32 0.0 + IMFILE.STDEV F32 0.0 + IMFILE.MEANSTDEV F32 0.0 + IMFILE.SKEWNESS F32 0.0 + IMFILE.KURTOSIS F32 0.0 + IMFILE.SN F32 0.0 + IMFILE.BIN.STDEV F32 0.0 + IMFILE.BIN.SN F32 0.0 + IMFILE.FLUX F32 2.0 + EXP.MEAN F32 0.0 + EXP.STDEV F32 0.0 + EXP.MEANSTDEV F32 0.0 + EXP.SN F32 0.0 + EXP.BIN.STDEV F32 0.0 + EXP.BIN.SN F32 0.0 + EXP.FLUX F32 2.0 + ENSEMBLE.MEAN F32 3.0 + ENSEMBLE.STDEV F32 3.0 + ENSEMBLE.MEANSTDEV F32 0.0 +END Index: /branches/pap_branch_070920/ippconfig/ucam/camera.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/camera.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/camera.config (revision 14957) @@ -0,0 +1,111 @@ +# Camera configuration file for MegaCam: describes the camera + +# File formats that we know about (these are relative to PATH) +FORMATS METADATA + RAW STR ucam/format_raw.config +END + + +# Description of camera --- all the chips and the cells that comprise them +FPA METADATA + chip STR xy00 xy10 xy20 xy30 xy40 xy50 xy60 xy70 xy01 xy11 xy21 xy31 xy41 xy51 xy61 xy71 xy02 xy12 xy22 xy32 xy42 xy52 xy62 xy72 xy03 xy13 xy23 xy33 xy43 xy53 xy63 xy73 xy04 xy14 xy24 xy34 xy44 xy54 xy64 xy74 xy05 xy15 xy25 xy35 xy45 xy55 xy65 xy75 xy06 xy16 xy26 xy36 xy46 xy56 xy66 xy76 xy07 xy17 xy27 xy37 xy47 xy57 xy67 xy77 +END + +# move this elsewhere? we need a lookup table to go from filter ID to abstract name +FILTER.ID METADATA + g STR g + r STR r + i STR i + z STR z + y STR y +END + +# Table of strings to use for the class identifier (see ippdb) according to the file level. +CLASSID METADATA + fpa STR fpa + chip STR {CHIP.NAME} + cell STR {CHIP.NAME}:{CELL.NAME} +END + +# convert supplied FPA.OBSTYPE values to abstract exptype names +OBSTYPE.TABLE METADATA + bias STR BIAS + zero STR BIAS + dark STR DARK + flat STR SKYFLAT + skyflat STR SKYFLAT + domeflat STR DOMEFLAT + object STR OBJECT + science STR OBJECT +END + +# Recipe options +RECIPES METADATA + # Recipes for ppImage + # PPIMAGE STR ucam/ppImage.config # Default: all (normal) options on +END + +FILERULES METADATA + PPIMAGE.OUTPUT STR PPIMAGE.OUTPUT + PPIMAGE.BIN1 STR PPIMAGE.BIN1.OUTPUT + PPIMAGE.BIN2 STR PPIMAGE.BIN2.OUTPUT + PPIMAGE.JPEG1 STR PPIMAGE.JPEG1.OUTPUT + PPIMAGE.JPEG2 STR PPIMAGE.JPEG2.OUTPUT + + PSASTRO.INPUT STR PSASTRO.INPUT.CMP + PSASTRO.OUTPUT STR PSASTRO.OUTPUT.CMP + PSPHOT.OUTPUT STR PSPHOT.OUTPUT.CMF + + ### input file definitions + TYPE INPUT FILENAME.RULE DATA.LEVEL FILE.TYPE + PPIMAGE.INPUT INPUT @FILES CHIP IMAGE + PPARITH.INPUT INPUT @FILES CHIP IMAGE + + ### use these entries to get the detrend images from specific files + PPIMAGE.MASK INPUT mask.fits CHIP IMAGE + PPIMAGE.BIAS INPUT bias.fit CHIP IMAGE + PPIMAGE.DARK INPUT dark.fits CHIP IMAGE + PPIMAGE.FLAT INPUT flat.fits CHIP IMAGE + + ### use these entries to get the detrend images from the database + #PPIMAGE.MASK INPUT @DETDB CHIP IMAGE + #PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE + #PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + #PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE + + PSPHOT.INPUT INPUT @FILES CHIP IMAGE + + PSASTRO.INPUT.CMP INPUT @FILES CHIP CMP + PSASTRO.INPUT.CMF INPUT @FILES CHIP CMF + + ### output file definitions + TYPE OUTPUT FILENAME.RULE DATA.LEVEL FILE.TYPE FILE.SAVE FILE.FORMAT + PPIMAGE.OUTPUT OUTPUT {OUTPUT}.fit CHIP IMAGE TRUE NONE + PPIMAGE.OUTPUT.CHIP OUTPUT {OUTPUT}.chip.fit FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA1 OUTPUT {OUTPUT}.fpa1.fit FPA IMAGE TRUE NONE + PPIMAGE.OUTPUT.FPA2 OUTPUT {OUTPUT}.fpa2.fit FPA IMAGE TRUE NONE + + PPIMAGE.BIN1.OUTPUT OUTPUT {OUTPUT}.b1.fit FPA IMAGE TRUE NONE + PPIMAGE.BIN2.OUTPUT OUTPUT {OUTPUT}.b2.fit FPA IMAGE TRUE NONE + PPIMAGE.JPEG1.OUTPUT OUTPUT {OUTPUT}.b1.jpg FPA JPEG TRUE NONE + PPIMAGE.JPEG2.OUTPUT OUTPUT {OUTPUT}.b2.jpg FPA JPEG TRUE NONE + + PSPHOT.RESID OUTPUT {OUTPUT}.res.fits CHIP IMAGE TRUE RAW + PSPHOT.BACKGND OUTPUT {OUTPUT}.bck.fits CHIP IMAGE TRUE RAW + PSPHOT.BACKSUB OUTPUT {OUTPUT}.sub.fits CHIP IMAGE TRUE RAW + PSPHOT.BACKMDL OUTPUT {OUTPUT}.mdl.fits CHIP IMAGE TRUE RAW + + PSPHOT.OUTPUT.RAW OUTPUT {OUTPUT}.{CHIP.NAME} CHIP RAW TRUE NONE + PSPHOT.OUTPUT.SX OUTPUT {OUTPUT}.sx CHIP SX TRUE NONE + PSPHOT.OUTPUT.OBJ OUTPUT {OUTPUT}.obj CHIP OBJ TRUE NONE + PSPHOT.OUTPUT.CMF OUTPUT {OUTPUT}.cmf CHIP CMF TRUE NONE + PSPHOT.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.cmp CHIP CMP TRUE NONE + + PSASTRO.OUTPUT.CMP OUTPUT {OUTPUT}.{CHIP.NAME}.smp CHIP CMP TRUE NONE + + PPARITH.OUTPUT OUTPUT {OUTPUT}.{CHIP.NAME}.fit CHIP IMAGE TRUE NONE + + + LOG.IMFILE OUTPUT {OUTPUT}.{CHIP.NAME}.log TEXT CHIP TRUE NONE + LOG.EXP OUTPUT {OUTPUT}.log TEXT FPA TRUE NONE +END Index: /branches/pap_branch_070920/ippconfig/ucam/format_raw.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/format_raw.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/format_raw.config (revision 14957) @@ -0,0 +1,145 @@ +### Raw data from microCam + +# How to identify this type +RULE METADATA + ORIGIN STR PS0 +# INSTRUME STR ucam1 + EXTEND BOOL T + NEXTEND S32 64 +END + +# How to read this data +FILE METADATA + PHU STR FPA # The FITS file represents an entire FPA + EXTENSIONS STR CELL # The extensions represent cells + FPA.NAME STR OBSTYPE # A PHU keyword for unique identifier within the hierarchy level +END + +# What's in the FITS file? +CONTENTS METADATA + xy00 STR chip:xy00:otCell + xy10 STR chip:xy10:otCell + xy20 STR chip:xy20:otCell + xy30 STR chip:xy30:otCell + xy40 STR chip:xy40:otCell + xy50 STR chip:xy50:otCell + xy60 STR chip:xy60:otCell + xy70 STR chip:xy70:otCell + xy01 STR chip:xy01:otCell + xy11 STR chip:xy11:otCell + xy21 STR chip:xy21:otCell + xy31 STR chip:xy31:otCell + xy41 STR chip:xy41:otCell + xy51 STR chip:xy51:otCell + xy61 STR chip:xy61:otCell + xy71 STR chip:xy71:otCell + xy02 STR chip:xy02:otCell + xy12 STR chip:xy12:otCell + xy22 STR chip:xy22:otCell + xy32 STR chip:xy32:otCell + xy42 STR chip:xy42:otCell + xy52 STR chip:xy52:otCell + xy62 STR chip:xy62:otCell + xy72 STR chip:xy72:otCell + xy03 STR chip:xy03:otCell + xy13 STR chip:xy13:otCell + xy23 STR chip:xy23:otCell + xy33 STR chip:xy33:otCell + xy43 STR chip:xy43:otCell + xy53 STR chip:xy53:otCell + xy63 STR chip:xy63:otCell + xy73 STR chip:xy73:otCell + xy04 STR chip:xy04:otCell + xy14 STR chip:xy14:otCell + xy24 STR chip:xy24:otCell + xy34 STR chip:xy34:otCell + xy44 STR chip:xy44:otCell + xy54 STR chip:xy54:otCell + xy64 STR chip:xy64:otCell + xy74 STR chip:xy74:otCell + xy05 STR chip:xy05:otCell + xy15 STR chip:xy15:otCell + xy25 STR chip:xy25:otCell + xy35 STR chip:xy35:otCell + xy45 STR chip:xy45:otCell + xy55 STR chip:xy55:otCell + xy65 STR chip:xy65:otCell + xy75 STR chip:xy75:otCell + xy06 STR chip:xy06:otCell + xy16 STR chip:xy16:otCell + xy26 STR chip:xy26:otCell + xy36 STR chip:xy36:otCell + xy46 STR chip:xy46:otCell + xy56 STR chip:xy56:otCell + xy66 STR chip:xy66:otCell + xy76 STR chip:xy76:otCell + xy07 STR chip:xy07:otCell + xy17 STR chip:xy17:otCell + xy27 STR chip:xy27:otCell + xy37 STR chip:xy37:otCell + xy47 STR chip:xy47:otCell + xy57 STR chip:xy57:otCell + xy67 STR chip:xy67:otCell + xy77 STR chip:xy77:otCell +END + +# Specify the cell data +CELLS METADATA + otCell METADATA # Orthogonal transfer cell + CELL.BIASSEC.SOURCE STR HEADER + CELL.TRIMSEC.SOURCE STR HEADER + CELL.BIASSEC STR BIASSEC + CELL.TRIMSEC STR DATASEC + END +END + +# How to translate PS concepts into FITS headers +TRANSLATION METADATA + FPA.AIRMASS STR AIRMASS + FPA.FILTER STR FILTER + FPA.POSANGLE STR ROTANGLE + FPA.RA STR RA + FPA.DEC STR DEC + FPA.RADECSYS STR RADECSYS + CELL.TIME STR DATE-OBS + CELL.EXPOSURE STR EXPTIME + CELL.DARKTIME STR DARKTIME + CELL.XBIN STR CCDBIN1 + CELL.YBIN STR CCDBIN2 + CELL.XPARITY STR IMTM1_1 + CELL.YPARITY STR IMTM2_2 + CELL.X0 STR IMNPIX1 + CELL.Y0 STR IMNPIX2 +END + +# Default PS concepts that may be specified by value +DEFAULTS METADATA + CELL.GAIN F32 1 + CELL.READNOISE F32 10.0 + CELL.SATURATION F32 65535 + CELL.BAD F32 0 + CELL.READDIR S32 1 + CELL.TIMESYS STR UTC + CHIP.X0 S32 0 + CHIP.Y0 S32 0 + CHIP.XPARITY S32 1 + CHIP.YPARITY S32 1 +END + +# How to translation PS concepts into database lookups +DATABASE METADATA + TYPE dbEntry TABLE COLUMN GIVENDBCOL GIVENPS +# A database entry refers to a particular column (COLUMN) in a +# particular table (TABLE), given certain PS concepts (GIVENPS) that +# match certain database columns (GIVENDBCOL). +END + + +# Where there might be some ambiguity, specify the format +FORMATS METADATA + FPA.RA STR HOURS + FPA.DEC STR DEGREES + CELL.TIME STR MJD + CELL.X0 STR FORTRAN + CELL.Y0 STR FORTRAN +END Index: /branches/pap_branch_070920/ippconfig/ucam/ppImage.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppImage.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppImage.config (revision 14957) @@ -0,0 +1,82 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction +DARK BOOL TRUE # Dark subtraction +FLAT BOOL TRUE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? +FPA1.FITS BOOL TRUE # Save 1st binned fpa image? +FPA2.FITS BOOL TRUE # Save 2nd binned fpa image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/ucam/ppImage_b.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppImage_b.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppImage_b.config (revision 14957) @@ -0,0 +1,82 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL FALSE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction +DARK BOOL FALSE # Dark subtraction +FLAT BOOL FALSE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/ucam/ppImage_d.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppImage_d.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppImage_d.config (revision 14957) @@ -0,0 +1,82 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL FALSE # Overscan subtraction +BIAS BOOL FALSE # Bias subtraction +DARK BOOL TRUE # Dark subtraction +FLAT BOOL FALSE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/ucam/ppImage_f.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppImage_f.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppImage_f.config (revision 14957) @@ -0,0 +1,82 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL FALSE # Overscan subtraction +BIAS BOOL FALSE # Bias subtraction +DARK BOOL FALSE # Dark subtraction +FLAT BOOL TRUE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL TRUE # Save 1st binned chip image? +BIN2.FITS BOOL TRUE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/ucam/ppImage_j.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppImage_j.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppImage_j.config (revision 14957) @@ -0,0 +1,85 @@ +### Phase 2 recipe configuration file + +### A little bit of a cheat to make a mosaicked binned JPEG from the binned FITS file. +### Set binning to 1, since the input will already be binned. + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0xff # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL FALSE # Overscan subtraction +BIAS BOOL FALSE # Bias subtraction +DARK BOOL FALSE # Dark subtraction +FLAT BOOL FALSE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL FALSE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL FALSE # Save 1st binned chip image? +BIN2.FITS BOOL FALSE # Save 2nd binned chip image? +BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 1 +BIN1.YBIN S32 1 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/ucam/ppImage_o.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppImage_o.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppImage_o.config (revision 14957) @@ -0,0 +1,82 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL FALSE # Bias subtraction +DARK BOOL FALSE # Dark subtraction +FLAT BOOL FALSE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL FALSE # Save 1st binned chip image? +BIN2.FITS BOOL FALSE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/ucam/ppImage_ob.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppImage_ob.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppImage_ob.config (revision 14957) @@ -0,0 +1,82 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction +DARK BOOL FALSE # Dark subtraction +FLAT BOOL FALSE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL FALSE # Save 1st binned chip image? +BIN2.FITS BOOL FALSE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/ucam/ppImage_obd.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppImage_obd.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppImage_obd.config (revision 14957) @@ -0,0 +1,82 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction +DARK BOOL FALSE # Dark subtraction +FLAT BOOL FALSE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL FALSE # Save 1st binned chip image? +BIN2.FITS BOOL FALSE # Save 2nd binned chip image? +BIN1.JPEG BOOL FALSE # Save 1st binned jpeg? +BIN2.JPEG BOOL FALSE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/ucam/ppImage_obdf.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppImage_obdf.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppImage_obdf.config (revision 14957) @@ -0,0 +1,82 @@ +### Phase 2 recipe configuration file + +# List of tasks to perform +MASK BOOL FALSE # Mask bad pixels +MASK.VALUE U8 0x10 # only mask pixels matching this bitmask +NONLIN BOOL FALSE # Non-linearity correction +OVERSCAN BOOL TRUE # Overscan subtraction +BIAS BOOL TRUE # Bias subtraction +DARK BOOL TRUE # Dark subtraction +FLAT BOOL TRUE # Flat-field normalisation +FRINGE BOOL FALSE # Fringe subtraction +PHOTOM BOOL FALSE # Source identification and photometry +ASTROM.CHIP BOOL FALSE +ASTROM.MOSAIC BOOL FALSE # Astrometry + +BASE.FITS BOOL TRUE # Save base detrended image? +CHIP.FITS BOOL FALSE # Save chip-mosaic-ed image? +FPA1.FITS BOOL FALSE # Save 1st binned fpa image? +FPA2.FITS BOOL FALSE # Save 2nd binned fpa image? +BIN1.FITS BOOL FALSE # Save 1st binned chip image? +BIN2.FITS BOOL FALSE # Save 2nd binned chip image? +BIN1.JPEG BOOL TRUE # Save 1st binned jpeg? +BIN2.JPEG BOOL TRUE # Save 2nd binned jpeg? + +# Non-linearity correction +NONLIN.SOURCE STR CHIP.NAME # How to determine the source +#@NONLIN.DATA F32 0.0 1.001 0.001 # A polynomial +NONLIN.DATA STR nonlin.dat # Filename for lookup table +#NONLIN.DATA METADATA # Source of non-linearity data +# ccd00 STR nonlin00.dat # A lookup table +# @ccd01 F32 0.0 1.001 0.001 # A polynomial +# @ccd02 F32 0.0 1.001 0.001 # A polynomial +# @ccd03 F32 1.2345 # A polynomial +# @ccd04 F32 0.0 1.001 0.001 # A polynomial +# @ccd05 F32 0.0 1.001 0.001 # A polynomial +# @ccd06 F32 0.0 1.001 0.001 # A polynomial +# @ccd07 F32 0.0 1.001 0.001 # A polynomial +# @ccd08 F32 0.0 1.001 0.001 # A polynomial +# @ccd09 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd11 F32 0.0 1.001 0.001 # A polynomial +# @ccd12 F32 0.0 1.001 0.001 # A polynomial +# @ccd13 F32 0.0 1.001 0.001 # A polynomial +# @ccd14 F32 0.0 1.001 0.001 # A polynomial +# @ccd15 F32 0.0 1.001 0.001 # A polynomial +# @ccd16 F32 0.0 1.001 0.001 # A polynomial +# @ccd17 F32 0.0 1.001 0.001 # A polynomial +# @ccd18 F32 0.0 1.001 0.001 # A polynomial +# @ccd19 F32 0.0 1.001 0.001 # A polynomial +# @ccd10 F32 0.0 1.001 0.001 # A polynomial +# @ccd21 F32 0.0 1.001 0.001 # A polynomial +# @ccd22 F32 0.0 1.001 0.001 # A polynomial +# @ccd23 F32 0.0 1.001 0.001 # A polynomial +# @ccd24 F32 0.0 1.001 0.001 # A polynomial +# @ccd25 F32 0.0 1.001 0.001 # A polynomial +# @ccd26 F32 0.0 1.001 0.001 # A polynomial +# @ccd27 F32 0.0 1.001 0.001 # A polynomial +# @ccd28 F32 0.0 1.001 0.001 # A polynomial +# @ccd29 F32 0.0 1.001 0.001 # A polynomial +# @ccd30 F32 0.0 1.001 0.001 # A polynomial +# @ccd31 F32 0.0 1.001 0.001 # A polynomial +# @ccd32 F32 0.0 1.001 0.001 # A polynomial +# @ccd33 F32 0.0 1.001 0.001 # A polynomial +# @ccd34 F32 0.0 1.001 0.001 # A polynomial +# @ccd35 F32 0.0 1.001 0.001 # A polynomial +# @ccd36 F32 0.0 1.001 0.001 # A polynomial +#END + +# Overscan subtraction +OVERSCAN.SINGLE BOOL FALSE # Reduce overscan to a single value? +#OVERSCAN.FIT STR SPLINE # NONE | POLYNOMIAL | SPLINE +OVERSCAN.FIT STR POLYNOMIAL # NONE | POLYNOMIAL | SPLINE +OVERSCAN.ORDER S32 5 # Order of polynomial fit +OVERSCAN.STAT STR MEAN # MEAN | MEDIAN + +# binned output image options +BIN1.XBIN S32 8 +BIN1.YBIN S32 8 +BIN2.XBIN S32 64 +BIN2.YBIN S32 64 + +PHOTCODE.RULE STR {CAMERA}.{FILTER.ID}.{CHIP.N} Index: /branches/pap_branch_070920/ippconfig/ucam/ppMerge_bias.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppMerge_bias.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppMerge_bias.config (revision 14957) @@ -0,0 +1,14 @@ +# Recipe configuration for ppMerge + +ROWS S32 128 # Number of rows to read at once +ELECTRONS F32 100.0 # Minimum number of electrons for useful signal +SAMPLE S32 100 # Sampling factor for measuring the background +REJ F32 3.0 # Rejection threshold (sigma) +ITER S32 1 # Number of rejection iterations +FRACHIGH F32 0.3 # Fraction of high pixels to reject immediately +FRACLOW F32 0.1 # Fraction of low pixels to reject immediately +NKEEP S32 5 # Minimum number of pixels in stack to keep +MASKVAL S32 0xff # Mask value for input data +### Statistics options: MEAN | MEDIAN | ROBUST | FITTED | CLIPPED +COMBINE STR MEAN # Statistic to use for combination: +BACKGROUND STR MEDIAN # Statistic to use to measure the background Index: /branches/pap_branch_070920/ippconfig/ucam/ppMerge_dark.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppMerge_dark.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppMerge_dark.config (revision 14957) @@ -0,0 +1,14 @@ +# Recipe configuration for ppMerge + +ROWS S32 128 # Number of rows to read at once +ELECTRONS F32 100.0 # Minimum number of electrons for useful signal +SAMPLE S32 100 # Sampling factor for measuring the background +REJ F32 3.0 # Rejection threshold (sigma) +ITER S32 1 # Number of rejection iterations +FRACHIGH F32 0.3 # Fraction of high pixels to reject immediately +FRACLOW F32 0.1 # Fraction of low pixels to reject immediately +NKEEP S32 5 # Minimum number of pixels in stack to keep +MASKVAL S32 0xff # Mask value for input data +### Statistics options: MEAN | MEDIAN | ROBUST | FITTED | CLIPPED +COMBINE STR MEAN # Statistic to use for combination: +BACKGROUND STR MEDIAN # Statistic to use to measure the background Index: /branches/pap_branch_070920/ippconfig/ucam/ppMerge_flat.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/ppMerge_flat.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/ppMerge_flat.config (revision 14957) @@ -0,0 +1,14 @@ +# Recipe configuration for ppMerge + +ROWS S32 128 # Number of rows to read at once +ELECTRONS F32 100.0 # Minimum number of electrons for useful signal +SAMPLE S32 100 # Sampling factor for measuring the background +REJ F32 3.0 # Rejection threshold (sigma) +ITER S32 1 # Number of rejection iterations +FRACHIGH F32 0.3 # Fraction of high pixels to reject immediately +FRACLOW F32 0.1 # Fraction of low pixels to reject immediately +NKEEP S32 5 # Minimum number of pixels in stack to keep +MASKVAL S32 0xff # Mask value for input data +### Statistics options: MEAN | MEDIAN | ROBUST | FITTED | CLIPPED +COMBINE STR MEAN # Statistic to use for combination: +BACKGROUND STR MEDIAN # Statistic to use to measure the background Index: /branches/pap_branch_070920/ippconfig/ucam/psastro.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/psastro.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/psastro.config (revision 14957) @@ -0,0 +1,36 @@ + +# astrometry matching parameters + +# nominal plate scale (microns / pixel) +# PSASTRO.PLATE.SCALE F32 13.5 +PSASTRO.PLATE.SCALE F32 1.0 + +# pmAstromGridMatch: +PSASTRO.GRID.MIN.ANGLE F32 -0.0851 +PSASTRO.GRID.MAX.ANGLE F32 +0.0851 +PSASTRO.GRID.DEL.ANGLE F32 0.0170 + +# pmAstromGridAngle +# max grid offset in FP units (microns) +# use plate-scale to make this in pixels? +# PSASTRO.GRID.OFFSET F32 10000. +# PSASTRO.GRID.SCALE F32 500. +PSASTRO.GRID.OFFSET F32 1000. +PSASTRO.GRID.SCALE F32 50 + +# these tweak are in FP units (pixels, currently) +PSASTRO.TWEAK.SCALE F32 1 +PSASTRO.TWEAK.RANGE F32 75 +PSASTRO.TWEAK.SMOOTH F32 2 +PSASTRO.TWEAK.NSIGMA F32 3 + +# pmAstromRadiusMatch +# use plate-scale to make this in pixels? +PSASTRO.MATCH.RADIUS F32 8 + +# pmAstromMatchFit +PSASTRO.CHIP.NX S32 1 # fit order +PSASTRO.CHIP.NY S32 1 # fit order +PSASTRO.CHIP.NITER S32 3 # fit clipping iterations +PSASTRO.CHIP.NSIGMA F32 3 # fit clipping sigmas + Index: /branches/pap_branch_070920/ippconfig/ucam/psphot.config =================================================================== --- /branches/pap_branch_070920/ippconfig/ucam/psphot.config (revision 14957) +++ /branches/pap_branch_070920/ippconfig/ucam/psphot.config (revision 14957) @@ -0,0 +1,27 @@ + +# turn these on to see specific outputs +#SAVE.BACKMDL BOOL TRUE +#SAVE.BACKGND BOOL TRUE +#SAVE.BACKSUB BOOL TRUE +SAVE.RESID BOOL TRUE +#SAVE.PSF BOOL TRUE +#LOAD.PSF BOOL FALSE + +IMSTATS_NPIX S32 1000 # number of pixels to use for sky estimate boxes: + +PSF_SN_LIM F32 100 # minimum S/N for stars used for PSF model +PSF_MAX_NSTARS S32 300 # limit number of stars used for PSF model + +# PSF model parameters : choose the PSF model +# list as many PSF_MODEL options as desired +# if you want to list multiple entries, uncomment 'MULTI' here +# PSF_MODEL MULTI +PSF_MODEL STR PS_MODEL_QGAUSS +# PSF_MODEL STR PS_MODEL_GAUSS +# PSF_MODEL STR PS_MODEL_PGAUSS +# PSF_MODEL STR PS_MODEL_TGAUSS ## not well tested, not very successful + +MOMENTS_SN_MIN F32 20.0 # min S/N to measure moments +EXT_MIN_SN F32 50.0 # fit galaxies above this S/N limit +FULL_FIT_SN_LIM F32 50.0 +AP_MIN_SN F32 25.0 Index: /branches/pap_branch_070920/psLib/src/fits/.cvsignore =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/.cvsignore (revision 14957) @@ -0,0 +1,10 @@ +.deps +.libs +Makefile +Makefile.in +*.la +*.lo +*.loT +*.bb +*.bbg +*.da Index: /branches/pap_branch_070920/psLib/src/fits/Makefile.am =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/Makefile.am (revision 14957) @@ -0,0 +1,20 @@ +#Makefile for fits functions of psLib +# +noinst_LTLIBRARIES = libpslibfits.la + +libpslibfits_la_CFLAGS = $(SRCINC) $(PSLIB_CFLAGS) $(CFITSIO_CFLAGS) $(AM_CFLAGS) +libpslibfits_la_SOURCES = \ + psFits.c \ + psFitsHeader.c \ + psFitsImage.c \ + psFitsTable.c + +EXTRA_DIST = fits.i + +pkginclude_HEADERS = \ + psFits.h \ + psFitsHeader.h \ + psFitsImage.h \ + psFitsTable.h + +CLEANFILES = *~ *.bb *.bbg *.da Index: /branches/pap_branch_070920/psLib/src/fits/fits.i =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/fits.i (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/fits.i (revision 14957) @@ -0,0 +1,5 @@ +/* fits headers */ +%include "psFits.h" +%include "psFitsHeader.h" +%include "psFitsImage.h" +%include "psFitsTable.h" Index: /branches/pap_branch_070920/psLib/src/fits/psFits.c =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/psFits.c (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/psFits.c (revision 14957) @@ -0,0 +1,827 @@ +/** @file psFits.c + * + * @brief Contains Fits I/O routines + * + * @ingroup FileIO + * + * @author Robert DeSonia, MHPCC + * + * @version $Revision: 1.71 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-09-18 03:01:17 $ + * + * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include "psFits.h" +#include "string.h" +#include "psError.h" +#include "psAssert.h" +#include "psImageStructManip.h" +#include "psMemory.h" +#include "psString.h" +#include "psLogMsg.h" +#include "psTrace.h" +#include "psVector.h" +#include "psAbort.h" + +#define MAX_STRING_LENGTH 256 // maximum length string for FITS routines +static char *defaultExtword = "EXTNAME"; + +static bool isHDUEmpty(const psFits* fits) +{ + /* check for keys - no keys means this is really an empty HDU */ + int keysexist = -1; + int morekeys; + int status = 0; + + fits_get_hdrspace(fits->fd, &keysexist, &morekeys, &status); + + // if no keys exist and not primary HDU, this really is an empty HDU + if (keysexist == 0) { + return true; + } + + return false; + +} + +static bool fitsClose(psFits* fits) +{ + int status = 0; + + if (fits != NULL) { + if (fits_close_file(fits->fd, &status)) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_BAD_FITS, true, + "Error while closing psFits object. CFITSIO error: %s", + fitsErr); + return false; + } + fits->fd = NULL; + } + return true; +} + +static void fitsFree(psFits* fits) +{ + if (!fits) return; + if (fits->fd) { + fitsClose(fits); + } + psFree (fits->extword); +} + +bool psFitsClose(psFits* fits) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + bool status = fitsClose(fits); + psFree(fits); + + return status; +} + +psFits* psFitsOpen(const char* name, const char* mode) +{ + int status = 0; + fitsfile *fptr = NULL; /* Pointer to the FITS file */ + + if (name == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("Specified filename can not be NULL.")); + return NULL; + } + + /* check the mode to determine how to open/create file */ + int iomode; + bool newFile; + if (strcmp(mode,"r") == 0) { + iomode = READONLY; + newFile = false; + } else if (strcmp(mode,"rw") == 0 || strcmp(mode,"r+") == 0) { + iomode = READWRITE; + newFile = false; + } else if (strcmp(mode,"w") == 0 || strcmp(mode,"w+") == 0) { + iomode = READWRITE; + newFile = true; + } else if (strcmp(mode,"a") == 0|| strcmp(mode,"a+") == 0) { + iomode = READWRITE; + newFile = (access(name, F_OK) != 0); + } else { + // mode is not valid + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "Specified mode, '%s', is invalid. Supported modes are r, r+, rw, w, w+, a, or a+.", + mode); + return NULL; + } + + if (newFile) { + /* Check if an existing file is in the way before creating file*/ + if (access(name, F_OK) == 0) { + // file exists, delete old one first + remove + (name); + } + + #if ( CFITSIO_DISKFILE == 1 ) + (void)fits_create_diskfile + #else + (void)fits_create_file + #endif + (&fptr, + name, + &status); + if (fptr == NULL || status != 0) { + char fitsErr[MAX_STRING_LENGTH] + ; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not create file,'%s'. CFITSIO Error: %s"), + name, fitsErr); + return NULL; + } + } else { + #if ( CFITSIO_DISKFILE == 1 ) + (void)fits_open_diskfile + #else + (void)fits_open_file + #endif + (&fptr, + name, + iomode, + &status); + if (fptr == NULL || status != 0) { + char fitsErr[MAX_STRING_LENGTH] + ; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not open file,'%s'. CFITSIO Error: %s"), + name, fitsErr); + return NULL; + } + } + + psFits* fits = psAlloc(sizeof(psFits)); + fits->fd = fptr; + fits->writable = (iomode == READWRITE); + fits->extword = NULL; + psMemSetDeallocator(fits,(psFreeFunc)fitsFree); + + return fits; +} + +static void psFitsOptionsFree(psFitsOptions *opt) +{ + psFree(opt->tilesize); +} + +psFitsOptions* psFitsOptionsAlloc( + psFitsCompressionType type, ///< type of compression + psVector *tilesize, ///< vector defining compression tile size + int noisebits, ///< noise bits + int scale, ///< hcompress scale + int smooth ///< hcompress smothing +) +{ + psFitsOptions *opt = psAlloc(sizeof(psFitsOptions)); + + opt->type = type; + opt->tilesize = psVectorCopy(NULL, tilesize, PS_DATA_S64); + opt->noisebits = noisebits; + opt->scale = scale; + opt->smooth = smooth; + + psMemSetDeallocator(opt, (psFreeFunc) psFitsOptionsFree); + + return opt; +} + +bool psMemCheckFits(psPtr ptr) +{ + PS_ASSERT_PTR(ptr, false); + return ( psMemGetDeallocator(ptr) == (psFreeFunc)fitsFree ); +} + +bool psFitsSetExtnameWord (psFits *fits, const char *extword) +{ + PS_ASSERT_PTR_NON_NULL(fits, false); + PS_ASSERT_PTR_NON_NULL(extword, false); + + psFree (fits->extword); + fits->extword = psStringCopy (extword); + return true; +} + +// move to the first HDU where extword == extname. this is equivalent to fits_movnam_hdu() for +// a user-defined word in place of EXTNAME +bool p_psFitsMoveExtName_UserKey(const psFits *fits, + const char *extname, + const char *extword) +{ + PS_ASSERT_PTR_NON_NULL(fits, false); + PS_ASSERT_PTR_NON_NULL(extname, false); + PS_ASSERT_PTR_NON_NULL(extword, false); + + int hdutype = 0; + char name[MAX_STRING_LENGTH]; + char extstring[MAX_STRING_LENGTH]; + + sprintf (extstring, "'%s'", extname); + + // NOTE: fits_* return 0 for success + for (int i = 1; true; i++) { + // are we able to read the next HDU? + + int status = 0; + if (fits_movabs_hdu(fits->fd, i, &hdutype, &status)) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + _("Could not find HDU with %s = '%s'. CFITSIO Error: %s"), + extword, extname, fitsErr); + return false; + } + // is there a keyword called 'extword'? (read as string regardless of type) + status = 0; + if (fits_read_keyword(fits->fd, (char *)extword, name, NULL, &status)) { + continue; + } + // if this was read as a string, we will have leading and trailing single-quotes + // try both for comparison + + // do we have the right hdu (names match)? + if (!strcmp (name, extname) || !strcmp (name, extstring)) { + return true; + } + } + psAbort("we should not reach here"); +} + +// XXX I will need to define a low-level function p_psFitsMoveExtName_UserKey () which +// uses fits_movabs_hdu() to replicate the functionality of fits_movnam_hdu using an +// alternate name for EXTNAME +bool psFitsMoveExtName(const psFits* fits, + const char* extname) +{ + int status = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + if (extname == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("Specified extension name can not be NULL.")); + return false; + } + + if (fits->extword != NULL) { + bool result = p_psFitsMoveExtName_UserKey(fits, extname, fits->extword); + return (result); + } + + if (fits_movnam_hdu(fits->fd, ANY_HDU, (char*)extname, 0, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + _("Could not find HDU '%s'. CFITSIO Error: %s"), + extname, fitsErr); + return false; + } + + return true; +} + +bool psFitsMoveExtNum(const psFits* fits, + int extnum, + bool relative) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + int status = 0; + int hdutype = 0; + + if (relative) { + fits_movrel_hdu(fits->fd, extnum, &hdutype, &status); + if (status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + _("Could not move %d HDUs from current position. CFITSIO Error: %s"), + extnum, fitsErr); + return false; + } + } else { + fits_movabs_hdu(fits->fd, extnum+1, &hdutype, &status); + if (status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + _("Could not move to specified HDU #%d. CFITSIO Error: %s"), + extnum, fitsErr); + return false; + } + } + + return true; +} + +bool psFitsMoveLast(psFits* fits) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + int size = psFitsGetSize(fits); + if (size == 0) { // empty file -- no action needed + return true; + } else { + return psFitsMoveExtNum(fits,size-1,false); + } +} + +int psFitsGetExtNum(const psFits* fits) +{ + int hdunum; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return PS_FITS_TYPE_NONE; + } + + + return fits_get_hdu_num(fits->fd,&hdunum) - 1; +} + +psString psFitsGetExtName(const psFits* fits) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return NULL; + } + + int status = 0; + char name[MAX_STRING_LENGTH]; + + char *extword = (fits->extword == NULL) ? defaultExtword : fits->extword; + + if (fits_read_key_str(fits->fd, extword, name, NULL, &status) != 0) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("Header keyword %s is not found"), extword); + return NULL; + } + return psStringCopy(name); +} + +bool psFitsSetExtName(psFits* fits, const char* name) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + if (name == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("Specified extension name can not be NULL.")); + return false; + } + + int status = 0; + + char *extword = (fits->extword == NULL) ? defaultExtword : fits->extword; + + if (fits_update_key_str(fits->fd, extword, (char*)name, NULL, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not write data to file. CFITSIO Error: %s"), + fitsErr); + return false; + } + + return true; +} + +bool psFitsDeleteExtNum(psFits* fits, + int extnum, + bool relative) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + if (! fits->writable) { + psError(PS_ERR_IO, true, + _("The psFits object is not writable.")); + return false; + } + + // move to the specified HDU + if (! psFitsMoveExtNum(fits,extnum,relative) ) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Failed to delete HDU #%d", + extnum); + return false; + } + + int status = 0; + + // OK, now let's delete the HDU + if (fits_delete_hdu(fits->fd, NULL, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not write data to file. CFITSIO Error: %s"), + fitsErr); + return false; + } + + return true; +} + +bool psFitsDeleteExtName(psFits* fits, + const char* extname) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + if (! fits->writable) { + psError(PS_ERR_IO, true, + _("The psFits object is not writable.")); + return false; + } + + // move to the specified HDU + if (! psFitsMoveExtName(fits,extname) ) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Failed to delete HDU with the name '%s'", + extname); + return false; + } + + + int status = 0; + + // OK, now let's delete the HDU + if (fits_delete_hdu(fits->fd, NULL, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not write data to file. CFITSIO Error: %s"), + fitsErr); + return false; + } + + return true; +} + +int psFitsGetSize(const psFits* fits) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return 0; + } + + int num = 0; + int status = 0; + + if (fits_get_num_hdus(fits->fd, &num, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + _("Failed to determine the number of HDUs. CFITSIO Error: %s"), + fitsErr); + return 0; + } + + return num; +} + +psFitsType psFitsGetExtType(const psFits* fits) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return PS_FITS_TYPE_NONE; + } + + int status = 0; + int hdutype = PS_FITS_TYPE_NONE; + + if (fits_get_hdu_type(fits->fd, &hdutype, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, + _("Failed to determine an HDU type. CFITSIO Error: %s"), + fitsErr); + return PS_FITS_TYPE_NONE; + } + + if (hdutype == PS_FITS_TYPE_IMAGE && + psFitsGetExtNum(fits) > 0 && + isHDUEmpty(fits)) { + return PS_FITS_TYPE_ANY; + } + + return hdutype; +} + +bool psFitsTruncate(psFits* fits) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return PS_FITS_TYPE_NONE; + } + + if (! fits->writable) { + psError(PS_ERR_IO, true, + _("The psFits object is not writable.")); + return PS_FITS_TYPE_NONE; + } + + int newEnd = psFitsGetExtNum(fits); + + psFitsMoveLast(fits); + int end = psFitsGetExtNum(fits); + + // delete HDUs from end to beginning position + 1; + for (int lcv=end;lcv > newEnd; lcv--) { + if (! psFitsDeleteExtNum(fits,lcv,false)) { + // failed to delete an HDU!? + psError(PS_ERR_UNKNOWN, false, + "Failed to truncate file. HDU #%d out of %d could not be deleted.", + lcv,end); + return false; + } + } + + return true; +} + + +bool psFitsSetCompression( + psFits* fits, ///< psFits object to close + psFitsCompressionType type, ///< type of compression + psVector *tilesize, + int noisebits, ///< noise bits + int scale, ///< hcompress scale + int smooth ///< hcompress smothing +) +{ + // convert psFitsCompressionType to cfitsio compression types + int comptype; + switch (type) { + case PS_FITS_COMPRESS_NONE: + comptype = 0x0; + break; + case PS_FITS_COMPRESS_GZIP: + comptype = GZIP_1; + break; + case PS_FITS_COMPRESS_RICE: + comptype = RICE_1; + break; + case PS_FITS_COMPRESS_HCOMPRESS: + comptype = HCOMPRESS_1; + break; + case PS_FITS_COMPRESS_PLIO: + comptype = PLIO_1; + break; + default: + psError(PS_ERR_UNKNOWN, true, "invalid psFitsCompressionType"); + return false; + } + + int status = 0; + if (fits_set_compression_type(fits->fd, comptype, &status)) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_BAD_FITS, true, + "Error while configuring compression. CFITSIO error: %s", fitsErr); + return false; + } + + // convert a psVector into the (long *) array that cfitsio requires + psVector *dim = NULL; + if (sizeof(long) == sizeof(psS64)) { + dim = psVectorCopy(NULL, tilesize, PS_DATA_S64); + fits_set_tile_dim(fits->fd, psVectorLength(dim), (long *)dim->data.S64, &status); + } else if (sizeof(long) == sizeof(psS32)) { + dim = psVectorCopy(NULL, tilesize, PS_DATA_S32); + fits_set_tile_dim(fits->fd, psVectorLength(dim), (long *)dim->data.S32, &status); + } else { + psAbort("can't map (long) type to a psLib type"); + } + // status check belongs to fits_set_tile_dim() call + if (status) { + fits_set_compression_type(fits->fd, 0x0, &status); + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_BAD_FITS, true, + "Error while configuring compression. CFITSIO error: %s", fitsErr); + return false; + } + + if (fits_set_noise_bits(fits->fd, noisebits, &status)) { + fits_set_compression_type(fits->fd, 0x0, &status); + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_BAD_FITS, true, + "Error while configuring compression. CFITSIO error: %s", fitsErr); + return false; + } + +#if FITS_HCOMP + if (fits_set_hcomp_scale(fits->fd, scale, &status)) { + fits_set_compression_type(fits->fd, 0x0, &status); + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_BAD_FITS, true, + "Error while configuring compression. CFITSIO error: %s", fitsErr); + return false; + } + if (fits_set_hcomp_smooth(fits->fd, smooth, &status)) { + fits_set_compression_type(fits->fd, 0x0, &status); + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_BAD_FITS, true, + "Error while configuring compression. CFITSIO error: %s", fitsErr); + return false; + } +#endif // FITS_HCOMP + + return true; +} + + +bool psFitsSetOptions( + psFits* fits, ///< psFits object to close + psFitsOptions *opt ///< options object +) +{ + return psFitsSetCompression( + fits, + opt->type, + opt->tilesize, + opt->noisebits, + opt->scale, + opt->smooth); +} + + +psDataType p_psFitsTypeFromCfitsio(int datatype) +{ + switch (datatype) { + case TBYTE: + return PS_TYPE_U8; + case TSBYTE: + return PS_TYPE_S8; + case TSHORT: + return PS_TYPE_S16; + case TUSHORT: + return PS_TYPE_U16; + case TLONG: + if (sizeof(long) == 8) { + return PS_TYPE_S64; + } + // no break + case TINT: + return PS_TYPE_S32; + case TULONG: + if (sizeof(unsigned long) == 8) { + return PS_TYPE_U64; + } + // no break + case TUINT: + return PS_TYPE_U32; + case TLONGLONG: + return PS_TYPE_S64; + case TFLOAT: + return PS_TYPE_F32; + case TDOUBLE: + return PS_TYPE_F64; + case TLOGICAL: + return PS_TYPE_BOOL; + default: + psError(PS_ERR_IO, true, + "Unknown FITS datatype, %d.", + datatype); + return 0; + } +} + +bool p_psFitsTypeToCfitsio(psDataType type, int* bitPix, double* bZero, int* dataType) +{ + int bitpix; + int datatype; + double bzero = 0.0; + + switch (type) { + + case PS_TYPE_U8: + bitpix = BYTE_IMG; + datatype = TBYTE; + break; + + case PS_TYPE_S8: + bitpix = BYTE_IMG; + bzero = INT8_MIN; + datatype = TSBYTE; + break; + + case PS_TYPE_U16: + bitpix = SHORT_IMG; + bzero = -1.0 * INT16_MIN; + datatype = TUSHORT; + break; + + case PS_TYPE_S16: + bitpix = SHORT_IMG; + datatype = TSHORT; + break; + + case PS_TYPE_U32: + bitpix = LONG_IMG; + bzero = -1.0 * INT32_MIN; + datatype = TUINT; + break; + + case PS_TYPE_S32: + bitpix = LONG_IMG; + datatype = TINT; + break; + + case PS_TYPE_F32: + bitpix = FLOAT_IMG; + datatype = TFLOAT; + break; + + case PS_TYPE_F64: + bitpix = DOUBLE_IMG; + datatype = TDOUBLE; + break; + + case PS_DATA_STRING: + bitpix = BYTE_IMG; + datatype = TSTRING; + break; + + case PS_DATA_BOOL: + bitpix = BYTE_IMG; + datatype = TLOGICAL; + break; + + default: { + char* typeStr; + PS_TYPE_NAME(typeStr,type); + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + _("Specified type, %s, is not supported."), + typeStr); + return false; + } + } + + // pass back the requested parameters (NULL parameters are not set, of course). + if (bitPix != NULL) { + *bitPix = bitpix; + } + + if (dataType != NULL) { + *dataType = datatype; + } + + if (bZero != NULL) { + *bZero = bzero; + } + + return true; +} + + Index: /branches/pap_branch_070920/psLib/src/fits/psFits.h =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/psFits.h (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/psFits.h (revision 14957) @@ -0,0 +1,264 @@ +/* @file psFits.h + * @brief Contains Fits I/O routines + * + * @author Robert DeSonia, MHPCC + * + * @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-09-18 02:56:36 $ + * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii + */ + +#ifndef PS_FITS_H +#define PS_FITS_H + +/// @addtogroup FileIO Input/Output +/// @{ + +#include +#include "psType.h" +#include "psArray.h" +#include "psVector.h" +#include "psMetadata.h" +#include "psImage.h" + +/** FITS HDU type. + * + * Enumeration for FITS HDU type. + * + */ +typedef enum { + PS_FITS_TYPE_NONE = -1, ///< Unknown HDU type + PS_FITS_TYPE_IMAGE = IMAGE_HDU, ///< Image HDU type + PS_FITS_TYPE_BINARY_TABLE = BINARY_TBL, ///< Binary table HDU type + PS_FITS_TYPE_ASCII_TABLE = ASCII_TBL, ///< ASCII table HDU type + PS_FITS_TYPE_ANY = ANY_HDU ///< Any HDU type +} psFitsType; + +typedef enum { + PS_FITS_COMPRESS_NONE = 0, + PS_FITS_COMPRESS_GZIP, + PS_FITS_COMPRESS_RICE, + PS_FITS_COMPRESS_HCOMPRESS, + PS_FITS_COMPRESS_PLIO +} psFitsCompressionType; + +/** FITS file object. + * + * This object should be considered opaque to the user; no item in this + * struct should be accessed directly. + * + */ +typedef struct +{ + fitsfile* fd; ///< the CFITSIO fits files handle. + bool writable; ///< Is the file writable? + char *extword; ///< user-specified word to name extensions (NULL implies EXTNAME) +} +psFits; + +/** FITS options object. */ +typedef struct +{ + psFitsCompressionType type; ///< type of compression + psVector *tilesize; ///< vector defining compression tile size + int noisebits; ///< noise bits + int scale; ///< hcompress scale + int smooth; ///< hcompress smothing +} +psFitsOptions; + +/** Opens a FITS file and allocates the associated psFits object. + * + * @return psFits* new psFits object for the FITS files specified or + * NULL if the open of the FITS file failed + */ +psFits* psFitsOpen( + const char* filename, ///< the FITS file name + const char* mode + /**< File open mode. Could be one of the following: + * 'r' (read only), + * 'r+' (read & write), + * 'rw' (same as 'r+'), or + * 'w' (create new file for writing) + */ +); + +/** Creates a new FITS options struct + * + * @return psFitsOptions or NULL on failure + */ +psFitsOptions* psFitsOptionsAlloc( + psFitsCompressionType type, ///< type of compression + psVector *tilesize, ///< vector defining compression tile size + int noisebits, ///< noise bits + int scale, ///< hcompress scale + int smooth ///< hcompress smothing +); + +/** Closes a FITS file. + * + * @return bool TRUE if FITS file was successfully closed, otherwise FALSE + */ +bool psFitsClose( + psFits* fits ///< psFits object to close +); + +/** Enables/configures FITS compression. + * + * Note that HCOMPRESS compression is not presently supported. + * + * @return bool TRUE if successfully configured, otherwise FALSE + */ +bool psFitsSetCompression( + psFits* fits, ///< psFits object to close + psFitsCompressionType type, ///< type of compression + psVector *tilesize, ///< vector defining compression tile size + int noisebits, ///< noise bits + int scale, ///< hcompress scale + int smooth ///< hcompress smothing +); + +/** Sets FITS write options + * + * @return bool TRUE if successfully configured, otherwise FALSE + */ +bool psFitsSetOptions( + psFits* fits, ///< psFits object to close + psFitsOptions *opt ///< options object +); + +/** Checks the type of a particular pointer. + * + * Uses the appropriate deallocation function in psMemBlock to check the ptr + * datatype. + * + * @return bool: True if the pointer matches a psFits structure, false + * otherwise. + */ +bool psMemCheckFits( + psPtr ptr ///< the pointer whose type to check +); + +// set the user-defined extension name; +bool psFitsSetExtnameWord (psFits *fits, const char *extword); + +// move to the first HDU where extword == extname. this is equivalent to fits_movnam_hdu() for +// a user-defined word in place of EXTNAME +bool p_psFitsMoveExtName_UserKey(const psFits *fits, + const char *extname, + const char *extword); + +/** Moves the FITS HDU to the specified extension name. + * + * @return bool TRUE if the extension name was found and move was + * successful, otherwise FALSE + */ +bool psFitsMoveExtName( + const psFits* fits, ///< the psFits object to move + const char* extname ///< the extension name +); + +/** Moves the FITS HDU to the specified extension number + * + * @return bool TRUE if the extension number was found and move was + * successful, otherwise FALSE + */ +bool psFitsMoveExtNum( + const psFits* fits, ///< the psFits object to move + int extnum, ///< the extension number to move to (zero is primary HDU) + bool relative ///< if true, extnum is a relative number to the current position +); + +/** Moves the FITS HDU to the end of the file + * + * @return bool TRUE if the move was successful, otherwise FALSE +*/ +bool psFitsMoveLast( + psFits* fits ///< the psFits object to move +); + +/** Get the current extension number, where 0 is the primary HDU. + * + * @return int Current HDU number of the psFits file or < 0 if an error + * occurred. + */ +int psFitsGetExtNum( + const psFits* fits ///< the psFits object +); + +/** Get the current extension name. + * + * @return int Current HDU name of the psFits file or NULL if an + * error occurred. + */ +psString psFitsGetExtName( + const psFits* fits ///< the psFits object +); + +/** Set the current extension's name + * + * @return bool TRUE if the extension was successfully set, otherwise FALSE. + */ +bool psFitsSetExtName( + psFits* fits, ///< the psFits object + const char* name ///< the extension name +); + +/** Get the total number of HDUs in the FITS file. + * + * @return int The total number of HDUs in the FITS file or < 0 if an + * error occurred. + */ +int psFitsGetSize( + const psFits* fits ///< the psFits object +); + +/** Remove the an HDU as specified by number + * + * @return bool TRUE if the specified HDU was removed, otherwise FALSE + */ +bool psFitsDeleteExtNum( + psFits* fits, ///< the psFits object + int extnum, ///< the extension number to delete (zero is primary HDU) + bool relative ///< if true, extnum is a relative number to the current position +); + +/** Remove the an HDU as specified by extension name + * + * @return bool TRUE if the specified HDU was removed, otherwise FALSE + */ +bool psFitsDeleteExtName( + psFits* fits, ///< the psFits object + const char* extname ///< the extension name to delete +); + +/** Get the extension type of the current HDU. + * + * @return psFitsType The type of the current HDU. If PS_FITS_TYPE_UNKNOWN, + * the type could not be determined. + */ +psFitsType psFitsGetExtType( + const psFits* fits ///< the psFits object +); + +/** Delete all extensions after the current position + * + * @return bool TRUE if the operation was successful, otherwise FALSE + */ +bool psFitsTruncate( + psFits* fits ///< the psFits object +); + +// Return the psLib type, given a cfitsio data type +psDataType p_psFitsTypeFromCfitsio(int datatype // cfitsio data type + ); + +// Return the cfitsio data type, given a psLib type +bool p_psFitsTypeToCfitsio(psDataType type, // psLib data type + int* bitPix, // The corresponding BITPIX (returned) + double* bZero, // The corresponding BZERO (returned) + int* dataType// The corresponding cfitsio data type (returned) + ); + +/// @} +#endif // #ifndef PS_FITS_H Index: /branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/psFitsHeader.c (revision 14957) @@ -0,0 +1,489 @@ +/** @file psFitsHeader.c + * + * @brief Contains Fits header I/O routines + * + * @ingroup FileIO + * + * @author Robert DeSonia, MHPCC + * + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-08-10 02:23:42 $ + * + * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include "psFits.h" +#include "string.h" +#include "strings.h" +#include "psError.h" + +#include "psImageStructManip.h" +#include "psMemory.h" +#include "psString.h" +#include "psLogMsg.h" +#include "psTrace.h" +#include "psVector.h" + +#define MAX_STRING_LENGTH 256 // maximum length string for FITS routines + +// list of FITS header keys to ignore; NULL-terminated +static char* ignoreFitsKeys[] = {"", NULL}; + +// List of FITS header keys that may be duplicated; NULL-terminated +static char *duplicateFitsKeys[] = {"COMMENT", "HIERARCH", "HISTORY", NULL}; + +// List of FITS header keys not to write (handled by cfitsio); NULL-terminated +static char *noWriteFitsKeys[] = {"SIMPLE", "XTENSION", "BITPIX", "NAXIS", "EXTNAME", "BSCALE", "BZERO", + "TFIELDS", NULL}; +// List of the start of FITS header keys not to write (handled by cfitsio); NULL-terminated +static char *noWriteFitsKeyStarts[] = {"NAXIS", "TTYPE", "TFORM", NULL}; + +// List of FITS header keys to be written with fits_write_comment + +psMetadata* psFitsReadHeader(psMetadata* out, + const psFits* fits) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return NULL; + } + + if (out == NULL) { + out = psMetadataAlloc(); + } + + // Get number of key names + int numKeys = 0; // Number of keywords + int keyNum = 0; // Current key number + int status = 0; // Status of cfitsio calls + fits_get_hdrpos(fits->fd, &numKeys, &keyNum, &status); + + // Get each key name. Keywords start at one. + for (int i = 1; i <= numKeys; i++) { + char keyName[MAX_STRING_LENGTH];// Keyword name + char keyValue[MAX_STRING_LENGTH]; // Corresponding value + char keyComment[MAX_STRING_LENGTH]; // Corresponding comment + fits_read_keyn(fits->fd, i, keyName, keyValue, keyComment, &status); + + // Check to see if the keyword should be ignored + bool ignoreKey = false; // Ignore this keyword? + for (int i = 0; ignoreFitsKeys[i] && !ignoreKey; i++) { + if (strcmp(keyName, ignoreFitsKeys[i]) == 0) { + ignoreKey = true; + } + } + if (ignoreKey) { + // We're done here; skip to the next key + continue; + } + +#if 0 + // This doesn't seem to be necessary + if (strncmp(keyName, "HIERARCH ", 9) == 0) { + char temp[MAX_STRING_LENGTH]; + strcpy(temp, &keyName[9]); + strcpy(keyName, temp); + } +#endif + + // Check to see if the keyword should be duplicated + int dupFlag = 0; // Duplicate flag + for (int i = 0; duplicateFitsKeys[i] && !dupFlag; i++) { + if (strcmp(keyName, duplicateFitsKeys[i]) == 0) { + dupFlag = PS_META_DUPLICATE_OK; + } + } + + char keyType; // Type of key; from cfitsio + if (keyValue[0] != 0) { // blank values are not handled by fits_get_keytype + fits_get_keytype(keyValue, &keyType, &status); + } else { + keyType = 'C'; + } + if (status != 0) { + break; + } + + bool success; // Was the add to the metadata successful? + switch (keyType) { + case 'X': // bit + case 'B': // byte + success = psMetadataAddS8(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, atoi(keyValue)); + break; + case 'I': // short int. + // This is the default type that cfitsio reports whenever it doesn't know what it is. + // Trap NAN, INF and -INF, which cfitsio doesn't handle. + if (strncasecmp(keyValue, "NAN", 3) == 0) { + success = psMetadataAddF32(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, NAN); + } else if (strncasecmp(keyValue, "INF", 3) == 0) { + success = psMetadataAddF32(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, INFINITY); + } else if (strncasecmp(keyValue, "-INF", 4) == 0) { + success = psMetadataAddF32(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, -INFINITY); + } else { + success = psMetadataAddS32(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, atoi(keyValue)); + } + break; + case 'J': // int. + success = psMetadataAddS32(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, atoi(keyValue)); + break; + case 'U': // unsigned int. + success = psMetadataAddU32(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, atol(keyValue)); + break; + + case 'K': // long int. can't all fit in a psS32, put in psF64 + case 'F': + success = psMetadataAddF64(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, atof(keyValue)); + break; + case 'C': { + char *keyValueFixed = keyValue; // Fixed version of the string + // remove the single-quotes at front/end + if (keyValueFixed[0] == '\'' && keyValueFixed[strlen(keyValue)-1] == '\'') { + keyValue[strlen(keyValue)-1] = '\0'; // Remove the trailing quote + keyValueFixed += 1; // Advance past the leading quote + } + // Remove trailing spaces, which are not significant, according to the FITS standard + // http://archive.stsci.edu/fits/fits_standard/node31.html + char *lastSpace = NULL; // The last space in the string + while (strlen(keyValueFixed) > 1 && (lastSpace = strrchr(keyValueFixed, ' ')) && + lastSpace[1] == '\0') { + // This is a trailing space, not a leading space. + lastSpace[0] = '\0'; // Truncate the string here + } + + // Need to trap NAN, INF and -INF written by psFitsWriteHeader. + // cfitsio won't write these, so we write them as strings, and then have to trap them on read. + if (strcasecmp(keyValueFixed, "NAN") == 0) { + success = psMetadataAddF32(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, NAN); + } else if (strcasecmp(keyValueFixed, "INF") == 0) { + success = psMetadataAddF32(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, INFINITY); + } else if (strcasecmp(keyValueFixed, "-INF") == 0) { + success = psMetadataAddF32(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, -INFINITY); + } else { + success = psMetadataAddStr(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, + keyValueFixed); + } + break; + } + case 'L': { + bool temp = (keyValue[0] == 'T') ? 1 : 0; + success = psMetadataAddBool(out, PS_LIST_TAIL, keyName, dupFlag, keyComment, temp); + break; + } + default: + psError(PS_ERR_IO, true, _("Specified FITS metadata type, %c, is not supported."), keyType); + return out; + } + + if (!success) { + psError(PS_ERR_UNKNOWN, false, _("Failed to add metadata item, %s."), keyName); + return out; + } + + } + + if (status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, _("Failed to add metadata item, %s."), fitsErr); + return false; + } + + return out; +} + +psMetadata* psFitsReadHeaderSet(psMetadata* out, const psFits* fits) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL.")); + psFree(out); + return NULL; + } + + if (out == NULL) { + out = psMetadataAlloc(); + } + + int size = psFitsGetSize(fits); + + int origPosition = psFitsGetExtNum(fits); + + for (int lcv=0; lcv < size; lcv++) { + psFitsMoveExtNum(fits, lcv, false); + + char* name = NULL; + if (lcv == 0) { + name = psStringCopy("PHU"); + } else { + name = psFitsGetExtName(fits); + } + + psMetadata* header = psFitsReadHeader(NULL, fits); + if (name != NULL && header != NULL) { + psMetadataAddMetadata(out, PS_LIST_TAIL, name, 0, "FITS Header", header); + } else { + psWarning("Failed to read HDU#%d header data.", + lcv); + } + + psFree(name); + psFree(header); + } + + // reposition to the original position + psFitsMoveExtNum(fits, origPosition, false); + + return out; +} + +static bool fitsWriteHeader(psFits *fits, // The FITS file handle + const psMetadata *output, // Metadata that is to be output into the FITS file + bool keyStarts // Write out the key starts? + ) +{ + int status = 0; // Status of cfitsio calls + bool simple = true; // If SIMPLE is T, then the file should conform to the FITS standard + psMetadataItem *simpleItem = psMetadataLookup(output, "SIMPLE"); // SIMPLE in the header + if (simpleItem) { + // We allow the user to write SIMPLE, but it must be boolean + if (simpleItem->type != PS_DATA_BOOL) { + psError(PS_ERR_BAD_PARAMETER_TYPE, true, "SIMPLE in a FITS header must be of boolean type: " + "not %x --- assuming TRUE.\n", simpleItem->type); + int value = false; // Temporary holder for boolean + fits_update_key(fits->fd, TLOGICAL, "SIMPLE", &value, + "File does not conform to FITS standard", &status); + simple = false; + } else if (!simpleItem->data.B) { + simple = false; + int value = false; // Temporary holder for boolean + fits_update_key(fits->fd, TLOGICAL, "SIMPLE", &value, + "File does not conform to FITS standard", &status); + } + // SIMPLE = T is taken care of by cfitsio. + } + + // Traverse the metadata list and add each key. + psListIterator* iter = psListIteratorAlloc(output->list, PS_LIST_HEAD, true); // Iterator + psMetadataItem* item; // Item from iteration + while ((item = psListGetAndIncrement(iter))) { + // Check to see if the item should be ignored + if (simple) { + // We ignore particular (required) keywords, because these are written by CFITSIO + // Furthermore, users tend to supply FITS headers that are wrong (e.g., after binning down the + // image, the NAXISn haven't been changed; or after converting to F32, the BITPIX hasn't been + // changed) so we'll take care of that for them. + bool writeKey = true; // Should we write this keyword? + for (int i = 0; noWriteFitsKeys[i] && writeKey; i++) { + if (strcmp(item->name, noWriteFitsKeys[i]) == 0) { + writeKey = false; + } + } + if (!writeKey) { + // Don't write it; skip to the next key + continue; + } + if (keyStarts) { + // Also block out TTYPEn, NAXISn, etc --- keywords that start with a certain sequence. + // We want to do this when writing an image or table, since it guarantees that the NAXISn etc + // that go in are correct. However, when we're writing a "blank" HDU (header only), we want + // to preserve NAXISn etc for reference, so we don't do this. + for (int i = 0; noWriteFitsKeyStarts[i] && writeKey; i++) { + if (strncmp(item->name, noWriteFitsKeyStarts[i], strlen(noWriteFitsKeyStarts[i])) == 0) { + writeKey = false; + } + } + if (!writeKey) { + // Don't write it; skip to the next key + continue; + } + } + } + + if (strcmp(item->name, "COMMENT") == 0) { + fits_write_comment(fits->fd, item->comment, &status); + } else if (strcmp(item->name, "HISTORY") == 0) { + fits_write_history(fits->fd, item->comment, &status); + } else { + // A regular FITS header + switch (item->type) { + case PS_DATA_BOOL: { + int value = item->data.B; + fits_update_key(fits->fd, TLOGICAL, item->name, &value, item->comment, &status); + break; + } + case PS_DATA_S8: + fits_update_key(fits->fd, TBYTE, item->name, &item->data.S8, item->comment, &status); + break; + case PS_DATA_S16: + fits_update_key(fits->fd, TSHORT, item->name, &item->data.S16, item->comment, &status); + break; + case PS_DATA_S32: + fits_update_key(fits->fd, TINT, item->name, &item->data.S32, item->comment, &status); + break; + case PS_DATA_U8: { + unsigned short int temp = item->data.U8; + fits_update_key(fits->fd, TUSHORT, item->name, &temp, item->comment, &status); + } + break; + case PS_DATA_U16: + fits_update_key(fits->fd, TUSHORT, item->name, &item->data.U16, item->comment, &status); + break; + case PS_DATA_U32: + fits_update_key(fits->fd, TUINT, item->name, &item->data.U32, item->comment, &status); + break; + case PS_DATA_F32: { + int infCheck = 0; // Result of isinf() + if (isnan(item->data.F32)) { + fits_update_key(fits->fd, TSTRING, item->name, "NaN", item->comment, &status); + } else if ((infCheck = isinf(item->data.F32)) != 0) { + if (infCheck == 1) { + fits_update_key(fits->fd, TSTRING, item->name, "Inf", item->comment, &status); + } else { + fits_update_key(fits->fd, TSTRING, item->name, "-Inf", item->comment, &status); + } + } else { + fits_update_key(fits->fd, TFLOAT, item->name, &item->data.F32, item->comment, &status); + } + break; + } + case PS_DATA_F64: { + int infCheck = 0; // Result of isinf() + if (isnan(item->data.F64)) { + fits_update_key(fits->fd, TSTRING, item->name, "NaN", item->comment, &status); + } else if ((infCheck = isinf(item->data.F64)) != 0) { + if (infCheck == 1) { + fits_update_key(fits->fd, TSTRING, item->name, "Inf", item->comment, &status); + } else { + fits_update_key(fits->fd, TSTRING, item->name, "-Inf", item->comment, &status); + } + } else { + fits_update_key(fits->fd, TDOUBLE, item->name, &item->data.F64, item->comment, &status); + } + break; + } + case PS_DATA_STRING: + fits_update_key(fits->fd, TSTRING, item->name, item->data.V, item->comment, &status); + break; + default: // all other META types are ignored + psLogMsg(__func__, PS_LOG_WARN, "Attempt to write metadata type %x to FITS header ignored.\n", + item->type); + break; + } + } + + if (status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, _("Could not write data to file. CFITSIO Error: %s"), fitsErr); + return false; + } + } + + psFree(iter); + + return true; +} + +bool psFitsWriteHeader(psFits *fits, + const psMetadata *output + ) +{ + if (!fits) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL.")); + return false; + } + + if (!output) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psMetadata was NULL. Need a non-NULL psMetadata for operation to be performed.")); + return false; + } + + return fitsWriteHeader(fits, output, true); +} + +bool psFitsWriteBlank(psFits* fits, + const psMetadata* output, + const char *extname + ) +{ + if (!fits) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL.")); + return false; + } + + // We allow output == NULL in order to write a minimal header. + + // Create a dummy image HDU for the primary HDU + int status = 0; // Status of cfitsio + + psFitsMoveLast(fits); + + int hdus = psFitsGetSize(fits); // Number of HDUs in file + if (hdus == 0) { + // We're creating the first image + fits_create_img(fits->fd, 16, 0, NULL, &status); + } else { + // Insert after the current position + fits_insert_img(fits->fd, 16, 0, NULL, &status); + } + + if (status) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, "Unable to create blank header.\n%s\n", fitsErr); + return false; + } + + if (output && !fitsWriteHeader(fits, output, false)) { + psError(PS_ERR_IO, false, "Unable to write FITS header.\n"); + return false; + } + + if (extname && strlen(extname)) { + psFitsSetExtName(fits, extname); + } + + char buffer[10]; + fits_write_img(fits->fd, TSHORT, 1, 0, buffer, &status); + + return true; +} + +bool psFitsHeaderValidate(psMetadata *header) +{ + if (header == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psMetadata was NULL. Need a non-NULL psMetadata for operation to be performed.")); + return false; + } + + // Traverse the metadata list and inspect at each key + psListIterator* iter = psListIteratorAlloc(header->list, PS_LIST_HEAD, true); // Iterator + psMetadataItem* item; // Item from iteration + bool valid = true; // Are all items valid? + while ((item = psListGetAndIncrement(iter))) { + if (item->type > PS_DATA_STRING) { // i.e., a non-primitive type + valid = false; + } + + if (strlen(item->name) > 8) { + item->name[8] = '\0'; // truncate to 8 characters + } + + fits_uppercase(item->name); // make uppercase + + // now, let's see if CFITSIO thinks this is a good keyword... + int status = 0; // Status from cfitsio calls + if (fits_test_keyword(item->name,&status) != 0) { + valid = false; + } + } + psFree(iter); + + return valid; +} Index: /branches/pap_branch_070920/psLib/src/fits/psFitsHeader.h =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/psFitsHeader.h (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/psFitsHeader.h (revision 14957) @@ -0,0 +1,69 @@ +/* @file psFitsHeader.h + * @brief Contains Fits header I/O routines + * + * @author Robert DeSonia, MHPCC + * + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-01-23 22:47:23 $ + * + * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii + */ + +#ifndef PS_FITSHEADER_H +#define PS_FITSHEADER_H + +/// @addtogroup FileIO Input/Output +/// @{ + +#include "psFits.h" +#include "psMetadata.h" + +/** Reads the header of the current HDU. + * + * @return psMetadata* the header data + */ +psMetadata* psFitsReadHeader( + psMetadata* out, + ///< The psMetadata to add the header data. If null, a new psMetadata is created. + const psFits* fits ///< the psFits object +); + +/** Reads the header of all HDUs. The current HDU is not changed. + * + * @return psMetadata* the header data set as a number of metadata entries + */ +psMetadata* psFitsReadHeaderSet( + psMetadata* out, ///< output metadata or NULL if new psMetadata is to be created. + const psFits* fits ///< the psFits object +); + +/** Writes the values of the metadata to the current HDU header. + * Doesn't check if the header has to be created. + * + * @return bool if TRUE, the write was successful, otherwise FALSE. + */ +bool psFitsWriteHeader( + psFits* fits, ///< the psFits object + const psMetadata* output ///< the psMetadata data in which to write +); + +/** Writes a "blank" --- a header only, with no image or table. + * + * @return bool if TRUE, the write was successful, otherwise FALSE. + */ +bool psFitsWriteBlank( + psFits* fits, ///< the psFits object + const psMetadata* output, ///< the psMetadata data in which to write + const char *extname +); + +/** psFitsHeaderValidate validates the supplied header so that it is in + * compliance to the FITS standard for header keyword names and types. + * + * @return bool TRUE if the resulting header conforms to the FITS + * standard, otherwise FALSE + */ +bool psFitsHeaderValidate(psMetadata *header); + +/// @} +#endif // #ifndef PS_FITS_H Index: /branches/pap_branch_070920/psLib/src/fits/psFitsImage.c =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/psFitsImage.c (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/psFitsImage.c (revision 14957) @@ -0,0 +1,653 @@ +/** @file psFitsImage.c + * + * @brief Contains Fits I/O routines + * + * @ingroup FileIO + * + * @author Robert DeSonia, MHPCC + * + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-01-09 22:38:52 $ + * + * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include + +#include "psFits.h" +#include "psAssert.h" +#include "psFitsImage.h" +#include "psError.h" + +#include "psImageStructManip.h" +#include "psMemory.h" +#include "psString.h" +#include "psLogMsg.h" +#include "psTrace.h" +#include "psVector.h" + +#include "psFitsHeader.h" + +#define MAX_STRING_LENGTH 256 // maximum length string for FITS routines + +// Information required to read a FITS file +typedef struct +{ + int nAxis; // Number of axes + int bitPix; // Bits per pixel + long nAxes[3]; // Length of each axis + long firstPixel[3]; // lower-left corner of image subset + long lastPixel[3]; // upper-right corner of image subset + long increment[3]; // increment for image subset + int fitsDatatype; // cfitsio data type + int psDatatype; // psLib data type +} +p_psFitsReadInfo; + +static p_psFitsReadInfo *p_psFitsReadInfoAlloc(const psFits *fits, // The FITS file handle + psRegion region, // Region to read + int z // z-plane to read in cube + ) +{ + PS_ASSERT_PTR_NON_NULL(fits, NULL); + PS_ASSERT_INT_NONNEGATIVE(z, NULL); + + p_psFitsReadInfo *info = psAlloc(sizeof(p_psFitsReadInfo)); + memset(info, 0, sizeof(p_psFitsReadInfo)); + + int status = 0; // CFITSIO status + char fitsErr[80]; // CFITSIO error message string + + // check to see if we even are positioned on an image HDU + int hduType; // Type of HDU + if (fits_get_hdu_type(fits->fd, &hduType, &status) != 0) { + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine the HDU type. CFITSIO Error: %s"), + fitsErr); + goto bad; + } + if (hduType != IMAGE_HDU) { + psError(PS_ERR_IO, true, + _("Current FITS HDU type must be an image.")); + goto bad; + } + + // Get the data type 'bitPix' from the FITS image + if (fits_get_img_equivtype(fits->fd, &info->bitPix, &status) != 0) { + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine image data type. CFITSIO Error: %s"), + fitsErr); + goto bad; + } + + /* Get the dimensions 'nAxis' from the FITS image */ + if (fits_get_img_dim(fits->fd, &info->nAxis, &status) != 0) { + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine image dimensions. CFITSIO Error: %s"), + fitsErr); + goto bad; + } + + /* Validate the number of axis */ + if ((info->nAxis < 2) || (info->nAxis > 3)) { + psError(PS_ERR_IO, true, + _("Image number of dimensions, %d, is not valid. Only two or three dimensions supported for FITS I/O."), + info->nAxis); + goto bad; + } + + /* Get the Image size from the FITS file */ + if (fits_get_img_size(fits->fd, info->nAxis, info->nAxes, &status) != 0) { + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine image size. CFITSIO Error: %s"), + fitsErr); + goto bad; + } + + info->firstPixel[0] = region.x0 + 1; + info->firstPixel[1] = region.y0 + 1; + info->firstPixel[2] = z + 1; + + if (region.x1 > 0) { + info->lastPixel[0] = region.x1; + } else { + info->lastPixel[0] = info->nAxes[0] + region.x1; // n.b., region.x1 < 0 + } + if (region.y1 > 0) { + info->lastPixel[1] = region.y1; + } else { + info->lastPixel[1] = info->nAxes[1] + region.y1; // n.b., region.y1 < 0 + } + info->lastPixel[2] = z + 1; + + info->increment[0] = 1; + info->increment[1] = 1; + info->increment[2] = 1; + + switch (info->bitPix) { + case BYTE_IMG: + info->psDatatype = PS_TYPE_U8; + info->fitsDatatype = TBYTE; + break; + case SBYTE_IMG: + info->psDatatype = PS_TYPE_S8; + info->fitsDatatype = TSBYTE; + break; + case USHORT_IMG: + info->psDatatype = PS_TYPE_U16; + info->fitsDatatype = TUSHORT; + break; + case SHORT_IMG: + info->psDatatype = PS_TYPE_S16; + info->fitsDatatype = TSHORT; + break; + case ULONG_IMG: + info->psDatatype = PS_TYPE_U32; + info->fitsDatatype = TUINT; + break; + case LONG_IMG: + info->psDatatype = PS_TYPE_S32; + info->fitsDatatype = TINT; + break; + case LONGLONG_IMG: + info->psDatatype = PS_TYPE_S64; + info->fitsDatatype = TLONGLONG; + break; + case FLOAT_IMG: + info->psDatatype = PS_TYPE_F32; + info->fitsDatatype = TFLOAT; + break; + case DOUBLE_IMG: + info->psDatatype = PS_TYPE_F64; + info->fitsDatatype = TDOUBLE; + break; + default: + psError(PS_ERR_IO, true, + _("FITS image type, BITPIX=%d, is not supported."), + info->bitPix); + goto bad; + } + + return info; + + // Common error cleanup +bad: + psFree(info); + return NULL; +} + +// Read into an extant image of just the right size +static bool fitsReadImage(psImage *output, // Output image + const psFits *fits, // FITS file handle + p_psFitsReadInfo *info // Info on how to read + ) +{ + // n.b., this assumes contiguous image buffer + assert(output); + assert(fits); + assert(info); + assert(output->numCols == info->lastPixel[0] - info->firstPixel[0] + 1); + assert(output->numRows == info->lastPixel[1] - info->firstPixel[1] + 1); // Right size + assert(!output->parent); // No parents means the buffer is contiguous + + int anynull = 0; // Are there any NULLs in the data? + int status = 0; // cfitsio status + if (fits_read_subset(fits->fd, info->fitsDatatype, info->firstPixel, info->lastPixel, + info->increment, NULL, output->data.V[0], &anynull, &status) != 0) { + char fitsErr[80]; // CFITSIO error message string + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Reading FITS file failed. CFITSIO Error: %s"), + fitsErr); + return false; + } + + return true; +} + +psImage* psFitsReadImage(const psFits *fits, // the psFits object + psRegion region, // the region in the FITS image to read + int z // the z-plane in the FITS image cube to read + ) +{ + p_psFitsReadInfo *info = p_psFitsReadInfoAlloc(fits, region, z); + + psImage *output = psImageAlloc(info->lastPixel[0] - info->firstPixel[0] + 1, + info->lastPixel[1] - info->firstPixel[1] + 1, + info->psDatatype); + + if (!fitsReadImage(output, fits, info)) { + psFree(info); + psFree(output); + return NULL; + } + + psFree(info); + return output; +} + +psImage* psFitsReadImageBuffer(psImage *output, // Output image buffer + const psFits *fits, // the psFits object + psRegion region, // the region in the FITS image to read + int z // the z-plane in the FITS image cube to read + ) +{ + if (output && output->parent) { + psError(PS_ERR_IO, true, "Unable to read into a buffer for a child image.\n"); + return NULL; + } + + p_psFitsReadInfo *info = p_psFitsReadInfoAlloc(fits, region, z); + + output = psImageRecycle(output, info->lastPixel[0] - info->firstPixel[0] + 1, + info->lastPixel[1] - info->firstPixel[1] + 1, + info->psDatatype); + + if (!fitsReadImage(output, fits, info)) { + psFree(info); + psFree(output); + return NULL; + } + + psFree(info); + return output; +} + +bool psFitsWriteImage(psFits* fits, + const psMetadata* header, + const psImage* input, + int numZPlanes, + const char* extname) +{ + // this is equivalent to insert after the last HDU + + psFitsMoveLast(fits); + return psFitsInsertImage(fits,header,input,numZPlanes,extname,true); +} + +bool psFitsInsertImage(psFits* fits, + const psMetadata* header, + const psImage* input, + int numZPlanes, + const char* extname, + bool after) +{ + + if (!fits) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psFits object can not NULL.")); + return false; + } + + if (!input) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, _("The input psImage was NULL. Need a non-NULL psImage for operation to be performed.")); + return false; + } + + int numCols = input->numCols; // Number of columns for image + int numRows = input->numRows; // Number of rows for image + int status = 0; // Status from cfitsio + + // determine the FITS-equivalent parameters + int bitPix; // Bits per pixel + double bZero; // Zero offset + int dataType; // cfitsio data type + if (! p_psFitsTypeToCfitsio(input->type.type, &bitPix, &bZero, &dataType) ) { + return false; + } + + int naxis = 3; // Number of axes + long naxes[3]; // Length of each axis + naxes[0] = numCols; + naxes[1] = numRows; + naxes[2] = numZPlanes; + + if (numZPlanes < 2) { + naxis = 2; + } + + // Create the image HDU + int hdus = psFitsGetSize(fits); // Number of HDUs in file + if (hdus == 0) { + // We're creating the first image + fits_create_img(fits->fd, bitPix, naxis, naxes, &status); + } else { + if (!after) { + if (psFitsGetExtNum(fits) == 0) { + // We're creating a replacement primary HDU. + // Set status to signal fits_insert_img to insert a new primary HDU + status = PREPEND_PRIMARY; + } else { + // Move back one to perform an insert after the previous HDU + psFitsMoveExtNum(fits, -1, true); + } + } + // Insert after the current position + fits_insert_img(fits->fd, bitPix, naxis, naxes, &status); + } + + if (header && !psFitsWriteHeader(fits, header)) { + psError(PS_ERR_IO, false, "Unable to write FITS header.\n"); + return false; + } + + if (bZero != 0) { // set the bscale/bzero + fits_write_key_dbl(fits->fd, "BZERO", bZero, 12, "Pixel Value Offset", &status); + fits_write_key_dbl(fits->fd, "BSCALE", 1.0, 12, "Pixel Value Scale", &status); + fits_set_bscale(fits->fd, 1.0, bZero, &status); + } + + // write the header, if any. + if (extname && strlen(extname) > 0) { + psFitsSetExtName(fits,extname); + } + + if (input->parent == NULL) { // if no parent, assume that the image data is contiguous + fits_write_img(fits->fd, + dataType, // datatype + 1, // writing to the first z-plane + numCols*numRows, // number of elements to write, i.e., the whole image + input->data.V[0], // the data + &status); + } else { // image data may not be contiguous; write one row at a time + int firstPixel = 1; + for (int row = 0; row < numRows; row++) { + fits_write_img(fits->fd, + dataType, // datatype + firstPixel, + numCols, // number of elements to write, i.e., one row's worth + input->data.V[row],// the raw row data + &status); + firstPixel += numCols; // move to next row + } + } + + if (status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not write data to file. CFITSIO Error: %s"), + fitsErr); + return false; + } + + return true; + +} + +bool psFitsUpdateImage(psFits* fits, + const psImage* input, + int x0, + int y0, + int z) +{ + int status = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + if (input == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psImage was NULL. Need a non-NULL psImage for operation to be performed.")); + return false; + } + + // check to see if we are positioned on an image HDU + int hduType; + if ( fits_get_hdu_type(fits->fd, &hduType, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine the HDU type. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + if (hduType != IMAGE_HDU) { + psError(PS_ERR_IO, true, + _("Current FITS HDU type must be an image.")); + return NULL; + } + + int numCols = input->numCols; + int numRows = input->numRows; + + // determine the FITS-equivalent parameters + int bitPix; + double bZero; + int dataType; + if (! p_psFitsTypeToCfitsio(input->type.type, &bitPix, &bZero, &dataType) ) { + return false; + } + + //check to see if the HDU has the same datatype + int fileBitpix; + int naxis; + long nAxes[3]; + nAxes[2] = 1; + fits_get_img_param(fits->fd, 3, &fileBitpix, &naxis, nAxes, &status); + + //check to see if the HDU has the same datatype + if (bitPix != fileBitpix) { + char* fitsTypeStr; + char* imageTypeStr; + PS_TYPE_NAME(fitsTypeStr,fileBitpix); + PS_TYPE_NAME(imageTypeStr,input->type.type); + psError(PS_ERR_IO, true, + _("Can not update a %s image given a %s image."), + fitsTypeStr, imageTypeStr); + return false; + } + + //check if the HDU has the z-plane requested + if (z >= nAxes[2]) { + psError(PS_ERR_BAD_PARAMETER_SIZE, true, + _("Current FITS HDU has %ld z-planes, but z-plane %d was specified."), + nAxes[2], z); + return false; + } + + // determine the region in the FITS file domain + long firstPixel[3]; + long lastPixel[3]; + + firstPixel[0] = x0 + 1; + firstPixel[1] = y0 + 1; + firstPixel[2] = z + 1; + + lastPixel[0] = x0 + numCols; + lastPixel[1] = y0 + numRows; + lastPixel[2] = z + 1; + + if (firstPixel[0] < 1 || firstPixel[0] > nAxes[0] || + firstPixel[1] < 1 || firstPixel[1] > nAxes[1] || + lastPixel[0] < 1 || lastPixel[0] > nAxes[0] || + lastPixel[1] < 1 || lastPixel[1] > nAxes[1]) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "Input image [size of %ix%i] at position (%i,%i) does not all lay in the %lix%li FITS image.", + numCols, numRows, + x0, y0, + nAxes[0], nAxes[1]); + return false; + } + + fits_write_subset(fits->fd, dataType, firstPixel, lastPixel, input->data.V[0], &status); + + if ( status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not write data to file. CFITSIO Error: %s"), + fitsErr); + return false; + } + + return true; +} + +psArray *psFitsReadImageCube(const psFits *fits, psRegion region) +{ + int nAxis = 0; // Number of axes + long nAxes[3]; // Number of pixels on each axis + int status = 0; // cfitsio status value + char fitsErr[80] = ""; // CFITSIO error message string + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return NULL; + } + + // Some of this replicates what is in psFitsReadImage, so it's a little inefficient. But it saves + // code replication, and should be sufficient for our needs. + + if (fits_get_img_dim(fits->fd, &nAxis, &status) != 0) { + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine image dimensions. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + + if (nAxis == 2) { + psArray *images = psArrayAlloc(1); // Single image plane + images->data[0] = psFitsReadImage(fits, region, 0); + return images; + } + if (nAxis == 3) { + if (fits_get_img_size(fits->fd, nAxis, nAxes, &status) != 0) { + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine image size. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + + psArray *images = psArrayAlloc(nAxes[2]); // Array of image planes + for (int i = 0; i < nAxes[2]; i++) { + images->data[i] = psFitsReadImage(fits, region, i); + } + + return images; + } + + // Bad dimensionality + psError(PS_ERR_IO, true, _("Image number of dimensions, %d, is not valid. Only two or three dimensions supported for FITS I/O."), nAxis); + return NULL; +} + +bool psFitsWriteImageCube(psFits *fits, psMetadata *header, const psArray *input, const char *extname) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + if (input == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psImage was NULL. Need a non-NULL psImage for operation to be performed.")); + return false; + } + + if (input->n == 0) { + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The input array was empty.")); + return false; + } + + if (input->n == 1) { + // The problem reduces to one already solved + return psFitsWriteImage(fits, header, input->data[0], 1, extname); + } + + // Check that all images are of the same size + psImage *testImage = input->data[0];// First image off the array + int numCols = testImage->numCols; // Number of columns + int numRows = testImage->numRows; // Number of rows + for (int i = 1; i < input->n; i++) { + testImage = input->data[i]; + if (testImage->numCols != numCols || testImage->numRows != numRows) { + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The sizes of images in the array differ.")); + return false; + } + } + + // Need to check the header to make sure NAXIS and NAXIS[1-3] are correct + psMetadata *headerCopy = NULL; // Copy of header + if (header) { + headerCopy = psMemIncrRefCounter(header); + } else { + headerCopy = psMetadataAlloc(); + } + bool update = psMetadataAddS32(headerCopy, PS_LIST_HEAD, "NAXIS", PS_META_REPLACE, "Dimensionality", 3) && + psMetadataAddS32(headerCopy, PS_LIST_HEAD, "NAXIS1", PS_META_REPLACE, "Number of columns", numCols) && + psMetadataAddS32(headerCopy, PS_LIST_HEAD, "NAXIS2", PS_META_REPLACE, "Number of rows", numRows) && + psMetadataAddS32(headerCopy, PS_LIST_HEAD, "NAXIS3", PS_META_REPLACE, "Number of image planes", + input->n); + if (! update) { + psError(PS_ERR_UNKNOWN, false, _("Failed to add metadata item, %s."), + "NAXIS, NAXIS1, NAXIS2, NAXIS3"); + psFree(headerCopy); + return false; + } + + // Now we can safely write the images out. + // The first is an psFitsImageWrite to create the extension. + // The next are psFitsImageUpdate to write into the extension. + if (! psFitsWriteImage(fits, headerCopy, input->data[0], input->n, extname)) { + psError(PS_ERR_UNKNOWN, false, _("Could not write image plane %d."), 0); + psFree(headerCopy); + return false; + } + psFree(headerCopy); // Free, or drop reference + + for (int i = 1; i < input->n; i++) { + if (! psFitsUpdateImage(fits, input->data[i], 0, 0, i)) { + psError(PS_ERR_UNKNOWN, false, _("Could not write image plane %d."), i); + return false; + } + } + + return true; +} + +bool psFitsUpdateImageCube(psFits *fits, const psArray *input, int x0, int y0) +{ + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + if (input == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psImage was NULL. Need a non-NULL psImage for operation to be performed.")); + return false; + } + + if (input->n == 0) { + psError(PS_ERR_BAD_PARAMETER_SIZE, true, _("The input array was empty.")); + return false; + } + + for (int i = 0; i < input->n; i++) { + if (! psFitsUpdateImage(fits, input->data[i], x0, y0, i)) { + psError(PS_ERR_UNKNOWN, false, _("Could not update image plane %d."), i); + return false; + } + } + + return true; +} + Index: /branches/pap_branch_070920/psLib/src/fits/psFitsImage.h =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/psFitsImage.h (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/psFitsImage.h (revision 14957) @@ -0,0 +1,86 @@ +/* @file psFitsImage.h + * @brief Contains Fits I/O routines + * + * @author Robert DeSonia, MHPCC + * + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-01-23 22:47:23 $ + * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii + */ + +#ifndef PS_FITSIMAGE_H +#define PS_FITSIMAGE_H + +/// @addtogroup FileIO Input/Output +/// @{ + +#include "psFits.h" +#include "psType.h" +#include "psArray.h" +#include "psVector.h" +#include "psMetadata.h" +#include "psImage.h" + +/** Reads an image, given the desired region and z-plane. + * + * @return psImage* the read image or NULL if there was an error. + */ +psImage* psFitsReadImage( + const psFits* fits, ///< the psFits object + psRegion region, ///< the region in the FITS image to read + int z ///< the z-plane in the FITS image cube to read +); + +// Read an image into an extant buffer +psImage* psFitsReadImageBuffer(psImage *output, // Output image buffer + const psFits *fits, // the psFits object + psRegion region, // the region in the FITS image to read + int z // the z-plane in the FITS image cube to read + ); + +/** Writes an image, given the desired region and z-plane. + * + * @return bool TRUE is the write was successful, otherwise FALSE. + */ +bool psFitsWriteImage( + psFits* fits, ///< the psFits object + const psMetadata* header, ///< header items for the new HDU. Can be NULL. + const psImage* input, ///< the image to output + int depth, ///< the number of z-planes of the FITS image data cube + const char* extname ///< FITS extension name +); + +/** Writes an image, given the desired region and z-plane. A new IMAGE HDU is + * appended to the end of the FITS file. + * + * @return bool TRUE is the write was successful, otherwise FALSE. + */ +bool psFitsInsertImage( + psFits* fits, ///< the psFits object + const psMetadata* header, ///< header items for the new HDU. Can be NULL. + const psImage* input, ///< the image to output + int depth, ///< the number of z-planes of the FITS image data cube + const char* extname, ///< FITS extension name + bool after ///< if TRUE, inserts HDU after current HDU, otherwise before +); + +/** Updates the FITS file image, given the desired region and z-plane. a new + * IMAGE HDU is inserted before or after, depending on the AFTER parameter, + * the current HDU. + * + * @return bool TRUE is the write was successful, otherwise FALSE. + */ +bool psFitsUpdateImage( + psFits* fits, ///< the psFits object + const psImage* input, ///< the image to output + int x0, ///< psImage's x-axis origin in FITS image coordinates + int y0, ///< psImage's y-axis origin in FITS image coordinates + int z ///< the z-planes of the FITS image data cube to write +); + +psArray *psFitsReadImageCube(const psFits *fits, psRegion region); +bool psFitsWriteImageCube(psFits *fits, psMetadata *header, const psArray *input, const char *extname); +bool psFitsUpdateImageCube(psFits *fits, const psArray *input, int x0, int y0); + +/// @} +#endif // #ifndef PS_FITS_H Index: /branches/pap_branch_070920/psLib/src/fits/psFitsTable.c =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/psFitsTable.c (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/psFitsTable.c (revision 14957) @@ -0,0 +1,796 @@ +/** @file psFitsTable.c + * + * @brief Contains Fits I/O routines + * + * @ingroup FileIO + * + * @author Robert DeSonia, MHPCC + * + * @version $Revision: 1.27 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-22 21:40:47 $ + * + * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include "psFits.h" +#include "string.h" +#include "psError.h" + +#include "psImageStructManip.h" +#include "psMemory.h" +#include "psString.h" +#include "psLogMsg.h" +#include "psTrace.h" +#include "psVector.h" +#include "psFitsTable.h" +#include "psFitsHeader.h" +#include "psAbort.h" +#include "psAssert.h" + +#define MAX_STRING_LENGTH 256 // maximum length string for FITS routines + + +psMetadata* psFitsReadTableRow(const psFits* fits, + int row) +{ + long numRows; + int numCols; + int status = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return NULL; + } + + // check to see if we even are positioned on a table HDU + int hdutype; + fits_get_hdu_type(fits->fd,&hdutype, &status); + if ( status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine the HDU type. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) { + psError(PS_ERR_IO, true, + _("Current FITS HDU type must be a table.")); + return NULL; + } + + // get the size of the FITS table + fits_get_num_rows(fits->fd, &numRows, &status); + fits_get_num_cols(fits->fd, &numCols, &status); + if ( status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Failed to determine the size of the current HDU table. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + + psTrace("psLib.fits",5,"Table size is %ix%li\n",numCols, numRows); + // the row parameter in the proper range? + if (row < 0 || row >= numRows) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + _("Specified row, %d, is not valid for current table of %ld rows."), + row, numRows); + return NULL; + } + + psMetadata* data = psMetadataAlloc(); + + int typecode; + long repeat; + long width; + char name[60]; + for (int col = 1; col <= numCols; col++) { + // get the column name + if (hdutype == BINARY_TBL) { + fits_get_bcolparms(fits->fd, col, name, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, &status); + } else { + fits_get_acolparms(fits->fd, col, name, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, &status); + } + // get the column type + fits_get_coltype(fits->fd, col, &typecode, &repeat, &width, &status); + + if (status == 0) { + + #define READ_TABLE_ROW_CASE(FITSTYPE, NATIVETYPE, TYPE, VECTYPE) \ + case FITSTYPE: { \ + if (repeat == 1) { \ + NATIVETYPE value; \ + int anynul = 0; \ + fits_read_col(fits->fd, FITSTYPE, col,row+1, \ + 1, 1, NULL, &value, &anynul, &status); \ + psTrace("psLib.fits",5,"Column #%i, '%s', is type %i, repeat %li, Value = %g\n", \ + col, name, typecode, repeat, (double)value); \ + psMetadataAdd(data,PS_LIST_TAIL, name, \ + PS_DATA_##TYPE, \ + "", (ps##TYPE)value); \ + } else { \ + NATIVETYPE* value = psAlloc(sizeof(NATIVETYPE)*repeat); \ + psVector* vec = psVectorAlloc(repeat,PS_TYPE_##VECTYPE); \ + int anynul = 0; \ + fits_read_col(fits->fd, FITSTYPE, col,row+1, \ + 1, repeat, NULL, value, &anynul, &status); \ + for (int lcv = 0; lcv < repeat; lcv++) { \ + vec->data.VECTYPE[lcv] = value[lcv]; \ + } \ + psMetadataAdd(data,PS_LIST_TAIL, name, PS_DATA_VECTOR, "", vec); \ + psFree(value); \ + psFree(vec); \ + } \ + break; \ + } + + switch (typecode) { + case TBYTE: + case TSHORT: + case TLONGLONG: + READ_TABLE_ROW_CASE(TLONG, long, S32,S32) + READ_TABLE_ROW_CASE(TFLOAT, float, F32,F32) + READ_TABLE_ROW_CASE(TDOUBLE, double, F64,F64) + READ_TABLE_ROW_CASE(TLOGICAL, bool, BOOL,S8); + case TSTRING: { + char* value = psAlloc(repeat+1); + int anynul = 0; + fits_read_col(fits->fd, TSTRING, col,row+1, + 1, 1, NULL, &value, &anynul, &status); + psTrace("psLib.fits",5,"Column #%i, '%s', is type %i, repeat %li, value = %s\n", + col, name, typecode, repeat, value); + if (anynul == 0) { + psMetadataAdd(data,PS_LIST_TAIL, name, + PS_DATA_STRING, + "", value); + } + psFree(value); + break; + } + default: + psWarning("Data type (%d) not supportted for column %d", + typecode, col); + + psTrace("psLib.fits", 2, + "Column %d or row %d was of a non primitive type, %d", + col, row, typecode); + } + } + + if ( status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Failed to retrieve table element (%d,%d). CFITSIO Error: %s"), + col,row,fitsErr); + psFree(data); + return NULL; + } + + } + + return data; +} + +psArray* psFitsReadTableColumn(const psFits* fits, + const char* colname) +{ + int colnum = 0; + int status = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return NULL; + } + + // check to see if we even are positioned on a table HDU + int hdutype; + if ( fits_get_hdu_type(fits->fd,&hdutype, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine the HDU type. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) { + psError(PS_ERR_IO, true, + _("Current FITS HDU type must be a table.")); + return NULL; + } + + // find the column by name + if ( fits_get_colnum(fits->fd, CASESEN, (char*)colname, &colnum, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Specified column, %s, was not found. CFITSIO Error: %s"), + colname, fitsErr); + return NULL; + } + + // get the number of rows + long numRows = 0; + fits_get_num_rows(fits->fd, &numRows, &status); + + // get the column length. + int width; + if ( fits_get_col_display_width(fits->fd, colnum, &width, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine the datatype of the table column. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + + // allocate the buffers + psArray* result = psArrayAlloc(numRows); + for (int row = 0; row < numRows; row++) { + result->data[row] = psAlloc((width+1)*sizeof(char)); + } + + fits_read_col_str(fits->fd, + colnum, + 1, // firstrow + 1, // firestelem + numRows, + "", // nulstr + (char**)result->data, + NULL, + &status); + + if ( status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Failed to read table column. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + + return result; +} + +psVector* psFitsReadTableColumnNum(const psFits* fits, + const char* colname) +{ + int status = 0; + int colnum = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return NULL; + } + + // check to see if we even are positioned on a table HDU + int hdutype; + if ( fits_get_hdu_type(fits->fd,&hdutype, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine the HDU type. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) { + psError(PS_ERR_IO, true, + _("Current FITS HDU type must be a table.")); + return NULL; + } + + // find the column by name + if ( fits_get_colnum(fits->fd, CASESEN, (char*)colname, &colnum, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Specified column, %s, was not found. CFITSIO Error: %s"), + colname, fitsErr); + return NULL; + } + + // get the number of rows + long numRows = 0; + fits_get_num_rows(fits->fd, + &numRows, + &status); + + // get the column datatype. + int typecode; + long repeat; + long width; + if ( fits_get_eqcoltype(fits->fd, colnum, &typecode, &repeat, &width, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine the datatype of the table column. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + + psVector* result = psVectorAlloc(numRows, p_psFitsTypeFromCfitsio(typecode)); + + fits_read_col(fits->fd, + typecode, + colnum, + 1 /* firstrow */, + 1 /* firstelem */, + numRows, + NULL, + (psPtr)(result->data.U8), + NULL, + &status); + + if ( status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Failed to read table column. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + + return result; +} + + +psArray* psFitsReadTable(const psFits* fits) +{ + int status = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return NULL; + } + + // check to see if we even are positioned on a table HDU + int hdutype; + if ( fits_get_hdu_type(fits->fd,&hdutype, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine the HDU type. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) { + psError(PS_ERR_IO, true, + _("Current FITS HDU type must be a table.")); + return NULL; + } + + // get the size of the FITS table + long numRows = 0; + fits_get_num_rows(fits->fd, &numRows, &status); + if ( status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Failed to determine the size of the current HDU table. CFITSIO Error: %s"), + fitsErr); + return NULL; + } + + + psArray* table = psArrayAlloc(numRows); + + for (int row = 0; row < numRows; row++) { + psTrace("psLib.fits",5,"Reading row %i of %li\n",row, numRows); + table->data[row] = psFitsReadTableRow(fits,row); + } + + return table; +} + +bool psFitsWriteTable(psFits* fits, + const psMetadata* header, + const psArray* table, + const char *extname) +{ + psFitsMoveLast(fits); + return psFitsInsertTable(fits, header, table, extname, true); +} + + +// Return the size of the column +static inline size_t columnSize(const psMetadataItem *item // Item for which to get the size + ) +{ + if (PS_DATA_IS_PRIMITIVE(item->type)) { + return 1; + } + switch (item->type) { + case PS_DATA_STRING: + return strlen(item->data.V); + case PS_DATA_VECTOR: { + psVector *vector = item->data.V; + return vector->n; + } + default: + psAbort("Shouldn't ever get here."); + } + return 0; +} + +// Get the TFORM character, given a PS type +static inline char getTForm(psDataType type) +{ + switch (type) { + case PS_TYPE_U8: + case PS_TYPE_S8: + return 'B'; + case PS_TYPE_S16: + return 'I'; + case PS_TYPE_S32: + return 'J'; + case PS_TYPE_U64: + case PS_TYPE_S64: + return 'K'; + case PS_TYPE_U16: + return 'U'; + case PS_TYPE_U32: + return 'V'; + case PS_TYPE_F32: + return 'E'; + case PS_TYPE_F64: + return 'D'; + case PS_TYPE_BOOL: + return 'L'; + case PS_DATA_STRING: + return 'A'; + default: + psError(PS_ERR_UNKNOWN, true, "Unknown type: %x\n", type); + return '?'; + } +} + + +// Column specification +// Included here, because there's no need for the user to have access to it +typedef struct +{ + psDataType type; // psLib type (e.g., PS_DATA_STRING or PS_TYPE_F32) + size_t size; // Size (number of repeats) + psElemType vectorType; // psLib type of vectors +} +colSpec; + + +bool psFitsInsertTable(psFits* fits, + const psMetadata* header, + const psArray* table, + const char *extname, + bool after) +{ + int status = 0; + + PS_ASSERT_PTR_NON_NULL(fits, false); + PS_ASSERT_ARRAY_NON_NULL(table, false); + + long numRows = table->n; + if (numRows < 1) { + // no table data, what can I do? + psError(PS_ERR_BAD_PARAMETER_SIZE, true, + _("Can't create a table without any rows.")); + return false; + } + + // Find the unique items in the array of metadata 'rows', and their sizes + psMetadata *colSpecs = psMetadataAlloc(); // Column specifications + size_t rowSize = 0; // Size (in bytes) of each row + for (long i = 0; i < numRows; i++) { + psMetadata* row = table->data[i]; + if (!row) { + continue; + } + psMetadataIterator *rowIter = psMetadataIteratorAlloc(row, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *colItem; // Column item, from iteration + while ((colItem = psMetadataGetAndIncrement(rowIter))) { + if (!(PS_DATA_IS_PRIMITIVE(colItem->type) || colItem->type == PS_DATA_STRING || + colItem->type == PS_DATA_VECTOR)) { + // unsupported type -- treating as an error + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + "Unsupported data type (%d) for Metadata Item '%s' in row %ld.", + colItem->type, colItem->name, i); + psFree(rowIter); + psFree(colSpecs); + return false; + } + + size_t size = columnSize(colItem); // Size for this column + + // Check to see if we know about this one; or update the size if required + psMetadataItem *colSpecItem = psMetadataLookup(colSpecs, colItem->name); + if (!colSpecItem) { + // A new one! + colSpec *spec = psAlloc(sizeof(colSpec)); // Specification for this column + spec->type = colItem->type; + spec->size = size; + if (colItem->type == PS_DATA_VECTOR) { + psVector *vector = colItem->data.V; // The vector + spec->vectorType = vector->type.type; + } + psMetadataAddPtr(colSpecs, PS_LIST_TAIL, colItem->name, PS_DATA_UNKNOWN, "", spec); + psFree(spec); // Drop reference + rowSize += PSELEMTYPE_SIZEOF(spec->type); + } else { + colSpec *spec = colSpecItem->data.V; // The specification + if (size > spec->size) { + spec->size = size; + } + if (colItem->type != spec->type) { + psLogMsg(__func__, PS_LOG_WARN, "Differing type found for column %s: %x vs %x --- " + "using the first found.\n", colSpecItem->name, colItem->type, spec->type); + } + if (colItem->type == PS_DATA_VECTOR) { + psVector *vector = colItem->data.V; // The vector + if (vector->type.type != spec->vectorType) { + psLogMsg(__func__, PS_LOG_WARN, "Differing vector type found for column %s: %x vs %x" + "--- using the first found.\n", colSpecItem->name, vector->type.type, + spec->vectorType); + } + } + } + } + psFree(rowIter); + } + + long numColumns = colSpecs->list->n;// Number of columns + if (numColumns == 0) { + // No table columns found + psError(PS_ERR_BAD_PARAMETER_SIZE, true, + "Did not find any column data to write to a table."); + psFree(colSpecs); + return false; + } + + // Create array of column names and types. + psArray *columnNames = psArrayAlloc(numColumns); // Array of column names, for cfitsio + psArray *columnTypes = psArrayAlloc(numColumns); // Array of column types, for cfitsio + psMetadataIterator *colSpecsIter = psMetadataIteratorAlloc(colSpecs, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *colSpecItem; // Column specification item, from iteration + for (long i = 0; (colSpecItem = psMetadataGetAndIncrement(colSpecsIter)); i++) { + colSpec *spec = colSpecItem->data.V; // The specification + columnNames->data[i] = psMemIncrRefCounter(colSpecItem->name); + psString colType = NULL; // The column type + if (spec->type == PS_DATA_VECTOR) { + psStringAppend(&colType, "%zd%c", spec->size, getTForm(spec->vectorType)); + } else { + psStringAppend(&colType, "%zd%c", spec->size, getTForm(spec->type)); + } + columnTypes->data[i] = colType; + } + + // Create the table HDU + int numHDUs = psFitsGetSize(fits); // Number of HDUs in file + if (numHDUs == 0) { + // We're creating the first extension + fits_create_tbl(fits->fd, + BINARY_TBL, + table->n, // number of rows in table + numColumns, // number of columns in table + (char**)columnNames->data, // names of the columns + (char**)columnTypes->data, // format of the columns + NULL, // physical unit of columns + NULL, // skip extension name: we set the by hand below + &status); + } else { + if (!after) { + if (psFitsGetExtNum(fits) == 0) { + // We're creating a replacement primary HDU. + // Set status to signal fits_insert_img to insert a new primary HDU + status = PREPEND_PRIMARY; + } else { + // Move back one to perform an insert after the previous HDU + psFitsMoveExtNum(fits, -1, true); + } + } + // Insert the table + fits_insert_btbl(fits->fd, + table->n, // number of rows in table + numColumns, // number of columns in table + (char**)columnNames->data, // names of the columns + (char**)columnTypes->data, // format of the columns + NULL, // physical unit of columns + NULL, // skip extension name: we set this by hand below + 0, &status); + } + psFree(columnNames); + psFree(columnTypes); + + if (status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, "Unable to create FITS table with %ld columns and %ld rows: %s", + numColumns, table->n, fitsErr); + psFree(colSpecsIter); + psFree(colSpecs); + return false; + } + + // Write header + if (header && !psFitsWriteHeader(fits, header)) { + psError(PS_ERR_IO, false, "Unable to write FITS header.\n"); + psFree(colSpecsIter); + psFree(colSpecs); + return false; + } + + // write the header, if any. + if (extname && strlen(extname) > 0) { + if (!psFitsSetExtName(fits, extname)) { + psError(PS_ERR_IO, false, "Unable to write FITS header extension name.\n"); + psFree(colSpecsIter); + psFree(colSpecs); + return false; + } + } + + // cfitsio requires that we write the data by columns --- urgh! + psMetadataIteratorSet(colSpecsIter, PS_LIST_HEAD); + for (long colNum = 1; (colSpecItem = psMetadataGetAndIncrement(colSpecsIter)); colNum++) { + // Note: colNum is unit-indexed, because it's for cfitsio + colSpec *spec = colSpecItem->data.V; // The specification + if (PS_DATA_IS_PRIMITIVE(spec->type)) { + size_t dataSize = PSELEMTYPE_SIZEOF(spec->type); // Size (in bytes) of this type + psVector *columnData = psVectorAlloc(table->n, spec->type); // The raw row data, to be written + psVectorInit(columnData, 0); + for (long i = 0; i < table->n; i++) { + psMetadata *row = table->data[i]; // The row of interest + psMetadataItem *dataItem = psMetadataLookup(row, colSpecItem->name); // The value of interest + memcpy(&columnData->data.U8[i * dataSize], &dataItem->data, dataSize); + } + + int fitsDataType; // Data type for cfitsio + p_psFitsTypeToCfitsio(spec->type, NULL, NULL, &fitsDataType); + fits_write_col(fits->fd, + fitsDataType, + colNum, // column number + 1, // first row + 1, // first element + table->n, // number of rows + columnData->data.U8, // the data + &status); + psFree(columnData); + } else { + switch (spec->type) { + case PS_DATA_STRING: { + psArray *strings = psArrayAlloc(table->n); // Array of strings + for (long i = 0; i < table->n; i++) { + psMetadata *row = table->data[i]; // The row of interest + strings->data[i] = psMemIncrRefCounter(psMetadataLookupStr(NULL, row, + colSpecItem->name)); + } + fits_write_col_str(fits->fd, colNum, 1, 1, table->n, (char**)strings->data, &status); + psFree(strings); + break; + } + case PS_DATA_VECTOR: { + size_t dataSize = PSELEMTYPE_SIZEOF(spec->vectorType); // Size of data, in bytes + psVector *columnData = psVectorAlloc(spec->size * table->n * dataSize, PS_TYPE_U8); + psVectorInit(columnData, 0); + for (long i = 0; i < table->n; i++) { + psMetadata *row = table->data[i]; // The row of interest + psMetadataItem* dataItem = psMetadataLookup(row, colSpecItem->name); + if (dataItem->type != PS_DATA_VECTOR) { + // Just in case --- get a zero instead of some weird result + continue; + } + psVector *vector = dataItem->data.V; + memcpy(&columnData->data.U8[i * dataSize * spec->size], vector->data.U8, + vector->n * dataSize); + } + + int fitsDataType; // Data type for cfitsio + p_psFitsTypeToCfitsio(spec->vectorType, NULL, NULL, &fitsDataType); + fits_write_col(fits->fd, fitsDataType, colNum, 1, 1, table->n * spec->size, + columnData->data.U8, &status); + psFree(columnData); + break; + } + default: + psAbort("Should never get here.\n"); + } + } + + // Check error status from writing column + if (status != 0) { + char fitsErr[MAX_STRING_LENGTH]; + fits_get_errstatus(status, fitsErr); + psError(PS_ERR_LOCATION_INVALID, true, "Unable to write column %ld of FITS table: %s", + colNum, fitsErr); + psFree(colSpecsIter); + psFree(colSpecs); + return false; + } + } + + psFree(colSpecsIter); + psFree(colSpecs); + + return true; +} + +bool psFitsUpdateTable(psFits* fits, + const psMetadata* data, + int row) +{ + int status = 0; + + if (fits == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psFits object can not NULL.")); + return false; + } + + if (data == NULL) { + psError(PS_ERR_BAD_PARAMETER_NULL, true, + _("The input psImage was NULL. Need a non-NULL psImage for operation to be performed.")); + return false; + } + + // check to see if we even are positioned on a table HDU + int hdutype; + if ( fits_get_hdu_type(fits->fd,&hdutype, &status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not determine the HDU type. CFITSIO Error: %s"), + fitsErr); + return false; + } + if (hdutype != ASCII_TBL && hdutype != BINARY_TBL) { + psError(PS_ERR_IO, true, + _("Current FITS HDU type must be a table.")); + return false; + } + + psMetadataIterator* iter = psMetadataIteratorAlloc((psPtr)data,PS_LIST_HEAD,NULL); + + psMetadataItem* item; + + while ( (item=psMetadataGetAndIncrement(iter)) != NULL) { + if (PS_DATA_IS_PRIMITIVE(item->type) || + item->type == PS_DATA_BOOL || + item->type == PS_DATA_STRING) { + // operating on primitive data type or string, i.e., not a complex object + int colnum = 0; + + if ( fits_get_colnum(fits->fd, CASESEN, item->name, &colnum, &status) == 0) { + // cooresponding column found in table + int dataType; + p_psFitsTypeToCfitsio(item->type, NULL, NULL, &dataType); + + if (fits_write_col(fits->fd, dataType, colnum, row+1, 1, 1, &item->data,&status) != 0) { + char fitsErr[MAX_STRING_LENGTH]; + (void)fits_get_errstatus(status, fitsErr); + psError(PS_ERR_IO, true, + _("Could not write data to file. CFITSIO Error: %s"), + fitsErr); + psFree(iter); + return false; + } + } else { + // the column was not found. + psWarning("No column with the name '%s' exists in the table.", + item->name); + } + } + } + + psFree(iter); + + return true; +} Index: /branches/pap_branch_070920/psLib/src/fits/psFitsTable.h =================================================================== --- /branches/pap_branch_070920/psLib/src/fits/psFitsTable.h (revision 14957) +++ /branches/pap_branch_070920/psLib/src/fits/psFitsTable.h (revision 14957) @@ -0,0 +1,116 @@ +/* @file psFitsTable.h + * @brief Contains Fits I/O routines + * + * @author EAM, PAP, JH + * @author Robert DeSonia, MHPCC + * + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-01-23 22:47:23 $ + * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii + */ + +#ifndef PS_FITSTABLE_H +#define PS_FITSTABLE_H + +/// @addtogroup FileIO Input/Output +/// @{ + +#include "psFits.h" + +#include "psType.h" +#include "psArray.h" +#include "psVector.h" +#include "psMetadata.h" +#include "psImage.h" + +/** Reads a table row. The current HDU type must be either + * PS_FITS_TYPE_BINARY_TABLE or PS_FITS_TYPE_ASCII_TABLE. + * + * @return psMetadata* The table row's data. The keys are the column names. + */ +psMetadata* psFitsReadTableRow( + const psFits* fits, ///< the psFits object + int row ///< row number to read +); + +/** Reads a table column. The current HDU type must be either + * PS_FITS_TYPE_BINARY_TABLE or PS_FITS_TYPE_ASCII_TABLE. + * + * @return psArray* Array of data items for the specified column or NULL + * if an error occurred. + */ +psArray* psFitsReadTableColumn( + const psFits* fits, ///< the psFits object + const char* colname ///< the column name +); + +/** Reads a table column of numbers. The current HDU type must be either + * PS_FITS_TYPE_BINARY_TABLE or PS_FITS_TYPE_ASCII_TABLE. + * + * @return psVector* Vector of data for the specified column or NULL + * if an error occurred. + */ +psVector* psFitsReadTableColumnNum( + const psFits* fits, ///< the psFits object + const char* colname ///< the column name +); + + +/** Reads a whole FITS table. The current HDU type must be either + * PS_FITS_TYPE_BINARY_TABLE or PS_FITS_TYPE_ASCII_TABLE. + * + * @return psArray* Array of psMetadata items, which contains the output + * data items of each row. + * + * @see psFitsReadTableRow + */ +psArray* psFitsReadTable( + const psFits* fits ///< the psFits object +); + +/** Writes a whole FITS table. A new HDU of the type BINTABLE is appended + * to the file. + * + * @return bool TRUE if the write was successful, otherwise FALSE + * + * @see psFitsReadTable + * @see psFitsInsertTable + */ +bool psFitsWriteTable( + psFits* fits, ///< the psFits object + const psMetadata* header, ///< header items for the new HDU. Can be NULL. + const psArray* table, ///< Array of psMetadata items, which contains the output data items of each row. + const char *extname ///< Extension name +); + +/** Inserts a whole FITS table. A new HDU of the type BINTABLE is inserted either + * before or after, depending on the AFTER parameter, the current HDU. + * + * @return bool TRUE if the insert/write was successful, otherwise FALSE + * + * @see psFitsWriteTable + */ +bool psFitsInsertTable( + psFits* fits, ///< the psFits object + const psMetadata* header, ///< header items for the new HDU. Can be NULL. + const psArray* table, ///< Array of psMetadata items, which contains the output data items of each row. + const char *extname, ///< Extension name + bool after ///< TRUE if insert is done after CHDU, otherwise table is inserted before CHDU +); + +/** Updates a FITS table. The current HDU type must be either + * PS_FITS_TYPE_BINARY_TABLE or PS_FITS_TYPE_ASCII_TABLE. + * + * @return bool TRUE if the write was successful, otherwise FALSE + * + * @see psFitsWriteTable + */ +bool psFitsUpdateTable( + psFits* fits, ///< the psFits object + const psMetadata* data, + ///< Array of psMetadata items, which contains the output data items of each row. + int row ///< the row number to update. +); + +/// @} +#endif // #ifndef PS_FITS_H Index: /branches/pap_branch_070920/psModules/src/camera/.cvsignore =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/.cvsignore (revision 14957) @@ -0,0 +1,6 @@ +.deps +.libs +Makefile +Makefile.in +*.la +*.lo Index: /branches/pap_branch_070920/psModules/src/camera/Makefile.am =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/Makefile.am (revision 14957) @@ -0,0 +1,57 @@ +noinst_LTLIBRARIES = libpsmodulescamera.la + +libpsmodulescamera_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) +libpsmodulescamera_la_LDFLAGS = -release $(PACKAGE_VERSION) +libpsmodulescamera_la_SOURCES = \ + pmFPA.c \ + pmFPACalibration.c \ + pmFPAConstruct.c \ + pmFPACopy.c \ + pmFPAHeader.c \ + pmFPAMaskWeight.c \ + pmFPAMosaic.c \ + pmFPARead.c \ + pmFPAUtils.c \ + pmFPAWrite.c \ + pmHDU.c \ + pmHDUUtils.c \ + pmHDUGenerate.c \ + pmFPA_JPEG.c \ + pmFPAview.c \ + pmFPAfile.c \ + pmFPAfileDefine.c \ + pmFPAfileIO.c \ + pmFPAfileFitsIO.c \ + pmFPAFlags.c \ + pmFPALevel.c \ + pmFPAExtent.c \ + pmCellSquish.c \ + pmReadoutStack.c + +pkginclude_HEADERS = \ + pmFPA.h \ + pmFPACalibration.h \ + pmFPAConstruct.h \ + pmFPACopy.h \ + pmFPAHeader.h \ + pmFPAMaskWeight.h \ + pmFPAMosaic.h \ + pmFPARead.h \ + pmFPAUtils.h \ + pmFPAWrite.h \ + pmHDU.h \ + pmHDUUtils.h \ + pmHDUGenerate.h \ + pmFPA_JPEG.h \ + pmFPAview.h \ + pmFPAfile.h \ + pmFPAfileDefine.h \ + pmFPAfileIO.h \ + pmFPAfileFitsIO.h \ + pmFPAFlags.h \ + pmFPALevel.h \ + pmFPAExtent.h \ + pmCellSquish.h \ + pmReadoutStack.h + +CLEANFILES = *~ Index: /branches/pap_branch_070920/psModules/src/camera/pmCellSquish.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmCellSquish.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmCellSquish.c (revision 14957) @@ -0,0 +1,176 @@ +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmShifts.h" +#include "pmCellSquish.h" + +// Comparing values to get ranges +#define COMPARE_SMALLER(TARGET, SOURCE) if ((SOURCE) < (TARGET)) (TARGET) = (SOURCE); +#define COMPARE_BIGGER(TARGET, SOURCE) if ((SOURCE) > (TARGET)) (TARGET) = (SOURCE); + + +bool pmCellSquish(pmCell *cell, psMaskType maskVal, bool useShifts) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_ARRAY_NON_NULL(cell->readouts, false); + psArray *readouts = cell->readouts; // Array of readouts + long numReadouts = readouts->n; // Number of readouts + + if (numReadouts <= 1) { + // We squished everything there was to squish + return true; + } + + pmShifts *shifts = NULL; // Orthogonal transfer shifts + if (useShifts) { + bool mdok; // Status of MD lookup + shifts = psMetadataLookupPtr(&mdok, cell->analysis, PM_SHIFTS_TABLE_NAME); + if (!mdok || !shifts) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Squishing with shifts requested, but no shifts found."); + return false; + } + if (shifts->num != numReadouts) { + psError(PS_ERR_BAD_PARAMETER_SIZE, true, + "Number of shifts (%ld) does not match number of readouts (%ld).", + shifts->num, numReadouts); + return false; + } + } + + // First pass to get the bounds, make sure everything is legit. + int xMin = 0, xMax = 0, yMin = 0, yMax = 0; // Bounds of the squish + bool valid = false; // Do we have a valid readout? + int col0 = 0, row0 = 0, numCols = 0, numRows = 0;// Window parameters for the readouts + int xShift = 0, yShift = 0; // Shift due to orthogonal transfer, to be applied + if (useShifts && shifts->xyRelative) { + // Correct for final shift, to put in correct frame for the image that is read out + xShift = - shifts->x->data.S32[shifts->num - 1]; + yShift = - shifts->y->data.S32[shifts->num - 1]; + } + for (long i = 0; i < numReadouts; i++) { + // Add in the shift + if (useShifts) { + if (shifts->xyRelative) { + // Need to accumulate shift + xShift += shifts->x->data.S32[i]; + yShift += shifts->y->data.S32[i]; + } else { + // Correct for final shift, to put in correct frame for the image that is read out + xShift = shifts->x->data.S32[i] - shifts->x->data.S32[shifts->num - 1]; + yShift = shifts->y->data.S32[i] - shifts->y->data.S32[shifts->num - 1]; + } + } + + pmReadout *readout = readouts->data[i]; // Readout of interest + if (!readout || !readout->image) { + continue; + } + + if (!valid) { + valid = true; + + col0 = readout->col0; + row0 = readout->row0; + numCols = readout->image->numCols; + numRows = readout->image->numRows; + + if (useShifts) { + xMin = col0; + xMax = col0 + numCols; + yMin = row0; + yMax = row0 + numRows; + } + } else { + if (readout->col0 != col0 || readout->row0 != row0 || + readout->image->numCols != numCols || readout->image->numRows != numRows) { + // Everything should have the same window because we've read it in from an image cube + psError(PS_ERR_BAD_PARAMETER_SIZE, true, + "Readout window [%d:%d,%d:%d] doesn't match canonical window [%d:%d,%d:%d]", + readout->col0, readout->col0 + readout->image->numCols, + readout->row0, readout->row0 + readout->image->numRows, + col0, col0 + numCols, row0, row0 + numRows); + return false; + } + + if (useShifts) { + // If there is shifting, the actual window may change + int xMinTest = readout->col0 + xShift; // Minimum x value + int xMaxTest = readout->col0 + readout->image->numCols + xShift; // Maximum x value + int yMinTest = readout->row0 + yShift; // Minimum y value + int yMaxTest = readout->row0 + readout->image->numRows + yShift; // Maximum y value + COMPARE_SMALLER(xMin, xMinTest); + COMPARE_BIGGER(xMax, xMaxTest); + COMPARE_SMALLER(yMin, yMinTest); + COMPARE_BIGGER(yMax, yMaxTest); + } + } + } + + if (useShifts) { + // Size of combined image, after shifts applied + numCols = xMax - xMin + 1; + numRows = yMax - yMin + 1; + } + psImage *squishImage = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Squished image + psImageInit(squishImage, 0.0); + psImage *squishMask = psImageAlloc(numCols, numRows, PS_TYPE_MASK); // Squished mask + psImageInit(squishMask, 0); + + // Second pass to do the squish + xShift = yShift = 0; // Reset the accumulated shifts + if (useShifts && shifts->xyRelative) { + // Correct for final shift, to put in correct frame for the image that is read out + xShift = - shifts->x->data.S32[shifts->num - 1]; + yShift = - shifts->y->data.S32[shifts->num - 1]; + } + for (long i = 0; i < numReadouts; i++) { + if (useShifts) { + if (shifts->xyRelative) { + // Need to accumulate shift + xShift += shifts->x->data.S32[i]; + yShift += shifts->y->data.S32[i]; + } else { + // Correct for final shift, to put in correct frame for the image that is read out + xShift = shifts->x->data.S32[i] - shifts->x->data.S32[shifts->num - 1]; + yShift = shifts->y->data.S32[i] - shifts->y->data.S32[shifts->num - 1]; + } + } + + pmReadout *readout = readouts->data[i]; // Readout of interest + if (!readout || !readout->image) { + continue; + } + + int xOffset = xMin - readout->col0; // Offset to squished readout in x + int yOffset = yMin - readout->row0; // Offset to squished readout in y + if (useShifts) { + xOffset += xShift; + yOffset += yShift; + } + + psImage *image = readout->image; // The image of interest + psImage *mask = readout->mask; // The mask of interest + for (int y = 0; y < readout->image->numRows; y++) { + int ySquish = y + yOffset; // Position on squished readout in y + for (int x = 0; x < readout->image->numCols; x++) { + int xSquish = x + xOffset; // Position on squished readout in x + squishImage->data.F32[ySquish][xSquish] += image->data.F32[y][x]; + if (mask) { + squishMask->data.PS_TYPE_MASK_DATA[ySquish][xSquish] |= mask->data.U8[y][x] & maskVal; + } + } + } + } + + pmCellFreeReadouts(cell); + pmReadout *squishRO = pmReadoutAlloc(cell); // New readout to hold squished image + squishRO->image = squishImage; + squishRO->mask = squishMask; + squishRO->row0 = yMin; + squishRO->col0 = xMin; + psFree(squishRO); // Drop reference + + return true; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmCellSquish.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmCellSquish.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmCellSquish.h (revision 14957) @@ -0,0 +1,13 @@ +#ifndef PM_CELL_SQUISH_H +#define PM_CELL_SQUISH_H + +/// Squish (combine all component readouts of) a cell +/// +/// The component readouts are combined, optionally taking into account orthogonal transfer shifts (assumed to +/// already have been read) and masks. +bool pmCellSquish(pmCell *cell, ///< Cell to have readouts combined + psMaskType maskVal, ///< Value to be masked + bool useShifts ///< Use the shifts when squishing? + ); + +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPA.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPA.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPA.c (revision 14957) @@ -0,0 +1,420 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmConcepts.h" +#include "pmMaskBadPixels.h" + +static void readoutFree(pmReadout *readout) +{ + // if this readout has a parent, drop that instance + if (readout->parent) { + psTrace("psModules.camera", 9, "Removing readout %zd from cell %zd...\n", + (size_t)readout, (size_t)readout->parent); + psArray *readouts = readout->parent->readouts; + for (int i = 0; i < readouts->n; i++) { + if (readouts->data[i] == readout) { + readouts->data[i] = NULL; + } + } + } + psTrace("psModules.camera", 9, "Freeing readout %zd\n", (size_t) readout); + + psFree(readout->image); + psFree(readout->mask); + psFree(readout->weight); + psFree(readout->analysis); + psFree(readout->bias); +} + +static void cellFree(pmCell *cell) +{ + + // if this cell has a parent, drop that instance + if (cell->parent) { + psTrace("psModules.camera", 9, "Removing cell %zd from chip %zd...\n", + (size_t)cell, (size_t)cell->parent); + psArray *cells = cell->parent->cells; + for (int i = 0; i < cells->n; i++) { + if (cells->data[i] == cell) { + cells->data[i] = NULL; + } + } + } + psTrace("psModules.camera", 9, "Freeing cell %zd\n", (size_t)cell); + pmCellFreeReadouts(cell); + psFree(cell->readouts); + + psFree(cell->concepts); + psFree(cell->analysis); + psFree(cell->config); + psFree(cell->hdu); +} + +static void chipFree(pmChip* chip) +{ + // if this chip has a parent, drop that instance + if (chip->parent) { + psTrace("psModules.camera", 9, "Removing chip %zd from fpa %zd...\n", + (size_t)chip, (size_t)chip->parent); + psArray *chips = chip->parent->chips; + for (int i = 0; i < chips->n; i++) { + if (chips->data[i] == chip) { + chips->data[i] = NULL; + } + } + } + + psTrace("psModules.camera", 9, "Freeing chip %zd\n", (size_t)chip); + pmChipFreeCells(chip); + psFree(chip->cells); + + psFree(chip->concepts); + psFree(chip->analysis); + psFree(chip->hdu); + + # if FPA_ASTROM + + psFree(chip->toFPA); + psFree(chip->fromFPA); + # endif +} + + +static void FPAFree(pmFPA *fpa) +{ + psTrace("psModules.camera", 9, "Freeing fpa %zd\n", (size_t)fpa); + + // NULL the parent pointers + psArray *chips = fpa->chips; + for (int i = 0 ; i < chips->n ; i++) { + pmChip *tmpChip = chips->data[i]; + if (! tmpChip) { + continue; + } + tmpChip->parent = NULL; + } + psFree(fpa->chips); + psFree(fpa->concepts); + psFree(fpa->analysis); + psFree((void *)fpa->camera); + psFree(fpa->hdu); + + # if FPA_ASTROM + + psFree(fpa->fromTPA); + psFree(fpa->toTPA); + psFree(fpa->toSky); + # endif +} + +void pmCellFreeReadouts(pmCell *cell) +{ + PS_ASSERT_PTR_NON_NULL(cell,); + + // + // Set the parent to NULL in all cell->readouts before psFree(cell->readouts) + // in order to avoid memory reference counter problems. + // + psArray *readouts = cell->readouts; + for (psS32 i = 0 ; i < readouts->n ; i++) { + pmReadout *tmpReadout = readouts->data[i]; + if (! tmpReadout) { + continue; + } + tmpReadout->parent = NULL; + psTrace("psModules.camera", 9, "Will now free readout %zd...\n", (size_t)tmpReadout); + } + cell->readouts = psArrayRealloc(cell->readouts, 0); + cell->readouts->n = 0; +} + + +void pmChipFreeCells(pmChip *chip) +{ + PS_ASSERT_PTR_NON_NULL(chip,); + + // + // Set the parent to NULL in all chip->cells before psFree(chip->cells) + // in order to avoid memory reference counter problems. + // + psArray *cells = chip->cells; + for (int i = 0 ; i < cells->n ; i++) { + pmCell *tmpCell = cells->data[i]; + if (! tmpCell) { + continue; + } + tmpCell->parent = NULL; + pmCellFreeReadouts(tmpCell);// Drop all readouts the cell holds + } + chip->cells = psArrayRealloc(chip->cells, 0); + chip->cells->n = 0; +} + +void pmReadoutFreeData (pmReadout *readout) +{ + if (!readout) { + return; + } + + psFree(readout->image); + psFree(readout->mask); + psFree(readout->weight); + psFree(readout->bias); + + psTrace("psModules.camera", 3, "Freeing readout data for %zd\n", (size_t) readout); + + readout->image = NULL; + readout->weight = NULL; + readout->mask = NULL; + readout->bias = psListAlloc(NULL); +} + +void pmCellFreeData(pmCell *cell) +{ + if (!cell) { + return; + } + + for (int i = 0; i < cell->readouts->n; i++) { + pmReadoutFreeData(cell->readouts->data[i]); + } + if (cell->hdu) { + psFree(cell->hdu->images); + psFree(cell->hdu->weights); + psFree(cell->hdu->masks); + // psFree(cell->hdu->header); + + cell->hdu->images = NULL; + cell->hdu->weights = NULL; + cell->hdu->masks = NULL; + // cell->hdu->header = NULL; + } +} + +void pmChipFreeData(pmChip *chip) +{ + if (!chip) { + return; + } + + for (int i = 0; i < chip->cells->n; i++) { + pmCellFreeData(chip->cells->data[i]); + } + if (chip->hdu) { + psFree(chip->hdu->images); + psFree(chip->hdu->weights); + psFree(chip->hdu->masks); + // psFree(chip->hdu->header); + + chip->hdu->images = NULL; + chip->hdu->weights = NULL; + chip->hdu->masks = NULL; + // chip->hdu->header = NULL; + } +} + +void pmFPAFreeData(pmFPA *fpa) +{ + if (!fpa) { + return; + } + + for (int i = 0; i < fpa->chips->n; i++) { + pmChipFreeData(fpa->chips->data[i]); + } + if (fpa->hdu) { + psFree(fpa->hdu->images); + psFree(fpa->hdu->weights); + psFree(fpa->hdu->masks); + // psFree(fpa->hdu->header); + + fpa->hdu->images = NULL; + fpa->hdu->weights = NULL; + fpa->hdu->masks = NULL; + // fpa->hdu->header = NULL; + } +} + +pmReadout *pmReadoutAlloc(pmCell *cell) +{ + pmReadout *tmpReadout = (pmReadout *)psAlloc(sizeof(pmReadout)); + psMemSetDeallocator(tmpReadout, (psFreeFunc) readoutFree); + + tmpReadout->image = NULL; + tmpReadout->mask = NULL; + tmpReadout->weight = NULL; + tmpReadout->bias = psListAlloc(NULL); + tmpReadout->analysis = psMetadataAlloc(); + tmpReadout->parent = cell; + if (cell) { + cell->readouts = psArrayAdd(cell->readouts, 1, (psPtr) tmpReadout); + } + + tmpReadout->process = true; // All cells are processed by default + tmpReadout->file_exists = false; // file not yet identified + tmpReadout->data_exists = false; // data yet read in + + tmpReadout->row0 = 0; + tmpReadout->col0 = 0; + + return(tmpReadout); +} + +pmCell *pmCellAlloc( + pmChip *chip, + const char *name +) +{ + pmCell *tmpCell = (pmCell *) psAlloc(sizeof(pmCell)); + psMemSetDeallocator(tmpCell, (psFreeFunc) cellFree); + + tmpCell->config = NULL; + tmpCell->analysis = psMetadataAlloc(); + tmpCell->readouts = psArrayAlloc(0); + tmpCell->parent = chip; + if (chip) { + chip->cells = psArrayAdd(chip->cells, 1, (psPtr) tmpCell); + } + tmpCell->hdu = NULL; + tmpCell->process = true; // All cells are processed by default + tmpCell->file_exists = false; // Not yet identified + tmpCell->data_exists = false; // Not yet read in + + tmpCell->concepts = psMetadataAlloc(); + tmpCell->conceptsRead = PM_CONCEPT_SOURCE_NONE; + if (!psMetadataAddStr(tmpCell->concepts, PS_LIST_HEAD, "CELL.NAME", 0, NULL, name)) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CELL.NAME to metadata.\n"); + } + pmConceptsBlankCell(tmpCell); + + return tmpCell; +} + +pmChip *pmChipAlloc( + pmFPA *fpa, + const char *name) +{ + pmChip *tmpChip = (pmChip*)psAlloc(sizeof(pmChip)); + psMemSetDeallocator(tmpChip, (psFreeFunc) chipFree); + + #if FPA_ASTROM + + tmpChip->toFPA = NULL; + tmpChip->fromFPA = NULL; + #endif + + tmpChip->analysis = psMetadataAlloc(); + tmpChip->cells = psArrayAlloc(0); + tmpChip->parent = fpa; + if (fpa) { + psArrayAdd(fpa->chips, 1, (psPtr)tmpChip); + } + tmpChip->hdu = NULL; + tmpChip->process = true; // Work on all chips, by default + tmpChip->file_exists = false; // Not yet identified + tmpChip->data_exists = false; // Not yet read in + + tmpChip->concepts = psMetadataAlloc(); + tmpChip->conceptsRead = PM_CONCEPT_SOURCE_NONE; + if (!psMetadataAddStr(tmpChip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, NULL, name)) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CHIP.NAME %s to concepts.\n", name); + } + pmConceptsBlankChip(tmpChip); + return tmpChip; +} + +pmFPA *pmFPAAlloc(const psMetadata *camera) +{ + pmFPA *tmpFPA = (pmFPA *) psAlloc(sizeof(pmFPA)); + psMemSetDeallocator(tmpFPA, (psFreeFunc) FPAFree); + + #if FPA_ASTROM + + tmpFPA->fromTPA = NULL; + tmpFPA->toTPA = NULL; + tmpFPA->toSky = NULL; + #endif + + tmpFPA->analysis = psMetadataAlloc(); + tmpFPA->camera = psMemIncrRefCounter((psPtr)camera); + tmpFPA->chips = psArrayAlloc(0); + tmpFPA->hdu = NULL; + + tmpFPA->concepts = psMetadataAlloc(); + tmpFPA->conceptsRead = PM_CONCEPT_SOURCE_NONE; + pmConceptsBlankFPA(tmpFPA); + + return tmpFPA; +} + +// Check a cell to ensure that all component readouts have the parent pointer set correctly +static bool cellCheckParents(pmCell *cell // Cell to check + ) +{ + PS_ASSERT_PTR_NON_NULL(cell, true); + + bool flag = true; + for (long i = 0; i < cell->readouts->n ; i++) { + pmReadout *tmpReadout = (pmReadout *) cell->readouts->data[i]; + if (!tmpReadout) { + continue; + } + if (tmpReadout->parent != cell) { + tmpReadout->parent = cell; + flag = false; + } + } + return flag; +} + +// Check a chip to ensure that all component cells have the parent pointer set correctly +static bool chipCheckParents(pmChip *chip // Chip to check + ) +{ + PS_ASSERT_PTR_NON_NULL(chip, true); + + bool flag = true; + for (long i = 0; i < chip->cells->n ; i++) { + pmCell *tmpCell = (pmCell*)chip->cells->data[i]; + if (!tmpCell) { + continue; + } + if (tmpCell->parent != chip) { + tmpCell->parent = chip; + flag = false; + } + + flag &= cellCheckParents(tmpCell); + } + return flag; +} + +psBool pmFPACheckParents(pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(fpa, true); + + bool flag = true; + for (long i = 0; i < fpa->chips->n ; i++) { + pmChip *tmpChip = (pmChip*)fpa->chips->data[i]; + if (!tmpChip) { + continue; + } + if (tmpChip->parent != fpa) { + tmpChip->parent = fpa; + flag = false; + } + + flag &= chipCheckParents(tmpChip); + } + return flag; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPA.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPA.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPA.h (revision 14957) @@ -0,0 +1,199 @@ +/* @file pmFPA.h + * @brief Defines the focal plane hierarchy, along with functions for interacting with it + * + * @author George Gusciora, MHPCC + * @author Paul Price, IfA + * @author Eugene Magnier, IfA + * + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-09-21 01:31:51 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_H +#define PM_FPA_H + +/// @addtogroup Camera Camera Layout +/// @{ + +#define FPA_ASTROM 1 ///< Include astrometry information in the structures? + +// Return chip position, given FPA position; calculations are all done in pixel units +#define PM_FPA_TO_CHIP(pos, chip0, chipParity) \ + (((pos) - (chip0))*(chipParity)) + +// Return cell position, given chip position; calculations are all done in pixel units +#define PM_CHIP_TO_CELL(pos, cell0, cellParity, binning) \ + (((pos) - (cell0))*(cellParity)/(binning)) + +// Return chip position, given a cell position; calculations are all done in pixel units +#define PM_CELL_TO_CHIP(pos, cell0, cellParity, binning) \ + ((pos)*(binning)*(cellParity) + (cell0)) + +// Return FPA position, given a chip position; calculations are all done in pixel units +#define PM_CHIP_TO_FPA(pos, chip0, chipParity) \ + ((pos)*(chipParity) + (chip0)) + +/// Focal plane array (the entirety of the camera) +/// +/// The FPA is the top-level camera structure, and consists of one or more chips. It also contains the +/// concepts metadata appropriate to this level, a summary of analysis tasks that have been performed, the +/// camera configuration information, any HDU that corresponds to this level for the file of interest, and +/// astrometric transformations. The astrometric transformations encode how to transform from the tangent +/// plane to the sky, and back. +typedef struct +{ + #if FPA_ASTROM + // Astrometric transformations + psPlaneTransform *fromTPA; ///< Transformation from tangent plane to focal plane, or NULL + psPlaneTransform *toTPA; ///< Transformation from focal plane to tangent plane, or NULL + psProjection *toSky; ///< Projection from tangent plane to sky, or NULL + #endif + // Information + psMetadata *concepts; ///< FPA-level concepts + unsigned int conceptsRead; ///< Which concepts have been read; see pmConceptsSource + psMetadata *analysis; ///< FPA-level analysis metadata + const psMetadata *camera; ///< Camera configuration + psArray *chips; ///< The component chips + pmHDU *hdu; ///< FITS header data unit of interest, or NULL +} +pmFPA; + +/// A chip (contiguous detector element) +/// +/// The chip is the mid-level camera structure, being part of an FPA, and consisting of one or more cells +/// (e.g., a CCD). It also contains the concepts metadata appropriate to this level, a summary of analysis +/// tasks that have been performed, status flags, any HDU that corresponds to this level for the file of +/// interest, and astrometric transformations. The astrometric transformations provide transforms between the +/// chip and FPA coordinates and back. +typedef struct +{ + #if FPA_ASTROM + // Astrometric transformations + psPlaneTransform *toFPA; ///< Transformation from chip to FPA coordinates, or NULL + psPlaneTransform *fromFPA; ///< Transformation from FPA to chip coordinates, or NULL + #endif + // Information + psMetadata *concepts; ///< Chip-level concepts + unsigned int conceptsRead; ///< Which concepts have been read; see pmConceptsSource + psMetadata *analysis; ///< Chip-level analysis metadata + psArray *cells; ///< The component cells + pmFPA *parent; ///< Parent FPA + bool process; ///< Do we bother about reading and working with this chip? + bool file_exists; ///< Does the file for this chip exist (read case only)? + bool data_exists; ///< Does the data for this chip exist (read case only)? + pmHDU *hdu; ///< FITS header data unit of interest, +} +pmChip; + +/// A cell (smallest logical unit) +/// +/// A cell is the lowest-level camera structure, being part of a chip (e.g., an amplifier). It may consist of +/// one or more readouts, which are individual reads of the cell. It also contains the concepts metadata +/// appropriate to this level, the cell configuration information (for convenience) from the camera +/// configuration, a summary of analysis tasks that have been performed, status flags, and any HDU that +/// corresponds to this level for the file of interest + +/** Cell data structure + * + * A cell consists of one or more readouts. It also contains a pointer to the + * cell's metadata, and its parent chip. On the astrometry side, it also + * contains coordinate transforms from the cell to chip, from the cell to + * focal-plane, as well as a "quick and dirty" tranform from the cell to + * sky coordinates. + * + */ +typedef struct +{ + psMetadata *concepts; ///< Cell-level concepts + unsigned int conceptsRead; ///< Which concepts have been read; see pmConceptsSource + psMetadata *config; ///< Cell configuration information (from CELLS in the camera config) + psMetadata *analysis; ///< Cell-level analysis metadata + psArray *readouts; ///< The component readouts + pmChip *parent; ///< Parent chip + bool process; ///< Do we bother about reading and working with this cell? + bool file_exists; ///< Does the file for this cell exist (read case only)? + bool data_exists; ///< Does the data for this cell exist (read case only)? + pmHDU *hdu; ///< FITS header data unit of interest +} +pmCell; + +/// A readout (individual read of a cell) +/// +/// A readout corresponds to an individual read of a cell (e.g., a single image as part of a video sequence, +/// or one of multiple coadds). It contains the actual pixels used in analysis (along with mask and weight +/// maps). When reading from a FITS file, the images are subimages (from CELL.TRIMSEC) of the pixels read +/// from the appropriate HDU (at the FPA, chip or cell level). The readout also contains a list of bias +/// sections (prescans or overscans, or otherwise), a summary of analysis tasks that have been performed, +/// status flags, and the offsets used for reading a FITS file incrementally. +typedef struct +{ + int col0; ///< Column offset; non-zero if reading in columns incrementally + int row0; ///< Row offset; non-zero if reading in rows incrementally + psImage *image; ///< Imaging area of readout (corresponds to CELL.TRIMSEC region) + psImage *mask; ///< Mask of input image (corresponds to CELL.TRIMSEC region) + psImage *weight; ///< Weight of input image (corresponds to CELL.TRIMSEC region) + psList *bias; ///< List of bias (prescan/overscan) images + psMetadata *analysis; ///< Readout-level analysis metadata + pmCell *parent; ///< Parent cell + bool process; ///< Do we bother about reading and working with this readout? + bool file_exists; ///< Does the file for this readout exist (read case only)? + bool data_exists; ///< Does the data for this readout exist (read case only)? +} +pmReadout; + +/// Free all readouts within a cell +void pmCellFreeReadouts(pmCell *cell ///< Cell for which to free readouts + ); + +/// Free all cells within a chip +void pmChipFreeCells(pmChip *chip ///< Chip for which to free cells + ); + +/// Free all data within a readout +void pmReadoutFreeData(pmReadout *readout ///< Readout for which to free data + ); + +/// Free all data within a cell (all readouts as well as metadata) +void pmCellFreeData(pmCell *cell ///< Cell for which to free data + ); + +/// Free all data within a chip (all cells as well as metadata) +void pmChipFreeData(pmChip *chip ///< Chip for which to free data + ); + +/// Free all data within an FPA (all chips as well as metadata) +void pmFPAFreeData(pmFPA *fpa ///< FPA for which to free data + ); + +/// Allocate a readout associated with a cell +pmReadout *pmReadoutAlloc(pmCell *cell ///< Parent cell, or NULL + ); + +/// Allocate a cell associated with a chip +/// +/// The name is used to set CELL.NAME within the concepts. +pmCell *pmCellAlloc(pmChip *chip, ///< Parent chip, or NULL + const char *name ///< Name of cell, for CELL.NAME + ); + +/// Allocate a chip associated with an FPA +/// +/// The name is used to set CHIP.NAME within the concepts +pmChip *pmChipAlloc(pmFPA *fpa, ///< Parent FPA, or NULL + const char *name ///< Name of chip, for CHIP.NAME + ); + +/// Allocate an FPA +pmFPA *pmFPAAlloc(const psMetadata *camera ///< Camera configuration (to store in FPA) + ); + + +/// Check parent links within an FPA +/// +/// Iterates through the FPA to verify that the "parent" links in the chip, cell and readout are set +/// correctly. If there are any incorrect links, they are fixed, and the function returns false. +bool pmFPACheckParents(pmFPA *fpa ///< FPA to check + ); +/// @} +#endif // #ifndef PM_FPA_H Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAAstrometry.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAAstrometry.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAAstrometry.c (revision 14957) @@ -0,0 +1,512 @@ +#include +#include "pslib.h" +#include "pmFPAAstrometry.h" +#include "pmFPA.h" + + +/***************************************************************************** +checkValidImageCoords(): this is a private function which simply determines if +the supplied x,y coordinates are in the range for the supplied psImage. + +XXX: What about col0 and row0 +XXX: This should return a psBool. +XXX: Macro this for speed. + *****************************************************************************/ +static psS32 checkValidImageCoords( + double x, + double y, + psImage* tmpImage) +{ + PS_ASSERT_IMAGE_NON_NULL(tmpImage, 0); + + // The FLT_EPSILON is because -0.0 was failing this. + if (((x+FLT_EPSILON) < 0.0) || (x > (double)tmpImage->numCols) || + ((y+FLT_EPSILON) < 0.0) || (y > (double)tmpImage->numRows)) { + return (0); + } + + return (1); +} + +/*****************************************************************************/ +/* FUNCTION IMPLEMENTATION - PUBLIC */ +/*****************************************************************************/ + +pmCell* pmCellInFPA( + const psPlane* fpaCoord, + const pmFPA* FPA) +{ + PS_ASSERT_PTR_NON_NULL(fpaCoord, NULL); + PS_ASSERT_PTR_NON_NULL(FPA, NULL); + + pmChip* tmpChip = NULL; + psPlane chipCoord; + pmCell* outCell = NULL; + + // Determine which chip contains the fpaCoords. + tmpChip = pmChipInFPA(fpaCoord, FPA); + if (tmpChip == NULL) { + return(NULL); + } + + // Convert to those chip coordinates. + psPlane *rc = pmCoordFPAToChip(&chipCoord, fpaCoord, tmpChip); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not determine Chip coords.\n"); + return(NULL); + } + + // Determine which cell contains those chip coordinates. + outCell = pmCellInChip(&chipCoord, tmpChip); + if (outCell == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not determine the cell.\n"); + return(NULL); + } + + return (outCell); +} + +pmChip* pmChipInFPA( + const psPlane* fpaCoord, + const pmFPA* FPA) +{ + PS_ASSERT_PTR_NON_NULL(fpaCoord, NULL); + PS_ASSERT_PTR_NON_NULL(FPA, NULL); + PS_ASSERT_PTR_NON_NULL(FPA->chips, NULL); + + psArray* chips = FPA->chips; + psS32 nChips = chips->n; + psPlane chipCoord; + pmCell *tmpCell = NULL; + + // + // Loop through every chip in this FPA. Convert the original FPA + // coordinates to chip coordinates for that chip. Then, determine if any + // cells in that chip contain those chip coordinates. + // XXX: Depending on the number of chips, and their topology, there may be + // a much more efficient way of doing this. + // + for (psS32 i = 0; i < nChips; i++) { + pmChip* tmpChip = chips->data[i]; + PS_ASSERT_PTR_NON_NULL(tmpChip, NULL); + PS_ASSERT_PTR_NON_NULL(tmpChip->fromFPA, NULL); + + psPlaneTransformApply(&chipCoord, tmpChip->fromFPA, fpaCoord); + + tmpCell = pmCellInChip(&chipCoord, tmpChip); + if (tmpCell != NULL) { + return(tmpChip); + } + } + + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not determine the chip.\n"); + return (NULL); +} + + +pmCell* pmCellInChip( + const psPlane* chipCoord, + const pmChip* chip) +{ + PS_ASSERT_PTR_NON_NULL(chipCoord, NULL); + PS_ASSERT_PTR_NON_NULL(chip, NULL); + + psPlane cellCoord; + psArray* cells; + + cells = chip->cells; + if (cells == NULL) { + return NULL; + } + + // + // We loop over each cell in the chip. We transform the chipCoord into + // a cellCoord for that cell and determine if that cellCoord is valid. + // If so, then we return that cell. + // XXX: Depending on the number of cells, and their topology, there may be + // a much more efficient way of doing this. + // + for (psS32 i = 0; i < cells->n; i++) { + pmCell* tmpCell = (pmCell* ) cells->data[i]; + PS_ASSERT_PTR_NON_NULL(tmpCell, NULL); + + psPlaneTransform *chipToCell = NULL; + if (true == p_psIsProjectionLinear(tmpCell->toChip)) { + chipToCell = p_psPlaneTransformLinearInvert(tmpCell->toChip); + } else { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: non-linear cell->chip transforms are not yet implemented.\n"); + //chipToCell = psPlaneTransformInvert(NULL, tmpCell->toChip, NULL, -1); + chipToCell = NULL; + } + if (chipToCell == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not invert the Cell->toChip transform.\n"); + return(NULL); + } + psArray* readouts = tmpCell->readouts; + + if (readouts != NULL) { + for (psS32 j = 0; j < readouts->n; j++) { + pmReadout* tmpReadout = readouts->data[j]; + PS_ASSERT_READOUT_NON_NULL(tmpReadout, NULL); + + psPlaneTransformApply(&cellCoord, + chipToCell, + chipCoord); + + if (checkValidImageCoords(cellCoord.x, + cellCoord.y, + tmpReadout->image)) { + psFree(chipToCell); + return (tmpCell); + } + } + } + psFree(chipToCell); + } + + //psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not determine the cell.\n"); + return (NULL); +} + + +psPlane* pmCoordCellToFPA( + psPlane* fpaCoord, + const psPlane* cellCoord, + const pmCell* cell) +{ + PS_ASSERT_PTR_NON_NULL(cellCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + + psPlane *rc = psPlaneTransformApply(fpaCoord, cell->toFPA, cellCoord); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform cell coords to FPA coords.\n"); + } + return(rc); +} + + +psPlane* pmCoordChipToFPA( + psPlane* outCoord, + const psPlane* inCoord, + const pmChip* chip) +{ + PS_ASSERT_PTR_NON_NULL(inCoord, NULL); + PS_ASSERT_PTR_NON_NULL(chip, NULL); + + psPlane *rc = psPlaneTransformApply(outCoord, chip->toFPA, inCoord); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform chip coords to FPA coords.\n"); + } + return(rc); +} + + +psPlane* pmCoordFPAToChip( + psPlane* chipCoord, + const psPlane* fpaCoord, + const pmChip* chip) +{ + PS_ASSERT_PTR_NON_NULL(fpaCoord, NULL); + PS_ASSERT_PTR_NON_NULL(chip, NULL); + PS_ASSERT_PTR_NON_NULL(chip->fromFPA, NULL); + + psPlane *rc = psPlaneTransformApply(chipCoord, chip->fromFPA, fpaCoord); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform FPA coords to Chip coords.\n"); + } + return(rc); +} + +psPlane* pmCoordCellToChip( + psPlane* outCoord, + const psPlane* inCoord, + const pmCell* cell) +{ + PS_ASSERT_PTR_NON_NULL(inCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + + psPlane *rc = psPlaneTransformApply(outCoord, cell->toChip, inCoord); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform Cell coords to Chip coords.\n"); + } + return(rc); +} + +psPlane* pmCoordChipToCell( + psPlane* cellCoord, + const psPlane* chipCoord, + const pmCell* cell) +{ + PS_ASSERT_PTR_NON_NULL(chipCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent, NULL); + + pmCell *tmpCell = pmCellInChip(chipCoord, cell->parent); + if (tmpCell == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not determine the proper cell.\n"); + return(NULL); + } + + psPlaneTransform *tmpChipToCell = NULL; + PS_ASSERT_PTR_NON_NULL(tmpCell->toChip, NULL); + if (true == p_psIsProjectionLinear(tmpCell->toChip)) { + tmpChipToCell = p_psPlaneTransformLinearInvert(tmpCell->toChip); + } else { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: non-linear cell->chip transforms are not yet implemented.\n"); + // XXX: tmpChipToCell = psPlaneTransformInvert(NULL, tmpCell->toChip, NULL, -1); + tmpChipToCell = NULL; + } + if (tmpChipToCell == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not invert the Cell->toChip transform.\n"); + return(NULL); + } + + psPlane *rc = psPlaneTransformApply(cellCoord, tmpChipToCell, chipCoord); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform Chip coords to Cell coords.\n"); + } + psFree(tmpChipToCell); + return(rc); +} + +psPlane* pmCoordFPAToTP( + psPlane* outCoord, + const psPlane* inCoord, + double color, + double magnitude, + const pmFPA* fpa) +{ + PS_ASSERT_PTR_NON_NULL(inCoord, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + + psPlane *rc = psPlaneDistortApply(outCoord, fpa->toTangentPlane, inCoord, color, magnitude); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform FPA coords to tangent plane coords.\n"); + } + return(rc); +} + +psPlane* pmCoordTPToFPA( + psPlane* fpaCoord, + const psPlane* tpCoord, + double color, + double magnitude, + const pmFPA* fpa) +{ + PS_ASSERT_PTR_NON_NULL(tpCoord, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + PS_ASSERT_PTR_NON_NULL(fpa->fromTangentPlane, NULL); + + psPlane *rc = psPlaneDistortApply(fpaCoord, fpa->fromTangentPlane, tpCoord, color, magnitude); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform tangent plane coords to FPA coords.\n"); + } + return(rc); +} + + +/***************************************************************************** +XXXDeproject(outSphere, coord, projection): This private routine is a wrapper +for p_psDeproject(). The reason: p_psDeproject() and p_psProject() combined +do not seem to produce the original coordinates when they even though they +should. XXXDeproject() simply negates the ->r and ->d members of the output +psSphere if the input ->y is larger than 0.0. I don't know why it works. + +I'm guessing the p_psProject() and p_psDeproject() functions have bugs. + +XXX: It appears that p_psProject() and p_psDeproject() have been fixed. +Remove this. + *****************************************************************************/ +psSphere* XXXDeproject( + psSphere *outSphere, + const psPlane* coord, + const psProjection* projection) +{ + psSphere *rc = p_psDeproject(outSphere, coord, projection); + + if (coord->y >= 0.0) { + rc->d = -rc->d; + rc->r = -rc->r; + } + + return(rc); +} + +/***************************************************************************** + *****************************************************************************/ +psSphere* pmCoordTPToSky( + psSphere* outSphere, + const psPlane* tpCoord, + const psProjection *projection) +{ + PS_ASSERT_PTR_NON_NULL(tpCoord, NULL); + PS_ASSERT_PTR_NON_NULL(projection, NULL); + + // psSphere *rc = XXXDeproject(outSphere, tpCoord, projection); + psSphere *rc = p_psDeproject(outSphere, tpCoord, projection); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform tangent plane coords to sky coords.\n"); + } + return(rc); +} + +/***************************************************************************** + *****************************************************************************/ +psPlane* pmCoordSkyToTP( + psPlane* tpCoord, + const psSphere* in, + const psProjection *projection) +{ + PS_ASSERT_PTR_NON_NULL(in, NULL); + PS_ASSERT_PTR_NON_NULL(projection, NULL); + + psPlane *rc = p_psProject(tpCoord, in, projection); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform sky to tangent plane coords.\n"); + } + return(rc); +} + +/***************************************************************************** + *****************************************************************************/ +psSphere* pmCoordCellToSky( + psSphere* skyCoord, + const psPlane* cellCoord, + double color, + double magnitude, + const pmCell* cell) +{ + PS_ASSERT_PTR_NON_NULL(cellCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->toFPA, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent->toTangentPlane, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent->projection, NULL); + psPlane fpaCoord; + psPlane tpCoord; + psPlane *rc; + pmFPA* parFPA = (cell->parent)->parent; + + // Convert the input cell coordinates to FPA coordinates. + rc = psPlaneTransformApply(&fpaCoord, cell->toFPA, cellCoord); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could transform cell coords to FPA coords.\n"); + return(NULL); + } + + // Convert the FPA coordinates to tangent plane Coordinates. + rc = psPlaneDistortApply(&tpCoord, parFPA->toTangentPlane, &fpaCoord, color, magnitude); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could transform FPA coords to tangent plane coords.\n"); + return(NULL); + } + + // Convert the tangent plane Coordinates to sky coordinates. + psSphere *rc2 = pmCoordTPToSky(skyCoord, &tpCoord, parFPA->projection); + if (rc2 == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform cell coords to sky coords.\n"); + } + + return(rc2); +} + +/***************************************************************************** + *****************************************************************************/ +psPlane* pmCoordSkyToCell( + psPlane* cellCoord, + const psSphere* skyCoord, + float color, + float magnitude, + const pmCell* cell) +{ + PS_ASSERT_PTR_NON_NULL(skyCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent, NULL); + PS_ASSERT_PTR_NON_NULL(cell->parent->parent, NULL); + pmChip *parChip = cell->parent; + pmFPA *parFPA = parChip->parent; + psPlane tpCoord; + psPlane fpaCoord; + psPlane chipCoord; + psPlane *rc; + + // Convert the skyCoords to tangent plane coords. + rc = pmCoordSkyToTP(&tpCoord, skyCoord, parFPA->projection); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not determine tangent plane coords.\n"); + return(NULL); + } + + // Convert the tangent plane coords to FPA coords. + rc = pmCoordTPToFPA(&fpaCoord, &tpCoord, color, magnitude, parFPA); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not determine FPA coords.\n"); + return(NULL); + } + + // Convert the FPA coords to chip coords. + rc = pmCoordFPAToChip(&chipCoord, &fpaCoord, parChip); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not determine chip coords.\n"); + return(NULL); + } + + // Convert the chip coords to cell coords. + rc = pmCoordChipToCell(cellCoord, &chipCoord, cell); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not determine cell coords.\n"); + return(NULL); + } + + return (cellCoord); +} + +/***************************************************************************** + *****************************************************************************/ +psSphere* pmCoordCellToSkyQuick( + psSphere* outSphere, + const psPlane* cellCoord, + const pmCell* cell) +{ + PS_ASSERT_PTR_NON_NULL(cellCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->toSky, NULL); + psPlane outPlane; + psPlane *rc; + rc = psPlaneTransformApply(&outPlane, cell->toSky, cellCoord); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could transform cell coords to sky coords.\n"); + return(NULL); + } + + psSphere *out = outSphere; + if (out == NULL) { + out = psSphereAlloc(); + } + out->r = outPlane.y; + out->d = outPlane.x; + + return(out); +} + +/***************************************************************************** + *****************************************************************************/ +psPlane* pmCoordSkyToCellQuick( + psPlane* cellCoord, + const psSphere* skyCoord, + const pmCell* cell) +{ + PS_ASSERT_PTR_NON_NULL(skyCoord, NULL); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + PS_ASSERT_PTR_NON_NULL(cell->toSky, NULL); + psPlane skyPlane; + skyPlane.y = skyCoord->r; + skyPlane.x = skyCoord->d; + + psPlane *rc = psPlaneTransformApply(cellCoord, cell->toSky, &skyPlane); + if (rc == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: could not transform sky to cell coords.\n"); + } + return(cellCoord); +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAAstrometry.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAAstrometry.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAAstrometry.h (revision 14957) @@ -0,0 +1,188 @@ +#ifndef PM_FPA_ASTROMETRY_H +#define PM_FPA_ASTROMETRY_H + +#include "pslib.h" +#include "pmFPA.h" + +/** Find cooresponding cell for given FPA coordinate + * + * @return pmCell* the cell cooresponding to the coord in FPA + */ +pmCell* pmCellInFPA( + const psPlane* coord, ///< the coordinate in FPA plane + const pmFPA* FPA ///< the FPA to search for the cell +); + + +/** Find cooresponding chip for given FPA coordinate + * + * @return pmChip* the chip cooresponding to coord + */ +pmChip* pmChipInFPA( + const psPlane* coord, ///< the coordinate in FPA plane + const pmFPA* FPA ///< the FPA to search for the cell +); + + +/** Find cooresponding cell for given Chip coordinate + * + * @return pmCell* the cell cooresponding to coord + */ +pmCell* pmCellInChip( + const psPlane* coord, ///< the coordinate in Chip plane + const pmChip* chip ///< the chip to search for the cell +); + + +/** Translate a cell coordinate into a chip coordinate + * + * @return psPlane* the resulting chip coordinate + */ +psPlane* pmCoordCellToChip( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the coordinate within Cell + const pmCell* cell ///< the Cell in interest +); + + +/** Translate a chip coordinate into a FPA coordinate + * + * @return psPlane* the resulting FPA coordinate + */ +psPlane* pmCoordChipToFPA( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the coordinate within Chip + const pmChip* chip ///< the chip in interest +); + + +/** Translate a FPA coordinate into a Tangent Plane coordinate + * + * @return psPlane* the resulting Tangent Plane coordinate + */ +psPlane* pmCoordFPAToTP( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the coordinate within FPA + double color, ///< Color of source + double magnitude, ///< Magnitude of source + const pmFPA* fpa ///< the FPA in interest +); + + +/** Translate a Tangent Plane coordinate into a Sky coordinate + * + * @return psSphere* the resulting Sky coordinate + */ +psSphere* pmCoordTPToSky( + psSphere* out, ///< a sphere struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the coordinate within Tangent Plane + const psProjection *projection +); + +/** Translate a cell coordinate into a FPA coordinate + * + * @return psPlane* the resulting FPA coordinate + */ +psPlane* pmCoordCellToFPA( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the coordinate within cell + const pmCell* cell ///< the cell in interest +); + + +/** Translate a cell coordinate into a Sky coordinate + * + * @return psSphere* the resulting Sky coordinate + */ +psSphere* pmCoordCellToSky( + psSphere* out, ///< a sphere struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the coordinate within cell + double color, ///< Color of source + double magnitude, ///< Magnitude of source + const pmCell* cell ///< the cell in interest +); + + +/** Translate a cell coordinate into a Sky coordinate using a 'quick and + * dirty' method + * + * @return psSphere* the resulting Sky coordinate + */ +psSphere* pmCoordCellToSkyQuick( + psSphere* out, ///< a sphere struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the coordinate within cell + const pmCell* cell ///< the cell in interest +); + + +/** Translate a Sky coordinate into a Tangent Plane coordinate + * + * @return psPlane* the resulting Tangent Plane coordinate + */ +psPlane* pmCoordSkyToTP( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psSphere* in, ///< the sky coordinate + const psProjection *projection +); + +/** Translate a Tangent Plane coordinate into a FPA coordinate + * + * @return psPlane* the resulting FPA coordinate + */ +psPlane* pmCoordTPToFPA( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the coordinate within tangent plane + double color, ///< Color of source + double magnitude, ///< Magnitude of source + const pmFPA* fpa ///< the FPA of interest +); + + +/** Translate a FPA coordinate into a chip coordinate + * + * @return psPlane* the resulting chip coordinate + */ +psPlane* pmCoordFPAToChip( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the FPA coordinate + const pmChip* chip ///< the chip of interest +); + + +/** Translate a chip coordinate into a cell coordinate + * + * @return psPlane* the resulting cell coordinate + */ +psPlane* pmCoordChipToCell( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psPlane* in, ///< the Chip coordinate + const pmCell* cell ///< the cell of interest +); + + +/** Translate a sky coordinate into a cell coordinate + * + * @return psPlane* the resulting cell coordinate + */ +psPlane* pmCoordSkyToCell( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psSphere* in, ///< the Sky coordinate + float color, ///< Color of source + float magnitude, ///< Magnitude of source + const pmCell* cell ///< the cell of interest +); + + +/** Translate a sky coordinate into a cell coordinate using a 'quick and + * dirty' method + * + * @return psPlane* the resulting cell coordinate + */ +psPlane* pmCoordSkyToCellQuick( + psPlane* out, ///< a plane struct to recycle. If NULL, a new struct is created + const psSphere* in, ///< the Sky coordinate + const pmCell* cell ///< the cell of interest +); + + +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPACalibration.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPACalibration.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPACalibration.c (revision 14957) @@ -0,0 +1,63 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmConfig.h" +#include "pmDetrendDB.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" +#include "pmFPAfile.h" + +#include "pmFPACalibration.h" + +float pmFPADarkNorm(const pmFPA *fpa, const pmFPAview *view, float expTime) +{ + PS_ASSERT_PTR_NON_NULL(fpa, NAN); + PS_ASSERT_PTR_NON_NULL(view, NAN); + + psMetadata *darkNorms = psMetadataLookupMetadata(NULL, fpa->camera, "DARK.NORM"); // Dark normalisations + if (!darkNorms) { + psError(PS_ERR_UNKNOWN, false, "Unable to find DARK.NORM in camera configuration."); + return NAN; + } + + const char *key = psMetadataLookupStr(NULL, fpa->camera, "DARK.NORM.KEY"); // Key for normalisation + if (!key || strlen(key) == 0) { + psError(PS_ERR_UNKNOWN, false, "Unable to find DARK.NORM.KEY in camera configuration."); + return NAN; + } + + psString keyResolved = pmFPANameFromRule(key, fpa, view); // Resolved version + if (!keyResolved || strlen(keyResolved) == 0) { + psError(PS_ERR_UNKNOWN, false, "Unable to resolve DARK.NORM.KEY: %s", key); + return NAN; + } + + psMetadata *polyMD = psMetadataLookupMetadata(NULL, darkNorms, keyResolved); // Metadata with polynomial + if (!polyMD) { + psError(PS_ERR_UNKNOWN, false, "Unable to find %s polynomial in the DARK.NORM metadata", keyResolved); + psFree(keyResolved); + return NAN; + } + + psPolynomial1D *poly = psPolynomial1DfromMetadata(polyMD); // Polynomial + if (!poly) { + psError(PS_ERR_UNKNOWN, false, "Unable to determine polynomial from %s in the DARK.NORM metadata", + keyResolved); + psFree(keyResolved); + return NAN; + } + psFree(keyResolved); + + float value = psPolynomial1DEval(poly, expTime); + + psFree(poly); + + return value; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPACalibration.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPACalibration.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPACalibration.h (revision 14957) @@ -0,0 +1,17 @@ +#ifndef PM_FPA_CALIBRATION_H +#define PM_FPA_CALIBRATION_H + +/// Return the dark normalisation value +/// +/// Unfortunately, dark current is not linear with the exposure time, but application of a polynomial +/// correction to the exposure time should make it linear. This function returns the appropriate value with +/// which to normalise a dark frame. The polynomial is obtained from DARK.NORM in the camera configuration. +/// The specific polynomial metadata to use is provided by DARK.NORM.KEY, which is keyword expanded in the +/// usual manner (e.g., try "{CHIP.NAME}"). +float pmFPADarkNorm(const pmFPA *fpa, ///< FPA for which to get the normalisation + const pmFPAview *view, ///< View to the FPA component of interest + float expTime ///< The nominal exposure time + ); + + +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAConstruct.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAConstruct.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAConstruct.c (revision 14957) @@ -0,0 +1,1350 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" +#include "pmFPAFlags.h" +#include "pmConcepts.h" +#include "pmFPAConstruct.h" +#include "pmFPAUtils.h" +#include "pmHDUUtils.h" + +#define TABLE_OF_CONTENTS "CONTENTS" // Name for camera format metadata containing the contents +#define CHIP_TYPES "CHIPS" // Name for camera format metadata containing the chip types +#define CELL_TYPES "CELLS" // Name for camera format metadata containing the cell types + + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// File-static functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Read data for a particular cell from the camera format description +static psMetadata *getCellData(const psMetadata *format, // The camera format description + const char *cellName // The name of the cell + ) +{ + assert(format); + assert(cellName && strlen(cellName) > 0); + + bool status = true; // Result of MD lookup + psMetadata *cells = psMetadataLookupMetadata(&status, format, CELL_TYPES); // The CELLS + if (!status || !cells) { + psError(PS_ERR_IO, true, "Unable to find %s in camera format.\n", CELL_TYPES); + return NULL; + } + + psMetadata *cellData = psMetadataLookupMetadata(&status, cells, cellName); // The data for the particular cell + if (!status || !cellData) { + psLogMsg(__func__, PS_LOG_WARN, "Unable to find specs for cell %s: ignored\n", cellName); + } + + return cellData; +} + +// Parse a list of first:second:third pairs in a string +static int parseContent(psArray **first, // Array of the first values + psArray **second, // Array of the second values + psArray **third, // Array of the third values + const char *string // The string to parse + ) +{ + assert(string && strlen(string) > 0); + // Must populate 'first', 'second', 'third' in order. + assert(!second || first); + assert(!third || second); + + int numArrays = third ? 3 : (second ? 2 : 1); // Number of arrays + + psList *values = psStringSplit(string, " ,;", true); // List of the parts + + if (first) { + *first = psArrayAlloc(values->n); + } + if (second) { + *second = psArrayAlloc(values->n); + } + if (third) { + *third = psArrayAlloc(values->n); + } + int num = 0; + psListIterator *valuesIter = psListIteratorAlloc(values, PS_LIST_HEAD, false); // Iterator for values + psString value = NULL; // "first:second:third" string + while ((value = psListGetAndIncrement(valuesIter))) { + psArray *fst = psStringSplitArray(value, ":", true); // First, second, third + switch (numArrays) { + case 3: + psArraySet(*third, num, fst->data[2]); + case 2: + psArraySet(*second, num, fst->data[1]); + case 1: + psArraySet(*first, num, fst->data[0]); + break; + default: + psAbort("Should never get here."); + } + num++; + psFree(fst); + } + psFree(valuesIter); + psFree(values); + + return num; +} + +// Get the name of a PHU chip or cell from the header +static psString phuNameFromHeader(const char *name, // The name to lookup: "CELL.NAME" or "CHIP.NAME" + const psMetadata *fileInfo, // FILE within the camera format description + const psMetadata *header // Primary header + ) +{ + assert(name && strlen(name) > 0); + assert(fileInfo); + assert(header); + + bool mdok = true; // Result of MD lookup + psString keyword = psMetadataLookupStr(&mdok, fileInfo, name); + if (!mdok || strlen(keyword) == 0) { + return false; + } + psMetadataItem *resultItem = psMetadataLookup(header, keyword); + if (!resultItem) { + psError(PS_ERR_IO, true, "Unable to find %s in primary header to identify %s.\n", keyword, name); + return NULL; + } + return psMetadataItemParseString(resultItem); +} + +// Add an HDU to the FPA +static bool addHDUtoFPA(pmFPA *fpa, // FPA to which to add + pmHDU *hdu // HDU to be added + ) +{ + assert(fpa); + assert(hdu); + + if (fpa->hdu) { + // Something's already here + if (fpa->hdu != hdu) { + psError(PS_ERR_IO, true, "Unable to add HDU since FPA already has one.\n"); + } + return false; + } + fpa->hdu = psMemIncrRefCounter(hdu); + pmFPASetFileStatus(fpa, true); + + return true; +} + +// Add an HDU to the chip +static bool addHDUtoChip(pmChip *chip, // Chip to which to add + pmHDU *hdu // HDU to be added + ) +{ + assert(chip); + assert(hdu); + + if (chip->hdu) { + // Something's already here + if (chip->hdu != hdu) { + psError(PS_ERR_IO, true, "Unable to add HDU since chip already has one.\n"); + } + return false; + } + chip->hdu = psMemIncrRefCounter(hdu); + pmChipSetFileStatus(chip, true); + + return true; +} + +// Add an HDU to the cell +static bool addHDUtoCell(pmCell *cell, // Cell to which to add + pmHDU *hdu // HDU to be added + ) +{ + assert(cell); + assert(hdu); + + if (cell->hdu) { + // Something's already here + if (cell->hdu != hdu) { + psError(PS_ERR_IO, true, "Unable to add HDU since cell already has one.\n"); + } + return false; + } + cell->hdu = psMemIncrRefCounter(hdu); + pmCellSetFileStatus(cell, true); + + return true; +} + + +// Looks up the particular content, based on the chip and cell +static const char *getContent(const psMetadata *fileInfo, // The FILE from the camera format configuration + const psMetadata *contents, // The CONTENTS from the camera format configuration + const pmChip *chip, // The chip of interest + const pmCell *cell // The cell of interest + ) +{ + assert(fileInfo); + assert(contents); + assert(chip); + + bool mdok = true; // Status of MD lookup + char *contentKey = psMetadataLookupStr(&mdok, fileInfo, "CONTENT"); // Key for CONTENTS + if (!mdok || !contentKey || strlen(contentKey) == 0) { + psError(PS_ERR_IO, true, "Unable to find CONTENT in FILE within camera format configuration.\n"); + return NULL; + } + + contentKey = psStringCopy(contentKey); // So that we're not altering something someone else might use... + + // Replace some concept names + if (strstr(contentKey, "{CHIP.NAME}")) { + if (!chip) { + psError(PS_ERR_IO, true, "CONTENT in FILE refers to CHIP.NAME, but no chip was provided.\n"); + psFree(contentKey); + return NULL; + } + const char *name = psMetadataLookupStr(&mdok, chip->concepts, "CHIP.NAME"); + if (mdok && name && strlen(name) > 0) { + psStringSubstitute(&contentKey, name, "{CHIP.NAME}"); + } + } + + if (strstr(contentKey, "{CELL.NAME}")) { + if (!chip) { + psError(PS_ERR_IO, true, "CONTENT in FILE refers to CELL.NAME, but no chip was provided.\n"); + psFree(contentKey); + return NULL; + } + const char *name = psMetadataLookupStr(&mdok, cell->concepts, "CELL.NAME"); + if (mdok && name && strlen(name) > 0) { + psStringSubstitute(&contentKey, name, "{CELL.NAME}"); + } + } + + // XXX: MORE SUBSTITUTION OPTIONS HERE! + + psTrace("psModules.camera", 5, "Looking up %s in the CONTENTS.\n", contentKey); + const char *content = psMetadataLookupStr(&mdok, contents, contentKey); + if (!mdok || !content || strlen(content) == 0) { + psFree(contentKey); + psError(PS_ERR_IO, true, "Unable to find %s in the CONTENTS.\n", contentKey); + return NULL; + } + + psFree(contentKey); + + return content; +} + + +// Given a list of contents, put the HDU in the correct place and plug in the cell configuration information +static bool processContents(pmFPA *fpa, // The FPA + pmChip *chip, // The chip + pmCell *cell, // The cell + pmHDU *hdu, // The HDU to be added + pmFPALevel level, // The level at which to add the HDU + psArray *chipNames, // The chip names + psArray *cellNames, // The cell names + psArray *cellTypes, // The cell types + const psMetadata *format // Camera format configuration + ) +{ + assert(fpa); + assert(cellTypes); + long num = cellTypes->n; // Number of entries to add + assert(chip || (chipNames && chipNames->n == num)); + assert(cell || (cellNames && cellNames->n == num)); + assert(format); + + if (hdu && level == PM_FPA_LEVEL_FPA) { + if (!addHDUtoFPA(fpa, hdu)) { + psError(PS_ERR_UNKNOWN, false, "Unable to add HDU to FPA"); + return false; + } + } + // Load fpa-related concepts + if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS, false, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from camera and defaults for fpa\n"); + return false; + } + + for (int i = 0; i < num; i++) { + psString cellType = cellTypes->data[i]; // The type of the cell + + // Find the chip + pmChip *newChip; // Chip of interest + if (chip) { + newChip = chip; + } else { + psString chipName = chipNames->data[i]; // The name of the chip + int chipNum = pmFPAFindChip(fpa, chipName); // The chip we're looking for + if (chipNum == -1) { + psError(PS_ERR_LOCATION_INVALID, false, + "Unable to find chip %s in fpa --- ignored.\n", chipName); + return false; + } + newChip = fpa->chips->data[chipNum]; + } + + // Put in the HDU + if (hdu && level == PM_FPA_LEVEL_CHIP) { + addHDUtoChip(newChip, hdu); + } + // Load chip-related concepts + if (!pmConceptsReadChip(newChip, PM_CONCEPT_SOURCE_DEFAULTS, false, false, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to read concepts from camera and defaults for chip\n"); + return false; + } + + // Find the cell + pmCell *newCell; // Cell of interest + if (cell) { + newCell = cell; + } else { + psString cellName = cellNames->data[i]; // The name of the cell + int cellNum = pmChipFindCell(newChip, cellName); // The cell we're looking for + if (cellNum == -1) { + psError(PS_ERR_LOCATION_INVALID, false, "Unable to find cell %s in chip --- ignored.\n", + cellName); + return false; + } + newCell = newChip->cells->data[cellNum]; + } + + psMetadata *cellData = getCellData(format, cellType); // Data for this cell + + if (hdu && level == PM_FPA_LEVEL_CELL) { + addHDUtoCell(newCell, hdu); + } + + // Put in the cell data + if (newCell->config) { + psLogMsg(__func__, PS_LOG_WARN, "Overwriting cell data in chip\n"); + psFree(newCell->config); // Make way! + } + newCell->config = psMemIncrRefCounter(cellData); + if (!pmConceptsReadCell(newCell, PM_CONCEPT_SOURCE_CELLS | PM_CONCEPT_SOURCE_DEFAULTS, + false, NULL)) { + psError(PS_ERR_UNKNOWN, false, + "Unable to read concepts from camera and defaults for cell type %s", cellType); + return false; + } + } + + return true; +} + +#if 0 +// Return the level at which EXTENSIONS go, from the FILE metadata within the camera format +static pmFPALevel hduLevel(const psMetadata *format // The camera format configuration + ) +{ + assert(format); + + bool mdok = true; // Status of MD lookup + psMetadata *file = psMetadataLookupMetadata(&mdok, format, "FILE"); // File information + if (!mdok || !file) { + psError(PS_ERR_IO, true, "Unable to find FILE information in camera format configuration.\n"); + return PM_FPA_LEVEL_NONE; + } + const char *extType = psMetadataLookupStr(&mdok, file, "EXTENSIONS"); + if (!mdok || !extType || strlen(extType) == 0) { + psError(PS_ERR_IO, true, "Unable to find EXTENSIONS in the FILE information in the camera format" + " configuration.\n"); + return PM_FPA_LEVEL_NONE; + } + + // Where do we stick in the HDUs? + pmFPALevel level = PM_FPA_LEVEL_NONE; // Level for HDU insertion + if (strcasecmp(extType, "CHIP") == 0) { + level = PM_FPA_LEVEL_CHIP; + } else if (strcasecmp(extType, "CELL") == 0) { + level = PM_FPA_LEVEL_CELL; + } else if (strcasecmp(extType, "NONE") != 0) { + psError(PS_ERR_IO, true, "EXTENSIONS is not CHIP or CELL or NONE.\n"); + } + + return level; +} +#endif + +// Find the chip of interest within the FPA, using either the view (simple) or the FITS header (bit more +// complicated). Also updates the provided view to point to the chip if we have to find it. +static pmChip *whichChip(pmFPAview *view, // View to chip, modified + const pmFPA *fpa, // FPA holding chip of interest + const pmFPAview *phuView, // View to PHU, or NULL + const psMetadata *fileInfo, // FILE information from camera format + const psMetadata *header // FITS header, or NULL + ) +{ + assert(view); + assert(fpa); + assert(phuView || header); + assert(fileInfo); + + if (phuView) { + return pmFPAviewThisChip(phuView, fpa); + } + + psString chipName = phuNameFromHeader("CHIP.NAME", fileInfo, header); + psTrace("psModules.camera", 5, "This is chip %s\n", chipName); + int chipNum = pmFPAFindChip(fpa, chipName); // Chip number + if (chipNum == -1) { + psError(PS_ERR_UNKNOWN, true, "Unable to find chip %s in FPA.\n", chipName); + return NULL; + } + psFree(chipName); + view->chip = chipNum; + return fpa->chips->data[chipNum]; +} + +// Find the cell of interest within the chip, using either the view (simple) or the FITS header (bit more +// complicated). Also updates the provided view to point to the cell if we have to find it. +static pmCell *whichCell(pmFPAview *view, // View to cell + const pmChip *chip, // Chip holding cell of interest + const pmFPAview *phuView, // View to PHU, or NULL + const psMetadata *fileInfo, // FILE information from camera format + const psMetadata *header // FITS header, or NULL + ) +{ + assert(view); + assert(chip); + assert(phuView || header); + assert(fileInfo); + + pmFPA *fpa = chip->parent; // The parent FPA + + if (phuView) { + return pmFPAviewThisCell(phuView, fpa); + } + + psString cellName = phuNameFromHeader("CELL.NAME", fileInfo, header); + psTrace("psModules.camera", 5, "This is cell %s\n", cellName); + int cellNum = pmChipFindCell(chip, cellName); // Cell number + if (cellNum == -1) { + psError(PS_ERR_UNKNOWN, true, "Unable to find cell %s in chip.\n", cellName); + return NULL; + } + view->cell = cellNum; + return chip->cells->data[cellNum]; +} + + +// PHU=FPA and EXTENSIONS=CHIP: +// TABLE_OF_CONTENTS(METADATA) has a list of extensions, each with a chipName:chipType. +// CHIP_TYPES(METADATA) has a list of chip types, each with cellName:cellType +static bool addSource_FPA_CHIP(pmFPA *fpa, // FPA to which to add + const psMetadata *format // The camera format + ) +{ + assert(fpa); + assert(format); + + psMetadata *contents = psMetadataLookupMetadata(NULL, format, TABLE_OF_CONTENTS); // The contents + if (!contents) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find %s in camera format.", TABLE_OF_CONTENTS); + return false; + } + + psMetadata *chips = psMetadataLookupMetadata(NULL, format, CHIP_TYPES); // The chip types + if (!chips) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find %s in camera format.", CHIP_TYPES); + return false; + } + + // Iterate over all extensions + psMetadataIterator *contentsIter = psMetadataIteratorAlloc(contents, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *item; // Item from iteration + while ((item = psMetadataGetAndIncrement(contentsIter))) { + if (item->type != PS_DATA_STRING) { + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + "Type for %s (%x) in %s METADATA in camera format is not STR", + item->name, item->type, TABLE_OF_CONTENTS); + psFree(contentsIter); + return false; + } + + const char *extname = item->name; // Extension name + pmHDU *hdu = pmHDUAlloc(extname); // HDU for this extension + // Casting to avoid "warning: passing arg 1 of `p_psMemIncrRefCounter' discards qualifiers from + // pointer target type" + hdu->format = psMemIncrRefCounter((const psPtr)format); + + // What's in the extension? It's specified by chipName:chipType + // Assume that an extension contains only a single chip, instead of multiple chips + + psString extContents = item->data.str; // Contents of extension + psArray *chipNames = NULL; + psArray *chipTypes = NULL; + if (parseContent(&chipNames, &chipTypes, NULL, extContents) != 1) { + psError(PS_ERR_UNKNOWN, false, + "Unable to parse chipName:chipType in %s of %s in camera format", + extname, TABLE_OF_CONTENTS); + } + + psString chipName = psMemIncrRefCounter(chipNames->data[0]); // Name of chip + psString chipType = psMemIncrRefCounter(chipTypes->data[0]); // Type of chip + psFree(chipNames); + psFree(chipTypes); + + // Get the chip + int chipNum = pmFPAFindChip(fpa, chipName); // Chip number + if (chipNum == -1) { + psError(PS_ERR_UNKNOWN, false, "Unable to find chip %s in FPA.\n", chipName); + psFree(hdu); + psFree(contentsIter); + return false; + } + pmChip *chip = fpa->chips->data[chipNum]; // Chip of interest + + // What's in the chip? + + psString chipContents = psMetadataLookupStr(NULL, chips, chipType); // Contents of the chip + if (!chipContents) { + psError(PS_ERR_UNEXPECTED_NULL, false, + "Unable to find chip type %s (for extension %s) in %s of camera format", + chipType, extname, CHIP_TYPES); + psFree(chipName); + psFree(chipType); + psFree(hdu); + psFree(contentsIter); + return false; + } + + psArray *cellNames = NULL; // Cell names + psArray *cellTypes = NULL; // Cell types + if (parseContent(&cellNames, &cellTypes, NULL, chipContents) == 0) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Unable to parse chip contents (within %s->%s in camera format; for chip %s) " + "as cellName:cellType", CHIP_TYPES, chipType, chipName); + psFree(cellNames); + psFree(cellTypes); + psFree(chipName); + psFree(chipType); + psFree(hdu); + psFree(contentsIter); + return false; + } + + if (!processContents(fpa, chip, NULL, hdu, PM_FPA_LEVEL_CHIP, NULL, cellNames, cellTypes, format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to set contents for chip %s from camera format.", + chipName); + psFree(cellNames); + psFree(cellTypes); + psFree(chipName); + psFree(chipType); + psFree(hdu); + psFree(contentsIter); + return false; + } + + psFree(cellNames); + psFree(cellTypes); + psFree(chipName); + psFree(chipType); + + psFree(hdu); // Drop reference + } + psFree(contentsIter); + + return true; +} + +// PHU=FPA and EXTENSIONS=CELL: +// TABLE_OF_CONTENTS(METADATA) has a list of extensions, each with a chipName:cellName:cellType. +static bool addSource_FPA_CELL(pmFPA *fpa, // FPA to which to add + const psMetadata *format // The camera format + ) +{ + assert(fpa); + assert(format); + + psMetadata *contents = psMetadataLookupMetadata(NULL, format, TABLE_OF_CONTENTS); // The contents + if (!contents) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find %s in camera format.", TABLE_OF_CONTENTS); + return false; + } + + // Iterate over all extensions + psMetadataIterator *contentsIter = psMetadataIteratorAlloc(contents, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *item; // Item from iteration + while ((item = psMetadataGetAndIncrement(contentsIter))) { + if (item->type != PS_DATA_STRING) { + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + "Type for %s (%x) in %s METADATA in camera format is not STR", + item->name, item->type, TABLE_OF_CONTENTS); + psFree(contentsIter); + return false; + } + + const char *extname = item->name; // Extension name + pmHDU *hdu = pmHDUAlloc(extname); // HDU for this extension + // Casting to avoid "warning: passing arg 1 of `p_psMemIncrRefCounter' discards qualifiers from + // pointer target type" + hdu->format = psMemIncrRefCounter((const psPtr)format); + + // What's in the extension? It's specified by (possibly multiple) chipName:cellName:cellType + + psArray *chipNames = NULL; // Chip names + psArray *cellNames = NULL; // Cell names + psArray *cellTypes = NULL; // Cell types + if (parseContent(&chipNames, &cellNames, &cellTypes, item->data.str) == 0) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Unable to parse extension contents (within %s->%s in camera format) as " + "chipName:cellName:cellType", TABLE_OF_CONTENTS, extname); + psFree(chipNames); + psFree(cellNames); + psFree(cellTypes); + psFree(hdu); + psFree(contentsIter); + return false; + } + + if (!processContents(fpa, NULL, NULL, hdu, PM_FPA_LEVEL_CELL, chipNames, cellNames, cellTypes, + format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to set contents from camera format."); + psFree(chipNames); + psFree(cellNames); + psFree(cellTypes); + psFree(hdu); + psFree(contentsIter); + return false; + } + + psFree(chipNames); + psFree(cellNames); + psFree(cellTypes); + + psFree(hdu); // Drop reference + } + psFree(contentsIter); + + return true; +} + +// PHU=FPA and EXTENSIONS=NONE: +// TABLE_OF_CONTENTS(STR) has a list of chipName:cellName:cellType. +static bool addSource_FPA_NONE(pmFPA *fpa, // FPA to which to add + const psMetadata *format // The camera format + ) +{ + assert(fpa); + assert(format); + + psString contents = psMetadataLookupStr(NULL, format, TABLE_OF_CONTENTS); // The contents + if (!contents) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find %s in camera format.", TABLE_OF_CONTENTS); + return false; + } + + // What's in the file? It's specified by (possibly multiple) chipName:cellName:cellType + + psArray *chipNames = NULL; // Chip names + psArray *cellNames = NULL; // Cell names + psArray *cellTypes = NULL; // Cell types + if (parseContent(&chipNames, &cellNames, &cellTypes, contents) == 0) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Unable to parse contents (within %s in camera format) as chipName:cellName:cellType", + TABLE_OF_CONTENTS); + psFree(chipNames); + psFree(cellNames); + psFree(cellTypes); + return false; + } + + if (!processContents(fpa, NULL, NULL, NULL, PM_FPA_LEVEL_NONE, chipNames, cellNames, cellTypes, + format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to set contents from camera format."); + psFree(chipNames); + psFree(cellNames); + psFree(cellTypes); + return false; + } + + psFree(chipNames); + psFree(cellNames); + psFree(cellTypes); + + return true; +} + + +// PHU=CHIP and EXTENSIONS=CELL: +// TABLE_OF_CONTENTS(METADATA) has a menu of contents, each with a chipType. +// CHIP_TYPES(METADATA) has a list of chip types, each with extension(METADATA) with cellName:cellType +static bool addSource_CHIP_CELL(pmChip *chip, // Chip to which to add + const psMetadata *format // The camera format + ) +{ + assert(chip); + assert(format); + + psMetadata *contents = psMetadataLookupMetadata(NULL, format, TABLE_OF_CONTENTS); // The contents + if (!contents) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find %s in camera format.", TABLE_OF_CONTENTS); + return false; + } + + psMetadata *chips = psMetadataLookupMetadata(NULL, format, CHIP_TYPES); // The chip types + if (!chips) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find %s in camera format.", CHIP_TYPES); + return false; + } + + psMetadata *fileInfo = psMetadataLookupMetadata(NULL, format, "FILE"); // The file information + if (!fileInfo) { + psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n"); + return false; + } + + const char *chipType = getContent(fileInfo, contents, chip, NULL); // The chip type + + // What's in the chip? + + psMetadata *chipContents = psMetadataLookupMetadata(NULL, chips, chipType); // Contents of the chip + if (!chipContents) { + psError(PS_ERR_UNEXPECTED_NULL, false, + "Unable to find chip type %s in %s of camera format", + chipType, CHIP_TYPES); + return false; + } + + pmFPA *fpa = chip->parent; // The parent FPA + + psMetadataIterator *contentsIter = psMetadataIteratorAlloc(chipContents, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *contentItem; // Content, from iteration + while ((contentItem = psMetadataGetAndIncrement(contentsIter))) { + if (contentItem->type != PS_DATA_STRING) { + psError(PS_ERR_BAD_PARAMETER_TYPE, true, + "Type for %s (%x) in %s METADATA in camera format is not STR", + contentItem->name, contentItem->type, TABLE_OF_CONTENTS); + psFree(contentsIter); + return false; + } + + const char *extname = contentItem->name; // Extension name + pmHDU *hdu = pmHDUAlloc(extname); // HDU for this extension + // Casting to avoid "warning: passing arg 1 of `p_psMemIncrRefCounter' discards qualifiers from + // pointer target type" + hdu->format = psMemIncrRefCounter((const psPtr)format); + + psArray *cellNames = NULL; // Cell names + psArray *cellTypes = NULL; // Cell types + if (parseContent(&cellNames, &cellTypes, NULL, contentItem->data.str) == 0) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Unable to parse chip contents (within %s->%s in camera format) " + "as cellName:cellType", CHIP_TYPES, chipType); + psFree(cellNames); + psFree(cellTypes); + psFree(hdu); + psFree(contentsIter); + return false; + } + + if (!processContents(fpa, chip, NULL, hdu, PM_FPA_LEVEL_CELL, NULL, cellNames, cellTypes, format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to set contents for chip type %s from camera format.", + chipType); + psFree(cellNames); + psFree(cellTypes); + psFree(hdu); + psFree(contentsIter); + return false; + } + + psFree(cellNames); + psFree(cellTypes); + + psFree(hdu); // Drop reference + } + psFree(contentsIter); + + return true; +} + +// PHU=CHIP and EXTENSIONS=NONE: +// TABLE_OF_CONTENTS(METADATA) has a menu of contents, each with a chipName:chipType. +// CHIP_TYPES(METADATA) has a list of chip types, each with cellName:cellType +static bool addSource_CHIP_NONE(pmChip *chip, // Chip to which to add + const psMetadata *format // The camera format + ) +{ + assert(chip); + assert(format); + + psMetadata *contents = psMetadataLookupMetadata(NULL, format, TABLE_OF_CONTENTS); // The contents + if (!contents) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find %s in camera format.", TABLE_OF_CONTENTS); + return false; + } + + psMetadata *chips = psMetadataLookupMetadata(NULL, format, CHIP_TYPES); // The chip types + if (!chips) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find %s in camera format.", CHIP_TYPES); + return false; + } + + psMetadata *fileInfo = psMetadataLookupMetadata(NULL, format, "FILE"); // The file information + if (!fileInfo) { + psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n"); + return false; + } + + pmFPA *fpa = chip->parent; // Parent FPA + + const char *chipType = getContent(fileInfo, contents, chip, NULL); // The chip type + + // What's in the chip? + + psString chipContents = psMetadataLookupStr(NULL, chips, chipType); // Contents of the chip + if (!chipContents) { + psError(PS_ERR_UNEXPECTED_NULL, false, + "Unable to find chip type %s in %s of camera format", chipType, CHIP_TYPES); + return false; + } + + psArray *cellNames = NULL; // Cell names + psArray *cellTypes = NULL; // Cell types + if (parseContent(&cellNames, &cellTypes, NULL, chipContents) == 0) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Unable to parse chip contents (within %s->%s in camera format) " + "as cellName:cellType", CHIP_TYPES, chipType); + psFree(cellNames); + psFree(cellTypes); + return false; + } + + if (!processContents(fpa, chip, NULL, NULL, PM_FPA_LEVEL_NONE, NULL, cellNames, cellTypes, format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to set contents for chip type %s from camera format.", + chipType); + psFree(cellNames); + psFree(cellTypes); + return false; + } + + psFree(cellNames); + psFree(cellTypes); + + return true; +} + +// PHU=CELL and EXTENSIONS=NONE: +// TABLE_OF_CONTENTS(METADATA) has a menu of contents, each with a cellName:cellType +static bool addSource_CELL_NONE(pmCell *cell, // Cell to which to add + const psMetadata *format // The camera format + ) +{ + assert(cell); + assert(format); + + psMetadata *contents = psMetadataLookupMetadata(NULL, format, TABLE_OF_CONTENTS); // The contents + if (!contents) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find %s in camera format.", TABLE_OF_CONTENTS); + return false; + } + + psMetadata *fileInfo = psMetadataLookupMetadata(NULL, format, "FILE"); // The file information + if (!fileInfo) { + psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n"); + return false; + } + + pmChip *chip = cell->parent; // Parent chip + pmFPA *fpa = chip->parent; // Parent FPA + + const char *content = getContent(fileInfo, contents, chip, cell); // Content of cell + + psArray *cellNames = NULL; // Cell names + psArray *cellTypes = NULL; // Cell types + if (parseContent(&cellNames, &cellTypes, NULL, content) != 1) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Unable to parse cell contents (%s) as cellName:cellType", content); + psFree(cellNames); + psFree(cellTypes); + return false; + } + + if (!processContents(fpa, chip, cell, NULL, PM_FPA_LEVEL_NONE, NULL, cellNames, cellTypes, format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to set contents for cell from camera format."); + psFree(cellNames); + psFree(cellTypes); + return false; + } + + psFree(cellNames); + psFree(cellTypes); + + return true; +} + + +// This is the engine for the pmFPAAddSourceFrom{Header,View} functions. +// It uses the camera format configuration information to determine where HDUs go in the FPA. +// It returns a view corresponding to the PHU +static pmFPAview *addSource(pmFPA *fpa, // The FPA + const char *fpaname, // The desired FPA name + const pmFPAview *phuView, // The view corresponding to the PHU, or NULL + const psMetadata *header, // The PHU header, or NULL + const psMetadata *format, // Format of file + bool install // Install the provided header in the location that we find? + ) +{ + assert(fpa); + assert(phuView || header); + assert(format); + + bool mdok; // Status of MD lookup + + // If FPA.NAME is already defined, new name must match it; otherwise, warn the user that something + // potentially bad is happening. + if (fpaname && install) { + const char *currentName = psMetadataLookupStr(&mdok, fpa->concepts, "FPA.NAME"); // Current name + if (mdok && currentName && strlen(currentName) > 0 && strcmp(currentName, fpaname) != 0) { + psLogMsg(__func__, PS_LOG_WARN, "FPA.NAME for new source (%s) doesn't match FPA.NAME for current " + "fpa (%s).\n", fpaname, currentName); + } + psMetadataAddStr(fpa->concepts, PS_LIST_HEAD, "FPA.NAME", PS_META_REPLACE, "Name of FPA", fpaname); + } else if (!psMetadataLookup(fpa->concepts, "FPA.NAME")) { + // Make sure there is an FPA.NAME + psMetadataAddStr(fpa->concepts, PS_LIST_HEAD, "FPA.NAME", 0, "Name of FPA", "UNKNOWN"); + } + + psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information + if (!mdok || !fileInfo) { + psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n"); + return NULL; + } + + // At what level does the PHU go? + const char *phuType = psMetadataLookupStr(&mdok, fileInfo, "PHU"); // What is the PHU? + if (!mdok || strlen(phuType) == 0) { + psError(PS_ERR_IO, false, "Unable to find PHU in the format specification.\n"); + return NULL; + } + + // Prepare the PHU to be placed in the camera hierarchy + pmHDU *phdu = pmHDUAlloc(NULL); // The primary header data unit + // Casting to psPtr to avoide "warning: passing arg 1 of `p_psMemIncrRefCounter' discards qualifiers from + // pointer target type" + phdu->header = psMemIncrRefCounter((const psPtr)header); + phdu->format = psMemIncrRefCounter((const psPtr)format); + pmFPAview *view = pmFPAviewAlloc(0); // View, to be returned + if (phuView) { + // Copy the view, for the case where we're given a header. + *view = *phuView; + } + + // And at what level do the individual extensions go? + const char *extType = psMetadataLookupStr(&mdok, fileInfo, "EXTENSIONS"); // What's in the extns? + if (!mdok || strlen(extType) == 0) { + psError(PS_ERR_IO, false, "Unable to find EXTENSIONS in the format specification.\n"); + psFree(view); + return NULL; + } + + // Now, there are a few cases: + + // Case PHU EXTENSIONS Description + // ==== === ========== =========== + // 1. FPA CHIP CONTENTS(METADATA) has a list of extensions, each with a chip type. + // CHIPS(METADATA) has a list of chip types, each with cell:type + // 2. FPA CELL CONTENTS(METADATA) has a list of extensions, each with chip:cell:type + // No need for CHIPS. + // 3. FPA NONE CONTENTS(STRING) has a list of extensions, chip:cell:type + // No need for CHIPS + // 4. CHIP CELL CONTENTS(METADATA) is a menu, each with a chip type + // CHIPS(METADATA) has a list of chip types(METADATA), containg a list of + // extensions. + // 5. CHIP NONE CONTENTS(METADATA) is a menu, each with a chip type + // CHIPS(METADATA) has a list of chip types(STRING) with cell:type + // 6. CELL NONE CONTENTS(METADATA) is a menu, each with a cell type. + // No need for CHIPS. + + + pmFPALevel phuLevel = pmFPALevelFromName(phuType); // Level for PHU + pmFPALevel extLevel = pmFPALevelFromName(extType); // Level for extensions + + switch (phuLevel) { + case PM_FPA_LEVEL_FPA: { + // We don't have to work out where the PHU is --- there's only one FPA. + // 'view' already points to the FPA. + switch (extLevel) { + case PM_FPA_LEVEL_CHIP: + phdu->blankPHU = true; + if (install) { + if (!addHDUtoFPA(fpa, phdu) || !addSource_FPA_CHIP(fpa, format) || + !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU, + true, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to add source."); + psFree(phdu); + psFree(view); + return NULL; + } + } + psFree(phdu); + return view; + case PM_FPA_LEVEL_CELL: + if (install) { + phdu->blankPHU = true; + if (!addHDUtoFPA(fpa, phdu) || !addSource_FPA_CELL(fpa, format) || + !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU, + true, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to add source."); + psFree(phdu); + psFree(view); + return NULL; + } + } + psFree(phdu); + return view; + case PM_FPA_LEVEL_NONE: + if (install) { + phdu->blankPHU = false; + if (!addHDUtoFPA(fpa, phdu) || !addSource_FPA_NONE(fpa, format) || + !pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU, + true, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to add source."); + psFree(phdu); + psFree(view); + return NULL; + } + } + psFree(phdu); + return view; + default: + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "EXTENSIONS level (%s) incompatible with PHU level (FPA)", extType); + psFree(phdu); + psFree(view); + return NULL; + } + break; + } + case PM_FPA_LEVEL_CHIP: { + // Which chip is our PHU? + pmChip *chip = whichChip(view, fpa, phuView, fileInfo, header); // Chip of interest + if (!chip) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find chip to add."); + psFree(phdu); + psFree(view); + return NULL; + } + switch (extLevel) { + case PM_FPA_LEVEL_CELL: + if (install) { + phdu->blankPHU = true; + if (!addHDUtoChip(chip, phdu) || !addSource_CHIP_CELL(chip, format) || + !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU, + true, true, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to add source."); + psFree(phdu); + psFree(view); + return NULL; + } + } + psFree(phdu); + return view; + case PM_FPA_LEVEL_NONE: + if (install) { + phdu->blankPHU = false; + if (!addHDUtoChip(chip, phdu) || !addSource_CHIP_NONE(chip, format) || + !pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU, + true, true, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to add source."); + psFree(phdu); + psFree(view); + return NULL; + } + } + psFree(phdu); + return view; + default: + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "EXTENSIONS level (%s) incompatible with PHU level (CHIP)", extType); + return NULL; + } + break; + } + case PM_FPA_LEVEL_CELL: { + pmChip *chip = whichChip(view, fpa, phuView, fileInfo, header); // Chip of interest + if (!chip) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find chip to add."); + psFree(phdu); + psFree(view); + return NULL; + } + pmCell *cell = whichCell(view, chip, phuView, fileInfo, header); // Cell of interest + if (!cell) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find cell to add."); + psFree(phdu); + psFree(view); + return NULL; + } + if (extLevel != PM_FPA_LEVEL_NONE) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "EXTENSIONS level (%s) incompatible with PHU level (CELL)", extType); + return NULL; + } + if (install) { + phdu->blankPHU = false; + if (!addHDUtoCell(cell, phdu) || !addSource_CELL_NONE(cell, format) || + !pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_DEFAULTS | PM_CONCEPT_SOURCE_PHU, + true, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to add source."); + psFree(phdu); + psFree(view); + return NULL; + } + } + psFree(phdu); + return view; + break; + } + default: + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Bad PHU level: %s", phuType); + return NULL; + } + + return NULL; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Public functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +pmFPA *pmFPAConstruct(const psMetadata *camera) +{ + PS_ASSERT_PTR_NON_NULL(camera, NULL); + + pmFPA *fpa = pmFPAAlloc(camera); // The FPA to fill out + + bool mdok = true; // Status from MD lookups + psMetadata *components = psMetadataLookupMetadata(&mdok, camera, "FPA"); // FPA components + if (!mdok || !components) { + psError(PS_ERR_IO, true, "Failed to lookup \"FPA\""); + psFree(fpa); + return NULL; + } + psMetadataIterator *componentsIter = psMetadataIteratorAlloc(components, PS_LIST_HEAD, NULL); + psMetadataItem *componentsItem = NULL; // Item from components + while ((componentsItem = psMetadataGetAndIncrement(componentsIter))) { + const char *chipName = componentsItem->name; // Name of the chip + if (componentsItem->type != PS_DATA_STRING) { + psLogMsg(__func__, PS_LOG_WARN, "Element %s in FPA within the camera configuration is not of " + "type STR (type=%x) --- ignored.\n", chipName, componentsItem->type); + continue; + } + + pmChip *chip = pmChipAlloc(fpa, chipName); // The chip + psList *cellNames = psStringSplit(componentsItem->data.V, " ,;", true); // List of cell names + psListIterator *cellNamesIter = psListIteratorAlloc(cellNames, PS_LIST_HEAD, false); // Iterator + + psString cellName = NULL; // Name of cell + while ((cellName = psListGetAndIncrement(cellNamesIter))) { + pmCell *cell = pmCellAlloc(chip, cellName); // New cell + psFree(cell); // Drop reference + } + psFree(chip); // Drop reference + psFree(cellNamesIter); + psFree(cellNames); + } + psFree(componentsIter); + + return fpa; +} + +bool pmFPAAddSourceFromView(pmFPA *fpa, const char *fpaname, const pmFPAview *phuView, + const psMetadata *format) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(phuView, false); + PS_ASSERT_PTR_NON_NULL(format, false); + + pmFPAview *view = addSource(fpa, fpaname, phuView, NULL, format, true); + bool status = (view != NULL); + psFree(view); + return status; +} + +pmFPAview *pmFPAAddSourceFromHeader(pmFPA *fpa, psMetadata *phu, const psMetadata *format) +{ + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + PS_ASSERT_PTR_NON_NULL(phu, NULL); + PS_ASSERT_PTR_NON_NULL(format, NULL); + + bool mdok = true; // Status from metadata lookups + psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information + if (!mdok || !fileInfo) { + psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n"); + return NULL; + } + + // Check the name of the FPA + psString fpaname = phuNameFromHeader("FPA.NAME", fileInfo, phu); // New name for the FPA + if (!fpaname || strlen(fpaname) == 0) { + psError(PS_ERR_IO, true, "Unable to determine FPA.NAME: check for FPA.NAME in FILE in camera format"); + return NULL; + } + + pmFPAview *view = addSource(fpa, fpaname, NULL, phu, format, true); // View of PHU, to return + psFree(fpaname); + + return view; +} + + +pmFPAview *pmFPAIdentifySourceFromHeader(pmFPA *fpa, psMetadata *phu, const psMetadata *format) +{ + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + PS_ASSERT_PTR_NON_NULL(phu, NULL); + PS_ASSERT_PTR_NON_NULL(format, NULL); + + return addSource(fpa, NULL, NULL, phu, format, false); +} + + +// Print spaces to indent +#define INDENT(FILE, LEVEL) \ +{ \ + for (int i = 0; i < (LEVEL); i++) { \ + fprintf(FILE, " "); \ + } \ +} + +void pmFPAPrint(FILE *fd, const pmFPA *fpa, bool header, bool concepts) +{ + PS_ASSERT_PTR_NON_NULL(fpa,); + + INDENT(fd, 1); + fprintf(fd, "FPA:\n"); + if (fpa->hdu) { + pmHDUPrint(fd, fpa->hdu, 2, header); + } + if (concepts) { + psMetadataPrint(fd, fpa->concepts, 2); + } + + psArray *chips = fpa->chips; // Array of chips + // Iterate over the FPA + for (int i = 0; i < chips->n; i++) { + INDENT(fd, 3); + fprintf(fd, "Chip: %d\n", i); + pmChip *chip = chips->data[i]; // The chip + if (chip->hdu) { + pmHDUPrint(fd, chip->hdu, 4, header); + } + if (concepts) { + psMetadataPrint(fd, chip->concepts, 4); + } + + // Iterate over the chip + psArray *cells = chip->cells; // Array of cells + for (int j = 0; j < cells->n; j++) { + INDENT(fd, 5); + fprintf(fd, "Cell: %d\n", j); + pmCell *cell = cells->data[j]; // The cell + if (cell->hdu) { + pmHDUPrint(fd, cell->hdu, 6, header); + } + if (concepts) { + psMetadataPrint(fd, cell->concepts, 6); + } + + psArray *readouts = cell->readouts; // Array of readouts + for (int k = 0; k < readouts->n; k++) { + pmReadout *readout = readouts->data[k]; // The readout + INDENT(fd, 6); + fprintf(fd, "Readout %d:\n", k); + INDENT(fd, 7); + fprintf(fd, "col0: %d\n", readout->col0); + INDENT(fd, 7); + fprintf(fd, "row0: %d\n", readout->row0); + psImage *image = readout->image; // The image + psImage *mask = readout->mask; // The mask + psImage *weight = readout->weight; // The weight + psList *bias = readout->bias; // The list of bias images + if (image) { + INDENT(fd, 7); + fprintf(fd, "Image: [%d:%d,%d:%d] (%dx%d)\n", image->col0, image->col0 + + image->numCols, image->row0, image->row0 + image->numRows, image->numCols, + image->numRows); + } + if (bias) { + psListIterator *biasIter = psListIteratorAlloc(bias, PS_LIST_HEAD, false); // Iterator + psImage *biasImage = NULL; // Bias image from iteration + while ((biasImage = psListGetAndIncrement(biasIter))) { + INDENT(fd, 7); + fprintf(fd, "Bias: [%d:%d,%d:%d] (%dx%d)\n", biasImage->col0, + biasImage->col0 + biasImage->numCols, biasImage->row0, + biasImage->row0 + biasImage->numRows, biasImage->numCols, biasImage->numRows); + } + psFree(biasIter); + } + if (mask) { + INDENT(fd, 7); + fprintf(fd, "Mask: [%d:%d,%d:%d] (%dx%d)\n", mask->col0, mask->col0 + + mask->numCols, mask->row0, mask->row0 + mask->numRows, mask->numCols, + mask->numRows); + } + if (weight) { + INDENT(fd, 7); + fprintf(fd, "Weight: [%d:%d,%d:%d] (%dx%d)\n", weight->col0, weight->col0 + + weight->numCols, weight->row0, weight->row0 + weight->numRows, weight->numCols, + weight->numRows); + } + } // Iterating over cell + } // Iterating over chip + } // Iterating over FPA + +} + + +pmFPALevel pmFPAPHULevel(const psMetadata *format) +{ + PS_ASSERT_METADATA_NON_NULL(format, PM_FPA_LEVEL_NONE); + + bool mdok; // Status of MD lookup + psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // Contents of FILE metadata + if (!mdok || !fileInfo) { + psError(PS_ERR_UNKNOWN, true, "Unable to find FILE in camera format configuration.\n"); + return PM_FPA_LEVEL_NONE; + } + const char *phu = psMetadataLookupStr(&mdok, fileInfo, "PHU"); // PHU level + if (!mdok || !phu || strlen(phu) == 0) { + psError(PS_ERR_UNKNOWN, true, "Unable to find PHU in FILE in camera format configuration.\n"); + return PM_FPA_LEVEL_NONE; + } + + return pmFPALevelFromName(phu); +} + +pmFPALevel pmFPAExtensionsLevel(const psMetadata *format) +{ + PS_ASSERT_METADATA_NON_NULL(format, PM_FPA_LEVEL_NONE); + + bool mdok; // Status of MD lookup + psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // Contents of FILE metadata + if (!mdok || !fileInfo) { + psError(PS_ERR_UNKNOWN, true, "Unable to find FILE in camera format configuration.\n"); + return PM_FPA_LEVEL_NONE; + } + + const char *extensions = psMetadataLookupStr(&mdok, fileInfo, "EXTENSIONS"); // EXTENSIONS level + if (!mdok || !extensions || strlen(extensions) == 0) { + psError(PS_ERR_UNKNOWN, true, "Unable to find EXTENSIONS in FILE in camera format configuration.\n"); + return PM_FPA_LEVEL_NONE; + } + + return pmFPALevelFromName(extensions); +} + Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAConstruct.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAConstruct.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAConstruct.h (revision 14957) @@ -0,0 +1,69 @@ +/* @file pmFPAConstruct.h + * @brief Functions to create an FPA, and add data sources to it. + * + * @author Paul Price, IfA + * + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_CONSTRUCT_H +#define PM_FPA_CONSTRUCT_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Construct an FPA instance on the basis of a camera configuration +/// +/// This is the function that creates the FPA hierarchy on the basis of the camera configuration. The "FPA" +/// entry in the camera configuration specifies the chips (each of type STR) with their component cells listed +/// as the corresponding values (whitespace separated). The FPA hierarchy is created devoid of any +/// input/output sources (i.e., HDUs). +pmFPA *pmFPAConstruct(const psMetadata *camera ///< The camera configuration + ); + +/// Add an (input or output) source to the focal plane hierarchy, specified by a view +/// +/// Given an FPA, add an HDU by specifying where it goes (i.e., by an FPAview). The camera format +/// configuration is required in order to describe how the FPA is laid out in terms of disk files. +bool pmFPAAddSourceFromView(pmFPA *fpa, ///< The FPA + const char *fpaname, ///< FPA.NAME for the source + const pmFPAview *phuView, ///< The view, corresponding to the PHU + const psMetadata *format ///< Format of file + ); + +/// Add an (input or output) source to the focal plane hierarchy, specified by a (primary) header +/// +/// Given an FPA, add an HDU by specifying a primary header, which is used to determine the FITS file +/// contents, and therefore the proper location for the HDU. The camera format configuration is required in +/// order to describe how the FPA is laid out in terms of disk files. +pmFPAview *pmFPAAddSourceFromHeader(pmFPA *fpa, ///< The FPA + psMetadata *phu, ///< Primary header of file + const psMetadata *format ///< Format of file + ); + +/// Identify a source in the focal plane hierarchy, specified by a (primary) header +/// +/// This is the same as pmFPAAddSourceFromHeader, except the input is not added into the FPA hierarchy. +/// This function serves only to identify where in the hierarchy it should go, not prepare for reading, etc. +pmFPAview *pmFPAIdentifySourceFromHeader(pmFPA *fpa, psMetadata *phu, const psMetadata *format); + +/// Print a representation of the FPA, including its headers and concepts. +/// +/// This function is intended for testing and development purposes. +void pmFPAPrint(FILE *fd, ///< File descriptor to which to print + const pmFPA *fpa, ///< FPA to print + bool header, ///< Print headers? + bool concepts ///< Print concepts? + ); + +/// Return the PHU level for an FPA, given the format +pmFPALevel pmFPAPHULevel(const psMetadata *format); + +/// Return the Extensions level for an FPA, given the format +pmFPALevel pmFPAExtensionsLevel(const psMetadata *format); + +/// @} + +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPACopy.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPACopy.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPACopy.c (revision 14957) @@ -0,0 +1,536 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPAUtils.h" +#include "pmHDUUtils.h" +#include "pmFPACopy.h" + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// File-static functions and macros +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Copy the value for a concept +#define COPY_CONCEPT(TARGET, SOURCE, NAME, TYPE) { \ + psMetadataItem *targetItem = psMetadataLookup(TARGET, NAME); \ + psMetadataItem *sourceItem = psMetadataLookup(SOURCE, NAME); \ + targetItem->data.TYPE = sourceItem->data.TYPE; } + +// Find the blank (image-less) PHU, given a cell. +static pmHDU *findBlankPHU(const pmCell *cell // The cell for which to find the PHU + ) +{ + assert(cell); + + if (cell->hdu && cell->hdu->blankPHU) { + return cell->hdu; + } + pmChip *chip = cell->parent; // The parent chip + if (chip->hdu && chip->hdu->blankPHU) { + return chip->hdu; + } + pmFPA *fpa = chip->parent; // The parent FPA + if (fpa->hdu && fpa->hdu->blankPHU) { + return fpa->hdu; + } + + return NULL; +} + +// copy one of the psImage components of the readout +static void readoutCopyComponent (psImage **target, psImage *source, psImageBinning *binning, bool xFlip, bool yFlip, bool pixels) { + + if (!source) return; + + if (*target) { + psFree(*target); + } + if (pixels) { + *target = psImageFlip(NULL, source, xFlip, yFlip); + return; + } + + // I have the fine image size, I know the binning factor, determine the ruff image size + binning->nXfine = source->numCols; + binning->nYfine = source->numRows; + psImageBinningSetRuffSize(binning, PS_IMAGE_BINNING_CENTER); + *target = psImageAlloc(binning->nXruff, binning->nYruff, source->type.type); + return; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// File-static engine functions --- these do all the work. Actually, cellCopy does all the work; the others +// merely iterate on the higher-level components. +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Common engine for pmCellCopy and pmCellCopyStructure +// Does the actual splitting/splicing that's required to copy an FPA to a different representation. +static bool cellCopy(pmCell *target, // The target cell + const pmCell *source, // The source cell, to be copied + bool pixels, // Copy the pixels? + int xBin, int yBin // (Relative) binning factors in x and y + ) +{ + assert(target); + assert(source); + assert(xBin > 0 && yBin > 0); + + // XXX this is a programming / config error + if (pixels && (xBin != 1 || yBin != 1)) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to copy pixels if binning is set\n"); + return false; + } + + // the binning structure carries the information no how to rebin the images if needed + psImageBinning *binning = psImageBinningAlloc(); + binning->nXbin = xBin; + binning->nYbin = yBin; + + psArray *sourceReadouts = source->readouts; // The source readouts + int numReadouts = sourceReadouts->n; // Number of readouts copied + + // Need to check/change CELL.XPARITY and CELL.YPARITY + bool mdokS = true; // Status of MD lookup + bool mdokT = true; // Status of MD lookup + bool xFlip = false; // Switch parity in x? + bool yFlip = false; // Switch parity in y? + + // enforce the following conditions: + // CELL.XPARITY is required + // CELL.XPARITY must be +/- 1 + int xParitySource = psMetadataLookupS32(&mdokS, source->concepts, "CELL.XPARITY"); // Source parity + int xParityTarget = psMetadataLookupS32(&mdokT, target->concepts, "CELL.XPARITY"); // Target x parity + assert(mdokS && mdokT); + if (abs(xParitySource) != 1 || abs(xParityTarget) != 1) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "CELL.XPARITY is not set for both source (%d) and target (%d)", + xParitySource, xParityTarget); + psFree(binning); + return false; + } + if (xParityTarget != xParitySource) { + xFlip = true; + } else { + // Use the source parity + COPY_CONCEPT(target->concepts, source->concepts, "CELL.XPARITY", S32); + } + + int yParityTarget = psMetadataLookupS32(&mdokT, target->concepts, "CELL.YPARITY"); // Target y parity + int yParitySource = psMetadataLookupS32(&mdokS, source->concepts, "CELL.YPARITY"); // Source parity + assert(mdokS && mdokT); + if (abs(yParitySource) != 1 || abs(yParityTarget) != 1) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "CELL.YPARITY is not set for both source (%d) and target (%d)", + yParitySource, yParityTarget); + psFree(binning); + return false; + } + if (yParityTarget != yParitySource) { + yFlip = true; + } else { + // Use the source parity + COPY_CONCEPT(target->concepts, source->concepts, "CELL.YPARITY", S32); + } + psTrace("psModules.camera", 3, "xFlip: %d; yFlip: %d\n", xFlip, yFlip); + + // Perform deep copy of the images. I would prefer *not* to do a deep copy, in the interests of speed (we + // still need to do another deep copy into the HDU for when we write out), but this is the only way I can + // think of to provide security against copying a cell and then unknowingly changing the source when + // manipulating the target. + for (int i = 0; i < numReadouts; i++) { + pmReadout *sourceReadout = sourceReadouts->data[i]; // The source readout + pmReadout *targetReadout = pmReadoutAlloc(target); // The target readout; this adds it to the cell + + // Copy attributes + // XXX is this correct under binning? + targetReadout->col0 = sourceReadout->col0; + targetReadout->row0 = sourceReadout->row0; + targetReadout->process = sourceReadout->process; + targetReadout->file_exists = sourceReadout->file_exists; + targetReadout->data_exists = sourceReadout->data_exists; + + // Copy all three image components (image, mask, weight) + readoutCopyComponent (&targetReadout->image, sourceReadout->image, binning, xFlip, yFlip, pixels); + readoutCopyComponent (&targetReadout->mask, sourceReadout->mask, binning, xFlip, yFlip, pixels); + readoutCopyComponent (&targetReadout->weight, sourceReadout->weight, binning, xFlip, yFlip, pixels); + + // Copy bias + while (targetReadout->bias->n > 0) { + psListRemove(targetReadout->bias, PS_LIST_HEAD); + } + + // Iterate over the biases + psListIterator *biasIter = psListIteratorAlloc(sourceReadout->bias, PS_LIST_HEAD, false); + psImage *bias = NULL; // Bias image from iteration + while ((bias = psListGetAndIncrement(biasIter))) { + psImage *biasCopy = NULL; // Copy of the bias + readoutCopyComponent (&biasCopy, bias, binning, xFlip, yFlip, pixels); + psListAdd(targetReadout->bias, PS_LIST_TAIL, biasCopy); + psFree(biasCopy); // Drop reference + } + psFree(biasIter); + + targetReadout->data_exists = true; + psFree(targetReadout); // Drop reference + } + + // Copy the remaining "concepts" over. Don't copy the TRIMSEC or BIASSEC, since these will be created by + // pmHDUGenerate if they don't already exist in the target. Don't copy the XPARITY or YPARITY, since + // we've used those to do the flips. Don't copy the X0 and Y0 because they are updated below (and are + // dependent upon the flips we've done above). + psMetadataIterator *conceptsIter = psMetadataIteratorAlloc(source->concepts, PS_LIST_HEAD, NULL); + psMetadataItem *conceptItem = NULL; // Item from iteration + while ((conceptItem = psMetadataGetAndIncrement(conceptsIter))) { + psString name = conceptItem->name; // Name of concept + if (!strcmp(name, "CELL.TRIMSEC")) continue; + if (!strcmp(name, "CELL.BIASSEC")) continue; + if (!strcmp(name, "CELL.XPARITY")) continue; + if (!strcmp(name, "CELL.YPARITY")) continue; + if (!strcmp(name, "CELL.X0")) continue; + if (!strcmp(name, "CELL.Y0")) continue; + + psMetadataItem *copy = psMetadataItemCopy(conceptItem); // Copy of the concept + psMetadataAddItem(target->concepts, copy, PS_LIST_TAIL, PS_META_REPLACE); + psFree(copy); // Drop reference + } + psFree(conceptsIter); + + // Need to update CELL.TRIMSEC and CELL.BIASSEC if we changed the binning and they exist already. + // XXX this code seems to be very similar to pmConceptsUpdate + if ((binning->nXbin != 1) || (binning->nYbin != 1)) { + bool mdok = false; + psRegion *trimsec = psMetadataLookupPtr(&mdok, target->concepts, "CELL.TRIMSEC"); // The trim section + if (mdok && trimsec && !psRegionIsNaN(*trimsec)) { + *trimsec = psImageBinningSetRuffRegion(binning, *trimsec); + // force integer pixels : truncate x0, roundup x1: + trimsec->x0 = (int)trimsec->x0; + if (trimsec->x1 > (int)trimsec->x1) { + trimsec->x1 = (int)trimsec->x1 + 1; + } else { + trimsec->x1 = (int)trimsec->x1; + } + trimsec->y0 = (int)trimsec->y0; + if (trimsec->y1 > (int)trimsec->y1) { + trimsec->y1 = (int)trimsec->y1 + 1; + } else { + trimsec->y1 = (int)trimsec->y1; + } + } + psList *biassecs = psMetadataLookupPtr(&mdok, target->concepts, "CELL.BIASSEC"); // The bias sections + if (mdok && biassecs && biassecs->n > 0) { + psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, true); // Iterator + psRegion *biassec = NULL; // Bias section, from iteration + while ((biassec = psListGetAndIncrement(biassecsIter))) { + if (!psRegionIsNaN(*biassec)) { + *biassec = psImageBinningSetRuffRegion(binning, *biassec); + // force integer pixels : truncate x0, roundup x1: + biassec->x0 = (int)biassec->x0; + if (biassec->x1 > (int)biassec->x1) { + biassec->x1 = (int)biassec->x1 + 1; + } else { + biassec->x1 = (int)biassec->x1; + } + biassec->y0 = (int)biassec->y0; + if (biassec->y1 > (int)biassec->y1) { + biassec->y1 = (int)biassec->y1 + 1; + } else { + biassec->y1 = (int)biassec->y1; + } + } + } + psFree(biassecsIter); + } + } + + // Need to update CELL.X0 and CELL.Y0 if we flipped + // XXX this section should probably use a common function consistent with psImageBinning + if (xFlip) { + int xZero = psMetadataLookupS32(NULL, source->concepts, "CELL.X0"); // CELL.X0 from source + int xParity = psMetadataLookupS32(NULL, source->concepts, "CELL.XPARITY"); // Parity in x + int sourceBin = psMetadataLookupS32(NULL, source->concepts, "CELL.XBIN"); // CELL.XBIN from source + int xSize = psMetadataLookupS32(NULL, source->concepts, "CELL.XSIZE"); // CELL.XSIZE of source + + if (sourceBin == 0) { + // Don't know the binning; assume it is unity + sourceBin = binning->nXbin; + } + + // XXX make sure this is consistent with the psImageBinning + psTrace("psModules.camera", 3, "CELL.X0: Before: %d After: %d\n", xZero, xZero + (xSize - 1) * xParity * sourceBin); + psTrace("psModules.camera", 9, "(xParity: %d xBin: %d numCols: %d)\n", xParity, sourceBin, xSize); + + if (xParity == 0 || xSize == 0) { + psWarning("New CELL.X0 may be incorrect due to missing concepts (CELL.XPARITY, CELL.XSIZE)"); + } + + xZero += (xSize - 1) * xParity * sourceBin; // Change the parity on the X0 position + psMetadataItem *newItem = psMetadataLookup(target->concepts, "CELL.X0"); // CELL.X0 from target + newItem->data.S32 = xZero; + } + if (yFlip) { + int yZero = psMetadataLookupS32(NULL, source->concepts, "CELL.Y0"); // CELL.Y0 from source + int yParity = psMetadataLookupS32(NULL, source->concepts, "CELL.YPARITY"); // Parity in y + int sourceBin = psMetadataLookupS32(NULL, source->concepts, "CELL.YBIN"); // Binning in y + int ySize = psMetadataLookupS32(NULL, source->concepts, "CELL.YSIZE"); // CELL.YSIZE of source + + if (sourceBin == 0) { + // Don't know the binning; assume it is unity + sourceBin = binning->nYbin; + } + + psTrace("psModules.camera", 3, "CELL.Y0: Before: %d After: %d\n", yZero, yZero + (ySize - 1) * yParity * sourceBin); + psTrace("psModules.camera", 9, "(yParity: %d yBin: %d numRows: %d)\n", yParity, sourceBin, ySize); + + if (yParity == 0 || ySize == 0) { + psWarning("New CELL.Y0 may be incorrect due to missing concepts " + "(CELL.Y0, CELL.YPARITY, CELL.YBIN, CELL.YSIZE)"); + } + + yZero += (ySize - 1) * yParity * sourceBin; // Change the parity on the Y0 position + psMetadataItem *newItem = psMetadataLookup(target->concepts, "CELL.Y0"); // CELL.Y0 from target + newItem->data.S32 = yZero; + } + + // Update the binning concepts + // XXX this should probably be done with a common function using psImageBinning + psMetadataItem *binItem = psMetadataLookup(target->concepts, "CELL.XBIN"); + binItem->data.S32 *= xBin; + binItem = psMetadataLookup(target->concepts, "CELL.YBIN"); + binItem->data.S32 *= yBin; + + // Copy any headers + pmHDU *targetHDU = pmHDUFromCell(target); // The target HDU + if (targetHDU) { + pmHDU *sourceHDU = pmHDUFromCell(source); // The source HDU + if (!sourceHDU) { + psWarning("Unable to copy header: no source header."); + } else if (sourceHDU->header) { + targetHDU->header = psMetadataCopy(targetHDU->header, sourceHDU->header); + } + } + + // Copy the PHU over as well, if required + pmHDU *targetPHU = findBlankPHU(target); // The target PHU + if (targetPHU && targetPHU != targetHDU) { + // pmHDU *sourcePHU = pmHDUGetHighest(source->parent->parent, source->parent, source); // A source HDU + pmHDU *sourcePHU = findBlankPHU(source); // The target PHU + if (sourcePHU && sourcePHU->header) { + targetPHU->header = psMetadataCopy(targetPHU->header, sourcePHU->header); + } + } + + psFree (binning); + target->data_exists = true; + target->parent->data_exists = true; + return true; +} + +// Common engine for pmChipCopy and pmChipCopyStructure +// Iterate on the components +static bool chipCopy(pmChip *target, // The target chip + const pmChip *source, // The source chip, to be copied + bool pixels, // Copy the pixels? + int xBin, int yBin // (Relative) binning factors in x and y + ) +{ + assert(target); + assert(source); + assert(xBin > 0); + assert(yBin > 0); + + psArray *targetCells = target->cells; // The target cells + psArray *sourceCells = source->cells; // The source cells + if (targetCells->n != sourceCells->n) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "Number of source cells (%ld) differs from the number of target cells (%ld)\n", + sourceCells->n, targetCells->n); + return false; + } + + bool status = true; // Status of copy + for (int i = 0; i < targetCells->n; i++) { + pmCell *targetCell = targetCells->data[i]; // The target cell + const char *cellName = psMetadataLookupStr(NULL, targetCell->concepts, "CELL.NAME"); // Name of cell + int cellNum = pmChipFindCell(source, cellName); // Number of cell with that name + if (cellNum >= 0) { + pmCell *sourceCell = sourceCells->data[cellNum]; // The source cell + status &= cellCopy(targetCell, sourceCell, pixels, xBin, yBin); + } + } + + // Update the concepts + psMetadataItem *chipName = psMemIncrRefCounter(psMetadataLookup(target->concepts, "CHIP.NAME")); + psMetadataCopy(target->concepts, source->concepts); + psMetadataAddItem(target->concepts, chipName, PS_LIST_TAIL, PS_META_REPLACE); + psFree(chipName); + psMetadataCopy(target->parent->concepts, source->parent->concepts); + + target->data_exists = true; + return status; +} + +// create a new pmChip with the data derived from the supplied chip +pmChip *pmChipDuplicate(pmFPA *fpa, const pmChip *sourceChip) +{ + assert(sourceChip); + + bool status; + char *chipName = psMetadataLookupStr(&status, sourceChip->concepts, "CHIP.NAME"); + pmChip *targetChip = pmChipAlloc (NULL, chipName); + targetChip->parent = fpa; + + psArray *sourceCells = sourceChip->cells; // The source cells + + for (int i = 0; i < sourceCells->n; i++) { + pmCell *sourceCell = sourceCells->data[i]; // The sources cell + const char *cellName = psMetadataLookupStr(NULL, sourceCell->concepts, "CELL.NAME"); // Name of cell + // XXX are there other concepts I need to copy first? + pmCell *targetCell = pmCellAlloc (targetChip, cellName); + int xParityTarget = psMetadataLookupS32(&status, sourceCell->concepts, "CELL.XPARITY"); // Target x parity + psMetadataAddS32 (targetCell->concepts, PS_LIST_TAIL, "CELL.XPARITY", PS_META_REPLACE, "", xParityTarget); + int yParityTarget = psMetadataLookupS32(&status, sourceCell->concepts, "CELL.YPARITY"); // Target y parity + psMetadataAddS32 (targetCell->concepts, PS_LIST_TAIL, "CELL.YPARITY", PS_META_REPLACE, "", yParityTarget); + if (!cellCopy(targetCell, sourceCell, true, 1, 1)) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, "failed to duplicate chip\n"); + return NULL; + } + // update the attributes + targetCell->file_exists = sourceCell->file_exists; + targetCell->data_exists = sourceCell->data_exists; + targetCell->process = sourceCell->process; + } + + // Update the concepts + psMetadataCopy(targetChip->concepts, sourceChip->concepts); + + // update the attributes + targetChip->file_exists = sourceChip->file_exists; + targetChip->data_exists = sourceChip->data_exists; + targetChip->process = sourceChip->process; + + return targetChip; +} + +// Common engine for pmFPACopy and pmFPACopyStructure. +// Iterate on the components +static bool fpaCopy(pmFPA *target, // The target FPA + const pmFPA *source, // The source FPA, to be copied + bool pixels, // Copy the pixels? + int xBin, int yBin // (Relative) binning factors in x and y + ) +{ + assert(target); + assert(source); + assert(xBin > 0); + assert(yBin > 0); + + psArray *targetChips = target->chips; // The target chips + psArray *sourceChips = source->chips; // The source chips + if (targetChips->n != sourceChips->n) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "Number of source chips (%ld) differs from the number of target chips (%ld)\n", + sourceChips->n, targetChips->n); + return false; + } + + bool status = true; // Status of copy + for (int i = 0; i < targetChips->n; i++) { + pmChip *targetChip = targetChips->data[i]; // The target chip + const char *chipName = psMetadataLookupStr(NULL, targetChip->concepts, "CHIP.NAME"); // Name of chip + int chipNum = pmFPAFindChip(source, chipName); // Number of chip with that name + if (chipNum >= 0) { + pmChip *sourceChip = sourceChips->data[chipNum]; // The source chip + status &= chipCopy(targetChip, sourceChip, pixels, xBin, yBin); + } + } + + // Update the concepts + psMetadataCopy(target->concepts, source->concepts); + + return status; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Public functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +bool pmFPACopy(pmFPA *target, const pmFPA *source) +{ + PS_ASSERT_PTR_NON_NULL(target, false); + PS_ASSERT_PTR_NON_NULL(source, false); + if (target == source) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Can't copy FPA onto itself."); + return false; + } + return fpaCopy(target, source, true, 1, 1); +} + +bool pmChipCopy(pmChip *target, const pmChip *source) +{ + PS_ASSERT_PTR_NON_NULL(target, false); + PS_ASSERT_PTR_NON_NULL(source, false); + if (target == source) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Can't copy chip onto itself."); + return false; + } + return chipCopy(target, source, true, 1, 1); +} + +bool pmCellCopy(pmCell *target, const pmCell *source) +{ + PS_ASSERT_PTR_NON_NULL(target, false); + PS_ASSERT_PTR_NON_NULL(source, false); + if (target == source) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Can't copy cell onto itself."); + return false; + } + return cellCopy(target, source, true, 1, 1); +} + + +bool pmFPACopyStructure(pmFPA *target, const pmFPA *source, int xBin, int yBin) +{ + PS_ASSERT_PTR_NON_NULL(target, false); + PS_ASSERT_PTR_NON_NULL(source, false); + PS_ASSERT_INT_POSITIVE(xBin, false); + PS_ASSERT_INT_POSITIVE(yBin, false); + if (target == source) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Can't copy FPA onto itself."); + return false; + } + return fpaCopy(target, source, false, xBin, yBin); +} + +bool pmChipCopyStructure(pmChip *target, const pmChip *source, int xBin, int yBin) +{ + PS_ASSERT_PTR_NON_NULL(target, false); + PS_ASSERT_PTR_NON_NULL(source, false); + PS_ASSERT_INT_POSITIVE(xBin, false); + PS_ASSERT_INT_POSITIVE(yBin, false); + if (target == source) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Can't copy chip onto itself."); + return false; + } + return chipCopy(target, source, false, xBin, yBin); +} + +bool pmCellCopyStructure(pmCell *target, const pmCell *source, int xBin, int yBin) +{ + PS_ASSERT_PTR_NON_NULL(target, false); + PS_ASSERT_PTR_NON_NULL(source, false); + PS_ASSERT_INT_POSITIVE(xBin, false); + PS_ASSERT_INT_POSITIVE(yBin, false); + if (target == source) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Can't copy cell onto itself."); + return false; + } + return cellCopy(target, source, false, xBin, yBin); +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPACopy.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPACopy.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPACopy.h (revision 14957) @@ -0,0 +1,78 @@ +/* @file pmFPACopy.h + * @brief Functions to copy FPA components. + * + * @author Paul Price, IfA + * + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-04-12 02:51:44 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_COPY_H +#define PM_FPA_COPY_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Copy an FPA and components, including the pixels, to a different representation of the same camera +/// +/// This function is useful for converting between different representations of the same camera. For example, +/// between Megacam "RAW" (one amp per extension) and Megacam "SPLICED" formats (two amps = 1 chip per +/// extension, spliced together). Components are spliced together as necessary. +bool pmFPACopy(pmFPA *target, ///< The target FPA + const pmFPA *source ///< The source FPA, to be copied + ); + +/// Copy a chip and components, including the pixels, to a different representation of the same camera +/// +/// This function is useful for converting between different representations of the same camera. For example, +/// between Megacam "RAW" (one amp per extension) and Megacam "SPLICED" formats (two amps = 1 chip per +/// extension, spliced together). Components are spliced together as necessary. +bool pmChipCopy(pmChip *target, ///< The target chip + const pmChip *source ///< The source chip, to be copied + ); + +/// Copy a cell and components, including the pixels, to a different representation of the same camera +/// +/// This function is useful for converting between different representations of the same camera. For example, +/// between Megacam "RAW" (one amp per extension) and Megacam "SPLICED" formats (two amps = 1 chip per +/// extension, spliced together). Components are spliced together as necessary. +bool pmCellCopy(pmCell *target, ///< The target cell + const pmCell *source ///< The source cell, to be copied + ); + + +/// Copy an FPA, but not the pixels, to a different representation of the same camera +/// +/// This function the same as pmFPACopy, except that the pixels are not copied (though images of sufficient +/// size are allocated in the target). Changes the CELL.XBIN and CELL.YBIN according to the provided binning +/// factors. +bool pmFPACopyStructure(pmFPA *target, ///< The target FPA + const pmFPA *source, ///< The source FPA, to be copied + int xBin, int yBin ///< Binning factors in x and y + ); + +/// Copy a chip, but not the pixels, to a different representation of the same camera +/// +/// This function the same as pmChipCopy, except that the pixels are not copied (though images of sufficient +/// size are allocated in the target). Changes the CELL.XBIN and CELL.YBIN according to the provided binning +/// factors. +bool pmChipCopyStructure(pmChip *target, ///< The target chip + const pmChip *source, ///< The source chip, to be copied + int xBin, int yBin ///< Binning factors in x and y + ); + +/// Copy a cell, but not the pixels, to a different representation of the same camera +/// +/// This function the same as pmCellCopy, except that the pixels are not copied (though images of sufficient +/// size are allocated in the target). Changes the CELL.XBIN and CELL.YBIN according to the provided binning +/// factors. +bool pmCellCopyStructure(pmCell *target, ///< The target cell + const pmCell *source, ///< The source cell, to be copied + int xBin, int yBin ///< Binning factors in x and y + ); + +pmChip *pmChipDuplicate(pmFPA *fpa, const pmChip *source); + +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAExtent.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAExtent.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAExtent.c (revision 14957) @@ -0,0 +1,155 @@ +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmHDUUtils.h" + +// return cell pixels bounding the readout +psRegion *pmReadoutExtent(const pmReadout *readout) +{ + PS_ASSERT_PTR_NON_NULL(readout, NULL); + + psImage *image = readout->image; // Image from which to get dimensions + if (!image) { + image = readout->mask; + } + if (!image) { + image = readout->weight; + } + + int xSize = 0; + int ySize = 0; + + if (!image) { + pmHDU *hdu = pmHDUFromReadout (readout); + if (hdu && hdu->header) { + xSize = psMetadataLookupS32(NULL, hdu->header, "NAXIS1"); + ySize = psMetadataLookupS32(NULL, hdu->header, "NAXIS2"); + } else { + // Don't have anything to base the true extent on, so have to give the hardwired value (largest possible extent) + xSize = psMetadataLookupS32(NULL, readout->parent->concepts, "CELL.XSIZE"); + ySize = psMetadataLookupS32(NULL, readout->parent->concepts, "CELL.YSIZE"); + } + return psRegionAlloc(0, xSize, 0, ySize); + } + + // Get the offset to the CCD window + int xWindow = psMetadataLookupS32(NULL, readout->parent->concepts, "CELL.XWINDOW"); + int yWindow = psMetadataLookupS32(NULL, readout->parent->concepts, "CELL.YWINDOW"); + return psRegionAlloc(xWindow, xWindow + image->numCols, + yWindow, yWindow + image->numRows); +} + +// return chip pixels bounding the cell (all readouts) +psRegion *pmCellExtent(const pmCell *cell) +{ + PS_ASSERT_PTR_NON_NULL(cell, NULL); + + psArray *readouts = cell->readouts; // Array of component readouts + psRegion *cellExtent = psRegionAlloc(INFINITY, 0, INFINITY, 0); // Extent of cell + for (long i = 0; i < readouts->n; i++) { + pmReadout *readout = readouts->data[i]; // Readout of interest + psRegion *roExtent = pmReadoutExtent(readout); // Extent of readout + cellExtent->x0 = PS_MIN(cellExtent->x0, roExtent->x0); + cellExtent->x1 = PS_MAX(cellExtent->x1, roExtent->x1); + cellExtent->y0 = PS_MIN(cellExtent->y0, roExtent->y0); + cellExtent->y1 = PS_MAX(cellExtent->y1, roExtent->y1); + psFree(roExtent); + } + + bool mdok; // Status of MD lookup + int x0 = psMetadataLookupS32(&mdok, cell->concepts, "CELL.X0"); // Cell x offset + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "Unable to find CELL.X0.\n"); + psFree(cellExtent); + return NULL; + } + int y0 = psMetadataLookupS32(&mdok, cell->concepts, "CELL.Y0"); // Cell y offset + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "Unable to find CELL.Y0.\n"); + psFree(cellExtent); + return NULL; + } + + cellExtent->x0 += x0; + cellExtent->x1 += x0; + cellExtent->y0 += y0; + cellExtent->y1 += y0; + + return cellExtent; +} + +// return chip pixels included in all cells +psRegion *pmChipPixels(const pmChip *chip) +{ + PS_ASSERT_PTR_NON_NULL(chip, NULL); + + psArray *cells = chip->cells; // Array of component cells + psRegion *chipExtent = psRegionAlloc(INFINITY, 0, INFINITY, 0); // Extent of chip + for (long i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // Cell of interest + psRegion *cellExtent = pmCellExtent(cell); // Extent of cell + chipExtent->x0 = PS_MIN(chipExtent->x0, cellExtent->x0); + chipExtent->x1 = PS_MAX(chipExtent->x1, cellExtent->x1); + chipExtent->y0 = PS_MIN(chipExtent->y0, cellExtent->y0); + chipExtent->y1 = PS_MAX(chipExtent->y1, cellExtent->y1); + psFree(cellExtent); + } + + return chipExtent; +} + +// return pixels in basic FPA grid bounded by chip +// this FPA grid has 0,0 at the 0,0 corner of one chip, and is NOT the same +// as the astrometry focal plane coordinate system +psRegion *pmChipExtent(const pmChip *chip) +{ + PS_ASSERT_PTR_NON_NULL(chip, NULL); + + psRegion *chipExtent = pmChipPixels(chip); + if (!chipExtent) return NULL; + + bool mdok; // Status of MD lookup + int x0 = psMetadataLookupS32(&mdok, chip->concepts, "CHIP.X0"); // Chip x offset + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "Unable to find CHIP.X0.\n"); + psFree(chipExtent); + return NULL; + } + int y0 = psMetadataLookupS32(&mdok, chip->concepts, "CHIP.Y0"); // Chip y offset + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "Unable to find CHIP.Y0.\n"); + psFree(chipExtent); + return NULL; + } + + chipExtent->x0 += x0; + chipExtent->x1 += x0; + chipExtent->y0 += y0; + chipExtent->y1 += y0; + + return chipExtent; +} + +// return FPA pixels included in all chips +// this FPA grid has 0,0 at the 0,0 corner of one chip, and is NOT the same +// as the astrometry focal plane coordinate system +psRegion *pmFPAPixels(const pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + + psArray *chips = fpa->chips; // Array of component chips + psRegion *fpaExtent = psRegionAlloc(INFINITY, 0, INFINITY, 0); // Extent of fpa + for (long i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // Chip of interest + psRegion *chipExtent = pmChipExtent(chip); // Extent of chip + fpaExtent->x0 = PS_MIN(fpaExtent->x0, chipExtent->x0); + fpaExtent->x1 = PS_MAX(fpaExtent->x1, chipExtent->x1); + fpaExtent->y0 = PS_MIN(fpaExtent->y0, chipExtent->y0); + fpaExtent->y1 = PS_MAX(fpaExtent->y1, chipExtent->y1); + psFree(chipExtent); + } + + return fpaExtent; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAExtent.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAExtent.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAExtent.h (revision 14957) @@ -0,0 +1,49 @@ +/* @file pmPFAExtent.h + * + * @author Paul Price, IfA + * + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-21 22:01:32 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_EXTENT_H +#define PM_FPA_EXTENT_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Return the extent of a readout +/// +/// The extent is determined from an image, if present, or the CELL.TRIMSEC otherwise. +psRegion *pmReadoutExtent(const pmReadout *readout ///< The readout of interest + ); + +/// Return the extent of a cell +/// +/// The extent is determined from the extent of the component readouts, plus CELL.X0,Y0 +psRegion *pmCellExtent(const pmCell *cell ///< The cell of interest + ); + +// return chip pixels included in all cells +psRegion *pmChipPixels(const pmChip *chip); + +/// Return the extent of a chip +/// +/// The extent is determined from the extent of the component cells, plus CHIP.X0,Y0 +psRegion *pmChipExtent(const pmChip *chip ///< The chip of interest + ); + +// return FPA pixels included in all chips +// this FPA grid has 0,0 at the 0,0 corner of one chip, and is NOT the same +// as the astrometry focal plane coordinate system +psRegion *pmFPAPixels(const pmFPA *fpa); + +/// Return the extent of an FPA +/// +/// The extent is determined from the extent of the component chips. +psRegion *pmFPAExtent(const pmFPA *fpa ///< The FPA of interest + ); + +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAFlags.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAFlags.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAFlags.c (revision 14957) @@ -0,0 +1,341 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" +#include "pmFPAFlags.h" + + +/** functions to turn on/off the file_exists flag **/ +bool pmFPASetFileStatus(pmFPA *fpa, bool status) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + + for (int i = 0; i < fpa->chips->n; i++) { + pmChip *chip = fpa->chips->data[i]; + pmChipSetFileStatus (chip, status); + } + return true; +} + +bool pmChipSetFileStatus(pmChip *chip, bool status) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + + chip->file_exists = status; + for (int i = 0; i < chip->cells->n; i++) { + pmCell *cell = chip->cells->data[i]; + pmCellSetFileStatus (cell, status); + } + return true; +} + +bool pmCellSetFileStatus(pmCell *cell, bool status) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + + cell->file_exists = status; + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + readout->file_exists = status; + } + return true; +} + +bool pmFPACheckFileStatus(const pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + + for (int i = 0; i < fpa->chips->n; i++) { + pmChip *chip = fpa->chips->data[i]; + if (!pmChipCheckFileStatus(chip)) { + return false; + } + } + return true; +} + +bool pmChipCheckFileStatus(const pmChip *chip) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + if (!chip->file_exists) { + return false; + } + + for (int i = 0; i < chip->cells->n; i++) { + pmCell *cell = chip->cells->data[i]; + if (!pmCellCheckFileStatus(cell)) { + return false; + } + } + return true; +} + +bool pmCellCheckFileStatus(const pmCell *cell) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + if (!cell->file_exists) { + return false; + } + + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + if (!readout->file_exists) { + return false; + } + } + return true; +} + +/** functions to turn on/off the data_exists flag **/ +bool pmFPASetDataStatus(pmFPA *fpa, bool status) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + + for (int i = 0; i < fpa->chips->n; i++) { + pmChip *chip = fpa->chips->data[i]; + pmChipSetDataStatus (chip, status); + } + return true; +} + +bool pmChipSetDataStatus(pmChip *chip, bool status) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + + chip->data_exists = status; + for (int i = 0; i < chip->cells->n; i++) { + pmCell *cell = chip->cells->data[i]; + pmCellSetDataStatus (cell, status); + } + return true; +} + +bool pmCellSetDataStatus (pmCell *cell, bool status) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + + cell->data_exists = status; + for (int i = 0; i < cell->readouts->n; i++) { + pmReadout *readout = cell->readouts->data[i]; + readout->data_exists = status; + } + return true; +} + +// pmFPA does not have its own data_exists flag; check its children +bool pmFPACheckDataStatus (const pmFPA *fpa) { + + PS_ASSERT_PTR_NON_NULL(fpa, false); + + for (int i = 0; i < fpa->chips->n; i++) { + pmChip *chip = fpa->chips->data[i]; + if (chip == NULL) continue; + if (chip->data_exists) return true; + } + return false; +} + +bool pmChipCheckDataStatus (const pmChip *chip) { + + PS_ASSERT_PTR_NON_NULL(chip, false); + + return (chip->data_exists); +} + +bool pmCellCheckDataStatus (const pmCell *cell) { + + PS_ASSERT_PTR_NON_NULL(cell, false); + + return (cell->data_exists); +} + +bool pmReadoutCheckDataStatus (const pmReadout *readout) { + + PS_ASSERT_PTR_NON_NULL(readout, false); + + return (readout->data_exists); +} + +bool pmFPAviewCheckDataStatus (const pmFPA *fpa, const pmFPAview *view) { + + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + if (view->chip == -1) { + bool exists = pmFPACheckDataStatus (fpa); + return exists; + } + + if (view->chip >= fpa->chips->n) { + psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n); + return false; + } + pmChip *chip = fpa->chips->data[view->chip]; + + if (view->cell == -1) { + bool exists = pmChipCheckDataStatus (chip); + return exists; + } + + if (view->cell >= chip->cells->n) { + psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n); + return false; + } + pmCell *cell = chip->cells->data[view->cell]; + + if (view->readout == -1) { + bool exists = pmCellCheckDataStatus (cell); + return exists; + } + + if (view->readout >= cell->readouts->n) { + psError(PS_ERR_IO, true, "Requested readout == %d >= cell->readouds->n == %ld", view->readout, cell->readouts->n); + return false; + } + pmReadout *readout = cell->readouts->data[view->readout]; + + bool exists = pmReadoutCheckDataStatus (readout); + return exists; +} + +// Set cells within a chip to be processed or not +static bool setCellsProcess(const pmChip *chip, // Chip of interest + bool process // Process this chip? + ) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + + psArray *cells = chip->cells; // Component cells + if (! cells) { + return false; + } + for (int i = 0; i < cells->n; i++) { + pmCell *tmpCell = cells->data[i]; // Cell of interest + if (tmpCell) { + tmpCell->process = process; + } + } + + return true; +} + + +bool pmFPASelectChip(pmFPA *fpa, int chipNum, bool exclusive) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + + psArray *chips = fpa->chips; // Component chips + if ((chips == NULL) || (chipNum >= chips->n)) { + return(false); + } + + for (int i = 0 ; i < chips->n ; i++) { + pmChip *tmpChip = (pmChip *) chips->data[i]; + if (tmpChip == NULL) { + continue; + } + if (i == chipNum) { + tmpChip->process = true; + setCellsProcess(tmpChip, true); + } else { + if (exclusive) { + tmpChip->process = false; + setCellsProcess(tmpChip, false); + } + } + + } + + return true; +} + +// XXX this function should probably be re-defined to merge with 'setCellsProcess' +bool pmChipSelectCell(pmChip *chip, int cellNum, bool exclusive) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + + psArray *cells = chip->cells; // Component cells + if (!cells || cellNum > cells->n) { + return false; + } + + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; + if (!cell) { + continue; + } + if (i == cellNum) { + cell->process = true; + } else { + if (exclusive) { + cell->process = false; + } + } + } + return true; +} + + +int pmFPAExcludeChip(pmFPA *fpa, int chipNum) +{ + PS_ASSERT_PTR_NON_NULL(fpa, -1); + + psArray *chips = fpa->chips; // Component chips + if (chips == NULL) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: fpa->chips == NULL\n"); + return(0); + } + if ((chipNum >= chips->n) || (NULL == (pmChip *) chips->data[chipNum])) { + psLogMsg(__func__, PS_LOG_WARN, "WARNING: the specified chip (%d) does not exist.\n", chipNum); + return(0); + } + + int numChips = 0; // Number of chips to be processed + for (int i = 0 ; i < chips->n ; i++) { + pmChip *tmpChip = (pmChip *) chips->data[i]; // Chip of interest + if (tmpChip != NULL) { + if (i == chipNum) { + tmpChip->process = false; + setCellsProcess(tmpChip, false); // Wipe out the cell as well + } else if (tmpChip->process) { + numChips++; + } + } + } + + return(numChips); +} + + +int pmChipExcludeCell(pmChip *chip, int cellNum) +{ + PS_ASSERT_PTR_NON_NULL(chip, -1); + + psArray *cells = chip->cells; // The component cells + if (!cells || cellNum > cells->n) { + return 0; + } + + int numCells = 0; // Number of cells to be processed + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; + if (!cell) { + continue; + } + if (i == cellNum) { + cell->process = false; + } else { + numCells++; + } + } + + return numCells; +} + Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAFlags.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAFlags.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAFlags.h (revision 14957) @@ -0,0 +1,122 @@ +/* @file pmFPAFlags.h + * @brief Functions for setting and checking the status flags within the FPA hierarchy + * + * @author George Gusciora, MHPCC + * @author Paul Price, IfA + * @author Eugene Magnier, IfA + * + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-05-03 20:04:01 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_FLAGS_H +#define PM_FPA_FLAGS_H + +/// @addtogroup Camera Camera Layout +/// @{ + +// Functions to turn on/off the file_exists flags + +/// Set the file_exists flag for an FPA and components +bool pmFPASetFileStatus(pmFPA *fpa, ///< FPA for which to set status + bool status ///< Status to set + ); + +/// Set the file_exists flag for a chip and components +bool pmChipSetFileStatus(pmChip *chip, ///< Chip for which to set status + bool status ///< Status to set + ); + +/// Set the file_exists flag for a cell and components +bool pmCellSetFileStatus(pmCell *cell, ///< Cell for which to set status + bool status ///< Status to set + ); + +// Functions to check the file_exists flags + +/// Return the file_exists status for an FPA and components +bool pmFPACheckFileStatus(const pmFPA *fpa ///< FPA for which to check status + ); + +/// Return the file_exists status for a chip and components +bool pmChipCheckFileStatus(const pmChip *chip ///< Chip for which to check status + ); + +/// Return the file_exists status for a chip and components +bool pmCellCheckFileStatus(const pmCell *cell ///< Cell for which to check status + ); + +// Functions to turn on/off the data_exists flags + +/// Set the data_exists flag for an FPA and components +bool pmFPASetDataStatus(pmFPA *fpa, ///< FPA for which to set status + bool status ///< Status to set + ); + +/// Set the data_exists flag for a chip and components +bool pmChipSetDataStatus(pmChip *chip, ///< Chip for which to set status + bool status ///< Status to set + ); + +/// Set the data_exists flag for a cell and components +bool pmCellSetDataStatus(pmCell *cell, ///< Cell for which to set status + bool status ///< Status to set + ); + + +// Functions the check the data_exists flags + +/// Check data_exists for the element of this fpa at this view +bool pmFPAviewCheckDataStatus (const pmFPA *fpa, ///< FPA to check + const pmFPAview *view ///< check for this view + ); + +/// Check data_exists for this fpa +bool pmFPACheckDataStatus (const pmFPA *fpa ///< FPA to check + ); + +/// Check data_exists for this chip +bool pmChipCheckDataStatus (const pmChip *chip ///< Chip to check +); + +/// Check data_exists for this cell +bool pmCellCheckDataStatus (const pmCell *cell ///< Cell to check +); + +/// Check data_exists for this readout +bool pmReadoutCheckDataStatus (const pmReadout *readout ///< Readout to check +); + + +// Functions to set the process flags + +/// Select a chip within an FPA for processing +/// +/// If exclusive is true, the specified chip is the only chip to be processed. A negative value for chipNum +/// is valid and, in combinations with exclusive, de-selects all chips. +bool pmFPASelectChip(pmFPA *fpa, ///< FPA containing the chip of interest + int chipNum, ///< Chip number to select + bool exclusive ///< Process this chip exclusive of the others? + ); + +/// Select a chip within a chip for processing +/// +/// If exclusive is true, the specified cell is the only chip to be processed. A negative value for cellNum +/// is valid and, in combinations with exclusive, de-selects all chips. +bool pmChipSelectCell(pmChip *chip, ///< Chip containing the cell of interest + int cellNum, ///< Cell number to select + bool exclusive ///< Process this cell exclusive of the others? + ); + +/// Exclude a chip within an FPA from processing +int pmFPAExcludeChip(pmFPA *fpa, ///< FPA containing the chip of interest + int chipNum ///< Chip number to exclude + ); + +/// Exclude a cell within a chip from processing +int pmChipExcludeCell(pmChip *chip, ///< Chip containing the chip of interest + int cellNum ///< Cell number to exclude + ); +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAHeader.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAHeader.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAHeader.c (revision 14957) @@ -0,0 +1,77 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmConcepts.h" +#include "pmFPAHeader.h" + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Public functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +bool pmCellReadHeader(pmCell *cell, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + if (!cell->hdu) { + return pmChipReadHeader(cell->parent, fits); + } + if (!pmHDUReadHeader(cell->hdu, fits)) { + psError(PS_ERR_IO, false, "Unable to read header for cell.\n"); + return false; + } + + return pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, false, NULL); +} + + +bool pmChipReadHeader(pmChip *chip, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + if (!chip->hdu) { + return pmFPAReadHeader(chip->parent, fits); + } + if (!pmHDUReadHeader(chip->hdu, fits)) { + psError(PS_ERR_IO, false, "Unable to read header for cell.\n"); + return false; + } + + if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, true, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for chip.\n"); + return false; + } + + return true; +} + + +bool pmFPAReadHeader(pmFPA *fpa, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + if (!fpa->hdu) { + return false; + } + if (!pmHDUReadHeader(fpa->hdu, fits)) { + psError(PS_ERR_IO, false, "Unable to read header for cell.\n"); + return false; + } + + if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, true, NULL)) { + psError(PS_ERR_UNKNOWN, false, "Unable to read concepts for FPA.\n"); + return false; + } + + return true; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAHeader.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAHeader.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAHeader.h (revision 14957) @@ -0,0 +1,41 @@ +/* @file pmFPAHeader.h + * @brief Functions read FITS headers for FPA components + * + * @author Paul Price, IfA + * + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-01-24 02:54:14 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_HEADER_H +#define PM_FPA_HEADER_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Read the FITS header (and ingest concepts) for an FPA, if it exists at this level +/// +/// Returns false if there was a problem. Returns true if it successfully read the header, or if the header +/// was already there. No iteration to lower levels is performed. +bool pmFPAReadHeader(pmFPA *fpa, ///< FPA for which to read header + psFits *fits ///< FITS file handle + ); + +/// Read the FITS header (and ingest concepts) for a chip, if it exists at this level +/// +/// Returns false if there was a problem. Returns true if it successfully read the header, or if the header +/// was already there. No iteration to lower levels is performed. +bool pmChipReadHeader(pmChip *chip, ///< Chip for which to read header + psFits *fits ///< FITS file handle + ); + +/// Read the FITS header (and ingest concepts) for a cell, if it exists at this level +/// +/// Returns false if there was a problem. Returns true if it successfully read the header, or if the header +/// was already there. No iteration to lower levels is performed. +bool pmCellReadHeader(pmCell *cell, ///< Cell for which to read header + psFits *fits ///< FITS file handle + ); +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPALevel.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPALevel.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPALevel.c (revision 14957) @@ -0,0 +1,60 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "pmFPALevel.h" + +static const char *NameNONE = "NONE"; ///< Name for PM_FPA_LEVEL_NONE +static const char *NameFPA = "FPA"; ///< Name for PM_FPA_LEVEL_FPA +static const char *NameCHIP = "CHIP"; ///< Name for PM_FPA_LEVEL_CHIP +static const char *NameCELL = "CELL"; ///< Name for PM_FPA_LEVEL_CELL +static const char *NameREADOUT = "READOUT"; ///< Name for PM_FPA_LEVEL_READOUT + +const char *pmFPALevelToName(pmFPALevel level) +{ + switch (level) { + case PM_FPA_LEVEL_NONE: + return NameNONE; + case PM_FPA_LEVEL_FPA: + return NameFPA; + case PM_FPA_LEVEL_CHIP: + return NameCHIP; + case PM_FPA_LEVEL_CELL: + return NameCELL; + case PM_FPA_LEVEL_READOUT: + return NameREADOUT; + default: + psAbort("You can't get here; level = %d", level); + } + return NULL; +} + +pmFPALevel pmFPALevelFromName(const char *name) +{ + pmFPALevel val; + + if (name == NULL) { + val = PM_FPA_LEVEL_NONE; + } else if (!strcasecmp(name, "FPA")) { + val = PM_FPA_LEVEL_FPA; + } else if (!strcasecmp(name, "CHIP")) { + val = PM_FPA_LEVEL_CHIP; + } else if (!strcasecmp(name, "CELL")) { + val = PM_FPA_LEVEL_CELL; + } else if (!strcasecmp(name, "READOUT")) { + val = PM_FPA_LEVEL_READOUT; + } else if (!strcasecmp(name, "NONE")) { + val = PM_FPA_LEVEL_NONE; + } else { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised FPA level name: %s", name); + val = PM_FPA_LEVEL_NONE; + } + + return val; +} + + Index: /branches/pap_branch_070920/psModules/src/camera/pmFPALevel.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPALevel.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPALevel.h (revision 14957) @@ -0,0 +1,35 @@ +/* @file pmFPALevel.h + * @brief Defines enum and string representations for the FPA levels + * + * @author Eugene Magnier, MHPCC + * + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-01-24 02:54:14 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_LEVEL_H +#define PM_FPA_LEVEL_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Specify the level of the FPA hierarchy +typedef enum { + PM_FPA_LEVEL_NONE, ///< No particular level specified + PM_FPA_LEVEL_FPA, ///< Level corresponds to an FPA + PM_FPA_LEVEL_CHIP, ///< Level corresponds to a Chip + PM_FPA_LEVEL_CELL, ///< Level corresponds to a Cell + PM_FPA_LEVEL_READOUT ///< Level corresponds to a Readout +} pmFPALevel; + + +/// Return the string representation of the FPA level +const char *pmFPALevelToName(pmFPALevel level ///< Level enum + ); + +/// Return the enum representation of the FPA level +pmFPALevel pmFPALevelFromName(const char *name ///< Level name + ); +/// @} +#endif // #ifndef PM_FPA_LEVEL_H Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAMaskWeight.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAMaskWeight.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAMaskWeight.c (revision 14957) @@ -0,0 +1,312 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmHDUUtils.h" +#include "pmHDUGenerate.h" +#include "pmFPAMaskWeight.h" + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// File-static (private) functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Create the parent mask images that reside in the HDU +static void createParentMasks(pmHDU *hdu // The HDU for which to create + ) +{ + assert(hdu); + assert(hdu->images); + + // Generate the parent mask images + psArray *images = hdu->images; // Array of images + psArray *masks = hdu->masks; // Array of masks + if (!masks) { + masks = psArrayAlloc(images->n); + hdu->masks = masks; + } + + for (long i = 0; i < images->n; i++) { + psImage *image = images->data[i]; // The image for this readout + if (!image || masks->data[i]) { + continue; + } + masks->data[i] = psImageAlloc(image->numCols, image->numRows, PS_TYPE_U8); + psImageInit(masks->data[i], 0); + } + + return; +} + +// Create the parent weight images that reside in the HDU +static void createParentWeights(pmHDU *hdu // The HDU for which to create + ) +{ + assert(hdu); + assert(hdu->images); + + // Generate the parent mask images + psArray *images = hdu->images; // Array of images + psArray *weights = hdu->weights; // Array of weight images + if (!weights) { + weights = psArrayAlloc(images->n); + hdu->weights = weights; + } + + for (long i = 0; i < images->n; i++) { + psImage *image = images->data[i]; // The image for this readout + if (!image || weights->data[i]) { + continue; + } + weights->data[i] = psImageAlloc(image->numCols, image->numRows, PS_TYPE_F32); + } + + return; +} + +// Identify a readout within the HDU, on the basis of the image pointer. +// This is a little dirty, but hopefully should work.... +static long identifyReadout(pmHDU *hdu, // The HDU containing the readouts + pmReadout *readout // The readout to be identified + ) +{ + assert(hdu); + assert(readout); + + long index = -1; // Index of the readout + for (long i = 0; i < hdu->images->n && index == -1; i++) { + if (hdu->images->data[i] == readout->image->parent) { + index = i; + } + } + + return index; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Public functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +bool pmReadoutSetMask(pmReadout *readout, psMaskType satMask, psMaskType badMask) +{ + PS_ASSERT_PTR_NON_NULL(readout, false); + PS_ASSERT_IMAGE_NON_NULL(readout->image, false); + + pmCell *cell = readout->parent; // The parent cell + bool mdok = true; // Status of MD lookup + + // Get the "concepts" of interest + float saturation = psMetadataLookupF32(&mdok, cell->concepts, "CELL.SATURATION"); // Saturation level + if (!mdok || isnan(saturation)) { + psError(PS_ERR_IO, true, "CELL.SATURATION is not set --- unable to set mask.\n"); + return false; + } + float bad = psMetadataLookupF32(&mdok, cell->concepts, "CELL.BAD"); // Bad level + if (!mdok || isnan(bad)) { + psError(PS_ERR_IO, true, "CELL.BAD is not set --- unable to set mask.\n"); + return false; + } + psTrace("psModules.camera", 5, "Saturation: %f, bad: %f\n", saturation, bad); + + + // Set up the mask + psImage *image = readout->image; // The image pixels + if (!readout->mask) { + // Generate a (throwaway) mask image, if required + readout->mask = psImageAlloc(image->numCols, image->numRows, PS_TYPE_U8); + psImageInit(readout->mask, 0); + } + psImage *mask = readout->mask; // The mask pixels + + // Dereference pointers for speed + psF32 **imageData = image->data.F32;// The image + psU8 **maskData = mask->data.U8; // The mask + + for (int i = 0; i < image->numRows; i++) { + for (int j = 0; j < image->numCols; j++) { + if (imageData[i][j] >= saturation) { + maskData[i][j] |= satMask; + } + if (imageData[i][j] <= bad) { + maskData[i][j] |= badMask; + } + if (!isfinite(imageData[i][j])) { + maskData[i][j] |= badMask; + } + } + } + + return true; +} + +// XXX this function creates the mask pixels, or uses the existing mask +// pixels. currently, it will set mask bits if (value <= BAD) or (value >= SATURATION) +// should we optionally ignore these tests? +bool pmReadoutGenerateMask(pmReadout *readout, psMaskType satMask, psMaskType badMask) +{ + PS_ASSERT_PTR_NON_NULL(readout, false); + + pmCell *cell = readout->parent; // The parent cell + bool mdok = true; // Status of MD lookup + + // Create the mask image if required + if (!readout->mask) { + psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section + if (!mdok || psRegionIsNaN(*trimsec)) { + psError(PS_ERR_IO, true, "CELL.TRIMSEC is not set --- unable to set mask.\n"); + return false; + } + + pmHDU *hdu = pmHDUFromCell(cell); // The HDU containing the cell's pixels + PS_ASSERT_PTR_NON_NULL(hdu, false); + if (!hdu->images && !pmHDUGenerateForCell(cell)) { + psError(PS_ERR_UNKNOWN, false, "Unable to generate HDU for cell.\n"); + return false; + } + + createParentMasks(hdu); + + // Need to identify which readout we're working with.... + long index = identifyReadout(hdu, readout); // Index of the readout + if (index == -1) { + psError(PS_ERR_UNKNOWN, true, "Unable to identify readout image in HDU.\n"); + return false; + } + + psImage *mask = psImageSubset(hdu->masks->data[index], *trimsec); // The mask pixels + if (!mask) { + psString trimsecString = psRegionToString(*trimsec); + psError(PS_ERR_UNKNOWN, false, "Unable to set mask from HDU with trimsec: %s.\n", trimsecString); + psFree(trimsecString); + return false; + } + psImageInit(mask, 0); + assert (readout->mask == NULL); // or else this is a memory leak. + readout->mask = mask; + } + + return pmReadoutSetMask(readout, satMask, badMask); +} + +bool pmReadoutSetWeight(pmReadout *readout, bool poisson) +{ + PS_ASSERT_PTR_NON_NULL(readout, false); + + pmCell *cell = readout->parent; // The parent cell + bool mdok = true; // Status of MD lookup + + // Get the "concepts" of interest + float gain = psMetadataLookupF32(&mdok, cell->concepts, "CELL.GAIN"); // Cell gain + if (!mdok || isnan(gain)) { + psError(PS_ERR_IO, true, "CELL.GAIN is not set --- unable to set weight.\n"); + return false; + } + float readnoise = psMetadataLookupF32(&mdok, cell->concepts, "CELL.READNOISE"); // Cell read noise + if (!mdok || isnan(readnoise)) { + psError(PS_ERR_IO, true, "CELL.READNOISE is not set --- unable to set weight.\n"); + return false; + } + + if (poisson) { + // Set weight image to the variance in ADU = f/g + rn^2 + psImage *image = readout->image; // The image pixels + readout->weight = (psImage*)psBinaryOp(readout->weight, image, "/", psScalarAlloc(gain, PS_TYPE_F32)); + + // a negative weight is non-sensical. if the image value drops below 1, the weight must be 1. + readout->weight = (psImage*)psUnaryOp(readout->weight, readout->weight, "abs"); + readout->weight = (psImage*)psBinaryOp(readout->weight, readout->weight, "max", + psScalarAlloc(1, PS_TYPE_F32)); + } else { + // Just use the read noise + if (!readout->weight) { + readout->weight = psImageAlloc(readout->image->numCols, readout->image->numRows, PS_TYPE_F32); + } + psImageInit(readout->weight, 0.0); + } + + readout->weight = (psImage*)psBinaryOp(readout->weight, readout->weight, "+", + psScalarAlloc(readnoise*readnoise/gain/gain, PS_TYPE_F32)); + + return true; +} + +// this function creates the weight pixels, or uses the existing weight pixels. it will set +// the noise pixel values only if the weight image is not supplied +bool pmReadoutGenerateWeight(pmReadout *readout, bool poisson) +{ + PS_ASSERT_PTR_NON_NULL(readout, false); + + pmCell *cell = readout->parent; // The parent cell + bool mdok = true; // Status of MD lookup + + // Create the weight image if required + if (readout->weight) + return true; + + psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section + if (!mdok || psRegionIsNaN(*trimsec)) { + psError(PS_ERR_IO, true, "CELL.TRIMSEC is not set --- unable to set weight.\n"); + return false; + } + + pmHDU *hdu = pmHDUFromCell(cell); // The HDU containing the cell's pixels + PS_ASSERT_PTR_NON_NULL(hdu, false); + if (!hdu->images && !pmHDUGenerateForCell(cell)) { + psError(PS_ERR_UNKNOWN, false, "Unable to generate HDU for cell.\n"); + return false; + } + + createParentWeights(hdu); + + // Need to identify which readout we're working with.... + long index = identifyReadout(hdu, readout); // Index of the readout + if (index == -1) { + psError(PS_ERR_UNKNOWN, true, "Unable to identify readout image in HDU.\n"); + return false; + } + + psImage *weight = psImageSubset(hdu->weights->data[index], *trimsec); // The weight pixels + if (!weight) { + psString trimsecString = psRegionToString(*trimsec); + psError(PS_ERR_UNKNOWN, false, "Unable to set weight from HDU with trimsec: %s.\n", + trimsecString); + psFree(trimsecString); + return false; + } + psImageInit(weight, 0); + readout->weight = weight; + + return pmReadoutSetWeight(readout, poisson); +} + +bool pmReadoutGenerateMaskWeight(pmReadout *readout, psMaskType satMask, psMaskType badMask, bool poisson) +{ + PS_ASSERT_PTR_NON_NULL(readout, false); + + bool success = true; // Was everything successful? + + success &= pmReadoutGenerateMask(readout, satMask, badMask); + success &= pmReadoutGenerateWeight(readout, poisson); + + return success; +} + +bool pmCellGenerateMaskWeight(pmCell *cell, psMaskType satMask, psMaskType badMask, bool poisson) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + + bool success = true; // Was everything successful? + psArray *readouts = cell->readouts; // Array of readouts + for (int i = 0; i < readouts->n; i++) { + pmReadout *readout = readouts->data[i]; // The readout + pmReadoutGenerateMaskWeight(readout, poisson, satMask, badMask); + } + + return success; +} + Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAMaskWeight.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAMaskWeight.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAMaskWeight.h (revision 14957) @@ -0,0 +1,96 @@ +/* @file pmFPAHeader.h + * @brief Functions read FITS headers for FPA components + * + * @author Paul Price, IfA + * @author Eugene Magnier, IfA + * + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-06-02 03:51:03 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_MASK_WEIGHT_H +#define PM_FPA_MASK_WEIGHT_H + +/// @addtogroup Camera Camera Layout +/// @{ + +#if 0 +/// Pixel mask values +typedef enum { + PM_MASK_CLEAR = 0x00, ///< The pixel is not masked + PM_MASK_BLANK = 0x01, ///< The pixel is blank or has no (valid) data + PM_MASK_FLAT = 0x02, ///< The pixel is non-positive in the flat-field + PM_MASK_DETECTOR = 0x02, ///< The detector pixel is bad (e.g., bad column, charge trap) + PM_MASK_SAT = 0x04, ///< The pixel is saturated in the image of interest + PM_MASK_BAD = 0x04, ///< The pixel is low in the image of interest + PM_MASK_RANGE = 0x04, ///< The pixel is out of range in the image of interest + PM_MASK_CR = 0x08, ///< The pixel is probably a CR + PM_MASK_SPARE1 = 0x10, ///< Spare mask value + PM_MASK_SPARE2 = 0x20, ///< Spare mask value + PM_MASK_SUSPECT = 0x40, ///< The pixel is suspected of being bad, but may not be + PM_MASK_MARK = 0x80, ///< The pixel is marked as temporarily ignored +} pmMaskValue; +#else +#define PM_MASK_MARK 0x80 ///< The pixel is marked as temporarily ignored +#define PM_MASK_SAT 0x04 ///< The pixel is saturated in the image of interest +#endif + +/// Set a temporary readout mask using CELL.SATURATION and CELL.BAD +/// +/// Identifies pixels that are saturated (>= CELL.SATURATION) or bad (<= CELL.BAD). The mask that is produced +/// within the readout is temporary --- it is not added to the HDU. This is intended for when the user is +/// iterating using pmReadoutReadNext, in which case the HDU can't be generated. +bool pmReadoutSetMask(pmReadout *readout, ///< Readout for which to set mask + psMaskType sat, ///< Mask value to give saturated pixels + psMaskType bad ///< Mask value to give bad (low) pixels + ); + + +/// Set a temporary readout weight map using CELL.GAIN and CELL.READNOISE +/// +/// Calculates weights (actually variances) for each pixel using photon statistics and the cell gain +/// (CELL.GAIN) and read noise (CELL.READNOISE). The weight map that is produced within the readout is +/// temporary --- it is not added to the HDU. This is intended for when the user is iterating using +/// pmReadoutReadNext, in which case the HDU can't be generated. +bool pmReadoutSetWeight(pmReadout *readout, ///< Readout for which to set weight + bool poisson ///< Use poisson weights (in addition to read noise)? + ); + +/// Generate a readout mask (suitable for output) using CELL.SATURATION and CELL.BAD +/// +/// Identifies pixels that are saturated (>= CELL.SATURATION) or bad (<= CELL.BAD). The mask that is produced +/// is suitable for output (complete with HDU entry). This is intended for most operations. +bool pmReadoutGenerateMask(pmReadout *readout, ///< Readout for which to generate mask + psMaskType sat, ///< Mask value to give saturated pixels + psMaskType bad ///< Mask value to give bad (low) pixels + ); + +/// Generate a weight map (suitable for output) using CELL.GAIN and CELL.READNOISE +/// +/// Calculates weights (actually variances) for each pixel using photon statistics and the cell gain +/// (CELL.GAIN) and read noise (CELL.READNOISE). The weight map that is produced within the readout is +/// suitable for output (complete with HDU entry). This is intended for most operations. +bool pmReadoutGenerateWeight(pmReadout *readout, ///< Readout for which to generate weight + bool poisson ///< Use poisson weights (in addition to read noise)? + ); + +/// Generate mask and weight map for a readout +/// +/// Calls pmReadoutGenerateMask and pmReadoutGenerateWeight for the readout +bool pmReadoutGenerateMaskWeight(pmReadout *readout, ///< Readout for which to generate mask and weights + psMaskType sat, ///< Mask value to give saturated pixels + psMaskType bad, ///< Mask value to give bad (low) pixels + bool poisson ///< Use poisson weights (in addition to read noise)? + ); + +/// Generate mask and weight maps for all readouts within a cell +/// +/// Calls pmReadoutGenerateMaskWeight for each readout within the cell. +bool pmCellGenerateMaskWeight(pmCell *cell, ///< Cell for which to generate mask and weights + psMaskType sat, ///< Mask value to give saturated pixels + psMaskType bad, ///< Mask value to give bad (low) pixels + bool poisson ///< Use poisson weights (in addition to read noise)? + ); +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAMosaic.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAMosaic.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAMosaic.c (revision 14957) @@ -0,0 +1,1358 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" +#include "pmFPAFlags.h" +#include "pmConceptsAverage.h" +#include "pmHDUUtils.h" +#include "pmConfig.h" +#include "pmAstrometryWCS.h" +#include "pmFPAExtent.h" + +#include "pmFPAMosaic.h" + + +#define CELL_LIST_BUFFER 10 // Buffer size for cell lists + +#define BLANK_VALUE 0.0 // Value for pixels that are blank in the mosaicked image (e.g., // + // between cells). + // XXX This should ultimately be set to NAN, but psphot doesn't like + // that (masking needs to be more thorough). + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// File-static (private) functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Do two regions overlap? +#define REGIONS_OVERLAP(region1, region2) \ +((region1->x0 > region2->x0 && region1->x0 < region2->x1) || \ + (region1->x1 > region2->x0 && region1->x1 < region2->x1) || \ + (region1->y0 > region2->y0 && region1->y0 < region2->y1) || \ + (region1->y1 > region2->y0 && region1->y1 < region2->y1)) + +// Compare a value with a maximum and minimum +#define COMPARE(value,min,max) \ +if ((value) < (min)) { \ + (min) = (value); \ +} \ +if ((value) > (max)) { \ + (max) = (value); \ +} + +// Update a concept to the assumed value +#define FIX_CONCEPT(SOURCE, NAME, TYPE, VALUE) \ +psMetadataItem *item = psMetadataLookup(SOURCE, NAME); \ +item->data.TYPE = VALUE; + +// Get the bounds for an chip's pixels on the HDU +static bool chipBounds(psRegion *bounds, // The bounds for the chip + const pmChip *chip // The chip to examine for contiguity + ) +{ + assert(chip); + + psArray *cells = chip->cells; // The array of cells + bool mdok = true; // Status of MD lookup + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // Cell of interest + psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section + if (!mdok || !trimsec || psRegionIsNaN(*trimsec)) { + psError(PS_ERR_UNKNOWN, true, "CELL.TRIMSEC hasn't been set for cell %d.\n", i); + return false; + } + + if (trimsec->x0 < bounds->x0) { + bounds->x0 = trimsec->x0; + } + if (trimsec->x1 > bounds->x1) { + bounds->x1 = trimsec->x1; + } + if (trimsec->y0 < bounds->y0) { + bounds->y0 = trimsec->y0; + } + if (trimsec->y1 > bounds->y1) { + bounds->y1 = trimsec->y1; + } + } + + return true; +} + +// Make sure the TRIMSEC doesn't overlap with the established image bounds +static bool chipContiguousTrimsec(psRegion *bounds, // The bounds of the image, altered if primary==true + const pmChip *chip // The chip to examine for contiguity + ) +{ + assert(bounds); + assert(chip); + + psArray *cells = chip->cells; // The array of cells + bool mdok = true; // Status of MD lookup + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // Cell of interest + psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section + if (!mdok || !trimsec || psRegionIsNaN(*trimsec)) { + psError(PS_ERR_UNKNOWN, true, "CELL.TRIMSEC hasn't been set for cell %d.\n", i); + return false; + } + + if (REGIONS_OVERLAP(trimsec, bounds)) { + return false; + } + } + + return true; +} + +// Make sure the BIASSEC doesn't overlap with the established image bounds +static bool chipContiguousBiassec(psRegion *bounds, // The bounds of the image, altered if primary==true + const pmChip *chip // The chip to examine for contiguity + ) +{ + assert(bounds); + assert(chip); + + // Check that the biases don't get in the way + psArray *cells = chip->cells; // The array of cells + bool mdok = true; // Status of MD lookup + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // Cell of interest + psList *biassecs = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.BIASSEC"); // Bias sections + if (!mdok || !biassecs) { + psError(PS_ERR_UNKNOWN, true, "CELL.BIASSEC hasn't been set for cell %d.\n", i); + return false; + } + if (biassecs->n == 0) { + // No point allocating an iterator if there's nothing there to iterate on + continue; + } + psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator + psRegion *biassec = NULL; // Bias section from iteration + while ((biassec = psListGetAndIncrement(biassecsIter))) { + if (psRegionIsNaN(*biassec)) { + continue; + } + if (REGIONS_OVERLAP(biassec, bounds)) { + psFree(biassecsIter); + return false; + } + } + psFree(biassecsIter); + } + + // If we've gotten this far, everything is fine. + return true; +} + +// Are the pixels for the FPA contiguous on the HDU? +// Work this out by examining all the CELL.TRIMSEC and CELL.BIASSEC regions for the component cells +static bool fpaContiguous(psRegion *bounds, // The bounds of the image, returned + const pmFPA *fpa // The FPA to examine for contiguity + ) +{ + assert(bounds); + assert(fpa); + + *bounds = psRegionSet(INFINITY, 0, INFINITY, 0); + + // Get the size of the pixels on the HDU + psArray *chips = fpa->chips; // The array of chips + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // Chip of interest + if (!chipBounds(bounds, chip)) { + return false; + } + } + + // Make sure the bias regions don't get in the way of the HDU + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // Chip of interest + if (!chipContiguousBiassec(bounds, chip)) { + return false; + } + } + + // If we got through it all, they must all be contiguous + return true; +} + + + +// Check a cell for niceness in the parity and binning +static bool niceCellParityBinning(int *xBin, int *yBin, // Binning for cell, to be returned + const pmCell *cell // Cell to check for niceness + ) +{ + assert(xBin); + assert(yBin); + assert(cell); + + // A "nice" cell must have only a single readout + if (cell->readouts->n != 1) { + return false; + } + + // A "nice" cell must have parity == 1 + bool mdok = true; // Status of MD lookup + int xParity = psMetadataLookupS32(&mdok, cell->concepts, "CELL.XPARITY"); // Parity in x + if (!mdok || xParity == 0) { + psError(PS_ERR_UNKNOWN, true, "CELL.XPARITY hasn't been set for cell.\n"); + return false; + } + if (xParity != 1) { + return false; + } + int yParity = psMetadataLookupS32(&mdok, cell->concepts, "CELL.YPARITY"); // Parity in y + if (!mdok || yParity == 0) { + psError(PS_ERR_UNKNOWN, true, "CELL.YPARITY hasn't been set for cell.\n"); + return false; + } + if (yParity != 1) { + return false; + } + + // A "nice" cell must have consistent binning + int xBinCell = psMetadataLookupS32(&mdok, cell->concepts, "CELL.XBIN"); // Binning in x + if (!mdok || xBin <= 0) { + psError(PS_ERR_UNKNOWN, true, "CELL.XBIN hasn't been set for cell.\n"); + return false; + } + int yBinCell = psMetadataLookupS32(&mdok, cell->concepts, "CELL.YBIN"); // Binning in y + if (!mdok || yBin <= 0) { + psError(PS_ERR_UNKNOWN, true, "CELL.YBIN hasn't been set for cell.\n"); + return false; + } + if (*xBin == 0 || *yBin == 0) { + *xBin = xBinCell; + *yBin = yBinCell; + } else if (xBinCell != *xBin || yBinCell != *yBin) { + return false; + } + + return true; +} + + +// Check a cell for niceness in the boundaries +static bool niceCellBounds(const pmCell *cell, // Cell to check for niceness + const psRegion *imageBounds // Bounds of the image on the HDU + ) +{ + // A "nice" cell must have the (0,0) pixel at CELL.X0,CELL.Y0 + bool mdok = true; // Status of MD lookup + int x0 = psMetadataLookupS32(&mdok, cell->concepts, "CELL.X0"); // Position of (0,0) on chip + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "CELL.X0 hasn't been set for cell.\n"); + return false; + } + int y0 = psMetadataLookupS32(&mdok, cell->concepts, "CELL.Y0"); // Position of (0,0) on chip + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "CELL.Y0 hasn't been set for cell.\n"); + return false; + } + pmReadout *readout = cell->readouts->data[0]; // A representative readout + if (!readout) { + return false; // Nothing here + } + if (x0 != readout->col0 + readout->image->col0 - (int)imageBounds->x0 || + y0 != readout->row0 + readout->image->row0 - (int)imageBounds->y0) { + psTrace("psModules.camera", 5, "CELL.X0,Y0 don't match: %d,%d vs %d,%d\n", x0, y0, + readout->col0 + readout->image->col0 - (int)imageBounds->x0, + readout->row0 + readout->image->row0 - (int)imageBounds->y0); + return false; + } + + return true; +} + + +// Is the chip "nice"? If so, return the region containing the chip pixels +static psRegion *niceChip(int *xBinChip, int *yBinChip, // Binning for chip, to be returned + const pmChip *chip // Chip to examine for "niceness". + ) +{ + assert(xBinChip); + assert(yBinChip); + assert(chip); + + // Check that we've got the HDU in the chip or the FPA + if ((!chip->hdu || !chip->hdu->images) && (!chip->parent->hdu || !chip->parent->hdu->images)) { + return NULL; + } + + // Check parity and binning for component cells + *xBinChip = 0; + *yBinChip = 0; + for (int i = 0; i < chip->cells->n; i++) { + pmCell *cell = chip->cells->data[i]; // The cell of interest + if (!niceCellParityBinning(xBinChip, yBinChip, cell)) { + return NULL; + } + } + + // Now check that the pixels are all contiguous + psRegion *imageBounds = psRegionAlloc(INFINITY, 0, INFINITY, 0); // Bound of image on HDU + if (!chipBounds(imageBounds, chip) || !chipContiguousBiassec(imageBounds, chip)) { + psTrace("psModules.camera", 5, "Image isn't contiguous.\n"); + psFree(imageBounds); + return NULL; + } + + psString region = psRegionToString(*imageBounds); + psTrace("psModules.camera", 7, "Image bounds: %s\n", region); + psFree(region); + + for (int i = 0; i < chip->cells->n; i++) { + pmCell *cell = chip->cells->data[i]; // The cell of interest + if (!niceCellBounds(cell, imageBounds)) { + psFree(imageBounds); + return NULL; + } + } + + // Need to check all the other chips if the HDU is in the FPA + pmFPA *fpa = chip->parent; // The parent FPA + if (fpa->hdu && fpa->hdu->images) { + psArray *chips = fpa->chips; // Array of chips + for (int i = 0; i < chips->n; i++) { + pmChip *testChip = chips->data[i]; // The chip of interest + if (testChip == chip) { + // Already done this one + continue; + } + if (!chipContiguousTrimsec(imageBounds, testChip) || + !chipContiguousBiassec(imageBounds, testChip)) { + psTrace("psModules.camera", 5, "Image isn't contiguous.\n"); + psFree(imageBounds); + return NULL; + } + } + } + + return imageBounds; +} + +// Is the FPA "nice"? If so, return the region containing the FPA pixels +static psRegion *niceFPA(int *xBinFPA, int *yBinFPA, // Binning for FPA, to be returned + const pmFPA *fpa // FPA to examine for "niceness". + ) +{ + assert(xBinFPA); + assert(yBinFPA); + assert(fpa); + + // Check that we've got the HDU in the chip or the FPA + if (!fpa->hdu || !fpa->hdu->images) { + return NULL; + } + + // Check parity and binning for component cells + *xBinFPA = 0; + *yBinFPA = 0; + for (int i = 0; i < fpa->chips->n; i++) { + pmChip *chip = fpa->chips->data[i]; // The chip of interest + for (int j = 0; i < chip->cells->n; i++) { + pmCell *cell = chip->cells->data[j]; // The cell of interest + if (!niceCellParityBinning(xBinFPA, yBinFPA, cell)) { + return NULL; + } + } + } + + // Now check that the pixels are all contiguous + psRegion *imageBounds = psRegionAlloc(0, 0, 0, 0); // Bound of image on HDU + if (!fpaContiguous(imageBounds, fpa)) { + psTrace("psModules.camera", 5, "Image isn't contiguous.\n"); + psFree(imageBounds); + return NULL; + } + + psString region = psRegionToString(*imageBounds); + psTrace("psModules.camera", 7, "Image bounds: %s\n", region); + psFree(region); + + for (int i = 0; i < fpa->chips->n; i++) { + pmChip *chip = fpa->chips->data[i]; // The chip of interest + for (int j = 0; i < chip->cells->n; i++) { + pmCell *cell = chip->cells->data[j]; // The cell of interest + if (!niceCellBounds(cell, imageBounds)) { + psFree(imageBounds); + return NULL; + } + } + } + + return imageBounds; +} + +// supporting macros used by imageMosaic() +// copy pixels without binning +#define COPY_WITH_PARITY_DIFFERENCE(TYPE) \ + case PS_TYPE_##TYPE: { \ + for (int y = 0; y < image->numRows; y++) { \ + int yTarget = yTargetBase + yParity * y; \ + for (int x = 0; x < image->numCols; x++) { \ + int xTarget = xTargetBase + xParity * x; \ + mosaic->data.TYPE[yTarget][xTarget] = image->data.TYPE[y][x]; \ + } \ + } \ + } \ + break; + +// In case the original image is binned but the mosaic is not, we need to fill in the values in +// the mosaic. this operation should be replaced with a call to one of the functions defined +// in psImageBinning +#define FILL_IN(TYPE) \ + case PS_TYPE_##TYPE: \ + for (int y = 0; y < image->numRows; y++) { \ + float yTargetBinBase = yTargetBase + yParity * yBinSource->data.S32[i] * y / yBinTarget; \ + for (int x = 0; x < image->numCols; x++) { \ + float xTargetBinBase = xTargetBase + xParity * xBinSource->data.S32[i] * x / xBinTarget; \ + for (int j = 0; j < yBinSource->data.S32[i]; j++) { \ + int yTarget = (int)(yTargetBinBase + yParity * (float)j / (float)yBinTarget); \ + for (int k = 0; k < xBinSource->data.S32[i]; k++) { \ + int xTarget = (int)(xTargetBinBase + xParity * (float)k / (float)xBinTarget); \ + mosaic->data.TYPE[yTarget][xTarget] = image->data.TYPE[y][x]; \ + } \ + } \ + } \ + } \ + break; + +// Mosaic multiple images, with flips, binning and offsets +static psImage *imageMosaic(const psArray *source, // Images to splice in + const psVector *xFlip, const psVector *yFlip, // Need to flip x and y? + const psVector *xBinSource, // Binning in x of source images + const psVector *yBinSource, // Binning in y of source images + int xBinTarget, int yBinTarget, // Binning in x and y of target images + const psVector *x0, const psVector *y0, // Offsets for source images on target + double unexposed // Value for unexposed pixels + ) +{ + assert(source); + assert(xFlip && xFlip->type.type == PS_TYPE_U8); + assert(yFlip && yFlip->type.type == PS_TYPE_U8); + assert(xBinSource && xBinSource->type.type == PS_TYPE_S32); + assert(yBinSource && yBinSource->type.type == PS_TYPE_S32); + assert(x0 && x0->type.type == PS_TYPE_S32); + assert(y0 && y0->type.type == PS_TYPE_S32); + assert(xFlip->n == source->n); + assert(yFlip->n == source->n); + assert(xBinSource->n == source->n); + assert(yBinSource->n == source->n); + assert(x0->n == source->n); + assert(y0->n == source->n); + + if (source->n == 0) { + return NULL; + } + + // Get the maximum extent of the mosaic image + int xMin = +INT_MAX; + int xMax = -INT_MAX; + int yMin = +INT_MAX; + int yMax = -INT_MAX; + psElemType type = 0; + int numImages = 0; // Number of images + psTrace("psModules.camera", 3, "Mosaicking %ld cells.\n", source->n); + for (int i = 0; i < source->n; i++) { + psImage *image = source->data[i]; // The image of interest + if (!image) { + continue; + } + numImages++; + + // Only implemented for F32 and U8 images so far. + assert(image->type.type == PS_TYPE_F32 || image->type.type == PS_TYPE_U8); + // All input types must be the same + if (type == 0) { + type = image->type.type; + } + assert(type == image->type.type); + + // Size of cell in x and y + int xParity = xFlip->data.U8[i] ? -1 : 1; + int yParity = yFlip->data.U8[i] ? -1 : 1; + psTrace("psModules.camera", 5, "Extent of cell %d: %d -> %d , %d -> %d\n", i, x0->data.S32[i], + x0->data.S32[i] + xParity * xBinSource->data.S32[i] * image->numCols, y0->data.S32[i], + y0->data.S32[i] + yParity * yBinSource->data.S32[i] * image->numRows); + + COMPARE(x0->data.S32[i], xMin, xMax); + COMPARE(y0->data.S32[i], yMin, yMax); + // Subtract the parity to get the inclusive limit (not exclusive) + COMPARE(x0->data.S32[i] + xParity * xBinSource->data.S32[i] * image->numCols - xParity, xMin, xMax); + COMPARE(y0->data.S32[i] + yParity * yBinSource->data.S32[i] * image->numRows - yParity, yMin, yMax); + } + if (numImages == 0) { + return NULL; + } + + // Set up the image + // Since both upper and lower values are inclusive, we need to add one to the size + float xSize = (float)(xMax - xMin + 1) / (float)xBinTarget; + if (xSize - (int)xSize > 0) { + xSize += 1; + } + float ySize = (float)(yMax - yMin + 1) / (float)yBinTarget; + if (ySize - (int)ySize > 0) { + ySize += 1; + } + + psTrace("psModules.camera", 3, "Spliced image will be %dx%d\n", (int)xSize, (int)ySize); + psImage *mosaic = psImageAlloc((int)xSize, (int)ySize, type); // The mosaic image + psImageInit(mosaic, unexposed); + + // Next pass through the images to do the mosaicking + // XXX this function uses summing for the output: is this the right choice? + for (int i = 0; i < source->n; i++) { + psImage *image = source->data[i]; // The image of interest + if (!image) { + continue; + } + int xParity = xFlip->data.U8[i] ? -1 : 1; // Parity difference, in x + int yParity = yFlip->data.U8[i] ? -1 : 1; // Parity difference, in y + int xTargetBase = (x0->data.S32[i] - xMin) / xBinTarget; // The base x position in the target frame + int yTargetBase = (y0->data.S32[i] - yMin) / yBinTarget; // The base y position in the target frame + + // in the first case, we are just copy a section pixel-by-pixel + if ((xBinSource->data.S32[i] == xBinTarget) && + (yBinSource->data.S32[i] == yBinTarget) && + (xFlip->data.U8[i] == 0) && + (yFlip->data.U8[i] == 0)) { + // Let someone else do the hard work + psImageOverlaySection(mosaic, image, xTargetBase, yTargetBase, "="); + continue; + } + + // in the second case, there's a difference with the parities, but we don't have to + // worry about binning + if (xBinSource->data.S32[i] == xBinTarget && yBinSource->data.S32[i] == yBinTarget) { + switch (type) { + COPY_WITH_PARITY_DIFFERENCE(F32); + COPY_WITH_PARITY_DIFFERENCE(U8); + default: + psAbort("Should never get here.\n"); + } + continue; + } + + // In the third case, the images are flipped and have different binnnig. + // We have to do all of the hard work ourselves + switch (type) { + FILL_IN(F32); + FILL_IN(U8); + default: + psAbort("Should never get here.\n"); + } + } // Iterating over images + + return mosaic; +} + +// Add a cell and its various properties to the arrays +static bool addCell(psArray *images, // Array of images + psArray *masks, // Array of masks + psArray *weights, // Array of weights + psVector *x0, // Array of X0 + psVector *y0, // Array of Y0 + psVector *xBin, // Array of XBIN + psVector *yBin, // Array of YBIN + psVector *xFlip, // Array indicating whether x axis should be flipped + psVector *yFlip, // Array indicating whether y axis should be flipped + const pmCell *cell, // Cell to add + int *xBinMin, // The minimum x binning, returned + int *yBinMin, // The minimum y binning, returned + bool chipStuff, // Worry about chip stuff as well? + int x0Target, int y0Target, // Target x0 and y0 offsets + int xParityTarget, int yParityTarget // Target parities + ) +{ + if (!cell) { + return false; + } + + // Expand the arrays and vectors to handle new data + long index = images->n; // The index to use + if (images->n == images->nalloc) { + images = psArrayRealloc(images, index + CELL_LIST_BUFFER); + masks = psArrayRealloc(masks, index + CELL_LIST_BUFFER); + weights = psArrayRealloc(weights, index + CELL_LIST_BUFFER); + x0 = psVectorRealloc(x0, index+ CELL_LIST_BUFFER); + y0 = psVectorRealloc(y0, index+ CELL_LIST_BUFFER); + xBin = psVectorRealloc(xBin, index+ CELL_LIST_BUFFER); + yBin = psVectorRealloc(yBin, index+ CELL_LIST_BUFFER); + xFlip = psVectorRealloc(xFlip, index+ CELL_LIST_BUFFER); + yFlip = psVectorRealloc(yFlip, index+ CELL_LIST_BUFFER); + } + + images->n = index + 1; + masks->n = index + 1; + weights->n = index + 1; + x0->n = index + 1; + y0->n = index + 1; + xBin->n = index + 1; + yBin->n = index + 1; + xFlip->n = index + 1; + yFlip->n = index + 1; + + bool mdok = true; // Status of MD lookup + bool good = true; // Is everything good? + + // Offset of the cell on the chip + int x0Cell = psMetadataLookupS32(&mdok, cell->concepts, "CELL.X0"); + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "CELL.X0 for cell is not set.\n"); + good = false; + } + int y0Cell = psMetadataLookupS32(&mdok, cell->concepts, "CELL.Y0"); + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "CELL.Y0 for cell is not set.\n"); + good = false; + } + psTrace("psModules.camera", 5, "Cell %ld: x0=%d y0=%d\n", index, x0Cell, y0Cell); + + // Offset of the chip on the FPA + int x0Chip = 0, y0Chip = 0; + if (chipStuff) { + pmChip *chip = cell->parent; // The parent chip + if (!chip) { + psError(PS_ERR_UNKNOWN, true, "Cell has no parent chip --- can't find CHIP.X0 and CHIP.Y0\n"); + good = false; + } + x0Chip = psMetadataLookupS32(&mdok, chip->concepts, "CHIP.X0"); + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "CHIP.X0 for chip is not set.\n"); + good = false; + } + y0Chip = psMetadataLookupS32(&mdok, chip->concepts, "CHIP.Y0"); + if (!mdok) { + psError(PS_ERR_UNKNOWN, true, "CHIP.Y0 for chip is not set.\n"); + good = false; + } + } + + // Binning + xBin->data.S32[index] = psMetadataLookupS32(&mdok, cell->concepts, "CELL.XBIN"); + if (!mdok || xBin->data.S32[index] == 0) { + psError(PS_ERR_UNKNOWN, true, "CELL.XBIN for cell is not set.\n"); + return false; + } else if (xBin->data.S32[index] < *xBinMin) { + *xBinMin = xBin->data.S32[index]; + } + yBin->data.S32[index] = psMetadataLookupS32(&mdok, cell->concepts, "CELL.YBIN"); + if (!mdok || yBin->data.S32[index] == 0) { + psError(PS_ERR_UNKNOWN, true, "CELL.YBIN for cell is not set.\n"); + return false; + } else if (yBin->data.S32[index] < *yBinMin) { + *yBinMin = yBin->data.S32[index]; + } + + // Do we need to flip? + int xParityCell = psMetadataLookupS32(&mdok, cell->concepts, "CELL.XPARITY"); + if (!mdok || (xParityCell != 1 && xParityCell != -1)) { + psError(PS_ERR_UNKNOWN, true, "CELL.XPARITY for cell is not set.\n"); + return false; + } + int yParityCell = psMetadataLookupS32(&mdok, cell->concepts, "CELL.YPARITY"); + if (!mdok || (yParityCell != 1 && yParityCell != -1)) { + psError(PS_ERR_UNKNOWN, true, "CELL.YPARITY for cell is not set.\n"); + return false; + } + + // Parity of the chip on the FPA + int xParityChip = 1, yParityChip = 1; + if (chipStuff) { + pmChip *chip = cell->parent; // The parent chip + xParityChip = psMetadataLookupS32(&mdok, chip->concepts, "CHIP.XPARITY"); + if (!mdok || (xParityChip != 1 && xParityChip != -1)) { + psError(PS_ERR_UNKNOWN, true, "CHIP.XPARITY for chip is not set.\n"); + return false; + } + yParityChip = psMetadataLookupS32(&mdok, chip->concepts, "CHIP.YPARITY"); + if (!mdok || (yParityChip != 1 && yParityChip != -1)) { + psError(PS_ERR_UNKNOWN, true, "CHIP.YPARITY for chip is not set.\n"); + return false; + } + } + + // Set the flips on the basis of the parity + // XXX if (level == CHIP) : only apply Cell parity + // XXX if (level == FPA) : apply Chip & Cell parity + if (xParityCell * xParityChip == xParityTarget) { + xFlip->data.U8[index] = 0; + } else { + xFlip->data.U8[index] = 1; + } + if (yParityCell * yParityChip == yParityTarget) { + yFlip->data.U8[index] = 0; + } else { + yFlip->data.U8[index] = 1; + } + + x0->data.S32[index] = x0Chip + x0Cell - x0Target; + y0->data.S32[index] = y0Chip + y0Cell - y0Target; + + // Add the readout to the array of images to be mosaicked + psArray *readouts = cell->readouts; // The array of readouts + if (readouts->n > 1) { + psLogMsg(__func__, PS_LOG_WARN, "Cell contains more than one readout (%ld) --- only the first will " + "be mosaicked.\n", readouts->n); + } + pmReadout *readout = readouts->data[0]; // The only readout we'll bother with + + // The images to put into the mosaic + images->data[index] = psMemIncrRefCounter(readout->image); + weights->data[index] = psMemIncrRefCounter(readout->weight); + masks->data[index] = psMemIncrRefCounter(readout->mask); + + psTrace("psModules.camera", 9, "Added cell (%p) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index, + x0->data.S32[index], y0->data.S32[index], xBin->data.S32[index], yBin->data.S32[index], + xFlip->data.U8[index], yFlip->data.U8[index]); + + return true; +} + + +// Mosaic together the cells in a chip +static bool chipMosaic(psImage **mosaicImage, // The mosaic image, to be returned + psImage **mosaicMask, // The mosaic mask, to be returned + psImage **mosaicWeights, // The mosaic weights, to be returned + int *xBinChip, int *yBinChip, // The binning in x and y, to be returned + const pmChip *chip, // Chip to mosaic + const pmCell *targetCell, // Cell to which to mosaic + psMaskType blank // Mask value to give blank pixels + ) +{ + assert(mosaicImage); + assert(mosaicMask); + assert(mosaicWeights); + assert(xBinChip); + assert(yBinChip); + assert(chip); + assert(targetCell); + + psArray *images = psArrayAlloc(0); // Array of images that will be mosaicked + psArray *weights = psArrayAlloc(0); // Array of weight images to be mosaicked + psArray *masks = psArrayAlloc(0); // Array of mask images to be mosaicked + psVector *x0 = psVectorAlloc(0, PS_TYPE_S32); // Origin x coordinates + psVector *y0 = psVectorAlloc(0, PS_TYPE_S32); // Origin y coordinates + psVector *xBin = psVectorAlloc(0, PS_TYPE_S32); // Binning in x + psVector *yBin = psVectorAlloc(0, PS_TYPE_S32); // Binning in y + psVector *xFlip = psVectorAlloc(0, PS_TYPE_U8); // Flip in x? + psVector *yFlip = psVectorAlloc(0, PS_TYPE_U8); // Flip in y? + + // Get the target characteristics + bool mdok = true; // Status of MD lookup + int x0Target = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.X0"); + if (!mdok) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.X0 is not set for the target cell; assuming 0.\n"); + FIX_CONCEPT(targetCell->concepts, "CELL.X0", S32, 0); + } + int y0Target = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.Y0"); + if (!mdok) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.Y0 is not set for the target cell; assuming 0.\n"); + FIX_CONCEPT(targetCell->concepts, "CELL.Y0", S32, 0); + } + int xParityTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.XPARITY"); + if (!mdok || (xParityTarget != -1 && xParityTarget != 1)) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.XPARITY is not set for the target cell; assuming 1.\n"); + FIX_CONCEPT(targetCell->concepts, "CELL.XPARITY", S32, 1); + xParityTarget = 1; + } + int yParityTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.YPARITY"); + if (!mdok || (yParityTarget != -1 && yParityTarget != 1)) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.YPARITY is not set for the target cell; assuming 1.\n"); + FIX_CONCEPT(targetCell->concepts, "CELL.YPARITY", S32, 1); + yParityTarget = 1; + } + + // Binning for the mosaicked chip is the minimum binning allowed by the cells + *xBinChip = INT_MAX; + *yBinChip = INT_MAX; + + // Set up the required inputs + bool allGood = true; // Is everything good, well-behaved? + psArray *cells = chip->cells; // The array of cells + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // The cell of interest + if (!cell || !cell->data_exists) { + continue; + } + allGood &= addCell(images, masks, weights, x0, y0, xBin, yBin, xFlip, yFlip, + cell, xBinChip, yBinChip, false, x0Target, y0Target, + xParityTarget, yParityTarget); + } + + // Check to see if the target has a smaller binning in mind + int xBinTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.XBIN"); + if (!mdok || xBinTarget == 0) { + // CELL.XBIN is not set for the target cell --- assume it's the same as the source + FIX_CONCEPT(targetCell->concepts, "CELL.XBIN", S32, *xBinChip); + } else { + *xBinChip = xBinTarget; + } + int yBinTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.YBIN"); + if (!mdok || yBinTarget == 0) { + // CELL.YBIN is not set for the target cell --- assume it's the same as the source + FIX_CONCEPT(targetCell->concepts, "CELL.YBIN", S32, *yBinChip); + } else { + *yBinChip = yBinTarget; + } + + // Mosaic the images together and we're done + if (allGood) { + *mosaicImage = imageMosaic(images, xFlip, yFlip, xBin, yBin, *xBinChip, *yBinChip, x0, y0, BLANK_VALUE); + *mosaicWeights = imageMosaic(weights, xFlip, yFlip, xBin, yBin, *xBinChip, *yBinChip, x0, y0, BLANK_VALUE); + *mosaicMask = imageMosaic(masks, xFlip, yFlip, xBin, yBin, *xBinChip, *yBinChip, x0, y0, blank); + } + + // Clean up + psFree(images); + psFree(weights); + psFree(masks); + psFree(xFlip); + psFree(yFlip); + psFree(xBin); + psFree(yBin); + psFree(x0); + psFree(y0); + + return allGood; +} + +// Mosaic together the cells in a FPA +static bool fpaMosaic(psImage **mosaicImage, // The mosaic image, to be returned + psImage **mosaicMask, // The mosaic mask, to be returned + psImage **mosaicWeights, // The mosaic weights, to be returned + int *xBinFPA, int *yBinFPA, // The binning in x and y, to be returned + const pmFPA *fpa, // FPA to mosaic + const pmChip *targetChip, // Chip to which to mosaic + const pmCell *targetCell, // Cell to which to mosaic + psMaskType blank // Mask value to give blank pixels + ) +{ + assert(mosaicImage); + assert(mosaicMask); + assert(mosaicWeights); + assert(xBinFPA); + assert(yBinFPA); + assert(fpa); + assert(targetChip); + assert(targetCell); + + psArray *images = psArrayAlloc(0); // Array of images that will be mosaicked + psArray *weights = psArrayAlloc(0); // Array of weight images to be mosaicked + psArray *masks = psArrayAlloc(0); // Array of mask images to be mosaicked + psVector *x0 = psVectorAlloc(0, PS_TYPE_S32); // Origin x coordinates + psVector *y0 = psVectorAlloc(0, PS_TYPE_S32); // Origin y coordinates + psVector *xBin = psVectorAlloc(0, PS_TYPE_S32); // Binning in x + psVector *yBin = psVectorAlloc(0, PS_TYPE_S32); // Binning in y + psVector *xFlip = psVectorAlloc(0, PS_TYPE_U8); // Flip in x? + psVector *yFlip = psVectorAlloc(0, PS_TYPE_U8); // Flip in y? + + // Get the target characteristics + bool mdok = true; // Status of MD lookup + int x0Target = psMetadataLookupS32(&mdok, targetChip->concepts, "CHIP.X0"); + if (!mdok) { + psLogMsg(__func__, PS_LOG_WARN, "CHIP.X0 is not set for the target chip; assuming 0.\n"); + FIX_CONCEPT(targetChip->concepts, "CHIP.X0", S32, 0); + } + int y0Target = psMetadataLookupS32(&mdok, targetChip->concepts, "CHIP.Y0"); + if (!mdok) { + psLogMsg(__func__, PS_LOG_WARN, "CHIP.Y0 is not set for the target chip; assuming 0.\n"); + FIX_CONCEPT(targetChip->concepts, "CHIP.Y0", S32, 0); + } + x0Target += psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.X0"); + if (!mdok) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.X0 is not set for the target cell; assuming 0.\n"); + FIX_CONCEPT(targetCell->concepts, "CELL.X0", S32, 0); + } + y0Target += psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.Y0"); + if (!mdok) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.Y0 is not set for the target cell; assuming 0.\n"); + FIX_CONCEPT(targetCell->concepts, "CELL.Y0", S32, 0); + } + int xParityChipTarget = psMetadataLookupS32(&mdok, targetChip->concepts, "CHIP.XPARITY"); + if (!mdok || (xParityChipTarget != -1 && xParityChipTarget != 1)) { + psLogMsg(__func__, PS_LOG_WARN, "CHIP.XPARITY is not set for the target chip; assuming 1.\n"); + FIX_CONCEPT(targetChip->concepts, "CHIP.XPARITY", S32, 1); + xParityChipTarget = 1; + } + int yParityChipTarget = psMetadataLookupS32(&mdok, targetChip->concepts, "CHIP.YPARITY"); + if (!mdok || (yParityChipTarget != -1 && yParityChipTarget != 1)) { + psLogMsg(__func__, PS_LOG_WARN, "CHIP.YPARITY is not set for the target chip; assuming 1.\n"); + FIX_CONCEPT(targetChip->concepts, "CHIP.YPARITY", S32, 1); + yParityChipTarget = 1; + } + int xParityCellTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.XPARITY"); + if (!mdok || (xParityCellTarget != -1 && xParityCellTarget != 1)) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.XPARITY is not set for the target cell; assuming 1.\n"); + FIX_CONCEPT(targetCell->concepts, "CELL.XPARITY", S32, 1); + xParityCellTarget = 1; + } + int yParityCellTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.YPARITY"); + if (!mdok || (yParityCellTarget != -1 && yParityCellTarget != 1)) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.YPARITY is not set for the target cell; assuming 1.\n"); + FIX_CONCEPT(targetCell->concepts, "CELL.YPARITY", S32, 1); + yParityCellTarget = 1; + } + int xParityTarget = xParityChipTarget * xParityCellTarget; + int yParityTarget = yParityChipTarget * yParityCellTarget; + + // Binning for the mosaicked chip is the minimum binning allowed by the cells + *xBinFPA = INT_MAX; + *yBinFPA = INT_MAX; + + // Set up the required inputs + bool allGood = true; // Is everything good, well-behaved? + psArray *chips = fpa->chips; // Array of chips + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // The chip of interest + if (!chip || !chip->data_exists) { + continue; + } + psArray *cells = chip->cells; // The array of cells + for (int j = 0; j < cells->n; j++) { + pmCell *cell = cells->data[j]; // The cell of interest + if (!cell || !cell->data_exists) { + continue; + } + allGood |= addCell(images, masks, weights, x0, y0, xBin, yBin, xFlip, yFlip, + cell, xBinFPA, yBinFPA, true, x0Target, y0Target, + xParityTarget, yParityTarget); + } + } + + // Check to see if the target has a smaller binning in mind + int xBinTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.XBIN"); + if (mdok && xBinTarget != 0) { + *xBinFPA = xBinTarget; + } + int yBinTarget = psMetadataLookupS32(&mdok, targetCell->concepts, "CELL.YBIN"); + if (mdok && yBinTarget != 0) { + *yBinFPA = yBinTarget; + } + + // Mosaic the images together and we're done + if (allGood) { + *mosaicImage = imageMosaic(images, xFlip, yFlip, xBin, yBin, *xBinFPA, *yBinFPA, x0, y0, BLANK_VALUE); + *mosaicWeights = imageMosaic(weights, xFlip, yFlip, xBin, yBin, *xBinFPA, *yBinFPA, x0, y0, BLANK_VALUE); + *mosaicMask = imageMosaic(masks, xFlip, yFlip, xBin, yBin, *xBinFPA, *yBinFPA, x0, y0, blank); + } + + // Clean up + psFree(images); + psFree(weights); + psFree(masks); + psFree(xFlip); + psFree(yFlip); + psFree(xBin); + psFree(yBin); + psFree(x0); + psFree(y0); + + return allGood; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Public functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Mosaic all the cells in a chip together. +// +// It is desirable to do this without using psImageOverlay (or similar) if it can be at all avoided (because +// it's really really slow in that case). There are therefore two cases: +// +// 1. The HDU is at the Chip or FPA level. This is the fast case, and only works if the HDU is "nice", by +// which I mean: +// +// - the CELL.TRIMSECs are contiguous on the HDU image +// - the CELL.PARITYs are identically +1 +// - the CELL.XBIN and CELL.YBIN are all identical +// +// Then we can just use psImageSubset to get the "mosaicked" chip. +// +// +// 2. The HDU is at the cell level, or the above requirements are not met, in which case we mosaic the cells. +// This is the slow case. We need to: +// +// - Throw away the bias regions +// - Convert all cells to common parity +// - Mosaic the cells into an HDU image using CELL.X0 and CELL.Y0 +// - Update CELL.TRIMSECs +// +// Once the demands of case 1 have been met, or case 2 has been performed, then we can create a cell to hold +// the mosaic image. + +bool pmChipMosaic(pmChip *target, const pmChip *source, bool deepCopy, psMaskType blank) +{ + // Target exists, and has only a single cell + PS_ASSERT_PTR_NON_NULL(target, false); + PS_ASSERT_PTR_NON_NULL(target->cells, false); + if (target->cells->n != 1) { + psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Target chip for mosaicking must contain a single cell.\n"); + return false; + } + pmCell *targetCell = target->cells->data[0]; // The target cell + PS_ASSERT_PTR_NON_NULL(targetCell, false); + // Source exists + PS_ASSERT_PTR_NON_NULL(source, false); + + + psImage *mosaicImage = NULL; // The mosaic image + psImage *mosaicMask = NULL; // The mosaic mask + psImage *mosaicWeights = NULL; // The mosaic weights + + // Find the HDU + psRegion *chipRegion = NULL; // Region on the HDU that corresponds to the chip + int xBin = 0, yBin = 0; // Binning for the chip mosaic + if (!deepCopy && (chipRegion = niceChip(&xBin, &yBin, source))) { + // Case 1 --- we need only cut out the region + psTrace("psModules.camera", 1, "Case 1 mosaicking: simple cut-out.\n"); + pmHDU *hdu = source->hdu; // The HDU that has the pixels + if (!hdu || !hdu->images) { + hdu = source->parent->hdu; + } + // force limits to land on chip + psRegion bounds = psRegionForImage (hdu->images->data[0], *chipRegion); + mosaicImage = psImageSubset(hdu->images->data[0], bounds); + if (!mosaicImage) { + psError(PS_ERR_UNKNOWN, false, "Unable to select image pixels.\n"); + return false; + } + if (hdu->masks) { + mosaicMask = psImageSubset(hdu->masks->data[0], bounds); + if (!mosaicMask) { + psError(PS_ERR_UNKNOWN, false, "Unable to select mask pixels.\n"); + return false; + } + } + if (hdu->weights) { + mosaicWeights = psImageSubset(hdu->weights->data[0], bounds); + if (!mosaicWeights) { + psError(PS_ERR_UNKNOWN, false, "Unable to select weight pixels.\n"); + return false; + } + } + } else { + // Case 2 --- we need to mosaic by cut and paste + psTrace("psModules.camera", 1, "Case 2 mosaicking: cut and paste.\n"); + if (!chipMosaic(&mosaicImage, &mosaicMask, &mosaicWeights, &xBin, &yBin, source, targetCell, blank)) { + psError(PS_ERR_UNKNOWN, false, "Unable to mosaic cells.\n"); + return false; + } + chipRegion = psRegionAlloc(0, 0, 0, 0); // We've cut and paste, so there's no valid trimsec + *chipRegion = psRegionForImage (mosaicImage, *chipRegion); + } + psTrace("psModules.camera", 1, "xBin,yBin: %d,%d\n", xBin, yBin); + + // Set the concepts for the target cell + psList *sourceCells = psArrayToList(source->cells); // List of cells + pmConceptsAverageCells(targetCell, sourceCells, chipRegion, NULL, false); + { + psMetadataItem *item = psMetadataLookup(targetCell->concepts, "CELL.X0"); + item->data.S32 = 0; + item = psMetadataLookup(targetCell->concepts, "CELL.Y0"); + item->data.S32 = 0; + item = psMetadataLookup(targetCell->concepts, "CELL.XBIN"); + item->data.S32 = xBin; + item = psMetadataLookup(targetCell->concepts, "CELL.YBIN"); + item->data.S32 = yBin; + } + psFree(sourceCells); + psFree(chipRegion); + + // Copy the concepts + target->concepts = psMetadataCopy(target->concepts, source->concepts); // Chip level + target->parent->concepts = psMetadataCopy(target->parent->concepts, source->parent->concepts); // FPA lvl + + // Now make a new readout to go in the target cell + pmReadout *newReadout = pmReadoutAlloc(targetCell); // New readout + newReadout->image = mosaicImage; + newReadout->mask = mosaicMask; + newReadout->weight = mosaicWeights; + psFree(newReadout); // Drop reference + + // Data now exists in the targets + pmChipSetDataStatus(target, true); + pmCellSetDataStatus(targetCell, true); + newReadout->data_exists = true; + + // Update the headers + pmHDU *sourceHDU = pmHDUFromChip(source); // The HDU for the source + pmHDU *targetHDU = pmHDUFromChip(target); // The HDU for the target + targetHDU->header = psMetadataCopy(targetHDU->header, sourceHDU->header); + pmHDU *targetPHU = pmHDUGetHighest(target->parent, target, NULL); + pmHDU *sourcePHU = pmHDUGetHighest(source->parent, source, NULL); + + // Need to update NAXIS1, NAXIS2 in the target header, so that when we write a CMF, it has the correct + // extent. I'm not convinced that this is the best way to do this, but it should be, at worst, harmless, + // since NAXIS[12] will get overwritten for an image with the proper dimensions. + psRegion *naxis = pmChipExtent(target); + psMetadataAddS32(targetHDU->header, PS_LIST_TAIL, "NAXIS1", PS_META_REPLACE, "Size in x", + naxis->x1 - naxis->x0); + psMetadataAddS32(targetHDU->header, PS_LIST_TAIL, "NAXIS2", PS_META_REPLACE, "Size in y", + naxis->y1 - naxis->y0); + psFree(naxis); + + + if (!targetPHU) { + psError(PS_ERR_UNKNOWN, true, "Unable to find HDU after mosaicking.\n"); + return false; + } + if (!targetPHU->header) { + // if we don't yet have a header, copy this one. + // XXX do we need to create an empty one if the levels do not match?? + if (true) { + targetPHU->header = psMetadataCopy(targetPHU->header, sourcePHU->header); + } else { + targetPHU->header = psMetadataAlloc(); + } + } + + if (!pmConfigConformHeader(targetPHU->header, targetPHU->format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to conform header after mosaicking.\n"); + return false; + } + + // If the cells contain the headers, we need to apply the WCS terms from (one of?) the cells + int xParityCellTarget = psMetadataLookupS32(NULL, targetCell->concepts, "CELL.XPARITY"); + if (xParityCellTarget != -1 && xParityCellTarget != 1) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.XPARITY is not set for target."); + return false; + } + int xParityChipTarget = psMetadataLookupS32(NULL, target->concepts, "CHIP.XPARITY"); + if (xParityChipTarget != -1 && xParityChipTarget != 1) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CHIP.XPARITY is not set for target."); + return false; + } + int xParityTarget = xParityCellTarget * xParityChipTarget; // Target parity in x + + int yParityCellTarget = psMetadataLookupS32(NULL, targetCell->concepts, "CELL.YPARITY"); + if (yParityCellTarget != -1 && yParityCellTarget != 1) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.YPARITY is not set for target."); + return false; + } + int yParityChipTarget = psMetadataLookupS32(NULL, target->concepts, "CHIP.YPARITY"); + if (yParityChipTarget != -1 && yParityChipTarget != 1) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CHIP.YPARITY is not set for target."); + return false; + } + int yParityTarget = yParityCellTarget * yParityChipTarget; // Target parity in y + + for (int i = 0; i < source->cells->n; i++) { + pmCell *cell = source->cells->data[i]; + if (!cell || !cell->hdu || !cell->hdu->header) { + continue; + } + + pmAstromWCS *wcs = pmAstromWCSfromHeader(cell->hdu->header); // WCS terms for this cell + if (!wcs) { + psWarning("Unable to read cell WCS to generate chip WCS --- ignored."); + continue; + } + + int xBinCell = psMetadataLookupS32(NULL, cell->concepts, "CELL.XBIN"); // Cell binning in x + if (xBinCell == 0) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.XBIN is not set."); + return false; + } + int xParitySource = psMetadataLookupS32(NULL, cell->concepts, "CELL.XPARITY") * + psMetadataLookupS32(NULL, source->concepts, "CHIP.XPARITY"); // Source parity in x + if (xParitySource != -1 && xParitySource != 1) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CHIP.XPARITY or CELL.XPARITY is not set for source."); + return false; + } + bool xFlip = (xParitySource == xParityTarget ? false : true); // Flip the x sense of the WCS? + int x0Cell = psMetadataLookupS32(NULL, cell->concepts, "CELL.X0"); // Cell offset in x + + // Modify the wcs terms for the cell offset, binning, and parity + float xBinRatio = (float)xBinCell / (float)xBin; + if (xFlip) { + wcs->crpix1 = x0Cell - wcs->crpix1 * xBinRatio; + wcs->cdelt1 *= -1; + } else { + wcs->crpix1 = x0Cell + wcs->crpix1 * xBinRatio; + } + wcs->cdelt1 *= xBinRatio; + + int yBinCell = psMetadataLookupS32(NULL, cell->concepts, "CELL.YBIN"); // Cell binning in y + if (yBinCell == 0) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CELL.YBIN is not set."); + return false; + } + int yParitySource = psMetadataLookupS32(NULL, cell->concepts, "CELL.YPARITY") * + psMetadataLookupS32(NULL, cell->parent->concepts, "CHIP.YPARITY"); // Source parity in y + if (yParitySource != -1 && yParitySource != 1) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "CHIP.YPARITY or CELL.YPARITY is not set for source."); + return false; + } + bool yFlip = (yParitySource == yParityTarget ? false : true); // Flip the y sense of the WCS? + int y0Cell = psMetadataLookupS32(NULL, cell->concepts, "CELL.Y0"); // Cell offset in y + + float yBinRatio = (float)yBinCell / (float)yBin; + if (yFlip) { + wcs->crpix2 = y0Cell - wcs->crpix2 * yBinRatio; + wcs->cdelt2 *= -1; + } else { + wcs->crpix2 = y0Cell + wcs->crpix2 * yBinRatio; + } + wcs->cdelt2 *= yBinRatio; + + if (!pmAstromWCStoHeader(targetHDU->header, wcs)) { + psError(PS_ERR_UNKNOWN, false, "Unable to generate chip WCS from cell WCS."); + psFree(wcs); + return false; + } + psFree(wcs); + + // XXX rather than quitting at this point, we could save this wcs structure and compare + // its values to the equivalent version from one of the other cells. + break; + } + + return true; +} + + +bool pmFPAMosaic(pmFPA *target, const pmFPA *source, bool deepCopy, psMaskType blank) +{ + // Target exists, and has only a single chip with single cell + PS_ASSERT_PTR_NON_NULL(target, false); + PS_ASSERT_PTR_NON_NULL(target->chips, false); + if (target->chips->n != 1) { + psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Target FPA for mosaicking must contain a single chip.\n"); + return false; + } + pmChip *targetChip = target->chips->data[0]; // The target chip + PS_ASSERT_PTR_NON_NULL(targetChip, false); + PS_ASSERT_PTR_NON_NULL(targetChip->cells, false); + if (target->chips->n != 1) { + psError(PS_ERR_BAD_PARAMETER_SIZE, true, "Target FPA for mosaicking must contain a single cell.\n"); + return false; + } + pmCell *targetCell = targetChip->cells->data[0]; // The target cell + PS_ASSERT_PTR_NON_NULL(targetCell, false); + // Source exists + PS_ASSERT_PTR_NON_NULL(source, false); + + psImage *mosaicImage = NULL; // The mosaic image + psImage *mosaicMask = NULL; // The mosaic mask + psImage *mosaicWeights = NULL; // The mosaic weights + + // Find the HDU + psRegion *fpaRegion = NULL; // Region on the HDU that corresponds to the FPA + int xBin = 0, yBin = 0; // Binning for the FPA mosaic + if (!deepCopy && (fpaRegion = niceFPA(&xBin, &yBin, source))) { + // Case 1 --- we need only cut out the region + psTrace("psModules.camera", 1, "Case 1 mosaicking: simple cut-out.\n"); + pmHDU *hdu = source->hdu; // The HDU that has the pixels + mosaicImage = psImageSubset(hdu->images->data[0], *fpaRegion); + if (hdu->masks) { + mosaicMask = psImageSubset(hdu->masks->data[0], *fpaRegion); + } + if (hdu->weights) { + mosaicWeights = psImageSubset(hdu->weights->data[0], *fpaRegion); + } + } else { + // Case 2 --- we need to mosaic by cut and paste + psTrace("psModules.camera", 1, "Case 2 mosaicking: cut and paste.\n"); + if (!fpaMosaic(&mosaicImage, &mosaicMask, &mosaicWeights, &xBin, &yBin, source, + targetChip, targetCell, blank)) { + psError(PS_ERR_UNKNOWN, false, "Unable to mosaic chips.\n"); + return false; + } + fpaRegion = psRegionAlloc(NAN, NAN, NAN, NAN); // We've cut and paste, so there's no valid trimsec + } + + // Set the concepts for the target cell, and add the mosaic in + // First we need a list of cells + psList *sourceCells = psListAlloc(NULL); // List of source cells + psArray *chips = source->chips; // Array of chips + pmChip *firstSourceChip = NULL; // The first chip in the source FPA; for headers + pmCell *firstSourceCell = NULL; // The first cell in the source FPA; for headers + for (long i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // Chip of interest + if (!chip || !chip->data_exists) { + continue; + } + psArray *cells = chip->cells; + for (long j = 0; j < cells->n; j++) { + pmCell *cell = cells->data[j]; // Cell of interest + if (!cell || !cell->data_exists) { + continue; + } + psListAdd(sourceCells, PS_LIST_TAIL, cell); + + // These are valid chip and cell to use for the header; grab the first such + if (!firstSourceCell && !firstSourceChip) { + firstSourceCell = cell; + firstSourceChip = chip; + } + } + } + pmConceptsAverageCells(targetCell, sourceCells, fpaRegion, NULL, false); + { + psMetadataItem *item = psMetadataLookup(targetCell->concepts, "CELL.X0"); + item->data.S32 = 0; + item = psMetadataLookup(targetCell->concepts, "CELL.Y0"); + item->data.S32 = 0; + item = psMetadataLookup(targetCell->concepts, "CELL.XBIN"); + item->data.S32 = xBin; + item = psMetadataLookup(targetCell->concepts, "CELL.YBIN"); + item->data.S32 = yBin; + } + psFree(sourceCells); + psFree(fpaRegion); + + // Currently, there's nothing interesting in the chip concepts that needs to be updated. + + // Copy the concepts for the target FPA + target->concepts = psMetadataCopy(target->concepts, source->concepts); + + // Now make a new readout to go in the new cell + pmReadout *newReadout = pmReadoutAlloc(targetCell); // New readout + newReadout->image = mosaicImage; + newReadout->mask = mosaicMask; + newReadout->weight = mosaicWeights; + psFree(newReadout); // Drop reference + + // Data now exists in the targets + pmChipSetDataStatus(targetChip, true); + pmCellSetDataStatus(targetCell, true); + newReadout->data_exists = true; + + // Update the headers + pmHDU *sourceHDU = pmHDUGetHighest(source, firstSourceChip, firstSourceCell); // The HDU for the source + if (!sourceHDU) { + psLogMsg(__func__, PS_LOG_WARN, "Unable to find HDU in source FPA; unable to copy headers.\n"); + return false; + } + pmHDU *targetHDU = pmHDUGetHighest(target, targetChip, targetCell); // The HDU for the target + if (!targetHDU) { + psLogMsg(__func__, PS_LOG_WARN, "Unable to find HDU in target FPA; unable to copy headers.\n"); + return false; + } + + if (sourceHDU->header) { + targetHDU->header = psMetadataCopy(targetHDU->header, sourceHDU->header); + } else if (!targetHDU->header) { + targetHDU->header = psMetadataAlloc(); + } + + if (!pmConfigConformHeader(targetHDU->header, targetHDU->format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to conform header after mosaicking.\n"); + return false; + } + + return true; +} + Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAMosaic.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAMosaic.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAMosaic.h (revision 14957) @@ -0,0 +1,41 @@ +/* @file pmFPAMosaic.h + * @brief Functions to mosaic FPA components into a single entity + * + * @author Paul Price, IfA + * + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-06-20 02:22:26 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_CHIP_MOSAIC_H +#define PM_CHIP_MOSAIC_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Mosaic all cells within a chip +/// +/// Mosaics all cells within the source into a single cell within the target (which must have only a single +/// cell). Cells are placed on the chip according to the CELL.X0 and CELL.Y0 offsets. This is useful for +/// getting an image of the chip on the sky. The mosaicking is done so as to avoid performing a deep copy of +/// the pixels, if possible. +bool pmChipMosaic(pmChip *target, ///< Target chip --- may contain only a single cell + const pmChip *source, ///< Source chip whose cells will be mosaicked + bool deepCopy, ///< Require a deep copy (disregard 'nice' chip) + psMaskType blank ///< Mask value to give blank pixels + ); + +/// Mosaic all cells within an FPA +/// +/// Mosaics all cells within the source into a single chip with single cell within the target (which must have +/// only a single chip with single cell). Cells are placed on the FPA according to the CHIP.X0, CHIP.Y0, +/// CELL.X0 and CELL.Y0 offsets. This is useful for getting an image of the FPA on the sky. The mosaicking +/// is done so as to avoid performing a deep copy of the pixels, if possible. +bool pmFPAMosaic(pmFPA *target, ///< Target FPA --- may contain only a single chip with a single cell + const pmFPA *source, ///< FPA whose chips and cells will be mosaicked + bool deepCopy, ///< Require a deep copy (disregard 'nice' chip) + psMaskType blank ///< Mask value to give blank pixels + ); +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPARead.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPARead.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPARead.c (revision 14957) @@ -0,0 +1,766 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" +#include "pmFPAFlags.h" +#include "pmHDUUtils.h" +#include "pmConcepts.h" +#include "pmFPAHeader.h" + +#include "pmFPARead.h" + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Definitions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Specify what to read +typedef enum { + FPA_READ_TYPE_IMAGE, // Read image + FPA_READ_TYPE_MASK, // Read mask + FPA_READ_TYPE_WEIGHT, // Read weight map + FPA_READ_TYPE_HEADER // Read header +} fpaReadType; + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// File-static functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Carve a readout from the image pixels +static bool readoutCarve(pmReadout *readout, // Readout to be carved up + psImage *image, // Image that will be carved + const psRegion *trimsec, // Trim section + const psList *biassecs, // Bias sections + fpaReadType type + ) +{ + assert(readout); + assert(image); + assert(trimsec); + assert(biassecs); + + // The image corresponding to the trim region + if (psRegionIsNaN(*trimsec)) { + psString regionString = psRegionToString(*trimsec); + psError(PS_ERR_UNKNOWN, true, "Invalid trim section: %s\n", regionString); + psFree(regionString); + psFree(readout); + return false; + } + psRegion region = psRegionSet(PS_MAX(trimsec->x0 - readout->col0, 0), // x0 + PS_MIN(trimsec->x1 - readout->col0, image->numCols), // x1 + PS_MAX(trimsec->y0 - readout->row0, 0), // y0 + PS_MIN(trimsec->y1 - readout->row0, image->numRows) // y1 + ); + + // place the image subset in the appropriate target location, freeing if needed + switch (type) { + case FPA_READ_TYPE_IMAGE: + if (readout->image) { + psFree (readout->image); + } + readout->image = psImageSubset(image, region); + break; + case FPA_READ_TYPE_MASK: + if (readout->mask) { + psFree (readout->mask); + } + readout->mask = psImageSubset(image, region); + break; + case FPA_READ_TYPE_WEIGHT: + if (readout->weight) { + psFree (readout->weight); + } + readout->weight = psImageSubset(image, region); + break; + default: + psAbort("Unknown read type: %x\n", type); + } + + // Get the list of overscans + // XXX should this step only be performed for IMAGE, not MASK and WEIGHT types? + // XXX that would allow us to overlay a MASK and WEIGHT which have been trimmed... + if (readout->bias->n != 0) { + // Make way! + psFree(readout->bias); + readout->bias = psListAlloc(NULL); + } + psListIterator *iter = psListIteratorAlloc((psList*)biassecs, PS_LIST_HEAD, false); // Iterator + psRegion *biassec = NULL; // A BIASSEC region from the list + while ((biassec = psListGetAndIncrement(iter))) { + if (psRegionIsNaN(*biassec)) { + psString regionString = psRegionToString(*biassec); + psError(PS_ERR_IO, true, "Invalid bias section: %s\n", regionString); + psFree(regionString); + psFree(readout); + return false; + } + psRegion region = psRegionSet(PS_MAX(biassec->x0 - readout->col0, 0), // x0 + PS_MIN(biassec->x1 - readout->col0, image->numCols), // x1 + PS_MAX(biassec->y0 - readout->row0, 0), // y0 + PS_MIN(biassec->y1 - readout->row0, image->numRows) // y1 + ); + psImage *overscan = psImageSubset(image, region); + psListAdd(readout->bias, PS_LIST_TAIL, overscan); + psFree(overscan); + } + psFree(iter); + + return true; +} + +// Read a component of a readout. We read in only the rows from min to max for plane z, for +// the full region requested. if we request a range outside the region, we will pad to fill +// out the edges of the region with 'bad' pixels. The output image always has max-min rows. +// The region represents the maximum bounds of the full image + +static psImage *readoutReadComponent(psImage *image, // Image into which to read + psFits *fits, // FITS file from which to read + const psRegion *fullImage, // full image region, read a subset + int readdir, // Read direction (1=rows, 2=cols) + int min, // Minimum row/col number to read + int max, // Maximum row/col number to read + int z, // Image plane to read + float bad // Bad value + ) +{ + assert(fits); + assert(fullImage); + assert((readdir == 1) || (readdir == 2)); + + int nRead = 0; + int nScans = max - min; + assert (nScans > 0); + + psRegion toRead = *fullImage; // full image region + + int dX = 0; + int dY = 0; + int nX = 0; + int nY = 0; + + if (readdir == 1) { + toRead.y0 = PS_MAX (toRead.y0, min); + toRead.y1 = PS_MIN (toRead.y1, max); + nRead = toRead.y1 - toRead.y0; + if (min < fullImage->y0) { + dY = toRead.y0; + } + nX = toRead.x1 - toRead.x0; + nY = nScans; + } else { + toRead.x0 = PS_MAX (toRead.x0, min); + toRead.x1 = PS_MIN (toRead.x1, max); + nRead = toRead.x1 - toRead.x0; + if (min < fullImage->x0) { + dX = toRead.x0; + } + nX = nScans; + nY = toRead.y1 - toRead.y0; + } + + psTrace("psModules.camera", 5, "Reading section [%.0f:%.0f,%.0f:%.0f]\n", + toRead.x0, toRead.x1, toRead.y0, toRead.y1); + image = psFitsReadImageBuffer(image, fits, toRead, z); // Desired pixels + psTrace("psModules.camera", 7, "Image is %dx%d\n", image->numCols, image->numRows); + + // XXX: We only support F32 for now + if (image->type.type != PS_TYPE_F32) { + psImage *temp = psImageCopy(NULL, image, PS_TYPE_F32); + psFree(image); + image = temp; + } + + // XXX this modification is not carried back up stream: it affects readout->row0,col0 + if (nRead < nScans) { + // The region of interest is smaller than the number of pixels we want. + psTrace("psModules.camera", 5, "Resizing image to %d,%d\n", nX, nY); + psImage *temp = psImageAlloc(nX, nY, image->type.type); + psImageInit(temp, bad); + psImageOverlaySection(temp, image, dX, dY, "="); + psFree(image); + image = temp; + } + + return image; +} + + +// Read into an cell; this is the engine for pmCellRead, pmCellReadMask, pmCellReadWeight +// Does most of the work for the reading --- reads the HDU, and portions the HDU into readouts. +static bool cellRead(pmCell *cell, // Cell into which to read + psFits *fits, // FITS file from which to read + psDB *db, // Database handle, for concepts ingest + fpaReadType type // Type to read + ) +{ + assert(cell); + assert(fits); + + pmHDU *hdu = pmHDUFromCell(cell); // The HDU + if (!hdu) { + return true; // We read everything we could + } + + // check if we have read the desired data, read it if needed + bool (*hduReadFunc)(pmHDU*, psFits*) = NULL; // Function to use to read the HDU + void *dataPointer = NULL; // pointer to location of desired data + switch (type) { + case FPA_READ_TYPE_IMAGE: + hduReadFunc = pmHDURead; + dataPointer = hdu->images; + break; + case FPA_READ_TYPE_HEADER: + hduReadFunc = pmHDUReadHeader; + dataPointer = hdu->header; + break; + case FPA_READ_TYPE_MASK: + hduReadFunc = pmHDUReadMask; + dataPointer = hdu->masks; + break; + case FPA_READ_TYPE_WEIGHT: + hduReadFunc = pmHDUReadWeight; + dataPointer = hdu->weights; + break; + default: + psAbort("Unknown read type: %x\n", type); + } + + // do we have the data we want (image, header, or etc). + if (!dataPointer) { + // attempt to read in the desired data + if (!hduReadFunc(hdu, fits)) { + psError(PS_ERR_UNKNOWN, false, "Unable to read HDU for cell.\n"); + return false; + } + } + + // load in the concept information for this cell + if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER, true, NULL)) { + //psError(PS_ERR_UNKNOWN, false, "Failed to read concepts for cell"); + //return false; + psWarning("Difficulty reading concepts for cell; attempting to proceed."); + } + + // skip the image arrays completely for the header-only files + if (type == FPA_READ_TYPE_HEADER) { + pmCellSetDataStatus(cell, true); + return true; + } + + // set up pointers for the different possible image arrays + psArray *imageArray = NULL; // Array of images in the HDU + psElemType imageType = PS_TYPE_F32; // Expected type for image + switch (type) { + case FPA_READ_TYPE_IMAGE: + imageArray = hdu->images; + imageType = PS_TYPE_F32; + break; + case FPA_READ_TYPE_MASK: + imageArray = hdu->masks; + imageType = PS_TYPE_MASK; + break; + case FPA_READ_TYPE_WEIGHT: + imageArray = hdu->weights; + imageType = PS_TYPE_F32; + break; + default: + psAbort("Unknown read type: %x\n", type); + } + + // Having read the cell, we now have to cut it up + psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC"); + psList *biassecs = psMetadataLookupPtr(NULL, cell->concepts, "CELL.BIASSEC"); + if (psRegionIsNaN(*trimsec)) { + psError(PS_ERR_IO, false, "CELL.TRIMSEC is not set --- can't read cell.\n"); + return false; + } + + // Iterate over each of the image planes, converting type if necessary, and extracting the bits that + // matter (CELL.TRIMSEC, CELL.BIASSEC) into readouts with readoutCarve. + for (int i = 0; i < imageArray->n; i++) { + psImage *source = imageArray->data[i]; // Source image, from the i-th plane + + // Type conversion here to support the modules, which don't have multiple type support yet + if (source->type.type != imageType) { + psImage *temp = psImageCopy(NULL, source, imageType); // Temporary image + psFree(imageArray->data[i]); + imageArray->data[i] = temp; + source = temp; + } + + pmReadout *readout; // Readout into which to read + if (cell->readouts->n > i && cell->readouts->data[i]) { + readout = psMemIncrRefCounter(cell->readouts->data[i]); + } else { + readout = pmReadoutAlloc(cell); + } + + if (!readoutCarve(readout, source, trimsec, biassecs, type)) { + psError(PS_ERR_UNEXPECTED_NULL, false, + "Unable to carve readout into image and bias sections for %d the plane.", i); + return NULL; + } + psFree(readout); // Drop reference + } + + pmCellSetDataStatus(cell, true); + return true; +} + + +// Read into an chip; this is the engine for pmChipRead, pmChipReadMask, pmChipReadWeight +// Iterates over component cells, reading each +static bool chipRead(pmChip *chip, // Chip into which to read + psFits *fits, // FITS file from which to read + psDB *db, // Database handle, for concepts ingest + fpaReadType type // Type to read + ) +{ + assert(chip); + assert(fits); + + bool success = false; // Were we able to read at least one HDU? + psArray *cells = chip->cells; // Array of cells + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // The cell of interest + success |= cellRead(cell, fits, db, type); + } + if (success) { + if (!pmConceptsReadChip(chip, PM_CONCEPT_SOURCE_HEADER, true, true, NULL)) { + psError(PS_ERR_IO, false, "Failed to read concepts for chip.\n"); + return false; + } + // XXX probably could just use chip->data_exists + pmChipSetDataStatus(chip, true); + } + + return success; +} + + +// Read into an FPA; this is the engine for pmFPARead, pmFPAReadMask, pmFPAReadWeight +// Iterates over component chips, reading each +static bool fpaRead(pmFPA *fpa, // FPA into which to read + psFits *fits, // FITS file from which to read + psDB *db, // Database handle, for concepts ingest + fpaReadType type // Type to read + ) +{ + assert(fpa); + assert(fits); + + bool success = false; // Were we able to read at least one HDU? + psArray *chips = fpa->chips; // Array of chips + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // The cell of interest + success |= chipRead(chip, fits, db, type); + } + if (success) { + if (!pmConceptsReadFPA(fpa, PM_CONCEPT_SOURCE_HEADER, true, NULL)) { + psError(PS_ERR_IO, false, "Failed to read concepts for FPA.\n"); + return false; + } + } else { + psError(PS_ERR_UNKNOWN, false, "Unable to read any chips in FPA"); + } + + return success; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Public functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Reading images +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// XXX need to pass back the error conditions as well as the 'keep going' state +bool pmReadoutReadNext(bool *status, pmReadout *readout, psFits *fits, int z, int numScans) +{ + PS_ASSERT_PTR_NON_NULL(readout, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + PS_ASSERT_INT_NONNEGATIVE(z, false); + PS_ASSERT_INT_NONNEGATIVE(numScans, false); + + assert (numScans || !readout->image); // cannot have readout->image and !numScans + + *status = false; + + // Get the HDU and read the header + pmCell *cell = readout->parent; // The parent cell + + pmHDU *hdu = pmHDUFromCell(cell); // The HDU + if (!hdu || hdu->blankPHU) { + // XXX is this an error condition? + *status = true; + return false; + } + + if (!pmCellReadHeader(cell, fits)) { + psError(PS_ERR_IO, false, "Unable to read header for cell!\n"); + return false; + } + + // Make sure we have the information we need + if (!pmConceptsReadCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS | + PM_CONCEPT_SOURCE_DEFAULTS, true, NULL)) { + psError(PS_ERR_IO, false, "Failed to read concepts for cell.\n"); + return false; + } + + // Get the trim and bias sections + bool mdok = true; // Status of MD lookup + psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim sections + if (!mdok || !trimsec || psRegionIsNaN(*trimsec)) { + psError(PS_ERR_IO, true, "CELL.TRIMSEC is not set.\n"); + return false; + } + psList *biassecs = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.BIASSEC"); // Bias sections + if (!mdok || !biassecs) { + psError(PS_ERR_IO, true, "CELL.BIASSEC is not set.\n"); + return false; + } + int readdir = psMetadataLookupS32(&mdok, cell->concepts, "CELL.READDIR"); // Read direction + if (!mdok || readdir == 0 || (readdir != 1 && readdir != 2)) { + psError(PS_ERR_IO, true, "CELL.READDIR is not set to -1 or +1.\n"); + return false; + } + float bad = psMetadataLookupF32(&mdok, cell->concepts, "CELL.BAD"); // Bad level + if (!mdok) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.BAD is not set --- assuming zero.\n"); + bad = 0.0; + } + + // Check the third dimension + int naxis = psMetadataLookupS32(&mdok, hdu->header, "NAXIS"); // The number of axes + if (!mdok) { + psError(PS_ERR_IO, true, "Unable to find NAXIS in header for extension %s\n", hdu->extname); + return false; + } + if (naxis == 0) { + // No pixels to read, as for a PHU. + *status = true; + return false; + } + if (naxis < 2 || naxis > 3) { + psError(PS_ERR_IO, true, "NAXIS in header of extension %s (= %d) is not valid.\n", + hdu->extname, naxis); + return false; + } + int naxis3 = 1; // The number of image planes + if (naxis == 3) { + naxis3 = psMetadataLookupS32(&mdok, hdu->header, "NAXIS3"); + if (!mdok) { + psError(PS_ERR_IO, true, "Unable to find NAXIS3 in header for extension %s\n", hdu->extname); + return false; + } + } + if (z >= naxis3) { + // Nothing to see here. Move along. + *status = true; + return false; + } + + // Get the size of the image plane + int naxis1 = psMetadataLookupS32(&mdok, hdu->header, "NAXIS1"); // The number of columns + if (!mdok) { + psError(PS_ERR_IO, true, "Unable to find NAXIS1 in header for extension %s\n", hdu->extname); + return false; + } + int naxis2 = psMetadataLookupS32(&mdok, hdu->header, "NAXIS2"); // The number of columns + if (!mdok) { + psError(PS_ERR_IO, true, "Unable to find NAXIS2 in header for extension %s\n", hdu->extname); + return false; + } + + // rationalize trimsec against naxis1, naxis2 + // valid range for trimsec is 1-Nx,1-Ny + // if (trimsec->x0 == 0) trimsec->x0 = 1; + if (trimsec->x1 < 1) + trimsec->x1 = naxis1 + trimsec->x1; + // if (trimsec->y0 == 0) trimsec->y0 = 1; + if (trimsec->y1 < 1) + trimsec->y1 = naxis2 + trimsec->y1; + + int maxSize; // Number of cols,rows in image + if (readdir == 1) { + maxSize = PS_MIN(naxis2, trimsec->y1 - trimsec->y0); + } else { + maxSize = PS_MIN(naxis1, trimsec->x1 - trimsec->x0); + } + + int offset; // start of the segment + int upper; // end of the segment + int lastScan; // last possible scan + + // Calculate the segment offset and upper limit, adjust readout->row0,col0 + if (readdir == 1) { + // Reading rows + offset = (readout->image) ? readout->row0 + numScans : 0; // extend to next section or start at beginning? + offset = (numScans == 0) ? trimsec->x0 : offset; // full array ? read full trimsec : read section + readout->row0 = offset; + readout->col0 = trimsec->x0; + lastScan = trimsec->y1; + } else { + // Reading cols + offset = (readout->image) ? readout->col0 + numScans : 0; + offset = (numScans == 0) ? trimsec->y0 : offset; // full array ? read full trimsec : read section + readout->col0 = offset; + readout->row0 = trimsec->y0; + lastScan = trimsec->x1; + } + upper = offset + numScans; + + // Blow away existing data. + // Do this before returning, so that we're not returning data from a previous read + psFree(readout->image); + readout->image = NULL; + + while (readout->bias->n > 0) { + psListRemove(readout->bias, PS_LIST_HEAD); + } + + if (offset >= lastScan) { + // We've read everything there is + psTrace("psModules.camera", 7, "Read everything.\n"); + *status = true; + return false; + } + + psTrace("psModules.camera", 7, "offset=%d, upper = %d, image is %dx%d, trimsec [%.0f:%.0f,%.0f:%.0f]\n", + offset, upper, naxis1, naxis2, trimsec->x0, trimsec->x1, trimsec->y0, trimsec->y1); + + // Get the new the trim section + readout->image = readoutReadComponent(readout->image, fits, trimsec, readdir, offset, upper, z, bad); // The image + + // Get the new bias sections + psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator for BIASSEC + psRegion *biassec = NULL; // Bias section from iteration + while ((biassec = psListGetAndIncrement(biassecsIter))) { + psImage *bias = readoutReadComponent(NULL, fits, biassec, readdir, offset, upper, z, bad); // The bias + psListAdd(readout->bias, PS_LIST_TAIL, bias); + psFree(bias); // Drop reference + } + psFree(biassecsIter); + + *status = true; + return true; +} + + +bool pmCellRead(pmCell *cell, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return cellRead(cell, fits, db, FPA_READ_TYPE_IMAGE); +} + +bool pmChipRead(pmChip *chip, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return chipRead(chip, fits, db, FPA_READ_TYPE_IMAGE); +} + +bool pmFPARead(pmFPA *fpa, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return fpaRead(fpa, fits, db, FPA_READ_TYPE_IMAGE); +} + + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Reading the mask +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +bool pmCellReadMask(pmCell *cell, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return cellRead(cell, fits, db, FPA_READ_TYPE_MASK); +} + +bool pmChipReadMask(pmChip *chip, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return chipRead(chip, fits, db, FPA_READ_TYPE_MASK); +} + +bool pmFPAReadMask(pmFPA *fpa, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return fpaRead(fpa, fits, db, FPA_READ_TYPE_MASK); +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Reading the weight map +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +bool pmCellReadWeight(pmCell *cell, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return cellRead(cell, fits, db, FPA_READ_TYPE_WEIGHT); +} + +bool pmChipReadWeight(pmChip *chip, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return chipRead(chip, fits, db, FPA_READ_TYPE_WEIGHT); +} + +bool pmFPAReadWeight(pmFPA *fpa, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return fpaRead(fpa, fits, db, FPA_READ_TYPE_WEIGHT); +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Reading the image header +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +bool pmCellReadHeaderSet(pmCell *cell, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return cellRead(cell, fits, db, FPA_READ_TYPE_HEADER); +} + +bool pmChipReadHeaderSet(pmChip *chip, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return chipRead(chip, fits, db, FPA_READ_TYPE_HEADER); +} + +bool pmFPAReadHeaderSet(pmFPA *fpa, psFits *fits, psDB *db) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return fpaRead(fpa, fits, db, FPA_READ_TYPE_HEADER); +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Reading FITS tables +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +int pmCellReadTable(pmCell *cell, psFits *fits, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(cell, 0); + PS_ASSERT_PTR_NON_NULL(fits, 0); + PS_ASSERT_STRING_NON_EMPTY(name, 0); + + const char *chipName = psMetadataLookupStr(NULL, cell->parent->concepts, "CHIP.NAME"); // Name of chip + const char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME"); // Name of cell + psString extname = NULL; // Extension name + psStringAppend(&extname, "%s_%s_%s", name, chipName, cellName); + + // XXX Could do a table lookup from the camera format, in case the input file isn't laid out with + // NAME_CHIP_CELL extension names --- use these as keys, and the value as the proper extension name. + // Allow interpolation of concepts, e.g., "{CHIP.NAME}" --> "ccd13". + + if (!psFitsMoveExtName(fits, extname)) { + psError(PS_ERR_IO, false, "Unable to move to extension %s\n", extname); + psFree(extname); + return 0; + } + + psMetadata *header = psFitsReadHeader(NULL, fits); // The FITS header + if (!header) { + psError(PS_ERR_IO, false, "Unable to read header for extension %s\n", extname); + psFree(extname); + psFree(header); + return 0; + } + + psString headerName = NULL; // Name for header + psStringAppend(&headerName, "%s.HEADER", name); + if (!psMetadataAdd(cell->analysis, PS_LIST_TAIL, headerName, PS_DATA_METADATA, + "FITS table header", header)) { + psError(PS_ERR_UNKNOWN, false, "Unable to add header from extension %s to analysis metadata " + "for chip %s, cell %s\n", extname, chipName, cellName); + psFree(headerName); + psFree(header); + psFree(extname); + return 0; + } + psFree(headerName); + psFree(header); + + psArray *table = psFitsReadTable(fits); // The table + if (!psMetadataAdd(cell->analysis, PS_LIST_TAIL, name, PS_DATA_ARRAY, "FITS table", table)) { + psError(PS_ERR_UNKNOWN, false, "Unable to add table from extension %s to analysis metadata " + "for chip %s, cell %s\n", extname, chipName, cellName); + psFree(table); + psFree(extname); + return 0; + } + + psFree(extname); + psFree(table); // Dropping reference + + return 1; +} + + +int pmChipReadTable(pmChip *chip, psFits *fits, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(chip, 0); + PS_ASSERT_PTR_NON_NULL(fits, 0); + PS_ASSERT_STRING_NON_EMPTY(name, 0); + + int numRead = 0; // Number of reads + psArray *cells = chip->cells; // Array of cells + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // Cell of interest + numRead += pmCellReadTable(cell, fits, name); + } + + return numRead; +} + + +int pmFPAReadTable(pmFPA *fpa, psFits *fits, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(fpa, 0); + PS_ASSERT_PTR_NON_NULL(fits, 0); + PS_ASSERT_STRING_NON_EMPTY(name, 0); + + int numRead = 0; // Number of reads + psArray *chips = fpa->chips; // Array of chips + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // Chip of interest + numRead += pmChipReadTable(chip, fits, name); + } + + return numRead; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPARead.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPARead.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPARead.h (revision 14957) @@ -0,0 +1,157 @@ +/* @file pmFPARead.h + * @brief Functions to read FPA components from a FITS file + * + * @author Paul Price, IfA + * + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-06-12 22:22:33 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_READ_H +#define PM_FPA_READ_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Read a readout incrementally +/// +/// Multiple calls to this function moves through a readout within a cell incrementally. It is required to +/// pass the readout previously acquired (or a newly-allocated one) in order to preserve state information +/// (where the read is at). Only a maximum of numRows rows are read at a time. Returns true if pixels are +/// read, and false otherwise. To facilitate looping, no error is generated for reading a plane that doesn't +/// exist. Note that this function doesn't put pixels in the HDU. It is therefore NOT COMPATIBLE with +/// pmCellWrite, pmChipWrite, and pmFPAWrite (or any function that uses or creates an HDU for that matter). +/// Use pmReadoutWriteNext to write the data that's read by this function. This function is intended for +/// reading in many readouts into memory at once (e.g., for stacking) where the input is not written out. +bool pmReadoutReadNext(bool *status, // non-error exit condition? + pmReadout *readout, // Readout into which to read + psFits *fits, // FITS file from which to read + int z, // Readout number/plane; zero-offset indexing + int numRows // The number of rows to read + ); + +/// Read an entire cell +/// +/// Reads the appropriate HDU, ingests concepts from the header, and portions pixels into readouts. Pixels +/// are converted to F32. +bool pmCellRead(pmCell *cell, // Cell to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read a chip +/// +/// Iterates over component cells, reading each with pmCellRead. +bool pmChipRead(pmChip *chip, // Chip to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read an FPA +/// +/// Iterates over component chips, reading each with pmChipRead. +bool pmFPARead(pmFPA *fpa, // FPA to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read an entire cell into the mask +/// +/// Same as pmCellRead, but reads into the mask element of the readouts. +bool pmCellReadMask(pmCell *cell, // Cell to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read an entire chip into the mask +/// +/// Same as pmChipRead, but reads into the mask element of the readouts. +bool pmChipReadMask(pmChip *chip, // Chip to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read an entire FPA into the mask +/// +/// Same as pmFPARead, but reads into the mask element of the readouts. +bool pmFPAReadMask(pmFPA *fpa, // FPA to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read an entire cell into the weight +/// +/// Same as pmCellRead, but reads into the weight element of the readouts. +bool pmCellReadWeight(pmCell *cell, // Cell to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read an entire chip into the weight +/// +/// Same as pmChipRead, but reads into the weight element of the readouts. +bool pmChipReadWeight(pmChip *chip, // Chip to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read an entire FPA into the weight +/// +/// Same as pmFPARead, but reads into the weight element of the readouts. +bool pmFPAReadWeight(pmFPA *fpa, // FPA to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read cell headers +/// +/// Same as pmCellRead, but reads only the headers of the readouts. +bool pmCellReadHeaderSet(pmCell *cell, // Cell to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read chip headers +/// +/// Same as pmChipRead, but reads only the headers of the readouts. +bool pmChipReadHeaderSet(pmChip *chip, // Chip to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read FPA headers +/// +/// Same as pmFPARead, but reads only the headers of the readouts. +bool pmFPAReadHeaderSet(pmFPA *fpa, // FPA to read into + psFits *fits, // FITS file from which to read + psDB *db // Database handle, for "concepts" ingest + ); + +/// Read a FITS table into the cell +/// +/// Given a name, which is combined with the chip and cell to identify the extension name ("NAME_CHIP_CELL"), +/// read the FITS table into the cell analysis metadata (with key being the provided name). The header is +/// also read and included in the cell analysis metadata under "name.HEADER". +int pmCellReadTable(pmCell *cell, ///< Cell for which to read table + psFits *fits, ///< FITS file from which the table + const char *name ///< Specifies the extension name, and target in the analysis metadata + ); + +/// Read a FITS table into the component cells +/// +/// Iterates over component cells, calling pmCellReadTable. +int pmChipReadTable(pmChip *chip, ///< Cell for which to read table + psFits *fits, ///< FITS file from which the table + const char *name ///< Specifies the extension name, and target in the analysis metadata + ); + +/// Read a FITS table into the component cells +/// +/// Iterates over component chips, calling pmChipReadTable. +int pmFPAReadTable(pmFPA *fpa, ///< Cell for which to read table + psFits *fits, ///< FITS file from which the table + const char *name ///< Specifies the extension name, and target in the analysis metadata + ); +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAUtils.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAUtils.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAUtils.c (revision 14957) @@ -0,0 +1,55 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPAUtils.h" + +int pmFPAFindChip(const pmFPA *fpa, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(fpa, -1); + PS_ASSERT_PTR_NON_NULL(name, -1); + if (strlen(name) == 0) { + return -1; + } + + psArray *chips = fpa->chips; // Array of chips + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // The chip of interest + psString testName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME"); // Name of this chip + if (strcmp(name, testName) == 0) { + return i; + } + } + + psError(PS_ERR_IO, true, "Unable to find chip %s\n", name); + return -1; +} + + +int pmChipFindCell(const pmChip *chip, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(chip, -1); + PS_ASSERT_PTR_NON_NULL(name, -1); + if (strlen(name) == 0) { + return -1; + } + + psArray *cells = chip->cells; // Array of cells + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // The cell of interest + psString testName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME"); // Name of this cell + if (strcmp(name, testName) == 0) { + return i; + } + } + + psError(PS_ERR_IO, true, "Unable to find cell %s\n", name); + return -1; +} + Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAUtils.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAUtils.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAUtils.h (revision 14957) @@ -0,0 +1,33 @@ +/* @file pmFPAUtils.h + * @brief Utility functions for FPAs + * + * @author Paul Price, IfA + * + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_UTILS_H +#define PM_FPA_UTILS_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Find a chip by name; return the index +/// +/// Looks for a chip within the FPA with CHIP.NAME matching the provided name. Returns the index of the chip, +/// or -1 if it was not found. +int pmFPAFindChip(const pmFPA *fpa, ///< FPA in which to find the chip + const char *name ///< Name of the chip + ); + +/// Find a cell by name; return the index +/// +/// Looks for a cell within the chip with CELL.NAME matching the provided name. Returns the index of the +/// cell, or -1 if it was not found. +int pmChipFindCell(const pmChip *chip, // Chip in which to find the cell + const char *name // Name of the cell + ); +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAWrite.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAWrite.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAWrite.c (revision 14957) @@ -0,0 +1,495 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmHDUUtils.h" +#include "pmHDUGenerate.h" +#include "pmConcepts.h" + +#include "pmFPAWrite.h" + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Definitions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Specify what to read +typedef enum { + FPA_WRITE_TYPE_IMAGE, // Write image + FPA_WRITE_TYPE_MASK, // Write mask + FPA_WRITE_TYPE_WEIGHT // Write weight map +} fpaWriteType; + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// File-static (private) functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + +// Update the FPA.NAME, CHIP.NAME and CELL.NAME in the FITS header, if required +bool pmFPAUpdateNames(pmFPA *fpa, pmChip *chip, pmCell *cell) +{ + pmHDU *hdu = pmHDUGetHighest(fpa, chip, cell); // Highest HDU, i.e., the PHU + if (!hdu) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find HDU.\n"); + return false; + } + if (!hdu->header) { + hdu->header = psMetadataAlloc(); + } + bool mdok; // Status of MD lookup + psMetadata *fileData = psMetadataLookupMetadata(&mdok, hdu->format, "FILE"); // File information + if (!mdok || !fileData) { + psError(PS_ERR_UNKNOWN, true, "Unable to find FILE information in camera format.\n"); + return false; + } + if (fpa) { + const char *fpaNameHdr = psMetadataLookupStr(&mdok, fileData, "FPA.NAME"); + if (mdok && fpaNameHdr && strlen(fpaNameHdr) > 0) { + const char *fpaName = psMetadataLookupStr(NULL, fpa->concepts, "FPA.NAME"); + psMetadataAddStr(hdu->header, PS_LIST_TAIL, fpaNameHdr, PS_META_REPLACE, "FPA name", fpaName); + } + } + if (chip) { + const char *chipNameHdr = psMetadataLookupStr(&mdok, fileData, "CHIP.NAME"); + if (mdok && chipNameHdr && strlen(chipNameHdr) > 0) { + const char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME"); + psMetadataAddStr(hdu->header, PS_LIST_TAIL, chipNameHdr, PS_META_REPLACE, "Chip name", chipName); + } + } + if (cell) { + const char *cellNameHdr = psMetadataLookupStr(&mdok, fileData, "CELL.NAME"); + if (mdok && cellNameHdr && strlen(cellNameHdr) > 0) { + const char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME"); + psMetadataAddStr(hdu->header, PS_LIST_TAIL, cellNameHdr, PS_META_REPLACE, "Cell name", cellName); + } + } + return true; +} + +// Return the appropriate image array for the given type +static psArray **appropriateImageArray(pmHDU *hdu, // HDU containing the image arrays + fpaWriteType type // Type to write + ) +{ + switch (type) { + case FPA_WRITE_TYPE_IMAGE: + return &hdu->images; + case FPA_WRITE_TYPE_MASK: + return &hdu->masks; + case FPA_WRITE_TYPE_WEIGHT: + return &hdu->weights; + default: + psAbort("Unknown write type: %x\n", type); + } + return NULL; +} + +// Run the appropriate HDU write function +static bool appropriateWriteFunc(pmHDU *hdu, // HDU to write + psFits *fits, // FITS file to which to write + fpaWriteType type // Type to write + ) +{ + switch (type) { + case FPA_WRITE_TYPE_IMAGE: + return pmHDUWrite(hdu, fits); + case FPA_WRITE_TYPE_MASK: + return pmHDUWriteMask(hdu, fits); + case FPA_WRITE_TYPE_WEIGHT: + return pmHDUWriteWeight(hdu, fits); + default: + psAbort("Unknown write type: %x\n", type); + } + return false; +} +// Write a cell image/mask/weight +static bool cellWrite(pmCell *cell, // Cell to write + psFits *fits, // FITS file to which to write + psDB *db, // Database handle for "concepts" update + bool blank, // Write a blank PHU? + fpaWriteType type // Type to write + ) +{ + assert(cell); + assert(fits); + + psTrace ("pmFPAWrite", 5, "writing to Cell (%d)\n", blank); + + pmHDU *hdu = cell->hdu; // The HDU + if (!hdu || !cell->data_exists) { + return true; // We wrote every HDU that exists + } + + psArray **imageArray = appropriateImageArray(hdu, type); // Array of images in the HDU + + // Generate the HDU if needed --- this is required after a pmFPACopy, or similar, which does not + // generate the HDU, but only copies the structure. + if (!blank && !hdu->blankPHU && !*imageArray && (!pmHDUGenerateForCell(cell) || !*imageArray)) { + psError(PS_ERR_UNKNOWN, false, "Unable to generate HDU for cell --- likely programming error.\n"); + return false; + } + + // We only write out a blank PHU if it's specifically requested. + bool writeBlank = blank && hdu->blankPHU && !*imageArray; // Write a blank PHU? + bool writeImage = !blank && !hdu->blankPHU && *imageArray; // Write an image? + + if (writeBlank || writeImage) { + + pmFPAUpdateNames(cell->parent->parent, cell->parent, cell); + pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS | + PM_CONCEPT_SOURCE_DEFAULTS; + if (!pmConceptsWriteCell(cell, source, true, NULL)) { + psError(PS_ERR_IO, false, "Unable to write concepts for cell.\n"); + return false; + } + if (!appropriateWriteFunc(hdu, fits, type)) { + psError(PS_ERR_IO, false, "Unable to write HDU for cell.\n"); + return false; + } + } + // No lower levels to which to recurse + + return true; +} + +// Write a chip image/mask/weight +static bool chipWrite(pmChip *chip, // Chip to write + psFits *fits, // FITS file to which to write + psDB *db, // Database handle for "concepts" update + bool blank, // Write a blank PHU? + bool recurse, // Recurse to lower levels? + fpaWriteType type // Type to write + ) +{ + assert(chip); + assert(fits); + + pmHDU *hdu = chip->hdu; // The HDU + + psTrace ("pmFPAWrite", 5, "writing to Chip (%d, %d)\n", blank, recurse); + + // If we have data at this level, try to write it out + if (hdu && chip->data_exists) { + psArray **imageArray = appropriateImageArray(hdu, type); // Array of images in HDU + + // Generate the HDU if needed --- this is required after a pmFPACopy, or similar, which does not + // generate the HDU, but only copies the structure. + if (!blank && !hdu->blankPHU && !*imageArray && (!pmHDUGenerateForChip(chip) || !*imageArray)) { + psError(PS_ERR_UNKNOWN, false, + "Unable to generate HDU for chip --- likely programming error.\n"); + return false; + } + + // We only write out a blank PHU if it's specifically requested. + bool writeBlank = blank && hdu->blankPHU && !*imageArray; // Write a blank HDU? + bool writeImage = !blank && !hdu->blankPHU && *imageArray; // Write an image? + + if (writeBlank || writeImage) { + pmFPAUpdateNames(chip->parent, chip, NULL); + pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS | + PM_CONCEPT_SOURCE_DEFAULTS; + if (!pmConceptsWriteChip(chip, source, true, true, NULL)) { + psError(PS_ERR_IO, false, "Unable to write concepts for chip.\n"); + return false; + } + if (!appropriateWriteFunc(hdu, fits, type)) { + psError(PS_ERR_IO, false, "Unable to write HDU for chip.\n"); + return false; + } + } + } + + // Recurse to lower level if specifically requested. + // XXX recursion implies blank == false (must be called on correct level?) + if (recurse) { + psArray *cells = chip->cells; // Array of cells + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // The cell of interest + if (!cellWrite(cell, fits, db, false, type)) { + psError(PS_ERR_IO, false, "Unable to write Chip.\n"); + return false; + } + } + } + + return true; +} + + +// Write an FPA image/mask/weight +static bool fpaWrite(pmFPA *fpa, // FPA to write + psFits *fits, // FITS file to which to write + psDB *db, // Database handle for "concepts" update + bool blank, // Write a blank PHU? + bool recurse, // Recurse to lower levels? + fpaWriteType type // Type to write + ) +{ + assert(fpa); + assert(fits); + + pmHDU *hdu = fpa->hdu; // The HDU + + psTrace ("pmFPAWrite", 5, "writing to FPA (%d, %d)\n", blank, recurse); + + // If we have data at this level, try to write it out + if (hdu) { + psArray **imageArray = appropriateImageArray(hdu, type); // Array of images in HDU + + // Generate the HDU if needed --- this is required after a pmFPACopy, or similar, which does not + // generate the HDU, but only copies the structure. + if (!blank && !hdu->blankPHU && !*imageArray && (!pmHDUGenerateForFPA(fpa) || !*imageArray)) { + psError(PS_ERR_UNKNOWN, false, + "Unable to generate HDU for FPA --- likely programming error.\n"); + return false; + } + + // We only write out a blank PHU if it's specifically requested. + bool writeBlank = blank && hdu->blankPHU && !*imageArray; // Write a blank PHU? + bool writeImage = !blank && !hdu->blankPHU && *imageArray; // Write an image? + + if (writeBlank || writeImage) { + pmFPAUpdateNames(fpa, NULL, NULL); + pmConceptSource source = PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CELLS | + PM_CONCEPT_SOURCE_DEFAULTS; + if (!pmConceptsWriteFPA(fpa, source, true, NULL)) { + psError(PS_ERR_IO, false, "Unable to write concepts for FPA.\n"); + return false; + } + if (!appropriateWriteFunc(hdu, fits, type)) { + psError(PS_ERR_IO, false, "Unable to write HDU for FPA.\n"); + return false; + } + } + } + + // Recurse to lower levels if requested + if (recurse) { + psArray *chips = fpa->chips; // Array of chips + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // The chip of interest + if (!chipWrite(chip, fits, db, false, true, type)) { + psError(PS_ERR_IO, false, "Unable to write FPA.\n"); + return false; + } + } + } + + return true; +} + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Public functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +bool pmReadoutWriteNext(pmReadout *readout, psFits *fits, int z) +{ + PS_ASSERT_PTR_NON_NULL(readout, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + pmHDU *hdu = pmHDUFromReadout(readout); // The HDU to which to write + if (!hdu) { + psError(PS_ERR_IO, false, "Unable to find HDU for readout.\n"); + return false; + } + psMetadata *header = hdu->header; // The FITS header + if (!header) { + psError(PS_ERR_IO, true, "No FITS header available in the HDU.\n"); + return false; + } + + // We have to rely to a great extent on the FITS header, because otherwise we simply don't know how many + // image planes there are (NAXIS3) or the size of the original image (NAXIS1, NAXIS2). + bool mdok = true; // Status of MD lookup + int naxis1 = psMetadataLookupS32(&mdok, header, "NAXIS1"); // Number of columns + if (!mdok || naxis1 <= 0) { + psError(PS_ERR_IO, true, "Can't find NAXIS1 in header.\n"); + return false; + } + int naxis2 = psMetadataLookupS32(&mdok, header, "NAXIS2"); // Number of rows + if (!mdok || naxis2 <= 0) { + psError(PS_ERR_IO, true, "Can't find NAXIS2 in header.\n"); + return false; + } + int naxis3 = psMetadataLookupS32(&mdok, header, "NAXIS3"); // Number of image planes + if (!mdok || naxis3 <= 0) { + naxis3 = 1; + } + if (z >= naxis3) { + psError(PS_ERR_IO, true, "Specified a plane number (%d) greater than NAXIS3 allows.\n", z); + return false; + } + + if (!hdu->images) { + psError(PS_ERR_IO, true, "No images allocated in HDU.\n"); + return false; + } + psImage *image = readout->image; // The image from the HDU to write + if (readout->row0 == 0 && readout->col0 == 0 && z == 0) { + // Then we can assume that nothing has been written to the FITS file for now + if (naxis1 == image->numCols && naxis2 == image->numRows) { + // We can write the whole lot at once + return psFitsWriteImage(fits, header, image, z, hdu->extname); + } + // Create a dummy image so we can write something larger than we actually have + psImage *dummy = psImageAlloc(naxis1, naxis2, image->type.type); // Dummy image + psImageInit(dummy, 0); + psImageOverlaySection(dummy, image, 0, 0, "="); + bool result = psFitsWriteImage(fits, header, dummy, z, hdu->extname); + psFree(dummy); + return result; + } + + // We can simply update an existing HDU + if (hdu->blankPHU && !psFitsMoveExtNum(fits, 0, false)) { + psError(PS_ERR_IO, false, "Unable to move to PHU\n"); + return false; + } + return psFitsUpdateImage(fits, image, readout->col0, readout->row0, z); +} + + +bool pmCellWrite(pmCell *cell, psFits *fits, psDB *db, bool blank) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + return cellWrite(cell, fits, db, blank, FPA_WRITE_TYPE_IMAGE); +} + +bool pmChipWrite(pmChip *chip, psFits *fits, psDB *db, bool blank, bool recurse) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + return chipWrite(chip, fits, db, blank, recurse, FPA_WRITE_TYPE_IMAGE); +} + +bool pmFPAWrite(pmFPA *fpa, psFits *fits, psDB *db, bool blank, bool recurse) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + return fpaWrite(fpa, fits, db, blank, recurse, FPA_WRITE_TYPE_IMAGE); +} + + +bool pmCellWriteMask(pmCell *cell, psFits *fits, psDB *db, bool blank) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + return cellWrite(cell, fits, db, blank, FPA_WRITE_TYPE_IMAGE); +} + +bool pmChipWriteMask(pmChip *chip, psFits *fits, psDB *db, bool blank, bool recurse) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + return chipWrite(chip, fits, db, blank, recurse, FPA_WRITE_TYPE_MASK); +} + +bool pmFPAWriteMask(pmFPA *fpa, psFits *fits, psDB *db, bool blank, bool recurse) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + return fpaWrite(fpa, fits, db, blank, recurse, FPA_WRITE_TYPE_MASK); +} + + +bool pmCellWriteWeight(pmCell *cell, psFits *fits, psDB *db, bool blank) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + return cellWrite(cell, fits, db, blank, FPA_WRITE_TYPE_WEIGHT); +} + +bool pmChipWriteWeight(pmChip *chip, psFits *fits, psDB *db, bool blank, bool recurse) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + return chipWrite(chip, fits, db, blank, recurse, FPA_WRITE_TYPE_WEIGHT); +} + +bool pmFPAWriteWeight(pmFPA *fpa, psFits *fits, psDB *db, bool blank, bool recurse) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + return fpaWrite(fpa, fits, db, blank, recurse, FPA_WRITE_TYPE_WEIGHT); +} + + +int pmCellWriteTable(psFits *fits, const pmCell *cell, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(cell, 0); + PS_ASSERT_PTR_NON_NULL(fits, 0); + PS_ASSERT_STRING_NON_EMPTY(name, 0); + + const char *chipName = psMetadataLookupStr(NULL, cell->parent->concepts, "CHIP.NAME"); // Name of chip + const char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME"); // Name of cell + + psArray *table = psMetadataLookupPtr(NULL, cell->analysis, name); // The FITS table + if (!table) { + // We wrote everything we could find + return 0; + } + + psString headerName = NULL; // Name for header in analysis metadata + psStringAppend(&headerName, "%s.HEADER", name); + psMetadata *header = psMetadataLookupMetadata(NULL, cell->analysis, headerName); // The FITS header + psFree(headerName); + + psString extname = NULL; // Extension name + psStringAppend(&extname, "%s_%s_%s", name, chipName, cellName); + + // XXX Could do a table lookup from the camera format, in case the input file isn't laid out with + // NAME_CHIP_CELL extension names --- use these as keys, and the value as the proper extension name. + // Allow interpolation of concepts, e.g., "{CHIP.NAME}" --> "ccd13". + + if (!psFitsWriteTable(fits, header, table, extname)) { + psError(PS_ERR_UNKNOWN, false, "Unable to write table from chip %s, cell %s to extension %s\n", + chipName, cellName, extname); + psFree(extname); + return 0; + } + + psFree(extname); + return 1; +} + + +int pmChipWriteTable(psFits *fits, const pmChip *chip, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(chip, 0); + PS_ASSERT_PTR_NON_NULL(fits, 0); + PS_ASSERT_STRING_NON_EMPTY(name, 0); + + int numWrite = 0; // Number of reads + psArray *cells = chip->cells; // Array of cells + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // Cell of interest + numWrite += pmCellWriteTable(fits, cell, name); + } + + return numWrite; +} + + +int pmFPAWriteTable(psFits *fits, const pmFPA *fpa, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(fpa, 0); + PS_ASSERT_PTR_NON_NULL(fits, 0); + PS_ASSERT_STRING_NON_EMPTY(name, 0); + + int numWrite = 0; // Number of reads + psArray *chips = fpa->chips; // Array of chips + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // Chip of interest + numWrite += pmChipWriteTable(fits, chip, name); + } + + return numWrite; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAWrite.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAWrite.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAWrite.h (revision 14957) @@ -0,0 +1,169 @@ +/* @file pmFPAWrite.h + * @brief Write FPA components to a FITS file + * + * @author Paul Price, IfA + * + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-31 04:17:41 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_WRITE_H +#define PM_FPA_WRITE_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Write a readout incrementally +/// +/// Writes a readout to a FITS file, perhaps incrementally (if it has been read in using pmReadoutReadNext). +/// Relies on the FITS header to specify how many image planes there are, and the width and height. +bool pmReadoutWriteNext(pmReadout *readout, ///< Readout to write + psFits *fits, ///< FITS file to which to write + int z ///< Image plane to write + ); + +/// Write a cell to a FITS file +/// +/// Generates CELL.TRIMSEC, CELL.BIASSEC and the HDU pixels if required. A blank (i.e., image-less header) is +/// written only if specifically requested. Writes the concepts to the various locations, and then the HDU to +/// the FITS file. This function should be called at the beginning of the output cell loop with blank=true in +/// order to produce the correct file structure. +bool pmCellWrite(pmCell *cell, ///< Cell to write + psFits *fits, ///< FITS file to which to write + psDB *db, ///< Database handle for "concepts" update + bool blank ///< Write a blank PHU? + ); + +/// Write a chip to a FITS file +/// +/// Generates CELL.TRIMSEC, CELL.BIASSEC and the HDU pixels if required. A blank (i.e., image-less header) is +/// written only if specifically requested. Writes the concepts to the various locations, and then the HDU to +/// the FITS file, optionally recursing to lower levels. This function should be called at the beginning of +/// the output chip loop with blank=true and recurse=false in order to produce the correct file structure. +bool pmChipWrite(pmChip *chip, ///< Chip to write + psFits *fits, ///< FITS file to which to write + psDB *db, ///< Database handle for "concepts" update + bool blank, ///< Write a blank PHU? + bool recurse ///< Recurse to lower levels? + ); + +/// Write an FPA to a FITS file +/// +/// Generates CELL.TRIMSEC, CELL.BIASSEC and the HDU pixels if required. A blank (i.e., image-less header) is +/// written only if specifically requested. Writes the concepts to the various locations, and then the HDU to +/// the FITS file, optionally recursing to lower levels. This function should be called at the beginning of +/// the output FPA loop with blank=true and recurse=false in order to produce the correct file structure. +bool pmFPAWrite(pmFPA *fpa, ///< FPA to write + psFits *fits, ///< FITS file to which to write + psDB *db, ///< Database handle for "concepts" update + bool blank, ///< Write a blank PHU? + bool recurse ///< Recurse to lower levels? + ); + +/// Write a cell mask to a FITS file +/// +/// Generates CELL.TRIMSEC, CELL.BIASSEC and the HDU mask pixels if required. A blank (i.e., image-less +/// header) is written only if specifically requested. Writes the concepts to the various locations, and then +/// the HDU mask to the FITS file. This function should be called at the beginning of the output cell loop +/// with blank=true in order to produce the correct file structure. +bool pmCellWriteMask(pmCell *cell, ///< Cell to write + psFits *fits, ///< FITS file to which to write + psDB *db, ///< Database handle for "concepts" update + bool blank ///< Write a blank PHU? + ); + +/// Write a chip mask to a FITS file +/// +/// Generates CELL.TRIMSEC, CELL.BIASSEC and the HDU mask pixels if required. A blank (i.e., image-less +/// header) is written only if specifically requested. Writes the concepts to the various locations, and then +/// the HDU mask to the FITS file, optionally recursing to lower levels. This function should be called at +/// the beginning of the output chip loop with blank=true and recurse=false in order to produce the correct +/// file structure. +bool pmChipWriteMask(pmChip *chip, ///< Chip to write + psFits *fits, ///< FITS file to which to write + psDB *db, ///< Database handle for "concepts" update + bool blank, ///< Write a blank PHU? + bool recurse ///< Recurse to lower levels? + ); + +/// Write an FPA mask to a FITS file +/// +/// Generates CELL.TRIMSEC, CELL.BIASSEC and the HDU mask pixels if required. A blank (i.e., image-less +/// header) is written only if specifically requested. Writes the concepts to the various locations, and then +/// the HDU mask to the FITS file, optionally recursing to lower levels. This function should be called at +/// the beginning of the output FPA loop with blank=true and recurse=false in order to produce the correct +/// file structure. +bool pmFPAWriteMask(pmFPA *fpa, ///< FPA to write + psFits *fits, ///< FITS file to which to write + psDB *db, ///< Database handle for "concepts" update + bool blank, ///< Write a blank PHU? + bool recurse ///< Recurse to lower levels? + ); + +/// Write a cell weight to a FITS file +/// +/// Generates CELL.TRIMSEC, CELL.BIASSEC and the HDU weight pixels if required. A blank (i.e., image-less +/// header) is written only if specifically requested. Writes the concepts to the various locations, and then +/// the HDU weight to the FITS file. This function should be called at the beginning of the output cell loop +/// with blank=true in order to produce the correct file structure. +bool pmCellWriteWeight(pmCell *cell, ///< Cell to write + psFits *fits, ///< FITS file to which to write + psDB *db, ///< Database handle for "concepts" update + bool blank ///< Write a blank PHU? + ); + +/// Write a chip weight to a FITS file +/// +/// Generates CELL.TRIMSEC, CELL.BIASSEC and the HDU weight pixels if required. A blank (i.e., image-less +/// header) is written only if specifically requested. Writes the concepts to the various locations, and then +/// the HDU weight to the FITS file, optionally recursing to lower levels. This function should be called at +/// the beginning of the output chip loop with blank=true and recurse=false in order to produce the correct +/// file structure. +bool pmChipWriteWeight(pmChip *chip, ///< Chip to write + psFits *fits, ///< FITS file to which to write + psDB *db, ///< Database handle for "concepts" update + bool blank, ///< Write a blank PHU? + bool recurse ///< Recurse to lower levels? + ); + +/// Write an FPA weight to a FITS file +/// +/// Generates CELL.TRIMSEC, CELL.BIASSEC and the HDU weight pixels if required. A blank (i.e., image-less +/// header) is written only if specifically requested. Writes the concepts to the various locations, and then +/// the HDU weight to the FITS file, optionally recursing to lower levels. This function should be called at +/// the beginning of the output FPA loop with blank=true and recurse=false in order to produce the correct +/// file structure. +bool pmFPAWriteWeight(pmFPA *fpa, ///< FPA to write + psFits *fits, ///< FITS file to which to write + psDB *db, ///< Database handle for "concepts" update + bool blank, ///< Write a blank PHU? + bool recurse ///< Recurse to lower levels? + ); + + +/// Write a FITS table from the cell's analysis metadata. +/// +/// The FITS table (a psArray of psMetadatas) from the cell's analysis metadata (under "name") is written to +/// the FITS file, at an extension specified by the name, chip name and cell name ("NAME_CHIP_CELL"). If a +/// header is present in the analysis metadata ("name.HEADER"), then it is written also. +int pmCellWriteTable(psFits *fits, ///< FITS file to which to write + const pmCell *cell, ///< Cell containing FITS table in the analysis metadata + const char *name ///< Name for the table data, and the extension name + ); + +int pmChipWriteTable(psFits *fits, ///< FITS file to which to write + const pmChip *chip, ///< Chip containing cells with tables to write + const char *name ///< Name for the table data, and the extension name + ); + +int pmFPAWriteTable(psFits *fits, ///< FITS file to which to write + const pmFPA *fpa, ///< FPA containing cells with tables to write + const char *name ///< Name for the table data, and the extension name + ); + +// XXX better name, please +bool pmFPAUpdateNames(pmFPA *fpa, pmChip *chip, pmCell *cell); + +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPA_JPEG.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPA_JPEG.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPA_JPEG.c (revision 14957) @@ -0,0 +1,225 @@ +/** @file pmFPA_JPEG.c + * + * This file contains functions to write JPEG images. + * + * @author EAM, IfA + * + * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-09-21 00:02:11 $ + * + * Copyright 2004 Maui High Performance Computing Center, University of Hawaii + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +/*****************************************************************************/ +/* INCLUDE FILES */ +/*****************************************************************************/ + +#include +#include +#include /* for strn?casecmp */ +#include + +#include "pmConfig.h" +#include "pmDetrendDB.h" + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" +#include "pmFPAfile.h" +#include "pmFPA_JPEG.h" + + +bool pmFPAviewWriteJPEG(const pmFPAview *view, pmFPAfile *file, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + pmFPA *fpa = file->fpa; + + if (view->chip == -1) { + pmFPAWriteJPEG (fpa, view, file, config); + return true; + } + + if (view->chip >= fpa->chips->n) { + return false; + } + pmChip *chip = fpa->chips->data[view->chip]; + + if (view->cell == -1) { + pmChipWriteJPEG (chip, view, file, config); + return true; + } + + if (view->cell >= chip->cells->n) { + return false; + } + pmCell *cell = chip->cells->data[view->cell]; + + if (view->readout == -1) { + pmCellWriteJPEG (cell, view, file, config); + return true; + } + + if (view->readout >= cell->readouts->n) { + return false; + } + pmReadout *readout = cell->readouts->data[view->readout]; + + pmReadoutWriteJPEG (readout, view, file, config); + return true; +} + +// read in all chip-level JPEG files for this FPA +bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + for (int i = 0; i < fpa->chips->n; i++) { + + pmChip *chip = fpa->chips->data[i]; + pmChipWriteJPEG (chip, view, file, config); + } + return true; +} + +// read in all cell-level JPEG files for this chip +bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + for (int i = 0; i < chip->cells->n; i++) { + + pmCell *cell = chip->cells->data[i]; + pmCellWriteJPEG (cell, view, file, config); + } + return true; +} + +// read in all readout-level JPEG files for this cell +bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + for (int i = 0; i < cell->readouts->n; i++) { + + pmReadout *readout = cell->readouts->data[i]; + pmReadoutWriteJPEG (readout, view, file, config); + } + return true; +} + +// write JPEG image for readout +// note that this function will try as hard a possible to write out a jpeg. it will not fail +// just because the values are in a poor range. it is more convenient to know you are getting +// a jpeg which is weird than to fail to get the file at all. +bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config) +{ + bool status; + PS_ASSERT_PTR_NON_NULL(readout, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + if (file->type != PM_FPA_FILE_JPEG) { + psError(PS_ERR_UNKNOWN, true, "warning: type mismatch"); + return false; + } + + psTrace("psModules.camera", 3, "writing jpeg for readout %zd\n", (size_t) readout); + + psMetadata *recipe = psMetadataLookupMetadata(&status, config->recipes, "PPIMAGE"); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "missing recipe PPIMAGE in config data"); + return false; + } + + psMetadata *options = psMetadataLookupMetadata(&status, recipe, file->name); + if (!status) { + psError(PS_ERR_UNKNOWN, true, "missing %s options in PPIMAGE recipe", file->name); + return false; + } + + float min = 0; + float max = 0; // Minimum and maximum for stretch + float mean = 0; + float delta = 0; + + // measure the image statistics for scaling + psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0); + psStats *stats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN); + stats->nSubsample = 10000; + if (!psImageBackground(stats, NULL, readout->image, NULL, 0, rng)) { + psStats *statsAlt = psStatsAlloc(PS_STAT_SAMPLE_MEAN | PS_STAT_SAMPLE_STDEV); + stats->nSubsample = 10000; + if (!psImageBackground(stats, NULL, readout->image, NULL, 0, rng)) { + psLogMsg("jpeg", PS_LOG_WARN, "Unable to measure statistics for image, writing blank jpeg\n"); + mean = 0; + delta = 1; + } else { + mean = statsAlt->sampleMean; + delta = 2*statsAlt->sampleStdev; + } + psFree(statsAlt); + } else { + mean = stats->robustMedian; + delta = stats->robustUQ - stats->robustLQ; + } + psFree(rng); + psFree(stats); + + char *colormapName = psMemIncrRefCounter (psMetadataLookupStr (NULL, options, "COLORMAP")); + if (!colormapName) + colormapName = psStringCopy ("-greyscale"); + char *mode = psMemIncrRefCounter (psMetadataLookupStr (NULL, options, "SCALE.MODE")); + if (!mode) + mode = psStringCopy ("RANGE"); + float fmin = psMetadataLookupF32 (&status, options, "SCALE.MIN"); + if (!status) + fmin = -3.0; + float fmax = psMetadataLookupF32 (&status, options, "SCALE.MAX"); + if (!status) + fmax = +6.0; + + if (!strcasecmp (mode, "RANGE")) { + min = mean + fmin*delta; + max = mean + fmax*delta; + } + if (!strcasecmp (mode, "FRACTION")) { + min = fmin*mean; + max = fmax*mean; + } + if (!strcasecmp (mode, "VALUE")) { + min = fmin; + max = fmax; + } + + if (!isfinite(min) || !isfinite(max)) { + psLogMsg("jpeg", PS_LOG_WARN, "The stretch parameters are not both finite, writing blank jpeg\n"); + min = 0; + max = 1; + } + + psImageJpegColormap *map = psImageJpegColormapSet (NULL, colormapName); + if (!map) { + map = psImageJpegColormapSet (NULL, "-greyscale"); + } + + psImageJpeg (map, readout->image, file->filename, min, max); + + psFree(map); + psFree(colormapName); + psFree(mode); + return true; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPA_JPEG.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPA_JPEG.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPA_JPEG.h (revision 14957) @@ -0,0 +1,24 @@ +/* @file pmFPAview.h + * @brief Tools to manipulate the FPA structure elements. + * + * @author EAM, IfA + * + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-04-14 03:22:47 $ + * Copyright 2004-2005 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_JPEG_H +#define PM_FPA_JPEG_H + +/// @addtogroup Camera Camera Layout +/// @{ + +bool pmFPAviewWriteJPEG (const pmFPAview *view, pmFPAfile *file, const pmConfig *config); +bool pmFPAWriteJPEG (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, const pmConfig *config); +bool pmChipWriteJPEG (pmChip *chip, const pmFPAview *view, pmFPAfile *file, const pmConfig *config); +bool pmCellWriteJPEG (pmCell *cell, const pmFPAview *view, pmFPAfile *file, const pmConfig *config); +bool pmReadoutWriteJPEG (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, const pmConfig *config); + +/// @} +# endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPA_MANAPLOT.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPA_MANAPLOT.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPA_MANAPLOT.c (revision 14957) @@ -0,0 +1,176 @@ +/** @file pmFPA_MANAPLOT.c + * + * This file contains functions to write MANAPLOT images. + * + * @author EAM, IfA + * + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ + * + * Copyright 2004 Maui High Performance Computing Center, University of Hawaii + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +/*****************************************************************************/ +/* INCLUDE FILES */ +/*****************************************************************************/ + +#include +#include +#include + +#include "pmDetrendDB.h" + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPAfile.h" +#include "pmFPAview.h" +#include "pmFPA_MANAPLOT.h" + + +bool pmFPAviewWriteMANAPLOT(const pmFPAview *view, pmFPAfile *file, pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + pmFPA *fpa = file->fpa; + + if (view->chip == -1) { + pmFPAWriteMANAPLOT (fpa, view, file, config); + return true; + } + + if (view->chip >= fpa->chips->n) { + return false; + } + pmChip *chip = fpa->chips->data[view->chip]; + + if (view->cell == -1) { + pmChipWriteMANAPLOT (chip, view, file, config); + return true; + } + + if (view->cell >= chip->cells->n) { + return false; + } + pmCell *cell = chip->cells->data[view->cell]; + + if (view->readout == -1) { + pmCellWriteMANAPLOT (cell, view, file, config); + return true; + } + + if (view->readout >= cell->readouts->n) { + return false; + } + pmReadout *readout = cell->readouts->data[view->readout]; + + pmReadoutWriteMANAPLOT (readout, view, file, config); + return true; +} + +// read in all chip-level MANAPLOT files for this FPA +bool pmFPAWriteMANAPLOT (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + for (int i = 0; i < fpa->chips->n; i++) { + + pmChip *chip = fpa->chips->data[i]; + pmChipWriteMANAPLOT (chip, view, file, config); + } + return true; +} + +// read in all cell-level MANAPLOT files for this chip +bool pmChipWriteMANAPLOT (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + for (int i = 0; i < chip->cells->n; i++) { + + pmCell *cell = chip->cells->data[i]; + pmCellWriteMANAPLOT (cell, view, file, config); + } + return true; +} + +// read in all readout-level MANAPLOT files for this cell +bool pmCellWriteMANAPLOT (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + for (int i = 0; i < cell->readouts->n; i++) { + + pmReadout *readout = cell->readouts->data[i]; + pmReadoutWriteMANAPLOT (readout, view, file, config); + } + return true; +} + +// read in all readout-level Objects files for this cell +bool pmReadoutWriteMANAPLOT (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(readout, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + if (file->type != PM_FPA_FILE_MANAPLOT) { + psError(PS_ERR_UNKNOWN, true, "warning: type mismatch"); + return false; + } + + // XXX does not have to be a mana script... + // this function will call a mana script of the form: + // scriptname (input) (output) + // scriptname : extname + // input : filextra + // output : filerule + + bool create = file->mode == PM_FPA_MODE_WRITE ? true : false; + + psString tmpName; + tmpName = pmFPAfileNameFromRule (file->filextra, file, view); + psString input = pmConfigConvertFilename (tmpName, config, create); + psFree (tmpName); + + tmpName = pmFPAfileNameFromRule (file->filerule, file, view); + psString output = pmConfigConvertFilename (tmpName, config, create); + psFree (tmpName); + + tmpName = pmFPAfileNameFromRule (file->extname, file, view); + psString script = pmConfigConvertFilename (tmpName, config, create); + psFree (tmpName); + + psString line = NULL; + psStringAppend (&line, "%s %s %s", script, input, output); + + // capture the stdout and stderr? + // XXX use psPipe instead? + int status = system (line); + if (status == -1) { + psError(PS_ERR_UNKNOWN, true, "fork failure: %s", script); + return false; + } + if (WEXITSTATUS(status) != 0) { + psError(PS_ERR_UNKNOWN, true, "error running: %s", script); + return false; + } + + psFree(line); + psFree(input); + psFree(output); + psFree(script); + + return true; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPA_MANAPLOT.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPA_MANAPLOT.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPA_MANAPLOT.h (revision 14957) @@ -0,0 +1,24 @@ +/* @file pmFPAview.h + * @brief Tools to manipulate the FPA structure elements. + * + * @author EAM, IfA + * + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-01-24 02:54:14 $ + * Copyright 2004-2005 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_MANAPLOT_H +#define PM_FPA_MANAPLOT_H + +/// @addtogroup Camera Camera Layout +/// @{ + +bool pmFPAviewWriteMANAPLOT (const pmFPAview *view, pmFPAfile *file, pmConfig *config); +bool pmFPAWriteMANAPLOT (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file, pmConfig *config); +bool pmChipWriteMANAPLOT (pmChip *chip, const pmFPAview *view, pmFPAfile *file, pmConfig *config); +bool pmCellWriteMANAPLOT (pmCell *cell, const pmFPAview *view, pmFPAfile *file, pmConfig *config); +bool pmReadoutWriteMANAPLOT (pmReadout *readout, const pmFPAview *view, pmFPAfile *file, pmConfig *config); + +/// @} +# endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAfile.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAfile.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAfile.c (revision 14957) @@ -0,0 +1,466 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include /* for strn?casecmp */ +#include + +#include "pmConfig.h" +#include "pmDetrendDB.h" + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" +#include "pmFPAfile.h" +#include "pmFPACopy.h" +#include "pmConcepts.h" + +static void pmFPAfileFree(pmFPAfile *file) +{ + if (!file) { + return; + } + + psTrace ("pmFPAfileFree", 5, "freeing %s\n", file->name); + psFree (file->fpa); + psFree (file->src); + psFree (file->readout); + psFree (file->names); + + psFree (file->camera); + psFree (file->cameraName); + psFree (file->format); + psFree (file->formatName); + psFree (file->name); + + if (file->fits != NULL) { + psFitsClose (file->fits); + } + + psFree (file->filerule); + + psFree (file->filesrc); + psFree (file->detrend); + + psFree (file->filename); + psFree (file->extname); + + return; +} + +pmFPAfile *pmFPAfileAlloc() +{ + pmFPAfile *file = psAlloc(sizeof(pmFPAfile)); + psMemSetDeallocator(file, (psFreeFunc) pmFPAfileFree); + + file->wrote_phu = false; + file->readout = NULL; + file->header = NULL; + + file->fileLevel = PM_FPA_LEVEL_NONE; + file->dataLevel = PM_FPA_LEVEL_NONE; + file->freeLevel = PM_FPA_LEVEL_NONE; + file->mosaicLevel = PM_FPA_LEVEL_NONE; + + file->type = PM_FPA_FILE_NONE; + file->mode = PM_FPA_MODE_NONE; + file->state = PM_FPA_STATE_CLOSED; + + file->fpa = NULL; + file->fits = NULL; + file->names = psMetadataAlloc(); + + file->camera = NULL; + file->cameraName = NULL; + file->format = NULL; + file->formatName = NULL; + file->name = NULL; + + file->filerule = NULL; + + file->filename = NULL; + file->extname = NULL; + + file->filesrc = NULL; + file->detrend = NULL; + + file->xBin = 1; + file->yBin = 1; + file->src = NULL; + + file->save = false; + + return file; +} + +// select the readout from the named pmFPAfile; if the named file does not exist, +pmReadout *pmFPAfileThisReadout (psMetadata *files, const pmFPAview *view, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(files, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(name, false); + PS_ASSERT_INT_POSITIVE(strlen(name), false); + + bool status; + + pmFPAfile *file = psMetadataLookupPtr (&status, files, name); + if (file == NULL) { + return NULL; + } + + // internal files have the readout as a separate element: + if (file->mode == PM_FPA_MODE_INTERNAL) { + return file->readout; + } + + pmReadout *readout = pmFPAviewThisReadout (view, file->fpa); + return readout; +} + +// select the cell from the named pmFPAfile; if the named file does not exist, +pmCell *pmFPAfileThisCell (psMetadata *files, const pmFPAview *view, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(files, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(name, false); + PS_ASSERT_INT_POSITIVE(strlen(name), false); + + bool status; + + pmFPAfile *file = psMetadataLookupPtr (&status, files, name); + if (file == NULL) { + return NULL; + } + + // internal files have the readout as a separate element: + if (file->mode == PM_FPA_MODE_INTERNAL) { + return NULL; + } + + pmCell *cell = pmFPAviewThisCell(view, file->fpa); + return cell; +} + +// select the readout from the named pmFPAfile; if the named file does not exist, +pmChip *pmFPAfileThisChip (psMetadata *files, const pmFPAview *view, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(files, false); + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(name, false); + PS_ASSERT_INT_POSITIVE(strlen(name), false); + + bool status; + + pmFPAfile *file = psMetadataLookupPtr (&status, files, name); + if (file == NULL) { + return NULL; + } + + // internal files have the readout as a separate element: + if (file->mode == PM_FPA_MODE_INTERNAL) { + return NULL; + } + + pmChip *chip = pmFPAviewThisChip (view, file->fpa); + return chip; +} + +psString pmFPANameFromRule(const char *rule, const pmFPA *fpa, const pmFPAview *view) +{ + PS_ASSERT_STRING_NON_EMPTY(rule, NULL); + PS_ASSERT_PTR_NON_NULL(view, NULL); + + psString newName = NULL; // New name, to be returned + newName = psStringCopy(rule); + + if (strstr (newName, "{FPA.NAME}") != NULL) { + char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.NAME"); + if (name != NULL) { + psStringSubstitute(&newName, "fpa", "{FPA.NAME}"); + } + } + if (strstr (newName, "{CHIP.NAME}") != NULL) { + pmChip *chip = pmFPAviewThisChip (view, fpa); + if (chip != NULL) { + char *name = psMetadataLookupStr (NULL, chip->concepts, "CHIP.NAME"); + if (name != NULL) { + psStringSubstitute(&newName, name, "{CHIP.NAME}"); + } + } + } + if (strstr (newName, "{CHIP.N}") != NULL) { + char *name = NULL; + if (view->chip < 0) { + psStringAppend (&name, "XX"); + } else { + psStringAppend (&name, "%02d", view->chip); + } + psStringSubstitute(&newName, name, "{CHIP.N}"); + psFree (name); + } + if (strstr (newName, "{CELL.NAME}") != NULL) { + pmCell *cell = pmFPAviewThisCell (view, fpa); + if (cell != NULL) { + char *name = psMetadataLookupStr (NULL, cell->concepts, "CELL.NAME"); + if (name != NULL) { + psStringSubstitute(&newName, name, "{CELL.NAME}"); + } + } + } + if (strstr (newName, "{CELL.N}") != NULL) { + char *name = NULL; + if (view->cell < 0) { + psStringAppend (&name, "XX"); + } else { + psStringAppend (&name, "%02d", view->cell); + } + psStringSubstitute(&newName, name, "{CELL.N}"); + } + if (strstr (newName, "{EXTNAME}") != NULL) { + pmHDU *hdu = pmFPAviewThisHDU (view, fpa); + if (hdu->extname && *hdu->extname) { + psStringSubstitute(&newName, hdu->extname, "{EXTNAME}"); + } + } + if (strstr (newName, "{FILTER}") != NULL) { + if (fpa != NULL) { + char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.FILTER"); + if (name && *name) { + psStringSubstitute(&newName, name, "{FILTER}"); + } + } + } + if (strstr (newName, "{FILTER.ID}") != NULL) { + if (fpa != NULL) { + char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.FILTERID"); + if (name && *name) { + psStringSubstitute(&newName, name, "{FILTER.ID}"); + } + } + } + if (strstr (newName, "{CAMERA}") != NULL) { + if (fpa != NULL) { + char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.INSTRUMENT"); + if (name && *name) { + psStringSubstitute(&newName, name, "{CAMERA}"); + } + } + } + if (strstr (newName, "{INSTRUMENT}") != NULL) { + if (fpa != NULL) { + char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.INSTRUMENT"); + if (name && *name) { + psStringSubstitute(&newName, name, "{INSTRUMENT}"); + } + } + } + if (strstr (newName, "{DETECTOR}") != NULL) { + if (fpa != NULL) { + char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.DETECTOR"); + if (name && *name) { + psStringSubstitute(&newName, name, "{DETECTOR}"); + } + } + } + if (strstr (newName, "{TELESCOPE}") != NULL) { + if (fpa != NULL) { + char *name = psMetadataLookupStr (NULL, fpa->concepts, "FPA.TELESCOPE"); + if (name && *name) { + psStringSubstitute(&newName, name, "{TELESCOPE}"); + } + } + } + return newName; +} + +// select the rule from the camera configuration, perform substitutions as needed +psString pmFPAfileNameFromRule(const char *rule, const pmFPAfile *file, const pmFPAview *view) +{ + PS_ASSERT_PTR_NON_NULL(rule, NULL); + PS_ASSERT_INT_POSITIVE(strlen(rule), NULL); + PS_ASSERT_PTR_NON_NULL(file, NULL); + PS_ASSERT_PTR_NON_NULL(view, NULL); + + psString newRule = NULL; // Rule to pass on to pmFPANameFromRule + newRule = psStringCopy(rule); + + if (strstr(newRule, "{OUTPUT}") != NULL) { + char *name = psMetadataLookupStr(NULL, file->names, "OUTPUT"); + if (name) { + psStringSubstitute(&newRule, name, "{OUTPUT}"); + } + } + + psString newName = pmFPANameFromRule(newRule, file->fpa, view); // New name, to be returned + psFree(newRule); + + return newName; +} + +// given an already-opened fits file, write the components corresponding +// to the specified view +bool pmFPAfileCopyView (pmFPA *out, pmFPA *in, const pmFPAview *view) +{ + PS_ASSERT_PTR_NON_NULL(out, false); + PS_ASSERT_PTR_NON_NULL(in, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + // pmFPAWrite takes care of all PHUs as needed + if (view->chip == -1) { + pmFPACopy (out, in); + return true; + } + if (view->chip >= in->chips->n) { + psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %ld", view->chip, in->chips->n); + return false; + } + pmChip *inChip = in->chips->data[view->chip]; + pmChip *outChip = out->chips->data[view->chip]; + + if (view->cell == -1) { + pmChipCopy (outChip, inChip); + return true; + } + if (view->cell >= inChip->cells->n) { + psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld", + view->cell, inChip->cells->n); + return false; + } + pmCell *inCell = inChip->cells->data[view->cell]; + pmCell *outCell = outChip->cells->data[view->cell]; + + if (view->readout == -1) { + pmCellCopy (outCell, inCell); + return true; + } + psError(PS_ERR_UNKNOWN, true, "Returning false"); + return false; + + // XXX add readout / segment equivalents +} + +// given an already-opened fits file, write the components corresponding +// to the specified view +bool pmFPAfileCopyStructureView (pmFPA *out, pmFPA *in, int xBin, int yBin, const pmFPAview *view) +{ + bool status; + PS_ASSERT_PTR_NON_NULL(out, false); + PS_ASSERT_PTR_NON_NULL(in, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + // XXX this should be smarter (ie, only copy concepts from the current chips) + // but such a call is needed, so re-copy stuff rather than no copy + pmFPACopyConcepts (out, in); + + // pmFPAWrite takes care of all PHUs as needed + if (view->chip == -1) { + status = pmFPACopyStructure (out, in, xBin, yBin); + return status; + } + if (view->chip >= in->chips->n) { + psError(PS_ERR_IO, true, "Requested chip == %d >= in->chips->n == %ld", view->chip, in->chips->n); + return false; + } + pmChip *inChip = in->chips->data[view->chip]; + pmChip *outChip = out->chips->data[view->chip]; + + if (view->cell == -1) { + status = pmChipCopyStructure (outChip, inChip, xBin, yBin); + return status; + } + if (view->cell >= inChip->cells->n) { + psError(PS_ERR_IO, true, "Requested cell == %d>= inChip->cells->n == %ld", + view->cell, inChip->cells->n); + return false; + } + pmCell *inCell = inChip->cells->data[view->cell]; + pmCell *outCell = outChip->cells->data[view->cell]; + + status = pmCellCopyStructure (outCell, inCell, xBin, yBin); + return status; +} + +pmFPAfileType pmFPAfileTypeFromString(const char *type) +{ + PS_ASSERT_STRING_NON_EMPTY(type, PM_FPA_FILE_NONE); + + if (!strcasecmp (type, "SX")) { + return PM_FPA_FILE_SX; + } + if (!strcasecmp (type, "OBJ")) { + return PM_FPA_FILE_OBJ; + } + if (!strcasecmp (type, "CMP")) { + return PM_FPA_FILE_CMP; + } + if (!strcasecmp (type, "CMF")) { + return PM_FPA_FILE_CMF; + } + if (!strcasecmp (type, "RAW")) { + return PM_FPA_FILE_RAW; + } + if (!strcasecmp (type, "IMAGE")) { + return PM_FPA_FILE_IMAGE; + } + if (!strcasecmp (type, "PSF")) { + return PM_FPA_FILE_PSF; + } + if (!strcasecmp (type, "JPEG")) { + return PM_FPA_FILE_JPEG; + } + if (!strcasecmp (type, "KAPA")) { + return PM_FPA_FILE_KAPA; + } + if (!strcasecmp (type, "MASK")) { + return PM_FPA_FILE_MASK; + } + if (!strcasecmp (type, "WEIGHT")) { + return PM_FPA_FILE_WEIGHT; + } + if (!strcasecmp (type, "FRINGE")) { + return PM_FPA_FILE_FRINGE; + } + if (!strcasecmp (type, "HEADER")) { + return PM_FPA_FILE_HEADER; + } + + return PM_FPA_FILE_NONE; +} + +char *pmFPAfileStringFromType(pmFPAfileType type) +{ + switch (type) { + case PM_FPA_FILE_SX: + return ("SX"); + case PM_FPA_FILE_OBJ: + return ("OBJ"); + case PM_FPA_FILE_CMP: + return ("CMP"); + case PM_FPA_FILE_CMF: + return ("CMF"); + case PM_FPA_FILE_RAW: + return ("RAW"); + case PM_FPA_FILE_IMAGE: + return ("IMAGE"); + case PM_FPA_FILE_PSF: + return ("PSF"); + case PM_FPA_FILE_JPEG: + return ("JPEG"); + case PM_FPA_FILE_KAPA: + return ("KAPA"); + case PM_FPA_FILE_MASK: + return ("MASK"); + case PM_FPA_FILE_WEIGHT: + return ("WEIGHT"); + case PM_FPA_FILE_FRINGE: + return ("FRINGE"); + case PM_FPA_FILE_HEADER: + return ("HEADER"); + default: + return ("NONE"); + } + return ("NONE"); +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAfile.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAfile.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAfile.h (revision 14957) @@ -0,0 +1,130 @@ +/* @file pmFPAview.h + * @brief Tools to manipulate the FPA structure elements. + * + * @author EAM, IfA + * + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-09-19 21:37:58 $ + * Copyright 2004-2005 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_FILE_H +#define PM_FPA_FILE_H + +/// @addtogroup Camera Camera Layout +/// @{ + +typedef enum { + PM_FPA_BEFORE, + PM_FPA_AFTER, +} pmFPAfilePlace; + +typedef enum { + PM_FPA_FILE_NONE, + PM_FPA_FILE_SX, + PM_FPA_FILE_OBJ, + PM_FPA_FILE_CMP, + PM_FPA_FILE_CMF, + PM_FPA_FILE_RAW, + PM_FPA_FILE_IMAGE, + PM_FPA_FILE_PSF, + PM_FPA_FILE_JPEG, + PM_FPA_FILE_KAPA, + PM_FPA_FILE_MASK, + PM_FPA_FILE_WEIGHT, + PM_FPA_FILE_FRINGE, + PM_FPA_FILE_HEADER, +} pmFPAfileType; + +typedef enum { + PM_FPA_MODE_NONE, + PM_FPA_MODE_READ, + PM_FPA_MODE_WRITE, + PM_FPA_MODE_INTERNAL, + PM_FPA_MODE_REFERENCE, +} pmFPAfileMode; + +typedef enum { + PM_FPA_STATE_OPEN = 0x01, + PM_FPA_STATE_CLOSED = 0x02, + PM_FPA_STATE_INACTIVE = 0x04, +} pmFPAfileState; + +typedef struct +{ + pmFPAfileMode mode; // is this file read, written, or only used internally? + pmFPAfileType type; // what type of data is read from / written to disk? + pmFPAfileState state; // have we opened the file, etc? + + pmFPALevel fileLevel; // what level in the FPA hierarchy represents a unique file? + pmFPALevel dataLevel; // at what level do we read/write the data segment? (request by user) + pmFPALevel freeLevel; // at what level do we free the data segment? (set by program) + pmFPALevel mosaicLevel; // at what level is the mosaic? + + pmFPA *fpa; // for I/O files, we carry a pointer to the complete fpa + psFits *fits; // for I/O files of fits type (IMAGE, CMP, CMF), we carry a file handle + + bool wrote_phu; // have we written a PHU for this file? + psMetadata *header; // pointer (view) to the current hdu header + + pmReadout *readout; // for internal files, we only carry a single readout + + psMetadata *names; // filenames supplied by the cmdline or detdb are saved here + + char *filerule; // rule for constructing a filename when needed + char *filesrc; // rule to find file in pmFPAfile->names list + + char *name; // the name of the rule (useful for debugging / tracing) + char *filename; // the current name of an active file + char *extname; // the current name of an active file extension + + pmDetrendSelectResults *detrend; // Detrend information, from pmDetrendSelect + + bool save; // Should the file be saved? + + // the following elements are used for WRITE-mode IMAGE-type pmFPAfiles to inform + // the creation of a new image based on an existing image + pmFPA *src; // if an output FPA, inherit from this FPA + int xBin; // desired binning in x direction + int yBin; // desired binning in y direction + + psMetadata *camera; // Camera configuration + psString cameraName; // Name of the camera + psMetadata *format; // Camera format + psString formatName; // name of the camera format +} +pmFPAfile; + +// allocate an empty pmFPAfile structure +pmFPAfile *pmFPAfileAlloc (); + +// select the readout from the named pmFPAfile; if the named file does not exist, +pmReadout *pmFPAfileThisReadout (psMetadata *files, const pmFPAview *view, const char *name); + +// select the cell from the named pmFPAfile; if the named file does not exist, +pmCell *pmFPAfileThisCell (psMetadata *files, const pmFPAview *view, const char *name); + +// select the chip from the named pmFPAfile; if the named file does not exist, +pmChip *pmFPAfileThisChip (psMetadata *files, const pmFPAview *view, const char *name); + +// add the specified filename info (value) to the files of the given mode using the given reference name +bool pmFPAfileAddFileNames (psMetadata *files, char *name, char *value, int mode); + +// convert the rule to a name based on the current view +psString pmFPANameFromRule(const char *rule, const pmFPA *fpa, const pmFPAview *view); + +// convert the rule to a name based on the current view +psString pmFPAfileNameFromRule(const char *rule, const pmFPAfile *file, const pmFPAview *view); + +bool pmFPAfileCopyView (pmFPA *out, pmFPA *in, const pmFPAview *view); + +bool pmFPAfileCopyStructureView (pmFPA *out, pmFPA *in, int xBin, int yBin, const pmFPAview *view); + +// Return the file type enum from a string +pmFPAfileType pmFPAfileTypeFromString(const char *type); + +// Return the file type as a string +char *pmFPAfileStringFromType(pmFPAfileType type); + +/// @} +# endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.c (revision 14957) @@ -0,0 +1,1169 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include /* for strn?casecmp */ +#include + +#include "pmConfig.h" +#include "pmDetrendDB.h" + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAview.h" +#include "pmFPAfile.h" +#include "pmFPAfile.h" +#include "pmFPAConstruct.h" + +// define an input-type pmFPAfile, bind to the optional fpa if supplied +pmFPAfile *pmFPAfileDefineInput(const pmConfig *config, pmFPA *fpa, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_PTR_NON_NULL(config->files, NULL); + PS_ASSERT_PTR_NON_NULL(config->camera, NULL); + PS_ASSERT_STRING_NON_EMPTY(name, NULL); + + bool status; + char *type; + + // select the FILERULES from config->camera + psMetadata *filerules = psMetadataLookupPtr (&status, config->camera, "FILERULES"); + if (filerules == NULL) { + psError(PS_ERR_IO, true, "Can't find FILERULES in the CAMERA configuration!"); + return NULL; + } + + // select the name from the FILERULES + // check for alias name (type == STR, name is aliased name) + const char *realname = psMetadataLookupStr (&status, filerules, name); + if (!realname || strlen(realname) == 0) { + realname = name; + } + + psMetadata *data = psMetadataLookupPtr (&status, filerules, realname); + if (data == NULL) { + psError(PS_ERR_IO, true, "Can't find file rule %s!", name); + return NULL; + } + + pmFPAfile *file = pmFPAfileAlloc (); + + // save the name of this pmFPAfile + file->name = psStringCopy (name); + + file->filerule = psMemIncrRefCounter(psMetadataLookupStr (&status, data, "FILENAME.RULE")); + + type = psMetadataLookupStr (&status, data, "FILE.TYPE"); + file->type = pmFPAfileTypeFromString(type); + if (file->type == PM_FPA_FILE_NONE) { + psError(PS_ERR_IO, true, "FILE.TYPE is not defined for %s\n", name); + return NULL; + } + + file->mode = PM_FPA_MODE_READ; + file->fileLevel = PM_FPA_LEVEL_NONE; // the fileLevel depends on the input data + + file->dataLevel = pmFPALevelFromName(psMetadataLookupStr (&status, data, "DATA.LEVEL")); + if (file->dataLevel == PM_FPA_LEVEL_NONE) { + psError(PS_ERR_IO, true, "DATA.LEVEL is not set for %s\n", name); + return NULL; + } + // default is to free the data after use (after written out) + // this can be overridden for pmFPAfiles used as carriers as well + file->freeLevel = file->dataLevel; + + if (fpa != NULL) { + file->fpa = psMemIncrRefCounter(fpa); + file->camera = psMemIncrRefCounter((psMetadata *)fpa->camera); + file->cameraName = psMemIncrRefCounter(config->cameraName); + } + + // XXX ppImage and similar require the added file to be unique + // XXX ppFocus wants to override the selection with the new selection + // XXX require programs like ppFocus to remove existing files by hand + if (!psMetadataAddPtr (config->files, PS_LIST_TAIL, name, + PS_DATA_UNKNOWN | PS_META_DUPLICATE_OK, "", file)) { + psError (PS_ERR_IO, false, "could not add %s to config files", name); + return NULL; + } + psFree (file); + return (file); +} + +// Define an output pmFPAfile +pmFPAfile *pmFPAfileDefineOutputForFormat(const pmConfig *config, // Configuration + pmFPA *fpa, // Optional FPA to bind + const char *name, // Name of file rule + psString cameraName, // Name of camera configuration to use + psString formatName // Name of camera format to use + ) +{ + bool status; + + // select the FILERULES from the camera config + psMetadata *filerules = psMetadataLookupPtr(&status, config->camera, "FILERULES"); + if (filerules == NULL) { + psError(PS_ERR_IO, true, "Can't find FILERULES in the CAMERA configuration!"); + return NULL; + } + + // select the name from the FILERULES + // check for alias name (type == STR, name is aliased name) + const char *realname = psMetadataLookupStr(&status, filerules, name); + if (!realname || strlen(realname) == 0) { + realname = name; + } + + psMetadata *data = psMetadataLookupPtr (&status, filerules, realname); + if (data == NULL) { + psError(PS_ERR_IO, true, "Can't find file rule %s!", name); + return NULL; + } + + pmFPAfile *file = pmFPAfileAlloc(); + + // save the name of this pmFPAfile + file->name = psStringCopy(name); + + file->filerule = psMemIncrRefCounter(psMetadataLookupStr(&status, data, "FILENAME.RULE")); + + const char *type = psMetadataLookupStr(&status, data, "FILE.TYPE"); + file->type = pmFPAfileTypeFromString(type); + if (file->type == PM_FPA_FILE_NONE) { + psError(PS_ERR_IO, true, "FILE.TYPE is not defined for %s\n", name); + psFree(file); + return NULL; + } + + file->mode = PM_FPA_MODE_WRITE; + file->save = false; + +// XXX we are deprecating the use of FILE.SAVE in the camera config +# if (0) + char *save = psMetadataLookupStr (&status, data, "FILE.SAVE"); + if (save != NULL) { + if (!strcasecmp (save, "TRUE")) { + file->save = true; + } else if (!strcasecmp (save, "FALSE")) { + file->save = false; + } else { + psError(PS_ERR_IO, true, "Illegal value \"%s\" for FILE.SAVE for %s", save, name); + psFree(file); + return NULL; + } + } +# endif + + // Use the camera we were told to, the camera of the provided FPA, or default to the default camera + psMetadata *camera; // Camera configuration + if (!cameraName || strlen(cameraName) == 0) { + if (fpa && fpa->camera) { + camera = (psMetadata*)fpa->camera; // Casting away const, so I can put it in the file + } else { + camera = config->camera; + cameraName = config->cameraName; + } + } else { + bool mdok; // Status of MD lookup + psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS"); // Known cameras + if (!mdok || !cameras) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n"); + return NULL; + } + camera = psMetadataLookupMetadata(&mdok, cameras, cameraName); // Camera configuration of interest + if (!mdok || !camera) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find automatically generated " + "camera configuration %s in site configuration.\n", cameraName); + return NULL; + } + + if (fpa && fpa->camera && fpa->camera != camera) { + psAbort("Camera of bound FPA is not the requested camera --- there is an inconsistency!"); + } + } + file->camera = psMemIncrRefCounter(camera); + file->cameraName = psMemIncrRefCounter(cameraName); + + // Use the format we were told to, the format specified in the file rule, or default to the default format + if (!formatName || strlen(formatName) == 0) { + // select the format list from the selected camera + formatName = psMetadataLookupStr(&status, data, "FILE.FORMAT"); + if (!formatName || strcmp(formatName, "NONE") == 0) { + // Try to get by with the default + formatName = config->formatName; + } + } + psMetadata *formats = psMetadataLookupMetadata(&status, file->camera, "FORMATS"); // List of formats + psMetadata *format = psMetadataLookupMetadata(&status, formats, formatName); // Camera format to use + if (!format) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to find format %s for file %s.\n", + formatName, file->name); + psFree(file); + return NULL; + } + file->format = psMemIncrRefCounter(format); + file->formatName = psStringCopy(formatName); + + if (fpa) { + file->fpa = psMemIncrRefCounter(fpa); + } else { + file->fpa = pmFPAConstruct(file->camera); + } + + file->fileLevel = pmFPAPHULevel(format); + if (file->fileLevel == PM_FPA_LEVEL_NONE) { + psError(PS_ERR_IO, true, "Unable to determine file level for %s\n", name); + psFree(file); + return NULL; + } + + file->dataLevel = pmFPALevelFromName(psMetadataLookupStr(&status, data, "DATA.LEVEL")); + if (file->dataLevel == PM_FPA_LEVEL_NONE) { + psError(PS_ERR_IO, true, "DATA.LEVEL is not set for %s\n", name); + psFree(file); + return NULL; + } + // default is to free the data after use (after written out) + // this can be overridden for pmFPAfiles used as carriers as well + file->freeLevel = file->dataLevel; + file->fileLevel = PS_MIN (file->fileLevel, file->dataLevel); + + // XXX the file/data/free level must be consistent with the reference fpa (but since we + // don't have access to its pmFPAfile, we cannot enforce this here... + + pmFPALevel extLevel = pmFPAExtensionsLevel(format); // Level for extensions + if (extLevel != PM_FPA_LEVEL_NONE) { + if (extLevel < file->dataLevel) { + psWarning("Level for extensions is higher than desired data level --- adjusting.\n"); + file->dataLevel = extLevel; + } + if (extLevel < file->freeLevel) { + psWarning("Level for extensions is higher than desired free level --- adjusting.\n"); + file->freeLevel = extLevel; + } + } else { + // if we do not have extensions in the file, we are forced to write out at the file level + file->dataLevel = file->fileLevel; + file->freeLevel = file->fileLevel; + } + + psTrace ("psModules.camera", 5, "file: %s, format: %s, fileLevel: %s, extLevel: %s, dataLevel: %s, freeLevel: %s\n", + file->name, file->formatName, pmFPALevelToName (file->fileLevel), pmFPALevelToName(extLevel), pmFPALevelToName (file->dataLevel), pmFPALevelToName (file->freeLevel)); + + // add argument-supplied OUTPUT name to this file + char *outname = psMetadataLookupStr(&status, config->arguments, "OUTPUT"); + psMetadataAddStr(file->names, PS_LIST_TAIL, "OUTPUT", PS_META_NO_REPLACE, "", outname); + + // place the resulting file in the config system + psMetadataAddPtr (config->files, PS_LIST_TAIL, name, PS_DATA_UNKNOWN, "", file); + psFree (file); // we free this copy of file, but 'files' still has a copy + return (file); // the returned value is a view into the version on 'files' +} + +// define a pmFPAfile, bind to the optional fpa if supplied +pmFPAfile *pmFPAfileDefineOutput(const pmConfig *config, pmFPA *fpa, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_PTR_NON_NULL(config->files, NULL); + PS_ASSERT_PTR_NON_NULL(config->camera, NULL); + PS_ASSERT_STRING_NON_EMPTY(name, NULL); + + return pmFPAfileDefineOutputForFormat(config, fpa, name, NULL, NULL); +} + +// define a pmFPAfile, bind to the optional file if supplied +pmFPAfile *pmFPAfileDefineOutputFromFile(const pmConfig *config, pmFPAfile *file, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_PTR_NON_NULL(config->files, NULL); + PS_ASSERT_PTR_NON_NULL(config->camera, NULL); + PS_ASSERT_STRING_NON_EMPTY(name, NULL); + + char *cameraName = NULL, *formatName = NULL; // Name of camera and format + pmFPA *fpa = NULL; // FPA for file + if (file) { + cameraName = file->cameraName; + formatName = file->formatName; + fpa = file->fpa; + } + + return pmFPAfileDefineOutputForFormat(config, fpa, name, cameraName, formatName); +} + +// search for argname on the config->argument list +// construct an FPA based on the files in this list (must represent a single FPA) +// built the association between the FPA elements (CHIP/CELL) and the files +// define the pmFPAfile filename and bind it to this FPA +// save the pmFPAfile on config->files +// return the pmFPAfile (a view to the one saved on config->files) +pmFPAfile *pmFPAfileDefineFromArgs(bool *success, pmConfig *config, const char *filename, const char *argname) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + PS_ASSERT_STRING_NON_EMPTY(argname, NULL); + + bool status; + pmFPA *fpa = NULL; + psFits *fits = NULL; + pmFPAfile *file = NULL; + psMetadata *phu = NULL; + psMetadata *format = NULL; + + // use success to identify valid exit conditions (as opposed to 'argument not supplied') + if (success) *success = false; + + // we search the argument data for the named fileset (argname) + psArray *infiles = psMetadataLookupPtr(&status, config->arguments, argname); + if (!status) { + if (success) *success = true; + return NULL; + } + if (infiles->n < 1) { + psError(PS_ERR_IO, false, "Found n == %ld files in %s in arguments\n", infiles->n, argname); + return NULL; + } + + // this function is implicitly an INPUT operation: do not create the file + psString realName = pmConfigConvertFilename (infiles->data[0], config, false); + if (!realName) { + psError(PS_ERR_IO, false, "Failed to convert file name %s\n", (char *) infiles->data[0]); + return NULL; + } + + // load the header of the first image + // EXTWORD (fits->extword) is not relevant to the PHU + fits = psFitsOpen (realName, "r"); + if (!fits) { + psError(PS_ERR_IO, false, "Failed to open file %s\n", realName); + psFree (realName); + return NULL; + } + phu = psFitsReadHeader (NULL, fits); + if (!phu) { + psError(PS_ERR_IO, false, "Failed to read file header %s\n", realName); + psFree (realName); + return NULL; + } + psFitsClose(fits); + + // determine the current format from the header + // determine camera if not specified already + format = pmConfigCameraFormatFromHeader (config, phu, true); + if (!format) { + psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", realName); + psFree(phu); + psFree (realName); + return NULL; + } + + // build the template fpa, set up the basic view + fpa = pmFPAConstruct (config->camera); + if (!fpa) { + psError(PS_ERR_IO, false, "Failed to construct FPA from %s", realName); + psFree (realName); + return NULL; + } + psFree (realName); + + // load the given filerule (from config->camera) and bind it to the fpa + // the returned file is just a view to the entry on config->files + file = pmFPAfileDefineInput (config, fpa, filename); + if (!file) { + psError(PS_ERR_IO, false, "file %s not defined\n", filename); + psFree(phu); + psFree(fpa); + psFree(format); + return NULL; + } + psFree (format); + file->format = psMemIncrRefCounter(format); + file->formatName = psStringCopy(config->formatName); + + // adjust the rules to identify these files in the file->names data + psFree (file->filerule); + file->filerule = psStringCopy ("@FILES"); + file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}"); + + file->fileLevel = pmFPAPHULevel(format); + if (file->fileLevel == PM_FPA_LEVEL_NONE) { + psError(PS_ERR_IO, true, "Unable to determine file level for %s\n", file->name); + psFree(phu); + psFree(fpa); + psFree(format); + psFree(file); + return NULL; + } + + // examine the list of input files and validate their cameras + // associated each filename with an element of the FPA + // save the association on file->names + for (int i = 0; i < infiles->n; i++) { + if (i > 0) { + // this function is implicitly an INPUT operation: do not create the file + psString realName = pmConfigConvertFilename (infiles->data[i], config, false); + if (!realName) { + psError(PS_ERR_IO, false, "Failed to convert file name %s", (char *) infiles->data[i]); + return NULL; + } + fits = psFitsOpen (realName, "r"); + if (!fits) { + psError(PS_ERR_IO, false, "Failed to open file %s\n", realName); + psFree (realName); + return NULL; + } + phu = psFitsReadHeader (NULL, fits); + if (!phu) { + psError(PS_ERR_IO, false, "Failed to read file header %s", realName); + psFree (realName); + psFitsClose (fits); + return NULL; + } + bool valid = false; + if (!pmConfigValidateCameraFormat (&valid, format, phu)) { + psError (PS_ERR_UNKNOWN, false, "Error in config scripts\n"); + psFree (realName); + psFitsClose (fits); + return NULL; + } + if (!valid) { + psError(PS_ERR_IO, false, "file %s is not from the required camera", realName); + psFree (realName); + psFitsClose (fits); + return NULL; + } + psFree(realName); + psFitsClose (fits); + } + + // set the view to the corresponding entry for this phu + pmFPAview *view = pmFPAAddSourceFromHeader (fpa, phu, format); + if (!view) { + psError(PS_ERR_IO, false, "Unable to determine source for %s", file->name); + psFree(phu); + psFree (fpa); + psFree (format); + return NULL; + } + + // associate the filename with the FPA element + char *name = pmFPAfileNameFromRule (file->filesrc, file, view); + + // save the name association in the pmFPAfile structure + psMetadataAddStr (file->names, PS_LIST_TAIL, name, 0, "", infiles->data[i]); + + psFree (view); + psFree (name); + psFree (phu); + } + psFree (fpa); + if (success) *success = true; + + return file; +} + +// search for argname on the config->argument list +// construct an FPA based on the files in this list (must represent a single FPA) +// built the association between the FPA elements (CHIP/CELL) and the files +// define the pmFPAfile filename and bind it to this FPA +// save the pmFPAfile on config->files +// return the pmFPAfile (a view to the one saved on config->files) +pmFPAfile *pmFPAfileBindFromArgs (bool *success, pmFPAfile *input, pmConfig *config, const char *filename, const char *argname) +{ + PS_ASSERT_PTR_NON_NULL(input, NULL); + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + PS_ASSERT_STRING_NON_EMPTY(argname, NULL); + + bool status; + psFits *fits = NULL; + pmFPAfile *file = NULL; + psMetadata *phu = NULL; + + // use success to identify valid exit conditions (as opposed to 'argument not supplied') + if (success) *success = false; + + // we search the argument data for the named fileset (argname) + psArray *infiles = psMetadataLookupPtr(&status, config->arguments, argname); + if (!status) { + // this is not an error: this just means no matching argument was supplied + if (success) *success = true; + return NULL; + } + if (infiles->n < 1) { + psError(PS_ERR_IO, false, "Found n == %ld files in %s in arguments\n", infiles->n, argname); + return NULL; + } + + // load the given filerule (from config->camera) and bind it to the fpa + // the returned file is just a view to the entry on config->files + file = pmFPAfileDefineInput (config, input->fpa, filename); + if (!file) { + psError(PS_ERR_IO, false, "file %s not defined\n", filename); + psFree(phu); + return NULL; + } + + // set derived values + file->fileLevel = input->fileLevel; + + // define the rule to identify these files in the file->names data + psFree (file->filerule); + psFree (file->filesrc); + file->filerule = psStringCopy ("@FILES"); + file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}"); + + // examine the list of input files and validate their cameras + // associated each filename with an element of the FPA + // save the association on file->names + psMetadata *format = NULL; + for (int i = 0; i < infiles->n; i++) { + // this function is implicitly an INPUT operation: do not create the file + psString realName = pmConfigConvertFilename (infiles->data[i], config, false); + if (!realName) { + psError(PS_ERR_IO, false, "Failed to convert file name %s", (char *) infiles->data[i]); + return NULL; + } + fits = psFitsOpen (realName, "r"); + if (!fits) { + psError(PS_ERR_IO, false, "Failed to open file %s\n", realName); + psFree (realName); + return NULL; + } + phu = psFitsReadHeader (NULL, fits); + if (!phu) { + psError(PS_ERR_IO, false, "Failed to read file header %s", realName); + psFree (realName); + psFitsClose (fits); + return NULL; + } + + if (!format) { + format = pmConfigCameraFormatFromHeader(config, phu, true); + if (!format) { + psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", realName); + psFree(phu); + psFree(realName); + psFitsClose(fits); + psFree(file); + return NULL; + } + } else { + bool valid = false; + if (!pmConfigValidateCameraFormat(&valid, format, phu)) { + psError(PS_ERR_UNKNOWN, false, "Error in config scripts\n"); + psFree(realName); + psFree(file); + psFitsClose(fits); + return NULL; + } + if (!valid) { + psError(PS_ERR_IO, false, "specified data file %s does not match format of supplied INPUT\n", + realName); + psFree(realName); + psFree(file); + psFitsClose(fits); + return NULL; + } + } + + psFree(realName); + psFitsClose(fits); + + // set the view to the corresponding entry for this phu + pmFPAview *view = pmFPAIdentifySourceFromHeader (input->fpa, phu, format); + if (!view) { + psError(PS_ERR_IO, false, "Unable to determine source for %s", file->name); + psFree(phu); + return NULL; + } + + // associate the filename with the FPA element + char *name = pmFPAfileNameFromRule(file->filesrc, file, view); + + // save the name association in the pmFPAfile structure + psMetadataAddStr (file->names, PS_LIST_TAIL, name, 0, "", infiles->data[i]); + + psFree (view); + psFree (name); + psFree (phu); + } + psFree(file->format); + file->format = format; + file->formatName = psStringCopy(config->formatName); + + if (success) *success = true; + return file; +} + +// search for argname on the config->argument list +// construct an FPA based on the files in this list (each represents the same FPA) +// built the association between the FPA elements (CHIP/CELL) and the files +// define the pmFPAfile filenames and bind them to the FPAs +// save the pmFPAfiles on config->files +// return the pmFPAfiles (a view to the one saved on config->files) +pmFPAfile *pmFPAfileDefineSingleFromArgs (bool *success, pmConfig *config, const char *filename, + const char *argname, int entry) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + PS_ASSERT_STRING_NON_EMPTY(argname, NULL); + + bool status; + pmFPA *fpa = NULL; + psFits *fits = NULL; + pmFPAfile *file = NULL; + psMetadata *phu = NULL; + psMetadata *format = NULL; + + if (success) *success = false; + + // we search the argument data for the named fileset (argname) + psArray *infiles = psMetadataLookupPtr(&status, config->arguments, argname); + if (!status) { + psTrace("psModules.camera", 5, "Failed to find %s in argument list", argname); + if (success) *success = true; + return NULL; + } + if (infiles->n <= entry) { + psError(PS_ERR_IO, false, "only %ld files in %s in argument, entry %d requested\n", infiles->n, argname, entry); + return NULL; + } + + // examine the list of input files and validate their cameras + // associated each filename with an element of the FPA + // save the association on file->names + fits = psFitsOpen (infiles->data[entry], "r"); + phu = psFitsReadHeader (NULL, fits); + psFitsClose (fits); + + // on first call to this function, config->camera is not set. + // later calls will give an error if the cameras do not match + format = pmConfigCameraFormatFromHeader (config, phu, true); + if (!format) { + psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", (char *)infiles->data[0]); + psFree(phu); + return NULL; + } + + // build the template fpa, set up the basic view + fpa = pmFPAConstruct (config->camera); + if (!fpa) { + psError(PS_ERR_IO, false, "Failed to construct FPA from %s", (char *)infiles->data[0]); + psFree(phu); + psFree(format); + return NULL; + } + + // load the given filerule (from config->camera) and bind it to the fpa + // the returned file is just a view to the entry on config->files + // we need a variable name here... (but in filerule) + file = pmFPAfileDefineInput (config, fpa, filename); + if (!file) { + psError(PS_ERR_IO, false, "file %s not defined\n", filename); + psFree(phu); + psFree(fpa); + psFree(format); + return NULL; + } + psFree (file->format); + file->format = format; + file->formatName = psStringCopy(config->formatName); + + // adjust the rules to identify these files in the file->names data + psFree (file->filerule); + psFree (file->filesrc); + file->filerule = psStringCopy ("@FILES"); + file->filesrc = psStringCopy ("{CHIP.NAME}.{CELL.NAME}"); + + file->fileLevel = pmFPAPHULevel(format); + if (file->fileLevel == PM_FPA_LEVEL_NONE) { + psError(PS_ERR_IO, true, "Unable to determine file level for %s\n", file->name); + psFree(phu); + psFree(fpa); + psFree(file); + psFree(format); + return NULL; + } + + // set the view to the corresponding entry for this phu + pmFPAview *view = pmFPAAddSourceFromHeader (fpa, phu, format); + if (!view) { + psError(PS_ERR_IO, false, "Unable to determine source for %s", file->name); + psFree(phu); + psFree(fpa); + psFree(file); + psFree(format); + return NULL; + } + + // associate the filename with the FPA element + char *name = pmFPAfileNameFromRule (file->filesrc, file, view); + + // save the name association in the pmFPAfile structure + psMetadataAddStr (file->names, PS_LIST_TAIL, name, 0, "", infiles->data[entry]); + + psFree(phu); + psFree(fpa); + psFree(view); + psFree(name); + psFree(format); + + if (success) *success = true; + return file; +} + +// define the named pmFPAfile from the camera->config +// only valid for pmFPAfile->mode = READ +pmFPAfile *pmFPAfileDefineFromConf (bool *success, const pmConfig *config, const char *filename) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + + if (success) *success = false; + + // a camera config is needed (as source of file rule) + if (config->camera == NULL) { + psError(PS_ERR_IO, true, "camera is not defined"); + return NULL; + } + + // build the template fpa, set up the basic view + pmFPA *fpa = pmFPAConstruct (config->camera); + if (!fpa) { + psError(PS_ERR_IO, false, "Failed to construct FPA for %s", filename); + return NULL; + } + + // load the given filerule (from config->camera) and bind it to the fpa + // the returned file is just a view to the entry on config->files + pmFPAfile *file = pmFPAfileDefineInput (config, fpa, filename); + psFree (fpa); + if (!file) { + psError(PS_ERR_IO, false, "file %s not defined\n", filename); + return NULL; + } + + // image names may not come from file->names + if (!strcasecmp (file->filerule, "@FILES")) { + psError(PS_ERR_IO, true, "supplied filerule uses illegal value @FILES"); + // XXX remove the file from config->files + psFree(file); + return NULL; + } + + // image names may come from the detrend database + if (!strcasecmp (file->filerule, "@DETDB")) { + psTrace ("pmFPAfile", 5, "requiring use of detrend database source\n"); + // don't free the file here: it is left on config->files + // to be used optionally by pmFPAfileDefineFromDetDB (or others) + if (success) *success = true; + return NULL; + } + + // Prepend the global path to the file rule + // this function is implicitly an INPUT operation: do not create the file + psString tmpName = pmConfigConvertFilename (file->filerule, config, false); + psFree (file->filerule); + file->filerule = tmpName; + + if (success) *success = true; + + return file; +} + +// construct an FPA based on the supplied config->camera +// built the association between the FPA elements (CHIP/CELL) and the files +// define the pmFPAfile filename and bind it to this FPA +// save the pmFPAfile on config->files +// return the pmFPAfile (a view to the one saved on config->files) +pmFPAfile *pmFPAfileDefineFromDetDB (bool *success, const pmConfig *config, const char *filename, + pmFPA *input, pmDetrendType type) +{ + PS_ASSERT_PTR_NON_NULL(input, NULL); + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_PTR_NON_NULL(config->camera, NULL); + PS_ASSERT_PTR_NON_NULL(config->files, NULL); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + + bool status; + pmFPA *fpa = NULL; + pmFPAfile *file = NULL; + + if (success) *success = false; + + // a camera config is needed (as source of file rule) + if (config->camera == NULL) { + psError(PS_ERR_IO, true, "camera is not defined"); + return NULL; + } + // a camera config is needed (as source of file rule) + if (config->cameraName == NULL) { + psAbort("camera defined but not cameraName!"); + } + + // find or define a pmFPAfile with this name + file = psMetadataLookupPtr (NULL, config->files, filename); + if (!file) { + // build the template fpa, set up the basic view + fpa = pmFPAConstruct (config->camera); + if (!fpa) { + psError(PS_ERR_IO, false, "Failed to construct FPA for %s", filename); + return NULL; + } + // load the given filerule (from config->camera) and bind it to the fpa + // the returned file is just a view to the entry on config->files + file = pmFPAfileDefineInput (config, fpa, filename); + if (!file) { + psError(PS_ERR_IO, false, "file %s not defined\n", filename); + psFree (fpa); + return NULL; + } + } + + // we are constructing a detselect command of the form: + // detselect -search -inst (camera) -type (type) -time (time) [others] + // camera, type, and time are derived from pmFPA *input, other options are + // added if specified for the particular detrend type by the DETREND.CONSTRAINTS + // note that the filter-dependent choices are set for ppImage in ppImageParseCamera + // XXX make all of the detrend constraints explicit in DETREND.CONSTRAINTS? + + // Get the time from FPA.TIME + psTime *time = psMetadataLookupPtr(NULL, input->concepts, "FPA.TIME"); + if (time->sec == 0 && time->nsec == 0) { + psLogMsg ("psModules.camera", PS_LOG_WARN, "FPA.TIME has not been set.\n"); + } + pmDetrendSelectOptions *options = pmDetrendSelectOptionsAlloc(config->cameraName, *time, type); + + // add additional constraints based on the type defined in the PPIMAGE recipe + // XXX use PPIMAGE or DETREND for the recipe name? + psMetadata *recipe = psMetadataLookupPtr (&status, config->recipes, "PPIMAGE"); + if (!status) { + psError(PS_ERR_UNEXPECTED_NULL, true, "PPIMAGE recipe not found."); + psFree(options); + psFree(fpa); + return false; + } + psMetadata *detConstraints = psMetadataLookupPtr (&status, recipe, "DETREND.CONSTRAINTS"); + if (!status) { + psWarning("DETREND.CONSTRAINTS not found --- no constraints will be applied."); + goto DETREND_SELECT; + } + + psString typeName = pmDetrendTypeToString (type); + psMetadata *constraints = psMetadataLookupPtr (&status, detConstraints, typeName); + if (!status) { + psWarning("DETREND.CONSTRAINTS for type %s not found --- no contraints will be applied.", typeName); + psFree(typeName); + goto DETREND_SELECT; + } + psFree(typeName); + + // loop over the constraints and include in the detselect options + psMetadataIterator *iter = psMetadataIteratorAlloc (constraints, PS_LIST_HEAD, NULL); + psMetadataItem *item = NULL; + while ((item = psMetadataGetAndIncrement (iter)) != NULL) { + if (item->type != PS_DATA_STRING) { + psWarning("Invalid type for DETREND.CONSTRAINT element %s --- ignoring constraint", item->name); + continue; + } + char *option = item->name; // item->name must correspond to a valid detselect option + char *concept = item->data.V; + + // these items refer to the corresponding values for the input image + // (ie, -filter input:filter or -exptime input:exptime) + if (!strcasecmp (option, "filter")) { + options->filter = psMetadataLookupPtr (&status, input->concepts, concept); + psMemIncrRefCounter (options->filter); + if (!status) + psAbort("failed to find filter (concept %s)", concept); + } else if (!strcasecmp (option, "exptime")) { + options->exptime = psMetadataLookupF32 (&status, input->concepts, concept); + options->exptimeSet = true; + if (!status) + psAbort("exptime not found (concept %s)", concept); + } else if (!strcasecmp (option, "airmass")) { + options->airmass = psMetadataLookupF32 (&status, input->concepts, concept); + options->airmassSet = true; + if (!status) + psAbort("airmass not found (concept %s)", concept); + } else if (!strcasecmp (option, "dettemp")) { + options->dettemp = psMetadataLookupF32 (&status, input->concepts, concept); + options->dettempSet = true; + if (!status) + psAbort("dettemp not found (concept %s)", concept); + } else if (!strcasecmp (option, "twilight")) { + options->twilight = psMetadataLookupF32 (&status, input->concepts, concept); + options->twilightSet = true; + if (!status) + psAbort("twilight not found (concept %s)", concept); + } + + // the version is applied literally + if (!strcasecmp (option, "version")) { + options->version = psMemIncrRefCounter (concept); + } + // we can override the detrend database dettype if desired + // ie, use DOMEFLAT for type FLAT + // the dettype string is applied literally + if (!strcasecmp (option, "dettype")) { + options->dettype = psMemIncrRefCounter (concept); + } + } + psFree(iter); + +DETREND_SELECT: + { + // search for existing detrend data (detID) + pmDetrendSelectResults *results = pmDetrendSelect (options, config); + if (!results) { + psError (PS_ERR_IO, false, "no matching detrend data"); + return NULL; + } + file->detrend = results; + } + + psFree (options); + + if (success) *success = true; + return file; +} + +// create a new output pmFPAfile based on an existing FPA +// only valid for pmFPAfile->mode == WRITE (or internal?) +pmFPAfile *pmFPAfileDefineFromFPA (const pmConfig *config, pmFPA *src, int xBin, int yBin, const char *filename) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(src, false); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + + pmFPA *fpa = pmFPAConstruct(src->camera); + pmFPAfile *file = pmFPAfileDefineOutput (config, fpa, filename); + if (!file) { + psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename); + return NULL; + } + file->src = psMemIncrRefCounter(src); // inherit output elements from this source pmFPA + file->xBin = xBin; + file->yBin = yBin; + psFree (fpa); + return file; +} + +pmFPAfile *pmFPAfileDefineFromFile(const pmConfig *config, pmFPAfile *src, int xBin, int yBin, + const char *filename) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(src, false); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + + pmFPAfile *file = pmFPAfileDefineOutputForFormat(config, NULL, filename, src->cameraName, + src->formatName); + file->src = psMemIncrRefCounter(src->fpa); // inherit output elements from this source pmFPA + file->xBin = xBin; + file->yBin = yBin; + return file; +} + +// create a new output pmFPAfile based on an existing FPA +// only valid for pmFPAfile->mode == WRITE (or internal?) +pmFPAfile *pmFPAfileDefineNewCamera (const pmConfig *config, const char *filename) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + + pmFPAfile *file = pmFPAfileDefineOutput (config, NULL, filename); + if (!file) { + psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename); + return NULL; + } + if (!file->camera) { + psError(PS_ERR_UNEXPECTED_NULL, false, "file %s does not define a new camera\n", filename); + return NULL; + } + file->fpa = pmFPAConstruct(file->camera); + + return file; +} + +pmFPAfile *pmFPAfileDefineSkycell(const pmConfig *config, pmFPA *fpa, const char *filename) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + PS_ASSERT_STRING_NON_EMPTY(config->cameraName, NULL); + PS_ASSERT_STRING_NON_EMPTY(config->formatName, NULL); + + pmFPAfile *file; // The new file + + if (config->cameraName[0] == '_' && + strcmp(config->cameraName + strlen(config->cameraName) - 8, "-SKYCELL") == 0) { + // The input camera is already a skycell + file = pmFPAfileDefineOutputForFormat(config, fpa, filename, config->cameraName, "SKYCELL"); + } else { + psString cameraName = NULL; // Name of the old camera configuration + if (config->cameraName[0] == '_' && + strcmp(config->cameraName + strlen(config->cameraName) - 5, "-CHIP") == 0) { + cameraName = psStringNCopy(config->cameraName + 1, strlen(config->cameraName) - 6); + } else if (config->cameraName[0] == '_' && + strcmp(config->cameraName + strlen(config->cameraName) - 4 , "-FPA") == 0) { + cameraName = psStringNCopy(config->cameraName + 1, strlen(config->cameraName) - 5); + } else { + cameraName = psMemIncrRefCounter(config->cameraName); + } + psString newCameraName = NULL; // Name of the new (automatically-generated) camera configuration + psStringAppend(&newCameraName, "_%s-SKYCELL", cameraName); + file = pmFPAfileDefineOutputForFormat(config, fpa, filename, newCameraName, "SKYCELL"); + psFree(cameraName); + psFree(newCameraName); + } + if (!file) { + psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename); + return NULL; + } + + // Ensure everything is written out at the appropriate level + file->fileLevel = PM_FPA_LEVEL_FPA; + file->dataLevel = PM_FPA_LEVEL_FPA; + file->freeLevel = PM_FPA_LEVEL_FPA; + + return file; +} + +pmFPAfile *pmFPAfileDefineChipMosaic(const pmConfig *config, pmFPA *src, const char *filename) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_PTR_NON_NULL(src, NULL); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + PS_ASSERT_STRING_NON_EMPTY(config->cameraName, NULL); + PS_ASSERT_STRING_NON_EMPTY(config->formatName, NULL); + + pmFPAfile *file; // The new file + if (config->cameraName[0] == '_' && + (strcmp(config->cameraName + strlen(config->cameraName) - 5, "-CHIP") == 0 || + strcmp(config->cameraName + strlen(config->cameraName) - 8, "-SKYCELL") == 0)) { + // The input camera has already been mosaicked to this level + file = pmFPAfileDefineOutputForFormat(config, NULL, filename, config->cameraName, config->formatName); + } else { + psString cameraName = NULL; // Name of the new (automatically-generated) camera configuration + if (config->cameraName[0] == '_' && + strcmp(config->cameraName + strlen(config->cameraName) - 4 , "-FPA") == 0) { + cameraName = psStringNCopy(config->cameraName + 1, strlen(config->cameraName) - 5); + } else { + cameraName = psMemIncrRefCounter(config->cameraName); + } + psString newCameraName = NULL; // Name of the new (automatically-generated) camera configuration + psStringAppend(&newCameraName, "_%s-CHIP", cameraName); + + // Find the correct camera configuration + file = pmFPAfileDefineOutputForFormat(config, NULL, filename, newCameraName, config->formatName); + psFree(newCameraName); + psFree(cameraName); + } + if (!file) { + psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename); + return NULL; + } + + file->src = psMemIncrRefCounter(src); // inherit output elements from this source pmFPA + + file->mosaicLevel = PM_FPA_LEVEL_CHIP; // don't do any I/O on this at a lower level + + return file; +} + +pmFPAfile *pmFPAfileDefineFPAMosaic(const pmConfig *config, pmFPA *src, const char *filename) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_PTR_NON_NULL(src, NULL); + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + PS_ASSERT_STRING_NON_EMPTY(config->cameraName, NULL); + + pmFPAfile *file; // The new file + if (config->cameraName[0] == '_' && + (strcmp(config->cameraName + strlen(config->cameraName) - 4 , "-FPA") == 0 || + strcmp(config->cameraName + strlen(config->cameraName) - 8, "-SKYCELL") == 0)) { + // The input camera has already been mosaicked to this level + file = pmFPAfileDefineOutputForFormat(config, NULL, filename, config->cameraName, config->formatName); + } else { + + psString original = NULL; // Name of the original camera configuration + if (config->cameraName[0] == '_' && + strcmp(config->cameraName + strlen(config->cameraName) - 5 , "-CHIP") == 0) { + // It's a chip mosaic; we need to get the original name + original = psStringNCopy(config->cameraName + 1, strlen(config->cameraName) - 6); + } else if (config->cameraName[0] == '_' && + strcmp(config->cameraName + strlen(config->cameraName) - 8, "-SKYCELL") == 0) { + original = psStringNCopy(config->cameraName + 1, strlen(config->cameraName) - 9); + } else { + original = psMemIncrRefCounter(config->cameraName); + } + psString cameraName = NULL; + psStringAppend(&cameraName, "_%s-FPA", original); + psFree(original); + + file = pmFPAfileDefineOutputForFormat(config, NULL, filename, cameraName, config->formatName); + psFree(cameraName); + } + if (!file) { + psError(PS_ERR_UNEXPECTED_NULL, false, "file %s not defined\n", filename); + return NULL; + } + + file->src = psMemIncrRefCounter(src); // inherit output elements from this source pmFPA + + file->mosaicLevel = PM_FPA_LEVEL_FPA; // don't do any I/O on this at a lower level + + return file; +} + +// create a file with the given name, assign it type "INTERNAL", and supply it with an image +// of the requested dimensions. (image only, mask and weight are ignored) +pmReadout *pmFPAfileDefineInternal (psMetadata *files, const char *name, int Nx, int Ny, int type) +{ + PS_ASSERT_PTR_NON_NULL(files, false); + PS_ASSERT_STRING_NON_EMPTY(name, NULL); + + pmReadout *readout = pmReadoutAlloc(NULL); + readout->image = psImageAlloc(Nx, Ny, type); + + // I want an image from the + pmFPAfile *file = pmFPAfileAlloc(); + file->mode = PM_FPA_MODE_INTERNAL; + file->name = psStringCopy (name); + + file->readout = readout; + psMetadataAddPtr(files, PS_LIST_TAIL, name, PS_DATA_UNKNOWN, "", file); + psFree(file); + // we free this copy of file, but 'files' still has a copy + + return readout; +} + +bool pmFPAfileDropInternal(psMetadata *files, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(files, false); + PS_ASSERT_STRING_NON_EMPTY(name, NULL); + + bool status = false; + + pmFPAfile *file = psMetadataLookupPtr (&status, files, name); + if (!status) { + psTrace("psModules.camera", 6, "Internal File %s not in file list", name); + return true; + } + if (file == NULL) { + psError(PS_ERR_IO, true, "file %s is NULL", name); + return false; + } + if (file->mode != PM_FPA_MODE_INTERNAL) { + psTrace("psModules.camera", 6, "FPA File %s not Internal, not dropping", name); + return true; + } + + psTrace("psModules.camera", 6, "dropping Internal FPA File %s", name); + psMetadataRemoveKey (files, name); + return true; +} + Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAfileDefine.h (revision 14957) @@ -0,0 +1,136 @@ +/* @file pmFPAview.h + * @brief Tools to manipulate the FPA structure elements. + * + * @author EAM, IfA + * + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-09-19 21:37:58 $ + * Copyright 2004-2005 Institute for Astronomy, University of Hawaii + */ + +/// @addtogroup Camera Camera Layout +/// @{ + +#ifndef PM_FPA_FILE_DEFINE_H +#define PM_FPA_FILE_DEFINE_H + +// load the pmFPAfile information from the camera configuration data +// +// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only +// reference count is held by the config->files metadata. Multiple file rules of the same name are permitted +// if multiple is true. +pmFPAfile *pmFPAfileDefineInput (const pmConfig *config, pmFPA *fpa, const char *name); + +// load the pmFPAfile information from the camera configuration data +// +// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only +// reference count is held by the config->files metadata. +// Define an output pmFPAfile +pmFPAfile *pmFPAfileDefineOutput(const pmConfig *config, // Configuration + pmFPA *fpa, // Optional FPA to bind + const char *name // Name of file rule + ); + +/// Same as pmFPAfileDefineOutput, but binds to the fpa in the provided file +pmFPAfile *pmFPAfileDefineOutputFromFile(const pmConfig *config, // Configuration + pmFPAfile *file, // File to bind FPAs, or NULL + const char *name // Name of file rule + ); + +/// Define the FPA file using the provided camera and format names. +pmFPAfile *pmFPAfileDefineOutputForFormat(const pmConfig *config, // Configuration + pmFPA *fpa, // Optional FPA to bind + const char *name, // Name of file rule + psString cameraName, // Name of camera configuration to use + psString formatName // Name of camera format to use + ); + +// look for the given argname on the argument list. find the give filename from the file rules +// +// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only +// reference count is held by the config->files metadata. +pmFPAfile *pmFPAfileDefineFromArgs (bool *found, pmConfig *config, const char *filename, const char *argname); + +// look for the given argname on the argument list; bind the associated files to the specified +// fpa. these are, eg, mask or weight images. +// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only +// reference count is held by the config->files metadata. +pmFPAfile *pmFPAfileBindFromArgs (bool *found, pmFPAfile *input, pmConfig *config, const char *filename, const char *argname); + +// look for the given argname on the argument list. find the give filename from the file rules +// +// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only +// reference count is held by the config->files metadata. +pmFPAfile *pmFPAfileDefineFromConf (bool *found, const pmConfig *config, const char *filename); + +// look for the given argname on the argument list. find the give filename from the file rules +// +// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only +// reference count is held by the config->files metadata. +pmFPAfile *pmFPAfileDefineFromDetDB (bool *found, const pmConfig *config, const char *filename, + pmFPA *input, pmDetrendType type); + +// create a new output pmFPAfile based on an existing FPA +// +// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only +// reference count is held by the config->files metadata. +pmFPAfile *pmFPAfileDefineFromFPA (const pmConfig *config, pmFPA *src, int xBin, int yBin, const char *filename); + +/// Same as pmFPAfileDefineFromFPA, except it uses an FPA file instead of an FPA +pmFPAfile *pmFPAfileDefineFromFile(const pmConfig *config, // Configuration + pmFPAfile *src, // Source file for this file + int xBin, int yBin, // Binning for this file + const char *filename // Name of file rule + ); + + +// create a new output pmFPAfile based on an existing FPA +// only valid for pmFPAfile->mode == WRITE (or internal?) +// +// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only +// reference count is held by the config->files metadata. +pmFPAfile *pmFPAfileDefineNewCamera (const pmConfig *config, const char *filename); + +/// Create a new output pmFPAfile for a skycell of the default camera +/// +/// The new pmFPAfile is inserted into the config->files metadata, freed and returned; so that the user does +/// not have to (and should not!) free the result. +pmFPAfile *pmFPAfileDefineSkycell(const pmConfig *config, ///< Configuration data + pmFPA *fpa, ///< FPA to which to bind + const char *filename ///< Output (root) filename + ); + + +/// Create a new output pmFPAfile based upon a chip mosaic of an existing FPA +/// +/// The new pmFPAfile is inserted into the config->files metadata, freed and returned; so that the user does +/// not have to (and should not!) free the result. +pmFPAfile *pmFPAfileDefineChipMosaic(const pmConfig *config, ///< Configuration data + pmFPA *src, ///< Source FPA + const char *filename ///< Output (root) filename + ); + +/// Create a new output pmFPAfile based upon an FPA mosaic of an existing FPA +/// +/// The new pmFPAfile is inserted into the config->files metadata, freed and returned; so that the user does +/// not have to (and should not!) free the result. +pmFPAfile *pmFPAfileDefineFPAMosaic(const pmConfig *config, ///< Configuration data + pmFPA *src, ///< Source FPA + const char *filename ///< Output (root) filename + ); + +// create a file with the given name, assign it type "INTERNAL", and supply it with an image +// of the requested dimensions. (image only, mask and weight are ignored) +pmReadout *pmFPAfileDefineInternal (psMetadata *files, const char *name, int Nx, int Ny, int type); + +// delete the INTERNAL file of the given name (if it exists) +bool pmFPAfileDropInternal (psMetadata *files, const char *name); + +// look for the given argname on the argument list. find the give filename from the file rules +// +// Note that the returned pmFPAfile is a view only, so it should not be freed by the caller --- the only +// reference count is held by the config->files metadata. +pmFPAfile *pmFPAfileDefineSingleFromArgs (bool *found, pmConfig *config, const char *filename, + const char *argname, int entry); +/// @} +# endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAfileFitsIO.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAfileFitsIO.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAfileFitsIO.c (revision 14957) @@ -0,0 +1,503 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include "pmConfig.h" +#include "pmDetrendDB.h" + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPARead.h" +#include "pmFPAWrite.h" +#include "pmFPAMaskWeight.h" +#include "pmFPAview.h" +#include "pmFPAfile.h" +#include "pmFPAfileFitsIO.h" +#include "pmFPACopy.h" +#include "pmFPAConstruct.h" + +pmFPA *pmFPAfileSuitableFPA(const pmFPAfile *file, const pmFPAview *view, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(file, NULL); + PS_ASSERT_PTR_NON_NULL(view, NULL); + + if (!file->format) { // Working with the same output format as input format + return psMemIncrRefCounter(file->fpa); + } + + // May need to change format + pmFPALevel level = pmFPAviewLevel(view); // Level for the view + if (level == PM_FPA_LEVEL_NONE || level == PM_FPA_LEVEL_READOUT) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "This function shouldn't be called at the readout (or unknown) level."); + return NULL; + } + + // Does the HDU of interest conform to the desired format? + pmHDU *hdu = pmFPAviewThisHDU(view, file->fpa); // The HDU of interest + if (hdu && hdu->format == file->format) { + // No work required + return psMemIncrRefCounter(file->fpa); + } + + // Otherwise, we have to generate a copy with the correct format + + pmFPAview *phuView = pmFPAviewAlloc(0); // View corresponding to the PHU + *phuView = *view; // Copy contents + pmFPALevel phuLevel = pmFPAPHULevel(file->format); // Level for the PHU + switch (phuLevel) { + case PM_FPA_LEVEL_FPA: + phuView->chip = -1; + // Flow through + case PM_FPA_LEVEL_CHIP: + phuView->cell = -1; + // Flow through + case PM_FPA_LEVEL_CELL: + phuView->readout = -1; + break; + case PM_FPA_LEVEL_READOUT: + case PM_FPA_LEVEL_NONE: + default: + psAbort("Should never get here: bad phu level.\n"); + } + + pmFPA *nameSource = file->src; // Source of FPA.NAME + if (!nameSource) { + nameSource = file->fpa; + } + bool mdok; // Status of MD lookup + const char *fpaname = psMetadataLookupStr(&mdok, nameSource->concepts, "FPA.NAME"); // Name of FPA + + pmFPA *copy = pmFPAConstruct(file->camera); // FPA to return + if (!pmFPAAddSourceFromView(copy, fpaname, phuView, file->format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to insert HDU into FPA for writing.\n"); + psFree(copy); + psFree(phuView); + return NULL; + } + psFree(phuView); + + switch (level) { + case PM_FPA_LEVEL_FPA: + if (!pmFPACopy(copy, file->fpa)) { + psError(PS_ERR_UNKNOWN, false, "Unable to copy FPA for format conversion.\n"); + return NULL; + } + return copy; + case PM_FPA_LEVEL_CHIP: { + pmChip *chip = pmFPAviewThisChip(view, copy); // Chip of interest + pmChip *srcChip = pmFPAviewThisChip(view, file->fpa); // Source chip + if (!pmChipCopy(chip, srcChip)) { + psError(PS_ERR_UNKNOWN, false, "Unable to copy chip for format conversion.\n"); + return false; + } + return copy; + } + case PM_FPA_LEVEL_CELL: { + pmCell *cell = pmFPAviewThisCell(view, copy); // Cell of interest + pmCell *srcCell = pmFPAviewThisCell(view, file->fpa); // Source cell + if (!pmCellCopy(cell, srcCell)) { + psError(PS_ERR_UNKNOWN, false, "Unable to copy cell for format conversion.\n"); + return false; + } + return copy; + } + case PM_FPA_LEVEL_READOUT: + case PM_FPA_LEVEL_NONE: + default: + psAbort("Should never get here: bad phu level.\n"); + } + + return NULL; + +} + +// given an already-opened fits file, read the table corresponding to the specified view +bool pmFPAviewReadFitsTable(const pmFPAview *view, pmFPAfile *file, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + pmFPA *fpa = file->fpa; // FPA of interest + psFits *fits = file->fits; // FITS file + + if (view->chip == -1) { + return pmFPAReadTable(fpa, fits, name) > 0; + } + + if (view->cell == -1) { + pmChip *chip = pmFPAviewThisChip(view, fpa); // Chip of interest + return pmChipReadTable(chip, fits, name) > 0; + } + + pmCell *cell = pmFPAviewThisCell(view, fpa); // Cell of interest + return pmCellReadTable(cell, fits, name) > 0; +} + +// given an already-opened fits file, write the table corresponding to the specified view +bool pmFPAviewWriteFitsTable(const pmFPAview *view, pmFPAfile *file, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + pmFPA *fpa = file->fpa; // FPA of interest + psFits *fits = file->fits; // FITS file + + if (view->chip == -1) { + return pmFPAWriteTable(fits, fpa, name) > 0; + } + + if (view->cell == -1) { + pmChip *chip = pmFPAviewThisChip(view, fpa); // Chip of interest + return pmChipWriteTable(fits, chip, name) > 0; + } + + pmCell *cell = pmFPAviewThisCell(view, fpa); // Cell of interest + return pmCellWriteTable(fits, cell, name) > 0; +} + + +// given an already-opened fits file, read the components corresponding to the specified view +static bool fpaViewReadFitsImage(const pmFPAview *view, // FPA view, specifying the level of interest + pmFPAfile *file, // FPA file of interest + bool (*fpaReadFunc)(pmFPA*, psFits*, psDB*), // Function to read FPA + bool (*chipReadFunc)(pmChip*, psFits*, psDB*), // Function to read chip + bool (*cellReadFunc)(pmCell*, psFits*, psDB*) // Function to read cell + ) +{ + assert(view); + assert(file); + + pmFPA *fpa = file->fpa; // FPA of interest + psFits *fits = file->fits; // FITS file from which to read + + if (view->chip == -1) { + return fpaReadFunc(fpa, fits, NULL); + } + + if (view->chip >= fpa->chips->n) { + psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n); + return false; + } + pmChip *chip = fpa->chips->data[view->chip]; // Chip of interest + + if (view->cell == -1) { + return chipReadFunc(chip, fits, NULL); + } + + if (view->cell >= chip->cells->n) { + psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n); + return false; + } + pmCell *cell = chip->cells->data[view->cell]; // Cell of interest + + if (view->readout == -1) { + return cellReadFunc(cell, fits, NULL); + } + psError(PS_ERR_UNKNOWN, true, "Bad view: %d,%d", view->chip, view->cell); + return false; + + // XXX pmReadoutRead, pmReadoutReadSegement disabled for now + #if 0 + + if (view->readout >= cell->readouts->n) { + psError(PS_ERR_IO, true, "Requested readout == %d >= cell->readouts->n == %d", + view->readout, cell->readouts->n); + return false; + } + pmReadout *readout = cell->readouts->data[view->readout]; + + if (view->nRows == 0) { + pmReadoutRead (readout, fits, NULL); + } else { + pmReadoutReadSegment (readout, fits, view->nRows, view->iRows, NULL, NULL); + } + return true; + #endif +} + + +bool pmFPAviewReadFitsImage(const pmFPAview *view, pmFPAfile *file) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + return fpaViewReadFitsImage(view, file, pmFPARead, pmChipRead, pmCellRead); +} + +bool pmFPAviewReadFitsMask(const pmFPAview *view, pmFPAfile *file) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + return fpaViewReadFitsImage(view, file, pmFPAReadMask, pmChipReadMask, pmCellReadMask); +} + +bool pmFPAviewReadFitsWeight(const pmFPAview *view, pmFPAfile *file) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + return fpaViewReadFitsImage(view, file, pmFPAReadWeight, pmChipReadWeight, pmCellReadWeight); +} + +bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view, pmFPAfile *file) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + return fpaViewReadFitsImage(view, file, pmFPAReadHeaderSet, pmChipReadHeaderSet, pmCellReadHeaderSet); +} + +// given an already-opened fits file, write the components corresponding +// to the specified view. when the file was opened, pmFPA/Chip/CellWrite was +// called on it with blank=true to write the (possible) blank PHU +// do NOT call the functions below with blank=true or they will write +// out data in an inconsistent fashion +// the calls below should recurse down the element to write out all components. +static bool fpaViewWriteFitsImage(const pmFPAview *view, // FPA view, specifying the level of interest + pmFPAfile *file, // FPA file of interest + const pmConfig *config, // Configuration + bool (*fpaWriteFunc)(pmFPA*, psFits*, psDB*, bool, bool), // Func for FPA + bool (*chipWriteFunc)(pmChip*, psFits*, psDB*, bool, bool), // Func for chip + bool (*cellWriteFunc)(pmCell*, psFits*, psDB*, bool) // Func for cell + ) +{ + assert(view); + assert(file); + + psFits *fits = file->fits; // FITS file + PS_ASSERT_PTR_NON_NULL(fits, false); + + pmFPA *fpa = pmFPAfileSuitableFPA(file, view, config); // FPA to write + + switch (pmFPAviewLevel(view)) { + case PM_FPA_LEVEL_FPA: { + bool success = fpaWriteFunc(fpa, fits, NULL, false, true); + psFree(fpa); + return success; + } + case PM_FPA_LEVEL_CHIP: { + pmChip *chip = pmFPAviewThisChip(view, fpa); // Chip of interest + bool success = chipWriteFunc(chip, fits, NULL, false, true); + psFree(fpa); + return success; + } + case PM_FPA_LEVEL_CELL: { + pmCell *cell = pmFPAviewThisCell(view, fpa); // Cell of interest + bool success = cellWriteFunc(cell, fits, NULL, false); + psFree(fpa); + return success; + } + case PM_FPA_LEVEL_READOUT: + #if 0 // XXX disable readout write for now + + { + pmReadout *readout = pmFPAviewThisReadout(view, file->fpa); // Readout of interest + if (changeFormat) + { + // No copy function defined for readouts! + psError(PS_ERR_UNKNOWN, false, "Unable to copy readout for format conversion on write.\n"); + return false; + } + if (view->nRows == 0) + { + return pmReadoutWrite(readout, fits, NULL, NULL); + } else + { + return pmReadoutWriteSegment(readout, fits, view->nRows, view->iRows, NULL, NULL); + } + } + #endif + case PM_FPA_LEVEL_NONE: + default: + psAbort("Should never reach here: invalid file level."); + } + + return false; +} + +bool pmFPAviewWriteFitsImage(const pmFPAview *view, pmFPAfile *file, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + return fpaViewWriteFitsImage(view, file, config, pmFPAWrite, pmChipWrite, pmCellWrite); +} + +bool pmFPAviewWriteFitsMask(const pmFPAview *view, pmFPAfile *file, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + return fpaViewWriteFitsImage(view, file, config, pmFPAWriteMask, pmChipWriteMask, pmCellWriteMask); +} + +bool pmFPAviewWriteFitsWeight(const pmFPAview *view, pmFPAfile *file, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + return fpaViewWriteFitsImage(view, file, config, pmFPAWriteWeight, pmChipWriteWeight, pmCellWriteWeight); +} + +// given an already-opened fits file, read the components corresponding +// to the specified view +bool pmFPAviewFreeData(const pmFPAview *view, pmFPAfile *file) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + pmFPA *fpa = file->fpa; + + if (view->chip == -1) { + psTrace ("pmFPAfile", 5, "freeing fpa for %s\n", file->filename); + pmFPAFreeData (fpa); + // XXX drop me: file->fpa = NULL; + return true; + } + + if (view->chip >= fpa->chips->n) { + psError(PS_ERR_IO, true, "Requested chip == %d >= fpa->chips->n == %ld", view->chip, fpa->chips->n); + return false; + } + pmChip *chip = fpa->chips->data[view->chip]; + + if (view->cell == -1) { + psTrace ("pmFPAfile", 5, "freeing chip %d for %s\n", view->chip, file->filename); + pmChipFreeData (chip); + return true; + } + + if (view->cell >= chip->cells->n) { + psError(PS_ERR_IO, true, "Requested cell == %d >= chip->cells->n == %ld", view->cell, chip->cells->n); + return false; + } + pmCell *cell = chip->cells->data[view->cell]; + + if (view->readout == -1) { + psTrace ("pmFPAfile", 5, "freeing cell %d for %s\n", view->cell, file->filename); + pmCellFreeData (cell); + return true; + } + psError(PS_ERR_UNKNOWN, true, "Returning false"); + return false; + + // XXX pmReadoutRead, pmReadoutReadSegement disabled for now + #if 0 + + if (view->readout >= cell->readouts->n) { + psError(PS_ERR_IO, true, "Requested readout == %d >= cell->readouts->n == %d", + view->readout, cell->readouts->n); + return false; + } + pmReadout *readout = cell->readouts->data[view->readout]; + + if (view->nRows == 0) { + pmReadoutRead (readout, fits, NULL); + } else { + pmReadoutReadSegment (readout, fits, view->nRows, view->iRows, NULL, NULL); + } + return true; + #endif +} + +#if 0 +// Shouldn't need this --- when we want to free fringe data, we want to free the whole level, not just the +// table. + +// Free the table within a cell +static void freeTable(pmCell *cell, // Cell of interest + const char *name // Name of table to free + ) +{ + assert(cell); + assert(name && strlen(name) > 0); + + psString headerName = NULL; // Name of header + psStringAppend(&headerName, "%s.HEADER", name); + if (psMetadataLookup(cell->analysis, headerName)) { + psMetadataRemoveKey(cell->analysis, headerName); + } + psFree(headerName); + + if (psMetadataLookup(cell->analysis, name)) { + psMetadataRemoveKey(cell->analysis, name); + } + + return; +} + +// given a file, free the components corresponding to the specified view +bool pmFPAviewFreeFitsTable (const pmFPAview *view, pmFPAfile *file, const char *name) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + PS_ASSERT_PTR_NON_NULL(file, false); + + pmFPA *fpa = file->fpa; + + if (view->chip == -1) { + psArray *chips = fpa->chips; // Array of chips + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // Chip of interest + psArray *cells = chip->cells; // Array of cells + for (int j = 0; j < cells->n; j++) { + pmCell *cell = cells->data[j]; // Cell of interest + freeTable(cell, name); + } + } + return true; + } + + if (view->cell == -1) { + pmChip *chip = pmFPAviewThisChip(view, fpa); // Chip of interest + psArray *cells = chip->cells; // Array of cells + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // Cell of interest + freeTable(cell, name); + } + return true; + } + + pmCell *cell = pmFPAviewThisCell(view, fpa); // Cell of interest + freeTable(cell, name); + return true; +} + +#endif + +bool pmFPAviewFitsWritePHU (const pmFPAview *view, pmFPAfile *file, const pmConfig *config) { + + bool status = false; + + if (file->mode != PM_FPA_MODE_WRITE) return true; + if (file->wrote_phu) return true; + + // select or generate the desired fpa in the correct output format + pmFPA *fpa = pmFPAfileSuitableFPA(file, view, config); + + switch (file->fileLevel) { + case PM_FPA_LEVEL_FPA: + status = pmFPAWrite(fpa, file->fits, NULL, true, false); + break; + case PM_FPA_LEVEL_CHIP: { + pmChip *chip = pmFPAviewThisChip(view, fpa); + status = pmChipWrite(chip, file->fits, NULL, true, false); + break; + } + case PM_FPA_LEVEL_CELL: { + pmCell *cell = pmFPAviewThisCell(view, fpa); + status = pmCellWrite(cell, file->fits, NULL, true); + break; + } + default: + psAbort("fileLevel not correctly set"); + break; + } + + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to write PHU for Image %s (%s)\n", file->filename, file->name); + return false; + } + + psFree(fpa); + file->wrote_phu = true; + return true; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAfileFitsIO.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAfileFitsIO.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAfileFitsIO.h (revision 14957) @@ -0,0 +1,88 @@ +/* @file pmFPAview.h + * @brief Tools to manipulate the FPA structure elements. + * + * @author EAM, IfA + * @author PAP, IfA + * + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-07-14 03:19:01 $ + * Copyright 2004-2005 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_FILE_FITS_IO_H +#define PM_FPA_FILE_FITS_IO_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Read an image into the current view +bool pmFPAviewReadFitsImage(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file ///< FPA file into which to read + ); + +/// Read a mask into the current view +bool pmFPAviewReadFitsMask(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file ///< FPA file into which to read + ); +/// Read a weight map into the current view +bool pmFPAviewReadFitsWeight(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file ///< FPA file into which to read + ); + +/// Read an image header into the current view +bool pmFPAviewReadFitsHeaderSet(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file ///< FPA file into which to read + ); + +/// Write the image for the specified view +bool pmFPAviewWriteFitsImage(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file, ///< FPA file to write + const pmConfig *config ///< Configuration + ); + +/// Write the mask for the specified view +bool pmFPAviewWriteFitsMask(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file, ///< FPA file to write + const pmConfig *config ///< Configuration + ); + +/// Write the weight map for the specified view +bool pmFPAviewWriteFitsWeight(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file, ///< FPA file to write + const pmConfig *config ///< Configuration + ); + +/// Write a PHU for a fits image if needed +bool pmFPAviewFitsWritePHU (const pmFPAview *view, pmFPAfile *file, const pmConfig *config); + +/// Free the data for the specified view +bool pmFPAviewFreeData(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file ///< FPA file to free data + ); + +/// Read a table into the current view +bool pmFPAviewReadFitsTable(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file, ///< FPA file into which to read + const char *name ///< Name of table + ); + +/// Write the table for the specified view +bool pmFPAviewWriteFitsTable(const pmFPAview *view, ///< View specifying level of interest + pmFPAfile *file, ///< FPA file to write + const char *name ///< Name of table + ); + +/// Produce a suitable FPA for writing, on the basis of the input FPAfile +/// +/// A new FPA with a changed format is generated if required (file->format is set and file->camera is equal to +/// the default, indicating a change in the format without changing the camera --- changes to the camera are +/// handled using other systems --- see pmFPAfileDefineChipMosaic, pmFPAfileDefineFPAMosaic). Otherwise the +/// file->fpa is returned (incremented). +pmFPA *pmFPAfileSuitableFPA(const pmFPAfile *file,///< File containing the fpa + const pmFPAview *view, ///< View at which to produce the fpa + const pmConfig *config ///< Configuration + ); + +/// @} + +# endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAfileIO.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAfileIO.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAfileIO.c (revision 14957) @@ -0,0 +1,875 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include /* for strn?casecmp */ +#include + +#include "pmConfig.h" +#include "pmDetrendDB.h" + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmFPAMaskWeight.h" +#include "pmFPAview.h" +#include "pmFPAFlags.h" +#include "pmFPAfile.h" +#include "pmFPACopy.h" +#include "pmFPARead.h" +#include "pmFPAWrite.h" +#include "pmFPAfileIO.h" +#include "pmFPAfileFitsIO.h" +#include "pmPeaks.h" +#include "pmMoments.h" +#include "pmResiduals.h" +#include "pmGrowthCurve.h" +#include "pmTrend2D.h" +#include "pmPSF.h" +#include "pmModel.h" +#include "pmSource.h" +#include "pmSourceIO.h" +#include "pmResiduals.h" +#include "pmPSF_IO.h" +#include "pmFPA_JPEG.h" +#include "pmSourcePlots.h" +#include "pmFPAConstruct.h" + +// attempt create, read, write, close, or free pmFPAfiles available in files files are +// automatically opened before they are read. In the case of MEF files, the PHU is +// read when the file is opened and written before the first extension is written. +bool pmFPAfileIOChecks (pmConfig *config, const pmFPAview *view, pmFPAfilePlace place) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_PTR_NON_NULL(config->files, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + psMetadata *files = config->files; + + // attempt to perform all create, read, write, close operations + psMetadataItem *item = NULL; + psMetadataIterator *iter = psMetadataIteratorAlloc (files, PS_LIST_HEAD, NULL); + while ((item = psMetadataGetAndIncrement (iter)) != NULL) { + pmFPAfile *file = item->data.V; + + switch (place) { + case PM_FPA_BEFORE: + if (!pmFPAfileRead (file, view, config)) { + psError(PS_ERR_IO, false, "failed READ in FPA_BEFORE block for %s", file->name); + goto failure; + } + if (!pmFPAfileCreate(file, view, config)) { + psError(PS_ERR_IO, false, "failed CREATE in FPA_BEFORE block for %s", file->name); + goto failure; + } + break; + case PM_FPA_AFTER: + if (!pmFPAfileWrite (file, view, config)) { + psError(PS_ERR_IO, false, "failed WRITE in FPA_AFTER block for %s", file->name); + goto failure; + } + if (!pmFPAfileClose(file, view)) { + psError(PS_ERR_IO, false, "failed CLOSE in FPA_AFTER block for %s", file->name); + goto failure; + } + break; + default: + psAbort("You can't get here"); + } + } + + // attempt to free data that is no longer needed + psMetadataIteratorSet (iter, PS_LIST_HEAD); + while ((item = psMetadataGetAndIncrement (iter)) != NULL) { + pmFPAfile *file = item->data.V; + + switch (place) { + case PM_FPA_BEFORE: + break; + case PM_FPA_AFTER: + if (!pmFPAfileFreeData(file, view)) { + if (!psMetadataRemoveKey(files, file->name)) { + psError(PS_ERR_IO, false, "failed to remove %s in FPA_AFTER block", file->name); + goto failure; + } + } + break; + default: + psAbort("You can't get here"); + } + } + psFree (iter); + return true; + +failure: + psFree (iter); + return false; +} + +// read the file, if necessary and possible +bool pmFPAfileRead(pmFPAfile *file, const pmFPAview *view, pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(file, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + // an internal file should not be sent here (should not be left on config->files) + PS_ASSERT(file->mode != PM_FPA_MODE_INTERNAL, false); + + // skip the following states + if (file->state & PM_FPA_STATE_INACTIVE) { + psTrace("psModules.camera", 6, "skip read for %s, file is inactive", file->name); + return true; + } + if (file->mode != PM_FPA_MODE_READ) { + psTrace("psModules.camera", 6, "skip read for %s, mode is not READ", file->name); + return true; + } + + // get the current level + pmFPALevel level = pmFPAviewLevel (view); + + // do we need to read this file? defer until we read the correct level + if (level != file->dataLevel) { + psTrace("psModules.camera", 6, "skip reading of %s at this level %s: dataLevel is %s", + file->name, pmFPALevelToName(level), pmFPALevelToName(file->dataLevel)); + return true; + } + + // do we need to open this file? + if (level >= file->fileLevel) { + // we are allowed to open a file at a level which is not the fileLevel, but we need to + // supply a view at the fileLevel for the file lookup functions below + pmFPAview *fileView = pmFPAviewForLevel (file->fileLevel, view); + if (!pmFPAfileOpen (file, fileView, config)) { + psError(PS_ERR_IO, false, "failed to open file %s (%s)", file->filename, file->name); + psFree (fileView); + return false; + } + psFree (fileView); + } + + // We need to read it --- double-check it's open! + if (file->state == PM_FPA_STATE_CLOSED) { + psError(PS_ERR_IO, false, "failed to open file %s when attempting to read", file->name); + return false; + } + + // select a reading method + bool status = true; + switch (file->type) { + case PM_FPA_FILE_IMAGE: + status = pmFPAviewReadFitsImage(view, file); + break; + case PM_FPA_FILE_MASK: + status = pmFPAviewReadFitsMask(view, file); + break; + case PM_FPA_FILE_WEIGHT: + status = pmFPAviewReadFitsWeight(view, file); + break; + case PM_FPA_FILE_HEADER: + status = pmFPAviewReadFitsHeaderSet(view, file); + break; + case PM_FPA_FILE_FRINGE: + status = pmFPAviewReadFitsImage (view, file); + if (status) { + if (!pmFPAviewReadFitsTable(view, file, "FRINGE")) { + psError(PS_ERR_UNKNOWN, false, "Unable to read fringe data from %s.\n", file->filename); + return false; + } + } + break; + case PM_FPA_FILE_SX: + case PM_FPA_FILE_RAW: + case PM_FPA_FILE_OBJ: + case PM_FPA_FILE_CMP: + case PM_FPA_FILE_CMF: + status = pmFPAviewReadObjects (view, file, config); + break; + case PM_FPA_FILE_PSF: + status = pmPSFmodelReadForView (view, file, config); + break; + case PM_FPA_FILE_JPEG: + case PM_FPA_FILE_KAPA: + break; + default: + psError(PS_ERR_IO, true, "warning: type mismatch; saw type %d (%s)", file->type, file->name); + return false; + } + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to read %s (%s)\n", file->filename, file->name); + return false; + } + psTrace ("psModules.camera", 5, "read %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout); + return true; +} + +// create the data elements (headers, images) appropriate for this view +bool pmFPAfileCreate (pmFPAfile *file, const pmFPAview *view, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(file, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + // these are not error conditions; these are state tests + if (file->state & PM_FPA_STATE_INACTIVE) { + psTrace("psModules.camera", 6, "skip create for inactive file %s", file->name); + return true; + } + if (file->mode != PM_FPA_MODE_WRITE) { + psTrace("psModules.camera", 6, "skip create for non-write file %s", file->name); + return true; + } + + // an internal file should not be returned to here + PS_ASSERT(file->mode != PM_FPA_MODE_INTERNAL, false); + + // get the current level + pmFPALevel level = pmFPAviewLevel (view); + + // don't create the file if the src (FPA) is not defined + if (file->src == NULL) { + psTrace("psModules.camera", 6, "skip create for FPA without src FPA for %s", file->name); + return true; + } + + // do we need to write this file? + if (level != file->fileLevel || file->mosaicLevel != PM_FPA_LEVEL_NONE) { + psTrace("psModules.camera", 6, "skip creation of %s at this level %s: fileLevel is %s", + file->name, pmFPALevelToName(level), pmFPALevelToName(file->fileLevel)); + return true; + } + + switch (file->type) { + case PM_FPA_FILE_IMAGE: + case PM_FPA_FILE_MASK: + case PM_FPA_FILE_WEIGHT: + case PM_FPA_FILE_FRINGE: { + // create FPA structure component based on view + psMetadata *format = file->format; // Camera format configuration + if (!format) { + format = config->format; + } + + pmFPA *nameSource = file->src; // Source of FPA.NAME + if (!nameSource) { + nameSource = file->fpa; + } + bool mdok; // Status of MD lookup + const char *fpaname = psMetadataLookupStr(&mdok, nameSource->concepts, "FPA.NAME"); // Name of FPA + + pmFPAAddSourceFromView(file->fpa, fpaname, view, format); + psTrace ("psModules.camera", 5, "created fpa data elements for %s (%s) (%d:%d:%d)\n", file->name, file->name, view->chip, view->cell, view->readout); + break; + } + case PM_FPA_FILE_HEADER: + psAbort ("Create not defined for HEADER"); + break; + case PM_FPA_FILE_SX: + case PM_FPA_FILE_RAW: + case PM_FPA_FILE_OBJ: + case PM_FPA_FILE_CMP: + case PM_FPA_FILE_CMF: + case PM_FPA_FILE_PSF: + case PM_FPA_FILE_JPEG: + case PM_FPA_FILE_KAPA: + break; + + default: + psError(PS_ERR_IO, true, "Unsupported type for %s: %d", file->name, file->type); + return false; + } + return true; +} + +bool pmFPAfileWrite(pmFPAfile *file, const pmFPAview *view, pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(file, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + if (file->state & PM_FPA_STATE_INACTIVE) { + psTrace("psModules.camera", 6, "skip write for %s, files is inactive", file->name); + return true; + } + + if (file->mode != PM_FPA_MODE_WRITE) { + psTrace("psModules.camera", 6, "skip write for %s, mode is not WRITE", file->name); + return true; + } + + // an internal file should not be returned to here + if (file->mode == PM_FPA_MODE_INTERNAL) { + psError(PS_ERR_IO, true, "File is mode PM_FPA_MODE_INTERNAL"); + return false; + } + + if (!file->save) { + psTrace("psModules.camera", 6, "skip write for %s, save is FALSE", file->name); + return true; + } + + // get the current level + pmFPALevel level = pmFPAviewLevel (view); + + // the effective dataLevel (for mosaics, we have preserved the original dataLevel) + pmFPALevel dataLevel = file->dataLevel; + if (file->mosaicLevel != PM_FPA_LEVEL_NONE && file->mosaicLevel < dataLevel) { + dataLevel = file->mosaicLevel; + } + + // do we need to write this file? + if (level != dataLevel) { + psTrace("psModules.camera", 6, "skip writing of %s at this level %s: dataLevel is %s", + file->name, pmFPALevelToName(level), pmFPALevelToName(dataLevel)); + return true; + } + + // do we have data to write at this level? + if (!pmFPAviewCheckDataStatus (file->fpa, view)) { + psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name); + return true; + } + + // note that for CMF and PSF, the test above is not sufficient to determine if there + // is actually any data to write out. this is because these types of output files + // have their data stored on the readout->analysis metadata structure of another + // (existing) fpa + if (file->type == PM_FPA_FILE_PSF) { + if (!pmPSFmodelCheckDataStatusForView (view, file)) { + psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name); + return true; + } + } + if (file->type == PM_FPA_FILE_CMF) { + if (!pmFPAviewCheckDataStatusForSources (view, file)) { + psTrace("psModules.camera", 6, "skip write for %s, no data for this entry", file->name); + return true; + } + } + + // open the file if not yet opened + // XXX do we need to test mosaicLevel? + if (level >= file->fileLevel) { + // we are allowed to open a file at a level which is not the fileLevel, but + // we need to supply view at the fileLevel for the file lookup functions below + pmFPAview *fileView = pmFPAviewForLevel (file->fileLevel, view); + if (!pmFPAfileOpen (file, fileView, config)) { + psError(PS_ERR_IO, false, "failed to open %s (%s)", file->filename, file->name); + psFree (fileView); + return false; + } + psFree (fileView); + } + + // do we need to write out a PHU? + if (level >= file->fileLevel) { + if (!pmFPAfileWritePHU (file, view, config)) { + psError(PS_ERR_IO, false, "failed to write phu for %s (%s)", file->filename, file->name); + return false; + } + } + + // select a writing method + bool status = true; + switch (file->type) { + case PM_FPA_FILE_IMAGE: + status = pmFPAviewWriteFitsImage(view, file, config); + break; + case PM_FPA_FILE_MASK: + status = pmFPAviewWriteFitsMask(view, file, config); + break; + case PM_FPA_FILE_WEIGHT: + status = pmFPAviewWriteFitsWeight(view, file, config); + break; + case PM_FPA_FILE_HEADER: + psAbort ("no HEADER write functions defined"); + break; + case PM_FPA_FILE_FRINGE: + status = pmFPAviewWriteFitsImage (view, file, config); + if (status) { + if (!pmFPAviewWriteFitsTable(view, file, "FRINGE")) { + psError(PS_ERR_UNKNOWN, false, "Unable to write fringe data from %s.\n", file->filename); + return false; + } + } + break; + case PM_FPA_FILE_SX: + case PM_FPA_FILE_RAW: + case PM_FPA_FILE_OBJ: + case PM_FPA_FILE_CMP: + case PM_FPA_FILE_CMF: + status = pmFPAviewWriteObjects (view, file, config); + break; + + case PM_FPA_FILE_PSF: + status = pmPSFmodelWriteForView (view, file, config); + break; + + case PM_FPA_FILE_JPEG: + status = pmFPAviewWriteJPEG (view, file, config); + break; + + case PM_FPA_FILE_KAPA: + status = pmFPAviewWriteSourcePlot (view, file, config); + break; + + default: + psError(PS_ERR_IO, true, "warning: type mismatch; saw type %d (%s)", file->type, file->name); + return false; + } + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to write %s (%s)\n", file->filename, file->name); + return false; + } + psTrace ("psModules.camera", 5, "wrote %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout); + return true; +} + +bool pmFPAfileClose (pmFPAfile *file, const pmFPAview *view) +{ + PS_ASSERT_PTR_NON_NULL(file, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + // an internal file should not be sent here (should not be left on config->files) + PS_ASSERT(file->mode != PM_FPA_MODE_INTERNAL, false); + + // skip the following states + if (file->state & PM_FPA_STATE_INACTIVE) { + psTrace("psModules.camera", 6, "skip close for %s, files is inactive", file->name); + return true; + } + if (file->state == PM_FPA_STATE_CLOSED) { + psTrace("psModules.camera", 6, "skip close for %s, files is closed", file->name); + return true; + } + + // is current level == open level? + pmFPALevel level = pmFPAviewLevel (view); + if (file->fileLevel != level) { + psTrace("psModules.camera", 6, "skip closing of %s at this level %s: fileLevel is %s", + file->name, pmFPALevelToName(level), pmFPALevelToName(file->fileLevel)); + return true; + } + + // check if we are actually open + bool status = true; + switch (file->type) { + // check the FITS types + case PM_FPA_FILE_IMAGE: + case PM_FPA_FILE_MASK: + case PM_FPA_FILE_WEIGHT: + case PM_FPA_FILE_HEADER: + case PM_FPA_FILE_FRINGE: + case PM_FPA_FILE_CMF: + case PM_FPA_FILE_PSF: + psTrace ("psModules.camera", 5, "closing %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout); + status = psFitsClose (file->fits); + file->fits = NULL; + file->header = NULL; + file->state = PM_FPA_STATE_CLOSED; + file->wrote_phu = false; + break; + + // ignore the TEXT types + case PM_FPA_FILE_SX: + case PM_FPA_FILE_RAW: + case PM_FPA_FILE_OBJ: + case PM_FPA_FILE_CMP: + case PM_FPA_FILE_JPEG: + case PM_FPA_FILE_KAPA: + break; + + default: + psError(PS_ERR_IO, true, "type mismatch: %d (%s)", file->type, file->name); + return false; + } + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to close %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout); + return false; + } + return true; +} + +bool pmFPAfileFreeData(pmFPAfile *file, const pmFPAview *view) +{ + PS_ASSERT_PTR_NON_NULL(file, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + // an internal file should not be sent here (should not be left on config->files) + PS_ASSERT(file->mode != PM_FPA_MODE_INTERNAL, false); + + if (file->state & PM_FPA_STATE_INACTIVE) { + psTrace("psModules.camera", 6, "skip free for %s, files is inactive", file->name); + return true; + } + + // get the current level + pmFPALevel level = pmFPAviewLevel (view); + + // do we need to free this file? + if (level != file->freeLevel) { + psTrace("psModules.camera", 6, "skip free of %s at this level %s: freeLevel is %s", + file->name, pmFPALevelToName(level), pmFPALevelToName(file->freeLevel)); + return true; + } + + bool status = true; + switch (file->type) { + case PM_FPA_FILE_IMAGE: + case PM_FPA_FILE_MASK: + case PM_FPA_FILE_WEIGHT: + case PM_FPA_FILE_HEADER: + case PM_FPA_FILE_FRINGE: + status = pmFPAviewFreeData(view, file); + break; + case PM_FPA_FILE_SX: + case PM_FPA_FILE_RAW: + case PM_FPA_FILE_OBJ: + case PM_FPA_FILE_CMP: + case PM_FPA_FILE_CMF: + case PM_FPA_FILE_PSF: + psTrace ("psModules.camera", 5, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name); + return true; + case PM_FPA_FILE_JPEG: + case PM_FPA_FILE_KAPA: + psTrace ("psModules.camera", 5, "nothing to free for %s (%s)\n", file->filename, file->name); + return true; + default: + psError(PS_ERR_IO, true, "warning: type mismatch; saw type %d", file->type); + return false; + } + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to read %s (%s)\n", file->filename, file->name); + return false; + } + psTrace ("psModules.camera", 5, "freed %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout); + return true; +} + +// open file (if not already opened). +// this function is only called only within pmFPAfileRead or pmFPAfileWrite. +bool pmFPAfileOpen (pmFPAfile *file, const pmFPAview *view, pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(file, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + bool status; + char *mode = NULL; + char *readMode = "r"; + char *writeMode = "w"; + + if (file->state & PM_FPA_STATE_INACTIVE) { + psTrace("psModules.camera", 6, "skip open for %s, files is inactive", file->name); + return true; + } + + if (file->state == PM_FPA_STATE_OPEN) { + return true; + } + + // these are programming errors + PS_ASSERT(file->mode != PM_FPA_MODE_NONE, false); + PS_ASSERT(file->mode != PM_FPA_MODE_INTERNAL, false); + + if (file->mode == PM_FPA_MODE_READ) { + mode = readMode; + } + if (file->mode == PM_FPA_MODE_WRITE) { + mode = writeMode; + } + if ((file->mode == PM_FPA_MODE_WRITE) && !file->save) { + psTrace("psModules.camera", 6, "skip open for %s, output file not requested", file->name); + return true; + } + + // determine the file name, free a name allocated earlier + psFree (file->filename); + file->filename = pmFPAfileNameFromRule (file->filerule, file, view); + if (file->filename == NULL) { + psError(PS_ERR_IO, true, "Filename is NULL"); + return false; + } + + // indirect filenames: these come from a list on the command line or elsewhere + if (!strcasecmp (file->filename, "@FILES")) { + char *filesrc = pmFPAfileNameFromRule (file->filesrc, file, view); + if (filesrc == NULL) { + psError(PS_ERR_IO, false, "error converting filesrc to name %s\n", file->filesrc); + return false; + } + + psFree (file->filename); + file->filename = psMetadataLookupStr (&status, file->names, filesrc); + + if (file->filename == NULL) { + psError(PS_ERR_IO, true, "filename lookup error (@FILES) for %s : %s\n", file->filesrc, filesrc); + psFree (filesrc); + return false; + } + // psMetadataLookupStr just returns a view, file->filename must be protected + psMemIncrRefCounter (file->filename); + psFree (filesrc); + } + + // get name from detrend database + // file->detrend->detID contains the desired -det_id detID -iteration iter string + if (!strcasecmp (file->filename, "@DETDB")) { + if (!file->detrend) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find information about selected detrend."); + return false; + } + + psString classId = NULL; // The class identifier, to pass to pmDetrendFile + psMetadata *menu = psMetadataLookupMetadata(&status, file->camera, "CLASSID"); // Menu of class IDs + if (!status || !menu) { + psWarning("Unable to find CLASSID metadata in camera configuration --- " + "assuming no class identifier required."); + } else { + const char *rule = psMetadataLookupStr(&status, menu, file->detrend->level); // Rule for class_id + if (!status || !rule || strlen(rule) == 0) { + psWarning("Unable to find %s in CLASSID within camera configuration --- " + "attempting to proceed without it.", file->detrend->level); + } else { + classId = pmFPAfileNameFromRule(rule, file, view); + if (!classId) { + psError(PS_ERR_IO, false, "error converting CLASSID rule to name: %s\n", rule); + return false; + } + } + } + psTrace ("psModules.camera", 6, "looking for detrend (%s, %s)\n", file->detrend->detID, classId); + psFree (file->filename); + + file->filename = pmDetrendFile(file->detrend->detID, classId, config); + if (file->filename == NULL) { + psError(PS_ERR_IO, false, "failed to find a valid detrend image for detID %s : classID %s\n", file->detrend->detID, classId); + psFree (classId); + return false; + } + + psTrace ("psModules.camera", 6, "got detrend file %s\n", file->filename); + psFree (classId); + } + + // apply filename mangling rules (file://, path://, neb://) + bool create = file->mode == PM_FPA_MODE_WRITE ? true : false; + psString tmpName = pmConfigConvertFilename (file->filename, config, create); + psFree (file->filename); + file->filename = tmpName; + + switch (file->type) { + // open the FITS types: + case PM_FPA_FILE_IMAGE: + case PM_FPA_FILE_MASK: + case PM_FPA_FILE_WEIGHT: + case PM_FPA_FILE_HEADER: + case PM_FPA_FILE_FRINGE: + case PM_FPA_FILE_CMF: + case PM_FPA_FILE_PSF: + psTrace ("psModules.camera", 5, "opening %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout); + file->fits = psFitsOpen (file->filename, mode); + if (file->fits == NULL) { + psError(PS_ERR_IO, false, "error opening file %s\n", file->filename); + return false; + } + file->state = PM_FPA_STATE_OPEN; + + // if needed, set the optional EXTWORD field based on the camera value + if (config && config->format) { + psMetadata *fileMenu = psMetadataLookupMetadata (NULL, config->format, "FILE"); + if (!fileMenu) { + psError (PS_ERR_IO, true, "FILE METADATA missing from camera format %s\n", config->formatName); + return false; + } + char *extword = psMetadataLookupStr (&status, fileMenu, "EXTWORD"); + if (status) { + psFitsSetExtnameWord (file->fits, extword); + } + } + + // In some cases, we need to read the PHU after we've opened the file. This happens for + // the images supplied by the detrend database, which are only identified here (pmConfigConvertFilename). + if (!pmFPAfileReadPHU (file, view, config)) { + psError (PS_ERR_IO, true, "error reading PHU for %s (%s) (%d:%d:%d)\n", file->filename, file->name, view->chip, view->cell, view->readout); + return false; + } + break; + + // defer opening TEXT types: + case PM_FPA_FILE_SX: + case PM_FPA_FILE_OBJ: + case PM_FPA_FILE_CMP: + case PM_FPA_FILE_RAW: + case PM_FPA_FILE_JPEG: + case PM_FPA_FILE_KAPA: + psTrace ("psModules.camera", 5, "defer opening %s\n", file->filename); + break; + + default: + psError(PS_ERR_IO, true, "type mismatch for %s : %d\n", file->filename, file->type); + return false; + } + return true; +} + +// for this file and view, if we need to read a PHU, read it. return true for any non-error +// condition. this function should be called by pmFPAfileOpen. +bool pmFPAfileReadPHU (pmFPAfile *file, const pmFPAview *view, pmConfig *config) +{ + // required conditions + if (file->mode != PM_FPA_MODE_READ) return true; + if (file->state != PM_FPA_STATE_OPEN) psAbort ("pmFPAfileReadPHU called on unopened file"); + if (file->fpa == NULL) psAbort ("pmFPAfileReadPHU called on file without an FPA"); + + // check if we need to read a PHU (if not, return true) + switch (file->fileLevel) { + case PM_FPA_LEVEL_FPA: + if (file->fpa->hdu) return true; + break; + case PM_FPA_LEVEL_CHIP: { + pmChip *chip = pmFPAviewThisChip(view, file->fpa); + if (!chip) psAbort ("inconsistent file/fpa: fileLevel is CHIP, view is FPA"); + if (chip->hdu) return true; + break; + } + case PM_FPA_LEVEL_CELL: { + pmCell *cell = pmFPAviewThisCell(view, file->fpa); + if (!cell) psAbort ("inconsistent file/fpa: fileLevel is CELL, view is FPA"); + if (cell->hdu) return true; + break; + } + case PM_FPA_LEVEL_NONE: + // Might get here immediately after opening a file selected from the detrend database. + break; + default: + psAbort("fileLevel not correctly set"); + break; + } + + // XXX do we need to advance to the first HDU? + psMetadata *phu = psFitsReadHeader (NULL, file->fits); + if (!file->format) { + // XXX do we need to read the recipe here? these files are supplemental, and probably + // do not need to re-load the recipes + file->format = pmConfigCameraFormatFromHeader (config, phu, false); + if (!file->format) { + psError(PS_ERR_IO, false, "Failed to read CCD format from %s\n", file->filename); + psFree(phu); + return false; + } + file->formatName = psStringCopy(config->formatName); + + } else { + bool valid; + if (!pmConfigValidateCameraFormat (&valid, file->format, phu)) { + psError (PS_ERR_UNKNOWN, false, "Error in camera configuration\n"); + psFree (phu); + return false; + } + if (!valid) { + psError(PS_ERR_IO, false, "file %s is not from the required camera", file->filename); + psFree (phu); + return false; + } + } + pmFPAview *thisView = pmFPAAddSourceFromHeader (file->fpa, phu, file->format); + psFree (thisView); + psFree (phu); + // XXX we can check the output view to be sure it corresponds to our current view + return true; +} + +// XXX this function is only called from pmFPAfileWrite +// XXX for each data type, there should be a function which writes the PHU, if needed +bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(file, false); + PS_ASSERT_PTR_NON_NULL(view, false); + + if (file->wrote_phu) return true; + + bool status = true; + switch (file->type) { + case PM_FPA_FILE_IMAGE: + case PM_FPA_FILE_MASK: + case PM_FPA_FILE_WEIGHT: + case PM_FPA_FILE_FRINGE: + status = pmFPAviewFitsWritePHU (view, file, config); + break; + case PM_FPA_FILE_CMF: + status = pmSource_CMF_WritePHU (view, file, config); + break; + case PM_FPA_FILE_PSF: + status = pmPSFmodelWritePHU (view, file, config); + break; + case PM_FPA_FILE_SX: + case PM_FPA_FILE_RAW: + case PM_FPA_FILE_OBJ: + case PM_FPA_FILE_CMP: + case PM_FPA_FILE_JPEG: + case PM_FPA_FILE_KAPA: + break; + default: + fprintf (stderr, "warning: type mismatch\n"); + return false; + } + if (!status) { + psError(PS_ERR_UNKNOWN, false, "failed to write PHU for %s (%s)\n", file->filename, file->name); + return false; + } + // XXX this is also being set in the individual functions. choose one or the other + file->wrote_phu = true; + return true; +} + +// set the state of the specified pmFPAfile to active (state == true) or inactive +// if name is NULL, set the state for all pmFPAfiles +bool pmFPAfileActivate (psMetadata *files, bool state, char *name) +{ + PS_ASSERT_PTR_NON_NULL(files, false); + + // Do this as an iteration rather than a lookup, since we may want to turn on/off multiple files at once + // (if there are multiple files defined with the same name). + + if (!name) { + psMetadataItem *item = NULL; + psMetadataIterator *iter = psMetadataIteratorAlloc (files, PS_LIST_HEAD, NULL); + while ((item = psMetadataGetAndIncrement (iter)) != NULL) { + pmFPAfile *file = item->data.V; + if (state) { + file->state &= PS_NOT_U8(PM_FPA_STATE_INACTIVE); + } else { + file->state |= PM_FPA_STATE_INACTIVE; + } + } + psFree (iter); + return true; + } + + if (!psMetadataLookup(files, name)) { + // We activated every example of that file that we could find. + return true; + } + + psString regex = NULL; // Regular expression for psMetadataIteratorAlloc + if (name) { + psStringAppend(®ex, "^%s$", name); + } + + int num = 0; // Number of files activated + psMetadataItem *item = NULL; // Item from iteration + psMetadataIterator *iter = psMetadataIteratorAlloc(files, PS_LIST_HEAD, regex); // Iterator + while ((item = psMetadataGetAndIncrement(iter))) { + pmFPAfile *file = item->data.V; // File of interest + if (state) { + file->state &= PS_NOT_U8(PM_FPA_STATE_INACTIVE); + } else { + file->state |= PM_FPA_STATE_INACTIVE; + } + num++; + } + psFree(iter); + psFree(regex); + + return true; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAfileIO.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAfileIO.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAfileIO.h (revision 14957) @@ -0,0 +1,45 @@ +/* @file pmFPAview.h + * @brief Tools to manipulate the FPA structure elements. + * + * @author EAM, IfA + * + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-04-14 03:22:47 $ + * Copyright 2004-2005 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_FILE_IO_H +#define PM_FPA_FILE_IO_H + +/// @addtogroup Camera Camera Layout +/// @{ + +// open the real file corresponding to the given pmFPAfile appropriate to the current view +bool pmFPAfileOpen (pmFPAfile *file, const pmFPAview *view, pmConfig *config); + +// read from the real file corresponding to the given pmFPAfile for the current view +bool pmFPAfileRead (pmFPAfile *file, const pmFPAview *view, pmConfig *config); + +bool pmFPAfileCreate (pmFPAfile *file, const pmFPAview *view, const pmConfig *config); + +// write to the real file corresponding to the given pmFPAfile for the current view +bool pmFPAfileWrite (pmFPAfile *file, const pmFPAview *view, pmConfig *config); + +// close the real file corresponding to the given pmFPAfile appropriate to the current view +bool pmFPAfileClose (pmFPAfile *file, const pmFPAview *view); + +// free the data at this level +bool pmFPAfileFreeData(pmFPAfile *file, const pmFPAview *view); + +// set the state of the specified pmFPAfile to active (state == true) or inactive +// if name is NULL, set the state for all pmFPAfiles +bool pmFPAfileActivate (psMetadata *files, bool state, char *name); + +// examine all pmFPAfiles listed in the files and perform the needed I/O operations (open,read,write,close) +bool pmFPAfileIOChecks (pmConfig *config, const pmFPAview *view, pmFPAfilePlace place); + +bool pmFPAfileWritePHU(pmFPAfile *file, const pmFPAview *view, const pmConfig *config); +bool pmFPAfileReadPHU (pmFPAfile *file, const pmFPAview *view, pmConfig *config); + +/// @} +# endif Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAview.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAview.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAview.c (revision 14957) @@ -0,0 +1,322 @@ +/** @file pmFPAview.c + * + * @author EAM, IfA + * + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ + * + * Copyright 2004 Maui High Performance Computing Center, University of Hawaii + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmHDUUtils.h" +#include "pmFPAview.h" + +static void pmFPAviewFree(pmFPAview *view) +{ + // No reason to keep this function, apart from the fact that it allows us to type the memBlock + return; +} + +pmFPAview *pmFPAviewAlloc(int nRows) +{ + pmFPAview *view = psAlloc(sizeof(pmFPAview)); + psMemSetDeallocator(view, (psFreeFunc) pmFPAviewFree); + + view->nRows = nRows; + pmFPAviewReset(view); + return view; +} + + +bool pmFPAviewReset(pmFPAview *view) +{ + PS_ASSERT_PTR_NON_NULL(view, false); + + view->chip = -1; + view->cell = -1; + view->readout = -1; + view->iRows = 0; + return true; +} + +// return a view restricted to the level (must be >= the input level) +pmFPAview *pmFPAviewForLevel(pmFPALevel level, const pmFPAview *input) +{ + PS_ASSERT_PTR_NON_NULL(input, NULL); + + pmFPAview *output = pmFPAviewAlloc (input->nRows); + *output = *input; + + switch (level) { + case PM_FPA_LEVEL_FPA: + output->chip = -1; + case PM_FPA_LEVEL_CHIP: + output->cell = -1; + case PM_FPA_LEVEL_CELL: + output->readout = -1; + break; + default: + break; + } + return output; +} + +pmFPALevel pmFPAviewLevel(const pmFPAview *view) +{ + PS_ASSERT_PTR_NON_NULL(view, PM_FPA_LEVEL_NONE); + + if (view->chip < 0) { + return PM_FPA_LEVEL_FPA; + } + if (view->cell < 0) { + return PM_FPA_LEVEL_CHIP; + } + if (view->readout < 0) { + return PM_FPA_LEVEL_CELL; + } + return PM_FPA_LEVEL_READOUT; +} + +pmChip *pmFPAviewThisChip(const pmFPAview *view, const pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(view, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + PS_ASSERT_PTR_NON_NULL(fpa->chips, NULL); + + if (view->chip < 0) { + return NULL; + } + + if (view->chip >= fpa->chips->n) { + return NULL; + } + + pmChip *chip = fpa->chips->data[view->chip]; + return chip; +} + +pmChip *pmFPAviewNextChip(pmFPAview *view, const pmFPA *fpa, int nStep) +{ + PS_ASSERT_PTR_NON_NULL(view, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + + view->cell = -1; + view->readout = -1; + view->iRows = 0; + + // if there are no available chips, return NULL + if (fpa->chips->n <= 0) { + view->chip = -1; + return NULL; + } + + // clean up < -1 values + if (view->chip < -1) { + view->chip = -1; + } + + // increment to the next chip + view->chip += nStep; + + // if we are at the end of the stack, return NULL + if (view->chip >= fpa->chips->n) { + view->chip = -1; + return NULL; + } + + // get the correct chip pointer + pmChip *chip = fpa->chips->data[view->chip]; + return (chip); +} + +pmCell *pmFPAviewThisCell(const pmFPAview *view, const pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(view, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + + if (view->cell < 0) { + return NULL; + } + + pmChip *chip = pmFPAviewThisChip (view, fpa); + PS_ASSERT_PTR_NON_NULL(chip, NULL); + + if (view->cell >= chip->cells->n) { + return NULL; + } + + pmCell *cell = chip->cells->data[view->cell]; + return cell; +} + +pmCell *pmFPAviewNextCell (pmFPAview *view, const pmFPA *fpa, int nStep) +{ + PS_ASSERT_PTR_NON_NULL(view, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + + pmChip *chip = pmFPAviewThisChip (view, fpa); + PS_ASSERT_PTR_NON_NULL(chip, NULL); + + view->readout = -1; + view->iRows = 0; + + // if there are no available cells, return NULL + if (chip->cells->n <= 0) { + view->cell = -1; + return NULL; + } + + // clean up < -1 values + if (view->cell < -1) { + view->cell = -1; + } + + // increment to the next cell + view->cell += nStep; + + // if we are at the end of the stack, return NULL + if (view->cell >= chip->cells->n) { + view->cell = -1; + return NULL; + } + + // get the correct cell pointer + pmCell *cell = chip->cells->data[view->cell]; + return (cell); +} + +pmReadout *pmFPAviewThisReadout (const pmFPAview *view, const pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(view, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + + if (view->readout < 0) { + return NULL; + } + + pmCell *cell = pmFPAviewThisCell (view, fpa); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + + if (view->readout >= cell->readouts->n) { + return NULL; + } + + pmReadout *readout = cell->readouts->data[view->readout]; + return readout; +} + +pmReadout *pmFPAviewNextReadout (pmFPAview *view, const pmFPA *fpa, int nStep) +{ + PS_ASSERT_PTR_NON_NULL(view, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + + pmCell *cell = pmFPAviewThisCell (view, fpa); + PS_ASSERT_PTR_NON_NULL(cell, NULL); + + view->iRows = 0; + + // if there are no available cells, return NULL + if (cell->readouts->n <= 0) { + view->readout = -1; + return NULL; + } + + // clean up < -1 values + if (view->readout < -1) { + view->readout = -1; + } + + // increment to the next cell + view->readout += nStep; + + // if we are at the end of the stack, return NULL + if (view->readout >= cell->readouts->n) { + view->readout = -1; + return NULL; + } + + // get the correct cell pointer + pmReadout *readout = cell->readouts->data[view->readout]; + return (readout); +} + +pmHDU *pmFPAviewThisHDU(const pmFPAview *view, const pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(view, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + + // the HDU is attached to a cell, chip or fpa + // if this view has a -1 for the level which contains the hdu, + // there is no unambiguous HDU + + if (view->chip < 0) { + return pmHDUFromFPA (fpa); + } + if (view->cell < 0) { + return pmHDUFromChip (pmFPAviewThisChip (view, fpa)); + } + if (view->readout < 0) { + return pmHDUFromCell (pmFPAviewThisCell (view, fpa)); + } + return pmHDUFromReadout (pmFPAviewThisReadout (view, fpa)); +} + +pmHDU *pmFPAviewThisPHU(const pmFPAview *view, const pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(view, NULL); + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + + // select the HDU which corresponds to the PHU containing this view + + pmHDU *hdu; + pmFPAview new; + pmChip *chip; + pmCell *cell; + + new = *view; + + if (view->chip < 0) { + hdu = pmHDUFromFPA (fpa); + if (!hdu) + return NULL; + if (hdu->blankPHU) + return hdu; + return NULL; + } + if (view->cell < 0) { + chip = pmFPAviewThisChip (view, fpa); + hdu = pmHDUFromChip (chip); + if (!hdu) + return NULL; + if (hdu->blankPHU) + return hdu; + new.chip = -1; + hdu = pmFPAviewThisPHU (&new, fpa); + return hdu; + } + if (view->readout < 0) { + cell = pmFPAviewThisCell (view, fpa); + hdu = pmHDUFromCell (cell); + if (!hdu) { + psAbort("a split readout is not covered by the current paradigm"); + } + if (hdu->blankPHU) + return hdu; + new.cell = -1; + hdu = pmFPAviewThisPHU (&new, fpa); + return hdu; + } + return NULL; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmFPAview.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmFPAview.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmFPAview.h (revision 14957) @@ -0,0 +1,117 @@ +/* @file pmFPA.h + * @brief Tools to manipulate the FPA structure elements. + * + * @author Eugene Magnier, IfA + * + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_FPA_VIEW_H +#define PM_FPA_VIEW_H + +/// @addtogroup Camera Camera Layout +/// @{ + +// #include "pmFPA.h" +// #include "pmFPALevel.h" + +/// Identifier for FPA components +/// +/// This structure allows the identification of a single component of the focal plane hierarchy (or multiple, +/// if we consider selecting all those components below the selected component). Components are identified on +/// the basis of their chip, cell, readout index. An index of -1 means all components at that level. +/// Additionally, since readouts may be read piecemeal, there are additional indices for these. +typedef struct +{ + int chip; ///< Number of the chip, or -1 for all + int cell; ///< Number of the cell, or -1 for all + int readout; ///< Number of the readout, or -1 for all + int nRows; ///< Maximum number of rows per readout segment read, or 0 for all + int iRows; ///< Starting point for this read +} +pmFPAview; + +/// Allocator for pmFPAview +pmFPAview *pmFPAviewAlloc(int nRows ///< Maximum number of rows per readout segment read, or 0 for all + ); + +/// Reset a view to select all components +bool pmFPAviewReset(pmFPAview *view ///< View to reset + ); + +// return a view restricted to the level (must be >= the input level) +pmFPAview *pmFPAviewForLevel(pmFPALevel level, const pmFPAview *input); + +/// Determine the current view level +/// +/// Returns the level appropriate for the view +pmFPALevel pmFPAviewLevel(const pmFPAview *view ///< View to examine + ); + +// Lookups + +/// Return the currently selected chip for this view +/// +/// Returns NULL if the selection is not specific or invalid +pmChip *pmFPAviewThisChip(const pmFPAview *view, ///< Current view + const pmFPA *fpa ///< FPA containing chip + ); + +/// Return the currently selected cell for this view +/// +/// Returns NULL if the selection is not specific or invalid +pmCell *pmFPAviewThisCell(const pmFPAview *view, ///< Current view + const pmFPA *fpa ///< FPA containing cell + ); + +/// Return the currently selected readout for this view +/// +/// Returns NULL if the selection is not specific or invalid +pmReadout *pmFPAviewThisReadout(const pmFPAview *view, ///< Current view + const pmFPA *fpa ///< FPA containing readout + ); + +// Incrementors + +/// Advance view to the next chip +/// +/// Returns NULL if there is no next +pmChip *pmFPAviewNextChip(pmFPAview *view, ///< Current view + const pmFPA *fpa, ///< FPA containing chips + int nStep ///< Number of chips to increment + ); + +/// Advance view to the next cell +/// +/// Returns NULL if there is no next +pmCell *pmFPAviewNextCell(pmFPAview *view, ///< Current view + const pmFPA *fpa, ///< FPA containing cells + int nStep ///< Number of cells to increment + ); + +/// Advance view to the next readout +/// +/// Returns NULL if there is no next +pmReadout *pmFPAviewNextReadout(pmFPAview *view, ///< Current view + const pmFPA *fpa, ///< FPA containing readouts + int nStep ///< Number of readouts to increment + ); + +/// Return the HDU corresponding to the current view +/// +/// Uses the pmHDUFrom* functions, combined with the view. +pmHDU *pmFPAviewThisHDU(const pmFPAview *view, ///< Current view + const pmFPA *fpa ///< FPA for view + ); + +/// Return the blank Primary HDU corresponding to the current view, if any +/// +/// Similar to pmFPAviewThisHDU, except returns NULL if no HDU is found, or the HDU is not a blank Primary HDU +pmHDU *pmFPAviewThisPHU(const pmFPAview *view, ///< Current view + const pmFPA *fpa ///< FPA for view + ); + +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmHDU.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmHDU.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmHDU.c (revision 14957) @@ -0,0 +1,231 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include + +#include "pmConfig.h" +#include "pmHDU.h" +#include "pmFPA.h" + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// File-static (private) functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Move to the appropriate extension in FITS file for HDU +static bool hduMove(pmHDU *hdu, // HDU with extname + psFits *fits // FITS file in which to move + ) +{ + // Deal with the PHU case + if (hdu->blankPHU || !hdu->extname) { + if (!psFitsMoveExtNum(fits, 0, false)) { + psError(PS_ERR_IO, false, "Unable to move to primary header!\n"); + return false; + } + return true; + } + + if (!psFitsMoveExtName(fits, hdu->extname)) { + psError(PS_ERR_IO, false, "Unable to move to extension %s\n", hdu->extname); + return false; + } + + return true; +} + +static void hduFree(pmHDU *hdu) +{ + psFree(hdu->extname); + psFree(hdu->format); + psFree(hdu->header); + psFree(hdu->images); + psFree(hdu->weights); + psFree(hdu->masks); +} + + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Public functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +pmHDU *pmHDUAlloc(const char *extname) +{ + pmHDU *hdu = psAlloc(sizeof(pmHDU)); + psMemSetDeallocator(hdu, (psFreeFunc)hduFree); + + if (!extname || strlen(extname) == 0) { + hdu->blankPHU = true; + hdu->extname = NULL; + } else { + hdu->blankPHU = false; + hdu->extname = psStringCopy(extname); + } + hdu->format = NULL; + hdu->header = NULL; + hdu->images = NULL; + hdu->weights = NULL; + hdu->masks = NULL; + + return hdu; +} + +bool pmHDUReadHeader(pmHDU *hdu, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(hdu, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + // Move to the appropriate extension + psTrace("psModules.camera", 5, "Moving to extension %s...\n", hdu->extname); + if (!hduMove(hdu, fits)) { + return false; + } + + if (!hdu->header) { + psTrace("psModules.camera", 5, "Reading the header...\n"); + hdu->header = psFitsReadHeader(hdu->header, fits); + if (! hdu->header) { + psError(PS_ERR_IO, false, "Unable to read header for extension %s\n", hdu->extname); + return false; + } + } + + return true; +} + +// Read an HDU from a FITS file +// XXX: Add a region specifier? +bool hduRead(pmHDU *hdu, // HDU to write + psArray **images, // Images into which to read + psFits *fits // FITS file to read + ) +{ + assert(hdu); + assert(images); + assert(fits); + + // Read the header; includes the move + if (!pmHDUReadHeader(hdu, fits)) { + return false; + } + + if (hdu->blankPHU) { + // Done already! + return true; + } + + if (*images) { + psLogMsg(__func__, PS_LOG_WARN, "HDU %s has already been read --- overwriting.\n", hdu->extname); + psFree(*images); // Blow away anything existing + } + psTrace("psModules.camera", 5, "Reading the pixels...\n"); + *images = psFitsReadImageCube(fits, psRegionSet(0,0,0,0)); + if (!*images) { + psError(PS_ERR_IO, false, "Unable to read pixels for extension %s\n", hdu->extname); + return false; + } + return true; +} + +bool pmHDURead(pmHDU *hdu, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(hdu, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return hduRead(hdu, &hdu->images, fits); +} + +bool pmHDUReadMask(pmHDU *hdu, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(hdu, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return hduRead(hdu, &hdu->masks, fits); +} + +bool pmHDUReadWeight(pmHDU *hdu, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(hdu, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return hduRead(hdu, &hdu->weights, fits); +} + +// Write an HDU to a FITS file +static bool hduWrite(pmHDU *hdu, // HDU to write + psArray *images, // Images to write + psFits *fits // FITS file to which to write + ) +{ + assert(hdu); + assert(fits); + + psTrace("psModules.camera", 7, "Writing HDU %s\n", hdu->extname); + + if (!images && !hdu->header) { + psLogMsg(__func__, PS_LOG_WARN, "Nothing to write for HDU %s\n", hdu->extname); + return false; + } + + // Preserve the extension name, if it's the PHU + char *extname = hdu->extname; // The name of the extension + if (!extname && hdu->header) { + bool mdok = true; // Status of MD lookup + extname = psMetadataLookupStr(&mdok, hdu->header, "EXTNAME"); + if (!mdok || !extname || strlen(extname) == 0) { + extname = ""; + } + } + + // Make sure it's recognisable as what it's supposed to be + if (!hdu->header) { + hdu->header = psMetadataAlloc(); + } + if (!pmConfigConformHeader(hdu->header, hdu->format)) { + psError(PS_ERR_UNKNOWN, false, "Unable to conform header to format.\n"); + return false; + } + + // Only a header + if (!images && !psFitsWriteBlank(fits, hdu->header, extname)) { + psError(PS_ERR_IO, false, "Unable to write header for extension %s\n", extname); + return false; + } + + if (images) { + psTrace("psModules.camera", 9, "Writing pixels for %s\n", hdu->extname); + if (!psFitsWriteImageCube(fits, hdu->header, images, extname)) { + psError(PS_ERR_IO, false, "Unable to write image to extension %s\n", hdu->extname); + return false; + } + } + return true; +} + +// XXX: Add a region specifier? +bool pmHDUWrite(pmHDU *hdu, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(hdu, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return hduWrite(hdu, hdu->images, fits); +} + +bool pmHDUWriteMask(pmHDU *hdu, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(hdu, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return hduWrite(hdu, hdu->masks, fits); +} + +bool pmHDUWriteWeight(pmHDU *hdu, psFits *fits) +{ + PS_ASSERT_PTR_NON_NULL(hdu, false); + PS_ASSERT_PTR_NON_NULL(fits, false); + + return hduWrite(hdu, hdu->weights, fits); +} Index: /branches/pap_branch_070920/psModules/src/camera/pmHDU.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmHDU.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmHDU.h (revision 14957) @@ -0,0 +1,82 @@ +/* @file pmHDU.h + * @brief Define a header data unit (from a FITS file), with functions to read and write + * + * @author Paul Price, IfA + * + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-01-24 02:54:14 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_HDU_H +#define PM_HDU_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// An instance of the FITS Header Data Unit +/// +/// Of course, it is not an exact replica of a FITS HDU --- they have no mask and weight data, but these are +/// stored here for convenience --- it keeps all the relevant data about the image in one place. +typedef struct +{ + psString extname; ///< The extension name + bool blankPHU; ///< Is this a blank FITS Primary Header Unit, i.e., no data? + psMetadata *format; ///< The camera format + psMetadata *header; ///< The FITS header, or NULL if primary for FITS; or section info + psArray *images; ///< The pixel data + psArray *weights; ///< The pixel data + psArray *masks; ///< The pixel data +} +pmHDU; + + +/// Allocator for pmHDU +pmHDU *pmHDUAlloc(const char *extname ///< Extension name, or NULL for PHU + ); + +/// Read the HDU header only +/// +/// Moves to the appropriate extension +bool pmHDUReadHeader(pmHDU *hdu, ///< HDU for which to read header + psFits *fits ///< FITS file from which to read + ); + +/// Read the HDU header and pixels +/// +/// Moves to the appropriate extension +bool pmHDURead(pmHDU *hdu, ///< HDU to read + psFits *fits ///< FITS file to read from + ); + +/// Read the HDU header and mask +/// +/// Moves to the appropriate extension +bool pmHDUReadMask(pmHDU *hdu, ///< HDU to read + psFits *fits ///< FITS file to read from + ); + +/// Read the HDU header and weight map +/// +/// Moves to the appropriate extension +bool pmHDUReadWeight(pmHDU *hdu, ///< HDU to read + psFits *fits ///< FITS file to read from + ); + +/// Write the HDU header and pixels +bool pmHDUWrite(pmHDU *hdu, ///< HDU to write + psFits *fits ///< FITS file to write to + ); + +/// Write the HDU header and mask +bool pmHDUWriteMask(pmHDU *hdu, ///< HDU to write + psFits *fits ///< FITS file to write to + ); + +/// Write the HDU header and weight map +bool pmHDUWriteWeight(pmHDU *hdu, ///< HDU to write + psFits *fits ///< FITS file to write to + ); + +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmHDUGenerate.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmHDUGenerate.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmHDUGenerate.c (revision 14957) @@ -0,0 +1,653 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include /* for strn?casecmp */ +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmHDUUtils.h" +#include "pmHDUGenerate.h" + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// File-static functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Add cells in a chip to a list +static bool addCellsFromChip(psList *list, // List of cells + const pmChip *chip // The chip from which to add cells + ) +{ + assert(list); + assert(chip); + + psArray *cells = chip->cells; // Array of cells + bool result = true; // Result of adding cells + for (int i = 0; i < cells->n; i++) { + pmCell *cell = cells->data[i]; // A cell + if (!cell->hdu) { // Don't add cells that have their own HDU + result |= psListAdd(list, PS_LIST_TAIL, cell); + } + } + + return result; +} + +// Add cells in an FPA to a list +static bool addCellsFromFPA(psList *list, // List of cells + const pmFPA *fpa // The FPA from which to add cells + ) +{ + assert(list); + assert(fpa); + + psArray *chips = fpa->chips; // Array of chips + bool result = true; // Result of adding cells + for (int i = 0; i < chips->n; i++) { + pmChip *chip = chips->data[i]; // A chip + if (! chip->hdu) { // Don't add chips that have their own HDU + result |= addCellsFromChip(list, chip); + } + } + + return result; +} + +// Get the maximum extent of the HDU from the trimsec and biassecs +static bool sizeHDU(int *xSize, int *ySize, // Size of HDU + psList *cells // List of cells + ) +{ + psListIterator *cellsIter = psListIteratorAlloc(cells, PS_LIST_HEAD, false); // Iterator for cells + pmCell *cell = NULL; // The cell from iteration + bool mdok = true; // Status of MD lookup + *xSize = 0; + *ySize = 0; + while ((cell = psListGetAndIncrement(cellsIter))) { + psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section + if (mdok && trimsec && !psRegionIsNaN(*trimsec)) { + *xSize = PS_MAX(trimsec->x1, *xSize); + *ySize = PS_MAX(trimsec->y1, *ySize); + } else { + psFree(cellsIter); + return false; + } + psList *biassecs = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.BIASSEC"); // Bias sections + if (mdok && biassecs) { + psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator + psRegion *biassec = NULL; // The bias section + while ((biassec = psListGetAndIncrement(biassecsIter))) { + if (!psRegionIsNaN(*biassec)) { + *xSize = PS_MAX(biassec->x1, *xSize); + *ySize = PS_MAX(biassec->y1, *ySize); + } else { + psFree(biassecsIter); + psFree(cellsIter); + return false; + } + } + psFree(biassecsIter); + } + } + psFree(cellsIter); + + return (*xSize != 0 && *ySize != 0); +} + + +static psRegion *sectionForImage(int *position, // Position on the output image, updated + const psImage *image, // Image containing the sizes and offsets + int readdir // Read direction, 1=rows, 2=cols + ) +{ + psRegion *region = NULL; // The region to return + switch (readdir) { + case 1: // Read direction is rows + region = psRegionAlloc(*position, *position + image->numCols, image->row0, + image->row0 + image->numRows); + *position += image->numCols; + break; + case 2: // Read direction is columns + region = psRegionAlloc(image->col0, image->col0 + image->numCols, *position, + *position + image->numRows); + *position += image->numRows; + break; + default: + psAbort("Shouldn't ever get here!\n"); + } + + return region; +} + +static bool doBiasSections(int *position, // Position on the output image, updated + int *readdir,// Read direction for cells + pmCell *cell // Cell + ) +{ + psMetadataItem *biassecItem = psMetadataLookup(cell->concepts, "CELL.BIASSEC"); // Bias sections + if (!biassecItem) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.BIASSEC has not been initialised in cell --- " + "ignored.\n"); + return false; + } + psFree(biassecItem->data.V); // Blow away the old list + psList *biassecs = psListAlloc(NULL); + biassecItem->data.V = biassecs; + + bool mdok = true; // Status of MD lookup + int cellreaddir = psMetadataLookupS32(&mdok, cell->concepts, "CELL.READDIR"); // Read direction + if (!mdok || (cellreaddir != 1 && cellreaddir != 2)) { + // Probably unnecessary, but just in case.... + psLogMsg(__func__, PS_LOG_WARN, "CELL.READDIR is not set in cell --- ignored.\n"); + return false; + } + if (*readdir == 0) { + *readdir = cellreaddir; + } else if (*readdir != cellreaddir) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.READDIR does not match read direction for HDU --- ignored.\n"); + return false; + } + + pmReadout *readout = cell->readouts->data[0]; // The first readout, as representative + psList *biases = readout->bias; // The bias images from the readout + + psListIterator *biasIter = psListIteratorAlloc(biases, PS_LIST_HEAD, true); // Iterator for biases + psImage *bias = NULL; // Bias image from iteration + while ((bias = psListGetAndIncrement(biasIter))) { + // Construct a region + psRegion *biassec = sectionForImage(position, bias, *readdir); + psListAdd(biassecs, PS_LIST_TAIL, biassec); + psFree(biassec); // Drop reference + } + psFree(biasIter); + + return true; +} + +// Generate CELL.TRIMSEC and CELL.BIASSEC for the cells +static bool generateTrimBias(psList *cells // List of cells below the HDU + ) +{ + pmCell *cell = NULL; // Cell from iteration + int numCells = cells->n; // Number of cells + int cellNum = 0; // The cell number + int position = 0; // Position on the image + bool mdok = true; // Status of MD lookup + int readdir = 0; // Read direction (1=rows, 2=cols) + + // First run through to do the LHS biases + psListIterator *cellsIter = psListIteratorAlloc(cells, PS_LIST_HEAD, false); // Iterator for cells + bool done = false; // Done with iteration (due to being halfway through)? + while ((cell = psListGetAndIncrement(cellsIter)) && !done) { + if (cellNum <= numCells/2 - 1) { + doBiasSections(&position, &readdir, cell); + cellNum++; + } else { + done = true; + } + } + + // Second run through to do the trim sections + psListIteratorSet(cellsIter, PS_LIST_HEAD); + while ((cell = psListGetAndIncrement(cellsIter))) { + psMetadataItem *trimsecItem = psMetadataLookup(cell->concepts, "CELL.TRIMSEC"); // Item with trimsec + if (!trimsecItem || trimsecItem->type != PS_DATA_REGION) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.TRIMSEC has not been initialised in cell --- " + "ignored.\n"); + continue; + } + psRegion *trimsec = trimsecItem->data.V; // Trim section + + int cellreaddir = psMetadataLookupS32(&mdok, cell->concepts, "CELL.READDIR"); // Read direction + if (!mdok || (cellreaddir != 1 && cellreaddir != 2)) { + // Probably unnecessary, but just in case.... + psLogMsg(__func__, PS_LOG_WARN, "CELL.READDIR is not set in cell --- ignored.\n"); + continue; + } + if (readdir == 0 && mdok && cellreaddir != 0) { + readdir = cellreaddir; + } else if (readdir != cellreaddir) { + psLogMsg(__func__, PS_LOG_WARN, "CELL.READDIR for cells within the HDU do not match!\n"); + cellreaddir = readdir; + } + + pmReadout *readout = cell->readouts->data[0]; // The first readout, as representative + // The proper image, used to get the size + psImage *image = readout->image ? readout->image : (readout->mask ? readout->mask : readout->weight); + if (!image) { + continue; + } + if (readout->mask && + (readout->mask->numCols != image->numCols || readout->mask->numRows != image->numRows)) { + psLogMsg(__func__, PS_LOG_WARN, "Image and mask have different sizes (%dx%d vs %dx%d)!\n", + image->numCols, image->numRows, readout->mask->numCols, readout->mask->numRows); + } + if (readout->weight && + (readout->weight->numCols != image->numCols || readout->weight->numRows != image->numRows)) { + psLogMsg(__func__, PS_LOG_WARN, "Image and weight have different sizes (%dx%d vs %dx%d)!\n", + image->numCols, image->numRows, readout->weight->numCols, readout->weight->numRows); + } + // New reference + trimsec = sectionForImage(&position, image, cellreaddir); + psFree(trimsecItem->data.V); + trimsecItem->data.V = trimsec; + } + + // A final run through to do the RHS biases + psListIteratorSet(cellsIter, cellNum); + while ((cell = psListGetAndIncrement(cellsIter))) { + doBiasSections(&position, &readdir, cell); + } + + // Clean up + psFree(cellsIter); + + return (position > 0); +} + +// Check the type for a current image against a previous type +static psElemType checkTypes(psElemType previous, // Previously defined type, or 0 + psElemType current // Current type + ) +{ + if (previous == 0) { + return current; + } + + if (previous != current) { + psLogMsg(__func__, PS_LOG_WARN, "Images within the HDU are of different types " + "(%x vs %x) --- promoting\n", previous, current); + return PS_MAX(previous, current); + } + + return previous; +} + + +// Paste the source image into the target, according to the provided region. The source is then updated to +// reference the region within the target. +static psImage *pasteImage(psImage *target, // Target image, into which the paste is made + psImage *source,// Source image, from which the paste is made, and then changed + psRegion *region // Image section into which to paste + ) +{ + if (source->numCols != region->x1 - region->x0 || source->numRows != region->y1 - region->y0) { + psString regionString = psRegionToString(*region); + psLogMsg(__func__, PS_LOG_WARN, "Image size (%dx%d) does not match region (%s).\n", + source->numCols, source->numRows, regionString); + psFree(regionString); + } + psImageOverlaySection(target, source, region->x0, region->y0, "="); + + // Reference the HDU version, so that subsequent changes will touch the HDU + return psImageSubset(target, *region); +} + + +// Generate the HDU, given a list of cells below that HDU. This is the main engine function, that does all +// the work. +static bool generateHDU(pmHDU *hdu, // HDU to generate + psList *cells // List of cells + ) +{ + // Check the number of readouts is consistent within the HDU + int numReadouts = -1; // Number of readouts + psElemType imageType = 0; // Type of readout images + psElemType maskType = 0; // Type of readout masks + psElemType weightType = 0; // Type of readout weights + { + psListIterator *iter = psListIteratorAlloc(cells, PS_LIST_HEAD, false); // Iterator for cells + pmCell *cell = NULL; // The cell from iteration + while ((cell = psListGetAndIncrement(iter))) + { + psArray *readouts = cell->readouts; + if (numReadouts == -1) { + numReadouts = readouts->n; + } else if (readouts->n != numReadouts) { + psError(PS_ERR_IO, true, "Number of readouts doesn't match: %ld vs %d\n", readouts->n, + numReadouts); + return false; + } + for (int i = 0; i < numReadouts; i++) { + pmReadout *readout = readouts->data[i]; // The readout + if (!readout) { + continue; + } + + if (!hdu->images && readout->image) { + imageType = checkTypes(imageType, readout->image->type.type); + } + if (!hdu->masks && readout->mask) { + maskType = checkTypes(maskType, readout->mask->type.type); + } + if (!hdu->weights && readout->weight) { + weightType = checkTypes(weightType, readout->weight->type.type); + } + } + } + psFree(iter); + } + if (numReadouts == 0 || (imageType == 0 && maskType == 0 && weightType == 0)) { + // Nothing from which to create an HDU + psFree(cells); + return false; + } + + // Get the size of the HDU, either from existing trimsec and biassec, or generate these and try again + int xSize = 0, ySize = 0; // Size of HDU + if (!sizeHDU(&xSize, &ySize, cells) && !(generateTrimBias(cells) && sizeHDU(&xSize, &ySize, cells))) { + psError(PS_ERR_IO, true, "Unable to determine size of HDU!\n"); + return false; + } + + // Generate the HDU + if (imageType) { + hdu->images = psArrayAlloc(numReadouts); + for (int i = 0; i < numReadouts; i++) { + psImage *image = psImageAlloc(xSize, ySize, imageType); + psImageInit(image, 0.0); + hdu->images->data[i] = image; + } + } + if (maskType) { + hdu->masks = psArrayAlloc(numReadouts); + for (int i = 0; i < numReadouts; i++) { + psImage *mask = psImageAlloc(xSize, ySize, maskType); + psImageInit(mask, 0); + hdu->masks->data[i] = mask; + } + } + if (weightType) { + hdu->weights = psArrayAlloc(numReadouts); + for (int i = 0; i < numReadouts; i++) { + psImage *weight = psImageAlloc(xSize, ySize, weightType); + psImageInit(weight, 0.0); + hdu->weights->data[i] = weight; + } + } + + // Insert the pixels into the HDU + { + psListIterator *iter = psListIteratorAlloc(cells, PS_LIST_HEAD, false); // Iterator for cells + pmCell *cell = NULL; // The cell from iteration + bool mdok = true; // Result of MD lookup + while ((cell = psListGetAndIncrement(iter))) + { + psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section + if (!mdok || !trimsec) { + psAbort("Shouldn't ever get here --- CELL.TRIMSEC should have been set above.\n"); + } + psList *biassecs = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.BIASSEC"); // Bias secionts + if (!mdok || !biassecs) { + psAbort("Shouldn't ever get here --- CELL.BIASSEC should have been set above.\n"); + } + psListIterator *biassecsIter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator + + psArray *readouts = cell->readouts; // Array of readouts + psArray *hduImages = hdu->images; // Array of images in the HDU + psArray *hduMasks = hdu->masks; // Array of masks in the HDU + psArray *hduWeights = hdu->weights; // Array of weights in the HDU + for (int i = 0; i < readouts->n; i++) { + pmReadout *readout = readouts->data[i]; // The readout of interest + if (!readout) { + continue; + } + + if (readout->image) { + psImage *new = pasteImage(hduImages->data[i], readout->image, trimsec); + psFree(readout->image); + readout->image = new; + } + if (readout->mask) { + psImage *new = pasteImage(hduMasks->data[i], readout->mask, trimsec); + psFree(readout->mask); + readout->mask = new; + } + if (readout->weight) { + psImage *new = pasteImage(hduWeights->data[i], readout->weight, trimsec); + psFree(readout->weight); + readout->weight = new; + } + + if (biassecs->n != readout->bias->n) { + psLogMsg(__func__, PS_LOG_WARN, "Number of bias sections (%ld) and number of biases (%ld)" + " do not match.\n", biassecs->n, readout->bias->n); + } + psListIterator *biasIter = psListIteratorAlloc(readout->bias, PS_LIST_HEAD, false); // Iteratr + psImage *bias = NULL; // Bias image, from iteration + psListIteratorSet(biassecsIter, PS_LIST_HEAD); + psRegion *biassec = NULL; // Bias region, from iteration + psList *newBias = psListAlloc(NULL); // New list of bias images + while ((bias = psListGetAndIncrement(biasIter)) && + (biassec = psListGetAndIncrement(biassecsIter))) { + psImage *new = pasteImage(hduImages->data[i], bias, biassec); + psListAdd(newBias, PS_LIST_TAIL, new); + psFree(new); // Drop reference + } + psFree(biasIter); + + // Add on the new list of bias images + psFree(readout->bias); + readout->bias = newBias; + } + psFree(biassecsIter); + } // Iterating over cells within the HDU + psFree(iter); + } + psFree(cells); + + return true; +} + +// Return the level that an extension applies to +static pmFPALevel extensionLevel(pmHDU *hdu // HDU to check + ) +{ + if (!hdu->format) { + psError(PS_ERR_UNEXPECTED_NULL, true, "HDU does not have a camera format.\n"); + return PM_FPA_LEVEL_NONE; + } + bool mdok = true; // Status of MD lookup + psMetadata *file = psMetadataLookupMetadata(&mdok, hdu->format, "FILE"); // File information for camera format + if (!mdok || !file) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Can't file FILE information for camera format " + "configuration.\n"); + return PM_FPA_LEVEL_NONE; + } + psString extensions = psMetadataLookupStr(&mdok, file, "EXTENSIONS"); // Where the HDUs are + if (!mdok || !extensions || strlen(extensions) == 0) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Can't find EXTENSIONS in the FILE information of the camera " + "format configuration.\n"); + return PM_FPA_LEVEL_NONE; + } + if (strcasecmp(extensions, "CELL") == 0) { + return PM_FPA_LEVEL_CELL; + } + if (strcasecmp(extensions, "CHIP") == 0) { + return PM_FPA_LEVEL_CHIP; + } + if (strcasecmp(extensions, "FPA") == 0) { + return PM_FPA_LEVEL_FPA; + } + if (strcasecmp(extensions, "NONE") == 0) { + return PM_FPA_LEVEL_NONE; + } + // No idea what it is + psError(PS_ERR_IO, true, "EXTENSIONS (%s) in FILE information is not FPA, CHIP, CELL or NONE.\n", + extensions); + return PM_FPA_LEVEL_NONE; +} + +// Generate HDU for cells belonging to a chip --- just an iterator +static bool generateForCells(pmChip *chip // Chip for which to generate HDUs + ) +{ + psArray *cells = chip->cells; // Array of cells + bool status = true; // Status of HDU generation + for (long i = 0; i < cells->n; i++) { + status |= pmHDUGenerateForCell(cells->data[i]); + } + return status; +} + +// Generate HDU for chips belonging to an FPA --- just an iterator +static bool generateForChips(pmFPA *fpa // FPA for which to generate HDUs + ) +{ + psArray *chips = fpa->chips; // Array of chips + bool status = true; // Status of HDU generation + for (long i = 0; i < chips->n; i++) { + status |= pmHDUGenerateForChip(chips->data[i]); + } + return status; +} + + +////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// Public functions +////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +bool pmHDUGenerateForCell(pmCell *cell) +{ + PS_ASSERT_PTR_NON_NULL(cell, false); + + // Get the HDU and a list of cells below it + pmHDU *hdu = pmHDUFromCell(cell); // The HDU in the cell + if (!hdu) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Can't find an HDU for cell.\n"); + return false; + } + if (hdu->images && hdu->masks && hdu->weights) { + // It's already here! + return true; + } + + pmFPALevel extLevel = extensionLevel(hdu); + switch (extLevel) { + case PM_FPA_LEVEL_NONE: + case PM_FPA_LEVEL_CELL: { + psList *cells = psListAlloc(NULL); // List of cells below the HDU + + if (cell->hdu) { + psListAdd(cells, PS_LIST_TAIL, cell); + } else { + pmChip *chip = cell->parent; // The parent chip + if (chip->hdu) { + addCellsFromChip(cells, chip); + } else { + pmFPA *fpa = chip->parent; // The parent FPA + if (fpa->hdu) { + addCellsFromFPA(cells, fpa); + } + } + } + if (cells->n == 0) { + // Nothing to do + return true; + } + + return generateHDU(hdu, cells); + } + case PM_FPA_LEVEL_CHIP: + case PM_FPA_LEVEL_FPA: + return pmHDUGenerateForChip(cell->parent); + default: + psAbort("Shouldn't ever get here: check your camera format configuration.\n"); + } + return false; +} + +bool pmHDUGenerateForChip(pmChip *chip) +{ + PS_ASSERT_PTR_NON_NULL(chip, false); + + // Get the HDU and a list of cells below it + pmHDU *hdu = pmHDUFromChip(chip); // The HDU in the chip + if (!hdu) { + // Nothing here; need to look further down + return generateForCells(chip); + } + if (hdu->images && hdu->masks && hdu->weights) { + // It's already here! + return true; + } + + pmFPALevel extLevel = extensionLevel(hdu); + switch (extLevel) { + case PM_FPA_LEVEL_CELL: + // Work on lower levels + return generateForCells(chip); + case PM_FPA_LEVEL_NONE: + case PM_FPA_LEVEL_CHIP: { + // Work on this level + psList *cells = psListAlloc(NULL); // List of cells below the HDU + if (chip->hdu) { + addCellsFromChip(cells, chip); + } else { + pmFPA *fpa = chip->parent; // The parent FPA + if (fpa->hdu) { + addCellsFromFPA(cells, fpa); + } + } + if (cells->n == 0) { + // Nothing to do + return true; + } + + return generateHDU(hdu, cells); + } + case PM_FPA_LEVEL_FPA: + // Work on higher levels + return pmHDUGenerateForFPA(chip->parent); + default: + psAbort("Shouldn't ever get here: check your camera format configuration.\n"); + } + return false; +} + + +bool pmHDUGenerateForFPA(pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(fpa, false); + + // Get the HDU and a list of cells below it + pmHDU *hdu = pmHDUFromFPA(fpa); // The HDU in the FPA + if (!hdu) { + // Nothing here; need to look further down + return generateForChips(fpa); + } + if (hdu->images && hdu->masks && hdu->weights) { + // It's already here! + return true; + } + + pmFPALevel extLevel = extensionLevel(hdu); + switch (extLevel) { + case PM_FPA_LEVEL_CELL: + case PM_FPA_LEVEL_CHIP: + // Work on lower levels + return generateForChips(fpa); + case PM_FPA_LEVEL_NONE: + case PM_FPA_LEVEL_FPA: { + // Work on this level + psList *cells = psListAlloc(NULL); // List of cells below the HDU + if (fpa->hdu) { + addCellsFromFPA(cells, fpa); + } + if (cells->n == 0) { + // Nothing to do + return true; + } + + return generateHDU(hdu, cells); + } + default: + psAbort("Shouldn't ever get here: check your camera format configuration.\n"); + } + return false; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmHDUGenerate.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmHDUGenerate.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmHDUGenerate.h (revision 14957) @@ -0,0 +1,53 @@ +/* @file pmHDUGenerate.h + * @brief Generate HDU pixels from FPA components that have pixels + * + * @author Paul Price, IfA + * + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_HDU_GENERATE_H +#define PM_HDU_GENERATE_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Generate an HDU (with CELL.TRIMSEC, CELL.BIASSEC and pixels) for a cell with pixels +/// +/// The write functions for the FPA hierarchy use pmHDUWrite, which assumes that the images in the readouts +/// are subimages of the pixels in the HDU structure. If this is not the case, the HDU pixels can be +/// generated using some simple assumptions. Splices the images and overscans together without regard for +/// CELL.X0 and CELL.Y0 (for a proper mosaic, see pmFPAMosaic), though it should respect CELL.READDIR (so that +/// the bias and trim sections match properly). A warning may be generated after running this function if the +/// bias and trim sections are specified in the camera format by default values rather than in the header. +/// Failure of this function is often due to a bad camera format file. +bool pmHDUGenerateForCell(pmCell *cell ///< The cell for which to generate an HDU + ); + +/// Generate an HDU (with CELL.TRIMSEC, CELL.BIASSEC and pixels) for a cell with pixels +/// +/// The write functions for the FPA hierarchy use pmHDUWrite, which assumes that the images in the readouts +/// are subimages of the pixels in the HDU structure. If this is not the case, the HDU pixels can be +/// generated using some simple assumptions. Splices the images and overscans together without regard for +/// CELL.X0 and CELL.Y0 (for a proper mosaic, see pmFPAMosaic), though it should respect CELL.READDIR (so that +/// the bias and trim sections match properly). A warning may be generated after running this function if the +/// bias and trim sections are specified in the camera format by default values rather than in the header. +/// Failure of this function is often due to a bad camera format file. +bool pmHDUGenerateForChip(pmChip *chip ///< The chip for which to generate an HDU + ); + +// Generate an HDU (with CELL.TRIMSEC, CELL.BIASSEC and pixels) from an FPA with pixels +/// +/// The write functions for the FPA hierarchy use pmHDUWrite, which assumes that the images in the readouts +/// are subimages of the pixels in the HDU structure. If this is not the case, the HDU pixels can be +/// generated using some simple assumptions. Splices the images and overscans together without regard for +/// CELL.X0 and CELL.Y0 (for a proper mosaic, see pmFPAMosaic), though it should respect CELL.READDIR (so that +/// the bias and trim sections match properly). A warning may be generated after running this function if the +/// bias and trim sections are specified in the camera format by default values rather than in the header. +/// Failure of this function is often due to a bad camera format file. +bool pmHDUGenerateForFPA(pmFPA *fpa ///< The fpa for which to generate an HDU + ); +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmHDUUtils.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmHDUUtils.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmHDUUtils.c (revision 14957) @@ -0,0 +1,151 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmHDUUtils.h" + +pmHDU *pmHDUFromFPA(const pmFPA *fpa) +{ + PS_ASSERT_PTR_NON_NULL(fpa, NULL); + return fpa->hdu; +} + +pmHDU *pmHDUFromChip(const pmChip *chip) +{ + PS_ASSERT_PTR_NON_NULL(chip, NULL); + + pmHDU *hdu = chip->hdu; // The HDU information + if (!hdu) { + hdu = pmHDUFromFPA(chip->parent); // Grab HDU info from the FPA + } + + return hdu; +} + +pmHDU *pmHDUFromCell(const pmCell *cell) +{ + PS_ASSERT_PTR_NON_NULL(cell, NULL); + + pmHDU *hdu = cell->hdu; // The HDU information + if (!hdu) { + hdu = pmHDUFromChip(cell->parent); // Grab HDU info from the chip + } + + return hdu; +} + +pmHDU *pmHDUFromReadout(const pmReadout *readout) +{ + PS_ASSERT_PTR_NON_NULL(readout, NULL); + + pmCell *cell = readout->parent; // cell containing this readout; + pmHDU *hdu = pmHDUFromCell(cell); + return hdu; +} + +// Get the lowest HDU +pmHDU *pmHDUGetLowest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) +{ + pmHDU *hdu = NULL; // The HDU that's at the lowest level + if (cell) { + hdu = pmHDUFromCell(cell); + } else if (chip) { + hdu = pmHDUFromChip(chip); + } else if (fpa) { + hdu = pmHDUFromFPA(fpa); + } + + return hdu; +} + +// Get the highest HDU +pmHDU *pmHDUGetHighest(const pmFPA *fpa, const pmChip *chip, const pmCell *cell) +{ + pmHDU *hdu = NULL; // The HDU that's at the highest level + if (fpa) { + hdu = pmHDUFromFPA(fpa); + } + if (!hdu && chip) { + hdu = pmHDUFromChip(chip); + } + if (!hdu && cell) { + hdu = pmHDUFromCell(cell); + } + + return hdu; +} + +// Print spaces to indent +#define INDENT(FILE, LEVEL) \ +{ \ + for (int i = 0; i < (LEVEL); i++) { \ + fprintf(FILE, " "); \ + } \ +} + +void pmHDUPrint(FILE *fd, const pmHDU *hdu, int level, bool header) +{ + PS_ASSERT_PTR_NON_NULL(hdu,); + + INDENT(fd, level); + if (hdu->blankPHU) { + fprintf(fd, "HDU: (PHU)\n"); + } else { + fprintf(fd, "HDU: %s\n", hdu->extname); + } + + INDENT(fd, level + 1); + fprintf(fd, "Format: %p\n", hdu->format); + if (header) { + INDENT(fd, level + 1); + if (hdu->header) { + fprintf(fd, "Header:\n"); + psMetadataPrint(fd, hdu->header, level + 2); + } else { + fprintf(fd, "No header.\n"); + } + } + + INDENT(fd, level + 1); + if (hdu->images) { + fprintf(fd, "Images:\n"); + for (long i = 0; i < hdu->images->n; i++) { + psImage *image = hdu->images->data[i]; // Image of interest + INDENT(fd, level + 2); + fprintf(fd, "%ld: %dx%d\n", i, image->numCols, image->numRows); + } + } else { + fprintf(fd, "NO images.\n"); + } + + INDENT(fd, level + 1); + if (hdu->masks) { + fprintf(fd, "Masks:\n"); + for (long i = 0; i < hdu->masks->n; i++) { + psImage *mask = hdu->masks->data[i]; // Mask of interest + INDENT(fd, level + 2); + fprintf(fd, "%ld: %dx%d\n", i, mask->numCols, mask->numRows); + } + } else { + fprintf(fd, "NO masks.\n"); + } + + INDENT(fd, level + 1); + if (hdu->weights) { + fprintf(fd, "Weights:\n"); + for (long i = 0; i < hdu->weights->n; i++) { + psImage *weight = hdu->weights->data[i]; // Weight image of interest + INDENT(fd, level + 2); + fprintf(fd, "%ld: %dx%d\n", i, weight->numCols, weight->numRows); + } + } else { + fprintf(fd, "NO weights.\n"); + } + + return; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmHDUUtils.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmHDUUtils.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmHDUUtils.h (revision 14957) @@ -0,0 +1,58 @@ +/* @file pmHDUUtils.h + * @brief Utility functions for working with an HDU + * + * @author Paul Price, IfA + * + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_HDU_UTILS_H +#define PM_HDU_UTILS_H + +/// @addtogroup Camera Camera Layout +/// @{ + +/// Get the lowest HDU in the hierarchy +/// +/// The lowest HDU in the hierarchy will be the one with the actual pixels (if all levels are supplied). +pmHDU *pmHDUGetLowest(const pmFPA *fpa, ///< The FPA + const pmChip *chip, ///< The chip, or NULL + const pmCell *cell ///< The cell, or NULL + ); + +/// Get the highest HDU in the hierarchy +/// +/// The highest HDU in the hierarchy will be the PHU (might get NULL if not all levels are supplied) +pmHDU *pmHDUGetHighest(const pmFPA *fpa, ///< The FPA + const pmChip *chip, ///< The chip, or NULL + const pmCell *cell ///< The cell, or NULL + ); + +/// Given an FPA, return the HDU (or NULL if all HDUs reside below the FPA) +pmHDU *pmHDUFromFPA(const pmFPA *fpa ///< FPA for which to find HDU + ); + +/// Given a chip, return the HDU (or NULL if it resides below the chip) +pmHDU *pmHDUFromChip(const pmChip *chip ///< Chip for which to find HDU + ); + +/// Given a cell, return the HDU +pmHDU *pmHDUFromCell(const pmCell *cell ///< Cell for which to find HDU + ); + +/// Given a readout, return the HDU +pmHDU *pmHDUFromReadout(const pmReadout *readout ///< Readout for which to find HDU + ); + +/// Print details about an HDU +/// +/// This is intended for testing or development use. +void pmHDUPrint(FILE *fd, ///< File descriptor to which to print + const pmHDU *hdu, ///< HDU to print + int level, ///< Level at which to print + bool header ///< Print header? + ); +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/camera/pmReadoutStack.c =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmReadoutStack.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmReadoutStack.c (revision 14957) @@ -0,0 +1,124 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#include "pmReadoutStack.h" + + +bool pmReadoutUpdateSize(pmReadout *readout, int minCols, int minRows, int numCols, int numRows, bool mask) +{ + PS_ASSERT_PTR_NON_NULL(readout, false); + + if (readout->image) { + *(psS32*) &(readout->col0) = PS_MIN(minCols, readout->col0); + *(psS32*) &(readout->row0) = PS_MIN(minRows, readout->row0); + } else { + *(psS32*) &(readout->col0) = minCols; + *(psS32*) &(readout->row0) = minRows; + } + + // (re-)Allocate the images + if (!readout->image) { + readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32); + } + if (readout->image->numCols < numCols || readout->image->numRows < numRows) { + // Generate the new output image by extending the current one, or making a whole new one + psImage *newImage = psImageAlloc(numCols, numRows, PS_TYPE_F32); + psImageInit(newImage, 0.0); + psImageOverlaySection(newImage, readout->image, readout->col0, readout->row0, "="); + psFree(readout->image); + readout->image = newImage; + } + + if (mask) { + if (!readout->mask) { + readout->mask = psImageAlloc(numCols, numRows, PS_TYPE_MASK); + } + if (readout->mask->numCols < numCols || readout->mask->numRows < numRows) { + psImage *newMask = psImageAlloc(numCols, numRows, PS_TYPE_MASK); + psImageInit(newMask, 0); + psImageOverlaySection(newMask, readout->mask, readout->col0, readout->row0, "="); + psFree(readout->mask); + readout->mask = newMask; + } + } + + return true; +} + +bool pmReadoutStackValidate(int *minInputColsPtr, int *maxInputColsPtr, int *minInputRowsPtr, + int *maxInputRowsPtr, int *numColsPtr, int *numRowsPtr, const psArray *inputs) +{ + PS_ASSERT_ARRAY_NON_NULL(inputs, false); + + // Step through each readout in the input image list to determine how big of an output image is needed to + // combine these input images. + int maxInputCols = 0; // The largest input column value + int maxInputRows = 0; // The largest input row value + int minInputCols = INT_MAX; // The smallest input column value + int minInputRows = INT_MAX; // The smallest input row value + int xSize = 0, ySize = 0; // The size of the output image + + int xMin = INT_MAX; + int yMin = INT_MAX; + int xMax = 0; + int yMax = 0; + + bool valid = false; // Do we have a single valid input? + for (long i = 0; i < inputs->n; i++) { + pmReadout *readout = inputs->data[i]; // Readout of interest + + if (!readout || !readout->image) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Input readout %ld is NULL or has NULL image.\n", i); + return false; + } + + // use the trimsec to define the max full range of the output pixels + pmCell *cell = readout->parent; // The parent cell + bool mdok = true; // Status of MD lookup + psRegion *trimsec = psMetadataLookupPtr(&mdok, cell->concepts, "CELL.TRIMSEC"); // Trim section + if (!mdok || !trimsec || psRegionIsNaN(*trimsec)) { + psWarning("CELL.TRIMSEC is not set for readout %ld --- ignored.\n", i); + } else { + xSize = PS_MAX(xSize, trimsec->x1 - trimsec->x0); + ySize = PS_MAX(ySize, trimsec->y1 - trimsec->y0); + xMin = PS_MIN(xMin, trimsec->x0); + xMax = PS_MAX(xMax, trimsec->x1); + yMin = PS_MIN(yMin, trimsec->y0); + yMax = PS_MAX(yMax, trimsec->y1); + } + + valid = true; + + // Range of pixels on output images + minInputCols = PS_MAX(xMin, PS_MIN(minInputCols, readout->col0)); + maxInputCols = PS_MIN(xMax, PS_MAX(maxInputCols, readout->col0 + readout->image->numCols)); + minInputRows = PS_MAX(yMin, PS_MIN(minInputRows, readout->row0)); + maxInputRows = PS_MIN(yMax, PS_MAX(maxInputRows, readout->row0 + readout->image->numRows)); + psTrace("psModules.camera", 7, "Readout %ld: offset %d,%d; size %dx%d\n", i, + readout->col0, readout->row0, readout->image->numCols, readout->image->numRows); + } + + if (minInputColsPtr) { + *minInputColsPtr = minInputCols; + } + if (maxInputColsPtr) { + *maxInputColsPtr = maxInputCols; + } + if (minInputRowsPtr) { + *minInputRowsPtr = minInputRows; + } + if (maxInputRowsPtr) { + *maxInputRowsPtr = maxInputRows; + } + if (numColsPtr) { + *numColsPtr = xSize; + } + if (numRowsPtr) { + *numRowsPtr = ySize; + } + + return valid; +} Index: /branches/pap_branch_070920/psModules/src/camera/pmReadoutStack.h =================================================================== --- /branches/pap_branch_070920/psModules/src/camera/pmReadoutStack.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/camera/pmReadoutStack.h (revision 14957) @@ -0,0 +1,22 @@ +#ifndef PM_READOUT_STACK_H +#define PM_READOUT_STACK_H + +#include "pmHDU.h" +#include "pmFPA.h" + +/// Update an output readout (for a stack) with the correct col0,row0 and the image size +bool pmReadoutUpdateSize(pmReadout *readout, ///< Readout which to update + int minCols, int minRows, ///< Minimum coordinates + int numCols, int numRows, ///< Size of images + bool mask ///< Worry about the mask? + ); + +/// Determine how large an output image is needed to combine the input readouts +bool pmReadoutStackValidate(int *minInputColsPtr, int *maxInputColsPtr, ///< Min and max size in x + int *minInputRowsPtr, int *maxInputRowsPtr, ///< Min and max size in y + int *numColsPtr, int *numRowsPtr, ///< Size of image + const psArray *inputs ///< Array of pmReadouts + ); + + +#endif Index: /branches/pap_branch_070920/psModules/src/config/.cvsignore =================================================================== --- /branches/pap_branch_070920/psModules/src/config/.cvsignore (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/.cvsignore (revision 14957) @@ -0,0 +1,8 @@ +.deps +.libs +Makefile +Makefile.in +*.la +*.lo +pmErrorCodes.c +pmErrorCodes.h Index: /branches/pap_branch_070920/psModules/src/config/Makefile.am =================================================================== --- /branches/pap_branch_070920/psModules/src/config/Makefile.am (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/Makefile.am (revision 14957) @@ -0,0 +1,33 @@ +noinst_LTLIBRARIES = libpsmodulesconfig.la + +libpsmodulesconfig_la_CPPFLAGS = $(SRCINC) $(PSMODULES_CFLAGS) +libpsmodulesconfig_la_LDFLAGS = -release $(PACKAGE_VERSION) +libpsmodulesconfig_la_SOURCES = \ + pmConfig.c \ + pmConfigRecipes.c \ + pmConfigCamera.c \ + pmConfigCommand.c \ + pmConfigMask.c \ + pmVersion.c \ + pmErrorCodes.c + +pkginclude_HEADERS = \ + pmConfig.h \ + pmConfigRecipes.h \ + pmConfigCamera.h \ + pmConfigCommand.h \ + pmConfigMask.h \ + pmVersion.h \ + pmErrorCodes.h + +# Error codes. +BUILT_SOURCES = pmErrorCodes.h pmErrorCodes.c +CLEANFILES = *~ pmErrorCodes.h pmErrorCodes.c + +pmErrorCodes.h : pmErrorCodes.dat pmErrorCodes.h.in + $(ERRORCODES) --data=pmErrorCodes.dat --outdir=. pmErrorCodes.h + +pmErrorCodes.c : pmErrorCodes.dat pmErrorCodes.c.in pmErrorCodes.h + $(ERRORCODES) --data=pmErrorCodes.dat --outdir=. pmErrorCodes.c + +EXTRA_DIST = pmErrorCodes.h.in pmErrorCodes.dat pmErrorCodes.c.in Index: /branches/pap_branch_070920/psModules/src/config/pmConfig.c =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfig.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfig.c (revision 14957) @@ -0,0 +1,1356 @@ +/** @file pmConfig.h + * + * @author PAP (IfA) + * @author EAM (IfA) + * + * @version $Revision: 1.104 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-09-05 02:30:30 $ + * + * Copyright 2004 Maui High Performance Computing Center, University of Hawaii + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include /* for strn?casecmp */ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "pmConfig.h" +#include "pmErrorCodes.h" +#include "pmFPALevel.h" +#include "pmConfigRecipes.h" +#include "pmConfigCamera.h" + +#ifdef HAVE_NEBCLIENT +#include +#endif // ifdef HAVE_NEBCLIENT + +#define PS_SITE "PS_SITE" // Name of the environment variable containing the site config file +#define PS_DEFAULT_SITE ".ipprc" // Default site config file + +static bool readCameraConfig = true; // Read the camera config on startup (with pmConfigRead)? +static psArray *configPath = NULL; // Search path for configuration files + +bool pmConfigReadParamsSet(bool newReadCameraConfig) +{ + bool oldReadCameraConfig = readCameraConfig; + readCameraConfig = newReadCameraConfig; + return oldReadCameraConfig; +} + +static void configFree(pmConfig *config) +{ + psFree(config->site); + psFree(config->files); + psFree(config->camera); + psFree(config->cameraName); + psFree(config->format); + psFree(config->formatName); + psFree(config->recipes); + psFree(config->recipeSymbols); + psFree(config->arguments); + psFree(config->database); +} + +pmConfig *pmConfigAlloc() +{ + pmConfig *config = psAlloc(sizeof(pmConfig)); + (void)psMemSetDeallocator(config, (psFreeFunc)configFree); + + // Initialise + config->site = NULL; + config->camera = NULL; + config->cameraName = NULL; + config->format = NULL; + config->formatName = NULL; + config->recipes = psMetadataAlloc(); + config->recipesRead = PM_RECIPE_SOURCE_NONE; + config->recipeSymbols = psMetadataAlloc(); + config->arguments = psMetadataAlloc(); + config->database = NULL; + config->defaultRecipe = NULL; + + // the file structure is used to carry pmFPAfiles + config->files = psMetadataAlloc (); + return config; +} + +// Resolve environment variables within a directory name; returns the resolved directory string. +// The returned string is likely a new pointer; the old pointer should be freed by psStringSubstitute. +static psString resolveEnvVar(psString dir // Directory to check for environment variables + ) +{ + char *envStart; // Start of any environment variable + while ((envStart = strchr(dir, '$'))) { + char *envName = envStart + 1; // Start of the environment variable name + if (envName[0] == '\0') { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Path %s contains a bad environment variable.\n", dir); + return NULL; + } + if (envName[0] == '{') { + envName++; + if (envName[0] == '\0') { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, + "Path %s contains a bad environment variable.\n", dir); + return NULL; + } + } + char *envStop = strpbrk(envStart, "}/"); // End of the environment variable + ssize_t nameLength = envStop ? envStop - envName : strlen(envName); // Length of the name + psString name = psStringNCopy(envName, nameLength); // The environment variable name + char *value = getenv(name); // Value of the environment variable + psFree(name); + psString valueSlash = NULL; // Value with appended slash + psStringAppend(&valueSlash, "%s/", value); + + ssize_t envvarLength = envStop ? envStop - envStart : strlen(envStart); // Length, w/o '}' + psString envvar = psStringNCopy(envStart, envvarLength + 1); // Environment variable, with $, {, } + + psTrace("psModules.config", 7, "Replacing %s with %s in directory %s\n", envvar, valueSlash, dir); + psStringSubstitute(&dir, valueSlash, envvar); + psFree(envvar); + psFree(valueSlash); + } + + return dir; +} + +void pmConfigSet(const char *path) +{ + PS_ASSERT_STRING_NON_EMPTY(path,); + + pmConfigDone(); + + psList *list = psStringSplit(path, ":", false); + configPath = psListToArray(list); + // Resolve environment variables + for (long i = 0; i < configPath->n; i++) { + configPath->data[i] = resolveEnvVar(configPath->data[i]); + psTrace("psModules.config", 4, "Path %ld: %s\n", i, (char*)configPath->data[i]); + } + psFree(list); +} + +void pmConfigDone(void) +{ + psFree(configPath); + configPath = NULL; +} + +bool pmConfigFileRead(psMetadata **config, const char *name, const char *description) +{ + PS_ASSERT_PTR_NON_NULL(config, false); + PS_ASSERT_STRING_NON_EMPTY(name, false); + PS_ASSERT_STRING_NON_EMPTY(description, false); + + char *realName = NULL; + unsigned int numBadLines = 0; + struct stat filestat; + + psTrace("psModules.config", 3, "Loading %s configuration from file %s\n", + description, name); + + uid_t uid = getuid(); + gid_t gid = getgid(); + + // we try: name, path[0]/name, path[1]/name, ... + // find the first existing entry in the path (starting with the bare name) + realName = psStringCopy (name); + psTrace ("psModules.config", 8, "trying %s\n", realName); + + int status = stat (realName, &filestat); + if (status == 0) { + if ((uid == filestat.st_uid) && (filestat.st_mode & S_IRUSR)) { + goto found; + } + if ((gid == filestat.st_gid) && (filestat.st_mode & S_IRGRP)) { + goto found; + } + if (filestat.st_mode & S_IROTH) { + goto found; + } + } + psFree (realName); + + if (configPath == NULL) { + psError(PS_ERR_IO, true, "Cannot find %s configuration file (%s) in path\n", description, name); + return false; + } + + for (int i = 0; i < configPath->n; i++) { + realName = psStringCopy (configPath->data[i]); + psStringAppend (&realName, "/%s", name); + psTrace ("psModules.config", 8, "trying %s\n", realName); + + status = stat (realName, &filestat); + if (status == 0) { + if ((uid == filestat.st_uid) && (filestat.st_mode & S_IRUSR)) { + goto found; + } + if ((gid == filestat.st_gid) && (filestat.st_mode & S_IRGRP)) { + goto found; + } + if (filestat.st_mode & S_IROTH) { + goto found; + } + } + psFree (realName); + } + + psError(PS_ERR_IO, true, "Cannot find %s configuration file %s in path\n", description, name); + return false; + +found: + *config = psMetadataConfigRead(NULL, &numBadLines, realName, true); + if (numBadLines > 0) { + psError(PS_ERR_IO, false, "%d bad lines in %s configuration file (%s)", + numBadLines, description, realName); + psFree (realName); + + return false; + } + if (!*config) { + psError(PS_ERR_IO, true, "Unable to read %s configuration from %s", + description, realName); + psFree (realName); + return false; + } + + psFree (realName); + return true; +} + +// Read metadata config files in a metadata +// The metadata contains file names, which will be replaced with the metadata that are in the files. +static bool metadataReadFiles(psMetadata *source, // Source metadata + const char *description // Description, for error messages + ) +{ + assert(source); + psMetadataIterator *iter = psMetadataIteratorAlloc(source, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *item; // Item from iteration + while ((item = psMetadataGetAndIncrement(iter))) { + if (item->type == PS_DATA_METADATA) { + continue; // We've already read it + } + if (item->type != PS_DATA_STRING) { + psTrace("config", 2, "Element %s in %s metadata is not of type STR.\n", + item->name, description); + continue; + } + + psTrace("config", 2, "Reading %s %s: %s\n", description, item->name, item->data.str); + psMetadata *new = NULL; // New metadata + if (!pmConfigFileRead(&new, item->data.str, item->name)) { + psError(PM_ERR_CONFIG, false, "Trouble reading reading %s %s --- " + "ignored.\n", description, item->name); + psFree(new); + psFree(iter); + return false; + } + + // Muck around under the hood to replace the filename with the metadata; don't try this at home, kids + item->type = PS_DATA_METADATA; + psFree(item->data.str); + item->data.md = new; + } + psFree(iter); + + return true; +} + +// Read the formats for a camera +static bool cameraReadFormats(psMetadata *camera, // Camera for which to read the formats + const char *name // Name of the camera, for error messages + ) +{ + assert(camera); + assert(name); + + bool mdok; // Status of MD lookup + psMetadata *formats = psMetadataLookupMetadata(&mdok, camera, "FORMATS"); // Formats + if (!mdok || !formats) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find FORMATS in camera configuration %s.\n", name); + return false; + } + if (!metadataReadFiles(formats, "camera format")) { + psError(PS_ERR_UNKNOWN, false, "Unable to read formats within camera configuration %s.\n", name); + return false; + } + + return true; +} + +// Read the calibrations for a camera +static bool cameraReadCalibrations(psMetadata *camera, // Camera for which to read the formats + const char *cameraName // Name of the camera, for error messages + ) +{ + assert(camera); + assert(cameraName); + + psMetadataItem *darkNorm = psMetadataLookup(camera, "DARK.NORM"); // The dark normalisation calibration + if (darkNorm) { + if (darkNorm->type == PS_DATA_STRING) { + const char *darkNormName = darkNorm->data.str; // The file name + psTrace("config", 2, "Reading %s dark normalisation: %s\n", cameraName, darkNormName); + psMetadata *new = NULL; // New metadata + if (!pmConfigFileRead(&new, darkNormName, "Dark normalisation")) { + psError(PM_ERR_CONFIG, false, "Trouble reading reading %s dark normalisation %s --- " + "ignored.\n", cameraName, darkNormName); + psFree(new); + return false; + } + + // Muck around under the hood to replace the filename with the metadata; + // don't try this at home, kids + darkNorm->type = PS_DATA_METADATA; + psFree(darkNorm->data.str); + darkNorm->data.md = new; + } else if (darkNorm->type != PS_DATA_METADATA) { + psWarning("DARK.NORM in camera %s is not of type STR or METADATA (%x)", cameraName, darkNorm->type); + } + } else { + // Add a dummy entry + psPolynomial1D *poly = psPolynomial1DAlloc(PS_POLYNOMIAL_ORD, 1); // Dummy polynomial + poly->coeff[0] = 0.0; + poly->coeff[1] = 1.0; + psMetadata *polyMD = psMetadataAlloc(); // Container for the polynomial + (void)psPolynomial1DtoMetadata(polyMD, poly, "_DEFAULT"); // Metadata to insert + psFree(poly); + psMetadataAddMetadata(camera, PS_LIST_TAIL, "DARK.NORM", 0, "Dark normalisation polynomial", + polyMD); + psMetadataAddStr(camera, PS_LIST_TAIL, "DARK.NORM.KEY", 0, "Key for dark normalisation", "_DEFAULT"); + psFree(polyMD); + } + + return true; +} + +pmConfig *pmConfigRead(int *argc, char **argv, const char *defaultRecipe) +{ + PS_ASSERT_PTR_NON_NULL(argc, NULL); + PS_ASSERT_INT_POSITIVE(*argc, NULL); + PS_ASSERT_PTR_NON_NULL(argv, NULL); + + pmConfig *config = pmConfigAlloc(); // The configuration, containing site, camera and recipes + config->defaultRecipe = defaultRecipe; + + // + // The following section of code attempts to determine which file is + // the configuration file. At the end of this code block, the siteName + // variable will contain the name of the configuration file. + // + char *siteName = NULL; + // + // First, try command line + // + psS32 argNum = psArgumentGet(*argc, argv, "-site"); + if (argNum != 0) { + // + // We remove the "-site" argument from argv. Then + // we look for the next argument, which should be the filename, and + // remove it as well. + // + psArgumentRemove(argNum, argc, argv); + if (argNum >= *argc) { + psLogMsg("psModules.config", PS_LOG_WARN, + "-site command-line switch provided without the required filename --- ignored.\n"); + } else { + siteName = psStringCopy(argv[argNum]); + psArgumentRemove(argNum, argc, argv); + } + } + // + // Next, try environment variable + // + if (!siteName) { + siteName = getenv(PS_SITE); + if (siteName) { + siteName = psStringCopy (siteName); + } + } + + // + // Last chance is ~/.ipprc + // + if (!siteName) { + char *home = getenv("HOME"); + siteName = psStringCopy(home); + psStringAppend(&siteName, "/%s", PS_DEFAULT_SITE); + } + + + // We have the configuration filename; now we read and parse the config + // file and store in psMetadata struct site. + // + + if (!pmConfigFileRead(&config->site, siteName, "site")) { + psFree(config); + return NULL; + } + + // Set options based on the site configuration. + { + bool mdok = true; // Status of MD lookup result + + // Initialise the psLib time handling + psString timeName = psMetadataLookupStr(&mdok, config->site, "TIME"); + if (mdok && timeName) + { + psTrace("psModules.config", 7, "Initialising psTime with file %s\n", timeName); + psTimeInit(timeName); + } + + + // Set logging level + int logLevel = psMetadataLookupS32(&mdok, config->site, "LOGLEVEL"); + if (mdok && logLevel >= 0) + { + psTrace("psModules.config", 7, "Setting log level to %d\n", logLevel); + psLogSetLevel(logLevel); + } + + + // Set logging format + psString logFormat = psMetadataLookupStr(&mdok, config->site, "LOGFORMAT"); + if (mdok && logFormat) + { + psTrace("psModules.config", 7, "Setting log format to %s\n", logFormat); + psLogSetFormat(logFormat); + } + + argNum = psArgumentGet(*argc, argv, "-log"); + if (argNum > 0) + { + psArgumentRemove(argNum, argc, argv); + if (argNum >= *argc) { + psLogMsg("psModules.config", PS_LOG_WARN, "-log command-line switch provided without the " + "required log destination --- ignored.\n"); + } else { + if (!psLogSetDestination(psMessageDestination(argv[argNum]))) { + psLogMsg("psModules.config", PS_LOG_WARN, "Unable to set log destination to %s\n", + argv[argNum]); + } + psArgumentRemove(argNum, argc, argv); + } + } else + { + // Set logging destination + psString logDest = psMetadataLookupStr(&mdok, config->site, "LOGDEST"); + if (mdok && logDest && strlen(logDest) > 0) { + // XXX: Only stdout and stderr are provided for now; this section should be + // expanded in the future to do files, and perhaps even sockets. + if (!psLogSetDestination(psMessageDestination(logDest))) { + psLogMsg("psModules.config", PS_LOG_WARN, "Unable to set log destination to %s\n", + argv[argNum]); + } + } + } + + // Set trace levels + psMetadata *trace = psMetadataLookupMetadata(&mdok, config->site, "TRACE"); + if (mdok && trace) + { + psMetadataIterator *traceIter = psMetadataIteratorAlloc(trace, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *traceItem = NULL; // Item from MD iteration + while ((traceItem = psMetadataGetAndIncrement(traceIter))) { + if (traceItem->type != PS_DATA_S32) { + psLogMsg("psModules.config", PS_LOG_WARN, + "The level for trace component %s is not of type S32 (%x)\n", + traceItem->name, traceItem->type); + continue; + } + psTrace("psModules.config", 7, "Setting trace level for %s to %d\n", traceItem->name, traceItem->data.S32); + (void)psTraceSetLevel(traceItem->name, traceItem->data.S32); + } + psFree(traceIter); + } + + // Set trace formats + psString traceFormat = psMetadataLookupStr(&mdok, config->site, "TRACEFORMAT"); + if (mdok && traceFormat) + { + psTrace("psModules.config", 7, "Setting trace format to %s\n", traceFormat); + (void)psTraceSetFormat(traceFormat); + } + + // Set trace destinations + #ifndef PS_NO_TRACE + psString traceDest = psMetadataLookupStr(&mdok, config->site, "TRACEDEST"); + if (mdok && traceDest && strlen(traceDest) > 0) + { + psTrace("psModules.config", 7, "Setting trace destination to %s\n", traceDest); + // XXX: Only stdout and stderr are provided for now; this section should be + // expanded in the future to do files, and perhaps even sockets. + if (!psTraceSetDestination(psMessageDestination(traceDest))) { + psLogMsg("psModules.config", PS_LOG_WARN, "Unable to set trace destination to %s\n", traceDest); + + } + } + #endif + + // Allow command line options to override defaults for logging. + // XXX: Is it appropriate to use the ArgVerbosity function for this? + // A: it removes the options from the command line. + // B: will the pmConfigRead function always be called on initialization. + // + psArgumentVerbosity(argc, argv); + // XXX: substitute the string for the default log level for "2". + } + + // define the config-file search path (configPath). Ensure that + // it contains the directory where we found the config file in + // the first place + if (configPath) { + pmConfigDone(); + } + + psString siteNameDir = psStringCopy(dirname(siteName)); + psFree(siteName); + + psString path = psMetadataLookupStr(NULL, config->site, "PATH"); + if (path) { + psStringAppend(&path, ":%s", siteNameDir); + } else { + path = psMemIncrRefCounter(siteNameDir); + } + pmConfigSet(path); + psFree(siteNameDir); + + // Next, we do a similar thing for the camera configuration file. The + // file is read and parsed into psMetadata struct "camera". + // + argNum = psArgumentGet(*argc, argv, "-camera"); + if (argNum > 0) { + psArgumentRemove(argNum, argc, argv); + if (argNum >= *argc) { + psLogMsg("psModules.config", PS_LOG_WARN, + "-camera command-line switch provided without the required camera or filename --- " + "ignored.\n"); + } else { + bool mdok = true; // Status of MD lookup + char *cameraName = argv[argNum]; // symbolic name of the camera + + // look for the CAMERAS list in config->site + psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS"); + if (!cameras) { + psError(PS_ERR_IO, false, "Unable to find CAMERAS in site configuration.\n"); + psFree(config); + return NULL; + } + + // look for the symbolic camera name in the CAMERAS metadata + char *cameraFile = psMetadataLookupStr(&mdok, cameras, cameraName); // The filename + if (!cameraFile) { + psError(PS_ERR_IO, false, "%s is not listed in the site CAMERAS list\n", cameraName); + psFree(config); + return NULL; + } + + // load this camera's configuration informatoin + if (!pmConfigFileRead(&config->camera, cameraFile, "camera")) { + psError(PM_ERR_CONFIG, false, "Problem reading %s", cameraName); + psFree(config); + return NULL; + } + // save the name for future uses + config->cameraName = psStringCopy (cameraName); + + psArgumentRemove(argNum, argc, argv); + + // Read in the formats + if (!cameraReadFormats(config->camera, cameraFile)) { + psError(PS_ERR_UNKNOWN, false, "Unable to read formats within camera configuration %s.\n", + cameraFile); + psFree(config); + return NULL; + } + + // Read in any camera-specific calibrations + if (!cameraReadCalibrations(config->camera, cameraName)) { + psError(PS_ERR_UNKNOWN, false, + "Unable to read calibrations within camera configuration %s.\n", + cameraName); + psFree(config); + return NULL; + } + + psMetadataAddMetadata(cameras, PS_LIST_HEAD, cameraName, PS_META_REPLACE, + "Camera specified on command line", config->camera); + + if (!pmConfigCameraSkycellVersion(config->site, cameraName)) { + psError(PS_ERR_UNKNOWN, false, + "Unable to generate skycell versions of specified camera %s.\n", + cameraName); + psFree(config); + return NULL; + } + + if (!pmConfigCameraMosaickedVersions(config->site, cameraName)) { + psError(PS_ERR_UNKNOWN, false, + "Unable to generate mosaicked versions of specified camera %s.\n", + cameraName); + psFree(config); + return NULL; + } + } + } + + // Read the camera configurations, if not already defined, and not turned off + if (!config->camera && readCameraConfig) { + bool mdok; // Status of MD lookup + psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS"); // List of cameras + if (!mdok || !cameras) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n"); + return false; + } + + if (!metadataReadFiles(cameras, "camera configuration")) { + psError(PS_ERR_UNKNOWN, false, "Unable to read cameras within site configuration.\n"); + psFree(config); + return NULL; + } + + // Now fill in the formats and calibrations + psMetadataIterator *iter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *item; // Item from iteration + while ((item = psMetadataGetAndIncrement(iter))) { + assert(item->type == PS_DATA_METADATA); + if (!cameraReadFormats(item->data.md, item->name)) { + psWarning("Unable to read formats for camera %s: removed.\n", item->name); + psMetadataRemoveKey(cameras, item->name); + } + if (!cameraReadCalibrations(item->data.md, item->name)) { + psWarning("Unable to read calibrations for camera %s: removed.\n", item->name); + psMetadataRemoveKey(cameras, item->name); + } + } + psFree(iter); + + if (!pmConfigCameraSkycellVersionsAll(config->site)) { + psError(PS_ERR_UNKNOWN, false, "Unable to generate skycell versions of cameras.\n"); + psFree(config); + return NULL; + } + if (!pmConfigCameraMosaickedVersionsAll(config->site)) { + psError(PS_ERR_UNKNOWN, false, "Unable to generate mosaicked versions of cameras.\n"); + psFree(config); + return NULL; + } + } + + // Load the recipes from the camera file, if appropriate + if(!pmConfigReadRecipes(config, PM_RECIPE_SOURCE_SITE | PM_RECIPE_SOURCE_CAMERA)) { + psError(PS_ERR_IO, false, "Failed to read recipes from camera file"); + psFree(config); + return NULL; + } + + // load command-line options of the form -recipe NAME RECIPE + pmConfigLoadRecipeArguments(argc, argv, config); + + // read in command-line options to specific recipe values + pmConfigLoadRecipeOptions(argc, argv, config, "-D"); + pmConfigLoadRecipeOptions(argc, argv, config, "-Di"); + pmConfigLoadRecipeOptions(argc, argv, config, "-Df"); + pmConfigLoadRecipeOptions(argc, argv, config, "-Db"); + + // Look for command-line options for files to replace + argNum = psArgumentGet(*argc, argv, "-F"); + if (argNum > 0) { + psArgumentRemove(argNum, argc, argv); + if (argNum + 1 >= *argc) { + psError(PS_ERR_BAD_PARAMETER_SIZE, true, + "Filerule switch (-F) provided without old and new filerule."); + psFree(config); + return NULL; + } + + const char *old = argv[argNum]; // The old file, to be replaced + psArgumentRemove(argNum, argc, argv); + const char *new = argv[argNum]; // The new file, the replacement + psArgumentRemove(argNum, argc, argv); + + psMetadata *cameras = psMetadataLookupMetadata(NULL, config->site, "CAMERAS"); // List of cameras + if (!cameras) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find CAMERAS in the site configuration.\n"); + return false; + } + + psMetadataIterator *camerasIter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *cameraItem; // Item from iteration + while ((cameraItem = psMetadataGetAndIncrement(camerasIter))) { + if (cameraItem->type != PS_DATA_METADATA) { + psWarning("Entry %s in CAMERAS is not of type METADATA --- ignored.", cameraItem->name); + continue; + } + psMetadata *camera = cameraItem->data.md; // Camera configuration + psMetadata *filerules = psMetadataLookupMetadata(NULL, camera, "FILERULES"); // File rules + if (!filerules) { + psWarning("Can't find FILERULES of type METADATA in camera %s --- ignored.", + cameraItem->name); + continue; + } + psMetadataItem *newItem = psMetadataLookup(filerules, new); // The rule of interest, or a redir. + if (!newItem) { + psWarning("Can't find file rule %s in camera %s --- ignored.", new, cameraItem->name); + continue; + } + psMetadata *newRule; // New rule (replacement) + switch (newItem->type) { + case PS_DATA_STRING: + // A redirection + newRule = psMetadataLookupMetadata(NULL, filerules, newItem->data.str); + break; + case PS_DATA_METADATA: + // The rule itself + newRule = newItem->data.md; + break; + default: + psWarning("Unable to find filerule %s of the correct type in camera %s --- ignored.", + new, cameraItem->name); + continue; + } + psMetadataAddMetadata(filerules, PS_LIST_TAIL, old, PS_META_REPLACE, + "Original replaced by -F option", newRule); + } + psFree(camerasIter); + } + + // check for values that override DB* keywords + argNum = psArgumentGet(*argc, argv, "-dbserver"); + if (argNum > 0) { + psArgumentRemove(argNum, argc, argv); + if (argNum >= *argc) { + psLogMsg("psModules.config", PS_LOG_WARN, + "-dbserver command-line switch provided without the required server name --- "); + } else { + char *dbserver = argv[argNum]; // The camera configuration file to read + if (!psMetadataAddStr(config->site, PS_LIST_TAIL, "DBSERVER", PS_META_REPLACE, NULL, dbserver)) { + psLogMsg("psModules.config", PS_LOG_WARN, + "failed to overwrite .ipprc DBSERVER value --- "); + } + + psArgumentRemove(argNum, argc, argv); + } + } + + argNum = psArgumentGet(*argc, argv, "-dbname"); + if (argNum > 0) { + psArgumentRemove(argNum, argc, argv); + if (argNum >= *argc) { + psLogMsg("psModules.config", PS_LOG_WARN, + "-dbname command-line switch provided without the required database name --- "); + } else { + char *dbname = argv[argNum]; // The camera configuration file to read + if (!psMetadataAddStr(config->site, PS_LIST_TAIL, "DBNAME", PS_META_REPLACE, NULL, dbname)) { + psLogMsg("psModules.config", PS_LOG_WARN, + "failed to overwrite .ipprc DBNAME value --- "); + } + + psArgumentRemove(argNum, argc, argv); + } + } + + argNum = psArgumentGet(*argc, argv, "-dbuser"); + if (argNum > 0) { + psArgumentRemove(argNum, argc, argv); + if (argNum >= *argc) { + psLogMsg("psModules.config", PS_LOG_WARN, + "-dbuser command-line switch provided without the required database name --- "); + } else { + char *dbuser = argv[argNum]; // The camera configuration file to read + if (!psMetadataAddStr(config->site, PS_LIST_TAIL, "DBUSER", PS_META_REPLACE, NULL, dbuser)) { + psLogMsg("psModules.config", PS_LOG_WARN, + "failed to overwrite .ipprc DBUSER value --- "); + } + + psArgumentRemove(argNum, argc, argv); + } + } + + argNum = psArgumentGet(*argc, argv, "-dbpassword"); + if (argNum > 0) { + psArgumentRemove(argNum, argc, argv); + if (argNum >= *argc) { + psLogMsg("psModules.config", PS_LOG_WARN, + "-dbpassword command-line switch provided without the required password --- "); + } else { + char *dbpassword = argv[argNum]; // The camera configuration file to read + if (!psMetadataAddStr(config->site, PS_LIST_TAIL, "DBPASSWORD", PS_META_REPLACE, NULL, dbpassword)) { + psLogMsg("psModules.config", PS_LOG_WARN, + "failed to overwrite .ipprc DBPASSWORD value --- "); + } + + psArgumentRemove(argNum, argc, argv); + } + } + + argNum = psArgumentGet(*argc, argv, "-dbport"); + if (argNum > 0) { + psArgumentRemove(argNum, argc, argv); + if (argNum >= *argc) { + psLogMsg("psModules.config", PS_LOG_WARN, + "-dbpport command-line switch provided without the required port number --- "); + } else { + char *dbport = argv[argNum]; // The camera configuration file to read + if (!psMetadataAddS32(config->site, PS_LIST_TAIL, "DBPORT", PS_META_REPLACE, NULL, (psS32)atoi(dbport))) { + psLogMsg("psModules.config", PS_LOG_WARN, + "failed to overwrite .ipprc DBPORT value --- "); + } + + psArgumentRemove(argNum, argc, argv); + } + } + + + psErrorClear(); // we may have failed to find some items in the metadata + + return config; +} + + +// XXX aren't these (return false) below errors: call psError? +bool pmConfigValidateCameraFormat(bool *valid, const psMetadata *cameraFormat, const psMetadata *header) +{ + PS_ASSERT_PTR_NON_NULL(cameraFormat, false); + PS_ASSERT_PTR_NON_NULL(header, false); + + // Read the rule for that camera format + bool mdStatus = true; + + psMetadata *rule = psMetadataLookupMetadata(&mdStatus, cameraFormat, "RULE"); + if (! mdStatus || ! rule) { + psError(PS_ERR_UNKNOWN, false, "Unable to read rule for camera."); + *valid = false; + return false; + } + + // Apply the rules + psMetadataIterator *ruleIter = psMetadataIteratorAlloc(rule, PS_LIST_HEAD, NULL); // Rule iterator + psMetadataItem *ruleItem = NULL; // Item from the metadata + + *valid = true; + while (*valid && (ruleItem = psMetadataGetAndIncrement(ruleIter))) { + // Check for the existence of the rule + psMetadataItem *headerItem = psMetadataLookup(header, ruleItem->name); + if (! headerItem) { + // rule item not found in header + psTrace("psModules.config", 5, "Can't find %s", ruleItem->name); + *valid = false; + } + + // Check to see if the rule works + if (headerItem && !psMetadataItemCompare(headerItem, ruleItem)) { + psTrace("psModules.config", 5, "%s doesn't match.", ruleItem->name); + *valid = false; + } + } // Iterating through the RULEs + + psFree(ruleIter); + return true; +} + +// Given a camera and a header, see if any of the camera formats match the header +static bool formatFromHeader(psMetadata **format, // Format to return + psString *name, // Name to return + psMetadata *camera, // Camera configuration + const psMetadata *header, // FITS header + const char *cameraName // Name of camera + ) +{ + assert(format); + assert(camera); + assert(header); + assert(cameraName); + assert(*cameraName); + + bool result = false; // Did we find the first match? + + // Read the list of formats + bool mdok = true; // Status of MD lookup + psMetadata *formats = psMetadataLookupMetadata(&mdok, camera, "FORMATS"); // List of formats + if (!mdok || !formats) { + psError(PS_ERR_UNKNOWN, false, "Unable to find list of FORMATS in camera %s", cameraName); + return false; + } + + if (!metadataReadFiles(formats, "camera format")) { + psError(PS_ERR_UNKNOWN, false, "Unable to read cameras formats within camera configuration.\n"); + return false; + } + + // Iterate over the formats + psMetadataIterator *formatsIter = psMetadataIteratorAlloc(formats, PS_LIST_HEAD, NULL); + psMetadataItem *formatsItem = NULL; // Item from formats + while ((formatsItem = psMetadataGetAndIncrement(formatsIter))) { + assert(formatsItem->type == PS_DATA_METADATA); // Since we have just read it in or deleted it + psMetadata *testFormat = formatsItem->data.md; // Format to test against + + psTrace("psModules.config", 5, "trying format %s", formatsItem->name); + + bool valid = false; + if (!pmConfigValidateCameraFormat(&valid, testFormat, header)) { + psError (PS_ERR_UNKNOWN, false, "Error in config scripts for camera %s, format %s\n", + cameraName, formatsItem->name); + return false; + } + if (valid) { + if (!*format) { + psLogMsg("psModules.config", PS_LOG_INFO, "Camera %s, format %s matches header.\n", + cameraName, formatsItem->name); + *format = psMemIncrRefCounter(testFormat); + *name = psStringCopy(formatsItem->name); + result = true; + } else { + psLogMsg("psModules.config", PS_LOG_WARN, + "Camera %s, format %s also matches header --- ignored.\n", + cameraName, formatsItem->name); + } + } + } + psFree(formatsIter); + return result; +} + +// we only need to read the recipe for the main camera images. for additional images (eg, sky +// cells) do not need to re-read the recipe files! +psMetadata *pmConfigCameraFormatFromHeader(pmConfig *config, const psMetadata *header, bool readRecipes) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_PTR_NON_NULL(header, NULL); + + psMetadata *format = NULL; // The winning format + psString name = NULL; // Name of the winning format + + // If we don't know what sort of camera we have, we try all that we know + if (! config->camera) { + bool mdok; // Metadata lookup status + psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS"); + if (! mdok || !cameras) { + psError(PS_ERR_IO, true, "Unable to find CAMERAS in the configuration."); + return NULL; + } + + if (!metadataReadFiles(cameras, "camera configuration")) { + psError(PS_ERR_UNKNOWN, false, "Unable to read cameras within site configuration.\n"); + return NULL; + } + + // Iterate over the cameras + psMetadataIterator *camerasIter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); + psMetadataItem *camerasItem = NULL; // Item from the metadata + while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) { + // Open the camera information + psTrace("psModules.config", 3, "Inspecting camera %s (%s)\n", camerasItem->name, + camerasItem->comment); + assert(camerasItem->type == PS_DATA_METADATA); // It should be because we've read it in or deleted + psMetadata *testCamera = camerasItem->data.md; // Camera to test against what we've got: + if (formatFromHeader(&format, &name, testCamera, header, camerasItem->name)) { + // Set the defaults, if they are not already set + if (!config->camera && !config->cameraName) { + config->camera = psMemIncrRefCounter(testCamera); + config->cameraName = psStringCopy(camerasItem->name); + } + if (!config->format && !config->formatName) { + config->formatName = name; + config->format = format; + } else { + psFree(name); + psFree(format); + } + } else { + psErr *error = psErrorLast(); + if (error->code != PS_ERR_NONE) { + psError(PS_ERR_IO, false, "Error reading camera config data for %s", camerasItem->name); + return NULL; + } + psFree(error); + } + } // Done looking at all cameras + psFree(camerasIter); + + if (! config->camera) { + psError(PS_ERR_IO, false, "Unable to find a camera that matches input FITS header!"); + return NULL; + } + + // Now we have the camera, we can read the recipes + if (readRecipes && !pmConfigReadRecipes(config, PM_RECIPE_SOURCE_CAMERA | PM_RECIPE_SOURCE_CL)) { + psError(PS_ERR_IO, false, "Error reading recipes from camera config for %s", config->cameraName); + return NULL; + } + return psMemIncrRefCounter(format); + } + + // Otherwise, try the specific camera + if (!formatFromHeader(&format, &name, config->camera, header, config->cameraName)) { + psError(PS_ERR_IO, true, "Unable to find a format with the specified camera (%s) that matches the " + "given header.\n", config->cameraName); + return NULL; + } + + if (!config->format && !config->formatName) { + config->formatName = name; + config->format = format; + } else { + psFree(format); + psFree(name); + } + return psMemIncrRefCounter(format); +} + +// Return the requested camera configuration +psMetadata *pmConfigCameraByName(pmConfig *config, const char *cameraName) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_STRING_NON_EMPTY(cameraName, NULL); + + psMetadata *cameras = psMetadataLookupMetadata(NULL, config->site, "CAMERAS"); + if (!cameras) { + psError(PS_ERR_IO, true, "Unable to find CAMERAS in the configuration."); + return NULL; + } + + char *cameraPath = psMetadataLookupStr(NULL, cameras, cameraName); + if (!cameraPath) { + psError(PS_ERR_IO, true, "Unable to find requested CAMERA in the configuration."); + return NULL; + } + + psMetadata *camera = NULL; // Camera to test against what we've got: + + if (!pmConfigFileRead(&camera, cameraPath, cameraName)) { + psLogMsg("psModules.config", PS_LOG_WARN, "Trouble reading reading camera configuration %s", cameraName); + psFree(camera); + return NULL; + } + + return camera; +} + +psDB *pmConfigDB(pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(config, NULL); + PS_ASSERT_PTR_NON_NULL(config->site, NULL); + + #ifndef HAVE_PSDB + + psError(PS_ERR_UNKNOWN, false, + "Cannot configure database: psModules was compiled without database support."); + return NULL; + + #else + + psBool mdStatus01 = false; + psBool mdStatus02 = false; + psBool mdStatus03 = false; + psBool mdStatus04 = false; + psBool mdStatus05 = false; + + // XXX leaky strings + psString dbServer = psMetadataLookupStr(&mdStatus01, config->site, "DBSERVER"); + psString dbUsername = psMetadataLookupStr(&mdStatus02, config->site, "DBUSER"); + psString dbPassword = psMetadataLookupStr(&mdStatus03, config->site, "DBPASSWORD"); + psString dbName = psMetadataLookupStr(&mdStatus04, config->site, "DBNAME"); + psS32 dbPort = psMetadataLookupS32(&mdStatus05, config->site, "DBPORT"); + if (!mdStatus05) { + dbPort = 0; + } + if (!(mdStatus01 && mdStatus02 && mdStatus03 && mdStatus04)) { + psLogMsg("psModules.config", PS_LOG_WARN, + "Could not determine database server, name, user, and password from site metadata.\n"); + return NULL; + } + + return psDBInit(dbServer, dbUsername, dbPassword, dbName, dbPort); + #endif +} + + +bool pmConfigConformHeader(psMetadata *header, const psMetadata *format) +{ + PS_ASSERT_PTR_NON_NULL(header, false); + PS_ASSERT_PTR_NON_NULL(format, false); + + bool mdok = true; // Status of MD lookup + psMetadata *rules = psMetadataLookupMetadata(&mdok, format, "RULE"); // How to identify this format + if (!mdok || !rules) { + psError(PS_ERR_IO, true, "Unable to find RULE in camera format.\n"); + return false; + } + + psMetadataIterator *rulesIter = psMetadataIteratorAlloc(rules, PS_LIST_HEAD, NULL); // Iterator for rules + psMetadataItem *rulesItem = NULL; // Item from iteration + while ((rulesItem = psMetadataGetAndIncrement(rulesIter))) { + psMetadataItem *newItem = psMetadataItemCopy(rulesItem); // Copy of item + psMetadataAddItem(header, newItem, PS_LIST_TAIL, PS_META_REPLACE); + psFree(newItem); // Drop reference + } + psFree(rulesIter); + + // XXX do we need to update the header based on elements of the FILE? + # if (0) + psMetadata *file = psMetadataLookupMetadata(&mdok, format, "FILE"); // How to identify this format + if (!mdok || !file) { + psError(PS_ERR_IO, true, "Unable to find FILE in camera format.\n"); + return false; + } + psString fpaName = psMetadataLookupStr(&mdok, file, "FPA.NAME"); + # endif + + return true; +} + +psArray *pmConfigFileSets(int *argc, char **argv, const char *file, const char *list) +{ + PS_ASSERT_PTR_NON_NULL(argc, NULL); + PS_ASSERT_INT_NONNEGATIVE(*argc, NULL); + PS_ASSERT_PTR_NON_NULL(argv, NULL); + + int Narg; + + // we load all input files onto a psArray, to be parsed later + psArray *input = psArrayAllocEmpty(16); + + // load the list of filenames the supplied file + // maybe a comma-separated list of words + // each word may be a glob: "file*.fits" + if (file && strlen(file) > 0 && (Narg = psArgumentGet (*argc, argv, file))) { + + // select the word after 'file' and split by comma + psArgumentRemove (Narg, argc, argv); + psArray *words = psStringSplitArray (argv[Narg], ",", true); + psArgumentRemove (Narg, argc, argv); + + // parse the word as a glob + glob_t globList; + for (int i = 0; i < words->n; i++) { + globList.gl_offs = 0; + glob (words->data[i], 0, NULL, &globList); + + // if the glob does not match, save the literal word: + // otherwise save all glob matches + if (globList.gl_pathc == 0) { + psArrayAdd (input, 16, words->data[i]); + } else { + for (int j = 0; j < globList.gl_pathc; j++) { + char *filename = psStringCopy (globList.gl_pathv[j]); + psArrayAdd (input, 16, filename); + psFree (filename); + } + } + } + psFree (words); + } + + // load the list from the supplied text file + if (list && strlen(list) > 0 && (Narg = psArgumentGet (*argc, argv, list))) { + int nItems; + char line[1024]; // XXX limits the list lines to 1024 chars + char word[1024]; + char *filename; + + psArgumentRemove (Narg, argc, argv); + FILE *f = fopen (argv[Narg], "r"); + if (f == NULL) { + psAbort("unable to open specified list file"); + } + while (fgets (line, 1024, f) != NULL) { + nItems = sscanf (line, "%s", word); + switch (nItems) { + case 0: + break; + case 1: + filename = psStringCopy (word); + psArrayAdd (input, 16, filename); + psFree (filename); + break; + default: + // rigid format, no comments allowed? + psAbort("error parsing input list file"); + break; + } + } + psArgumentRemove (Narg, argc, argv); + } + + return input; +} + +bool pmConfigFileSetsMD(psMetadata *metadata, int *argc, char **argv, const char *name, + const char *file, const char *list) +{ + PS_ASSERT_PTR_NON_NULL(metadata, false); + PS_ASSERT_STRING_NON_EMPTY(name, NULL); + + psErrorClear(); // pmConfigFileSets may or may not call psError, so + // if files->n == 0 we'll want to call psError(..., false, ...) + psArray *files = pmConfigFileSets(argc, argv, file, list); + if (files->n == 0) { + // psError(PS_ERR_IO, false, "pmConfigFileSets failed to find %s in the argument list", name); + psFree (files); + return false; + } + + psMetadataAddPtr(metadata, PS_LIST_TAIL, name, PS_DATA_ARRAY, "", files); + psFree (files); + return true; +} + +// convert the supplied name, create a new output psString +psString pmConfigConvertFilename(const char *filename, const pmConfig *config, bool create) +{ + PS_ASSERT_STRING_NON_EMPTY(filename, NULL); + PS_ASSERT_PTR_NON_NULL(config, NULL); + + // strip file:// from front of name + if (!strncasecmp(filename, "file:", strlen("file:"))) { + psString newName = psStringCopy(filename); + + char *point = newName + strlen("file:"); + while (*point == '/') + point ++; + char *tmpName = NULL; + psStringAppend (&tmpName, "/%s", point); + psFree (newName); + newName = tmpName; + + if (!create && access(newName, R_OK) != 0) { + psError(PS_ERR_IO, true, "Unable to access file %s", newName); + psFree(newName); + return NULL; + } + + return newName; + } + + // replace path://PATH with matched datapath + if (!strncasecmp(filename, "path://", strlen("path://"))) { + PS_ASSERT_METADATA_NON_NULL(config->site, NULL); + + psString newName = psStringCopy(filename); + + // filename should be of the form: path://PATH/rest/of/file + // replace PATH with matching name from config->site:DATAPATH + psMetadata *datapath = psMetadataLookupPtr (NULL, config->site, "DATAPATH"); + if (datapath == NULL) { + psError(PS_ERR_UNKNOWN, true, "DATAPATH is not defined in config.site"); + psFree (newName); + return NULL; + } + + char *point = newName + strlen("path://"); + char *mark = strchr (point, '/'); + if (mark == NULL) { + psError(PS_ERR_UNKNOWN, true, "syntax error in PATH-style name %s", newName); + psFree (newName); + return false; + } + + psString path = psStringNCopy (point, mark - point); + char *realpath = psMetadataLookupStr (NULL, datapath, path); + if (realpath == NULL) { + psError(PS_ERR_UNKNOWN, true, + "path (%s) not defined in config.site:DATAPATH for PATH-style name %s", + path, newName); + psFree(newName); + psFree(path); + return false; + } + psFree(path); + + char *tmpName = NULL; + psStringAppend(&tmpName, "%s/%s", realpath, mark + 1); + psFree(newName); + newName = tmpName; + + if (!create && access(newName, R_OK) != 0) { + psError(PS_ERR_IO, true, "Unable to access file %s", newName); + psFree(newName); + return NULL; + } + return newName; + } + + // substitute neb://name with matched nebulous name + if (!strncasecmp(filename, "neb://", strlen("neb://"))) { + #ifdef HAVE_NEBCLIENT + + bool status = false; + psString neb_server = NULL; + + // check the env first + neb_server = getenv("NEB_SERVER"); + + // if env isn't set, check the config system + if (!neb_server) { + neb_server = psMetadataLookupStr(&status, config->site, "NEB_SERVER"); + if (!status) { + psError(PM_ERR_CONFIG, true, "failed to lookup config value for NEB_SERVER."); + return NULL; + } + } + + if (!neb_server) { + psError(PM_ERR_CONFIG, true, "Could not determine nebulous server URI."); + return NULL; + } + + nebServer *server = nebServerAlloc(neb_server); + if (!server) { + psError(PM_ERR_SYS, true, "failed to create a nebServer object: %s", nebErr(server)); + nebServerFree(server); + return NULL; + } + + // ignore the leading neb:// + char *cleanFilename = (char *)filename + strlen("neb://"); + + char *nebfile = NULL; + if (create) { + nebfile = nebCreate(server, cleanFilename, NULL, NULL); + if (!nebfile) { + psError(PM_ERR_SYS, true, "failed to create a new nebulous key: %s", nebErr(server)); + nebServerFree(server); + return NULL; + } + } else { + nebfile = nebFind(server, cleanFilename); + if (!nebfile) { + psError(PM_ERR_SYS, true, "failed to find nebulous key: %s", nebErr(server)); + nebServerFree(server); + return NULL; + } + } + + // convert nebfile into a psString + psString path = psStringCopy(nebfile); + nebFree(nebfile); + nebServerFree(server); + + return path; + + #else // ifdef HAVE_NEBCLIENT + + psError(PM_ERR_PROG, true, "psModules was compiled without nebulous support."); + return NULL; + #endif // ifdef HAVE_NEBCLIENT + + } + + // if we go this far, do nothing + return psStringCopy(filename); +} Index: /branches/pap_branch_070920/psModules/src/config/pmConfig.h =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfig.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfig.h (revision 14957) @@ -0,0 +1,173 @@ +/* @file pmConfig.h + * @brief Configuration functions + * + * @author Paul Price, IfA + * @author Eugene Magnier, IfA + * + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-04-19 02:10:12 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_CONFIG_H +#define PM_CONFIG_H + +/// @addtogroup Config Configuration System +/// @{ + +/// Sources for recipes. +/// +/// Defines what recipe sources have been read. This allows us to read recipes from different sources as they +/// become available. For example, we may not have access to the camera configuration until we have read a +/// FITS file. We allow symbolic links, which means the user can specify on the command-line the name of a +/// recipe that's defined elsewhere, instead of typing the entire filename. This structure is private to +/// psModules --- there is no need for the user to know about it. +typedef enum { + PM_RECIPE_SOURCE_NONE = 0x00, ///< None yet + PM_RECIPE_SOURCE_SITE = 0x01, ///< Site configuration + PM_RECIPE_SOURCE_CAMERA = 0x02, ///< Camera configuration + PM_RECIPE_SOURCE_CL = 0x04, ///< Command-line + PM_RECIPE_SOURCE_SYMBOLIC = 0x14, ///< Symbolic link, specified on command-line + PM_RECIPE_SOURCE_ALL = 0xff ///< All sources +} pmRecipeSource; + +/// Configuration information +/// +/// This structure stores the configuration information: the site, camera and recipe configuration, the +/// command-line arguments, the pmFPAfiles used, and the database handle. +typedef struct +{ + psMetadata *site; ///< Site configuration + psMetadata *camera; ///< Camera specification + psString cameraName; ///< Camera name + psMetadata *format; ///< Camera format description + psString formatName; ///< Camera format name + psMetadata *recipes; ///< Recipes for processing + psMetadata *arguments; ///< Processed command-line arguments + psMetadata *files; ///< pmFPAfiles used for analysis + psDB *database; ///< Database handle + const char *defaultRecipe; ///< name of top-level recipe for this program + // Private members + pmRecipeSource recipesRead; ///< Which recipe sources have been read + psMetadata *recipeSymbols; ///< Where each recipe came from + + // dropping the argc, argv info from pmConfig + # if (0) + int *argc; ///< Number of command-line arguments + char **argv; ///< Command-line arguments (raw version) + # endif +} +pmConfig; + +/// Allocator for pmConfig +pmConfig *pmConfigAlloc(); + +/// Set static configuration information +/// +/// The search path for the configuration files is a local static variable, set by this function. +void pmConfigSet(const char *path ///< Search paths for configuration files; colon-delimited directories + ); + +/// Free static memory used in the configuration system +void pmConfigDone(void); + +/// Read configuration information from the command line. +/// +/// pmConfigRead loads the site configuration (the file name is specified by "-site SITE_FILE" on the +/// command-line, the PS_SITE environment variable, or it is $HOME/.ipprc). The configuration search path is +/// set. The camera configuration is loaded if it is specified on the command line ("-camera +/// CAMERA_FILE"). Recipes specified on the command line ("-recipe RECIPE_NAME RECIPE_SOURCE") are also +/// loaded. These command-line arguments are removed from from the command-line, to simplify parsing. The +/// psLib log, trace and time setups are also performed if specified in the site configuration. +pmConfig *pmConfigRead(int *argc, ///< Number of command-line arguments + char **argv, ///< Array of command-line arguments + const char *defaultRecipe ///< name of top-level recipe for this program + ); + +/// Read a configuration file +/// +/// Read a metadata configuration file into the supplied metadata. Produce an error and return false if +/// there's a problem. +bool pmConfigFileRead(psMetadata **config, ///< Config to output + const char *name, ///< Name of file + const char *description ///< Description of file + ); + +/// Validate a header against the camera format +/// +/// Given a FITS header (the PHU header), check it against the RULE metadata contained within the camera +/// format; return found = true if it matches. return false on serious errors +bool pmConfigValidateCameraFormat(bool *valid, + const psMetadata *cameraFormat, ///< Camera format containing the RULE + const psMetadata *header // FITS header for the PHU + ); + +/// Determine the camera format (and camera if unknown) from examining the header +/// +/// Given a FITS header, check it against all known cameras (unless we already know which camera, from +/// pmConfigRead) and all known formats for those cameras in order to identify which is appropriate. The +/// first matching format is accepted; further matches produce warnings. The accepted camera is saved in the +/// configuration. The accepted format is returned. +psMetadata *pmConfigCameraFormatFromHeader(pmConfig *config, ///< The configuration + const psMetadata *header, ///< The FITS header + bool readRecipes ///< optionally read the recipes as well as the format + ); + +/// Return the camera configuration specified by name +/// +/// Given a camera name, returns the camera configuration metadata. +psMetadata *pmConfigCameraByName(pmConfig *config, ///< The configuration + const char *cameraName ///< The camera name header + ); + +/// Setup the database +/// +/// Initialise the database connection using the DBSERVER, DBNAME, DBUSER, DBPASSWORD values provided in the +/// site configuration. Stores the database handle in the configuration, and also returns it. +psDB *pmConfigDB(pmConfig *config ///< Configuration + ); + +/// Make the supplied header conform to the nominated camera format. +/// +/// Given a FITS header, make it conform to the RULE in the specified camera format. This is useful for +/// switching between formats, or generating fake data that must be recognised by +/// pmConfigCameraFormatFromHeader. +bool pmConfigConformHeader(psMetadata *header, ///< Header to conform + const psMetadata *format ///< Camera format + ); + +/// Read the command-line for files (or a text file containing a list of files) +/// +/// Given the 'file' and 'list' arguments (e.g., "-file" and "-list"), find the arguments associated with +/// these words and interpret them as lists of files. Return an array of the resulting filenames. +psArray *pmConfigFileSets(int *argc, ///< Number of arguments (I/O) + char **argv, ///< Array of arguments + const char *file, ///< CL argument specifying a filename + const char *list ///< CL argument specifying a text file with a list of filenames + ); + +/// Stuff associated files from the command-line into a metadata +/// +/// Calls pmConfigFileSets to parse the command line for filenames (or a list which provides filenames), and +/// stuffs the array of filenames into the metadata under "name". +bool pmConfigFileSetsMD(psMetadata *metadata, ///< Metadata into which to stuff the array + int *argc, ///< Number of arguments (I/O) + char **argv, ///< Array of arguments + const char *name, ///< Name for array in the metadata + const char *file, ///< CL argument specifying a filename + const char *list ///< CL argument specifying a text file with a list of filenames + ); + +/// Convert the supplied name, create a new output psString +psString pmConfigConvertFilename( + const char *filename, ///< file path/URI + const pmConfig *config, ///< configuration + bool create ///< create the file if it doesn't exist +); + +/// Set whether all config parameters are read on startup +bool pmConfigReadParamsSet(bool newReadCameraConfig // Desired mode for camera configuration reading + ); + +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/config/pmConfigCamera.c =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfigCamera.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfigCamera.c (revision 14957) @@ -0,0 +1,849 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include /* for strn?casecmp */ +#include + +#include "pmHDU.h" +#include "pmFPA.h" +#include "pmFPALevel.h" +#include "pmVersion.h" +#include "pmConcepts.h" +#include "pmConfigCamera.h" + +#define TABLE_OF_CONTENTS "CONTENTS" // Name for camera format metadata containing the contents +#define CHIP_TYPES "CHIPS" // Name for camera format metadata containing the chip types +#define CELL_TYPES "CELLS" // Name for camera format metadata containing the cell types + +// local helper functions defined below +static void removeCellConceptsSources(psMetadata *source); +static void removeChipConceptsSources(psMetadata *source); + +// Generate the skycell version of a named camera configuration +bool pmConfigCameraSkycellVersion(psMetadata *site, // The site configuration + const char *name // Name of the un-mosaicked camera + ) +{ + PS_ASSERT_METADATA_NON_NULL(site, false); + PS_ASSERT_STRING_NON_EMPTY(name, false); + + bool mdok; // Status of MD lookup + psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras + if (!mdok || !cameras) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n"); + return false; + } + if (!pmConfigGenerateSkycellVersion(cameras, cameras, name, site)) { + psError(PS_ERR_UNKNOWN, true, "Failed to build skycell camera description for %s\n", name); + return false; + } + return true; +} + + +bool pmConfigCameraSkycellVersionsAll(psMetadata *site) +{ + PS_ASSERT_METADATA_NON_NULL(site, false); + + bool mdok; // Status of MD lookup + psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras + if (!mdok || !cameras) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n"); + return false; + } + + psMetadataIterator *camerasIter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *camerasItem = NULL; // Item from iteration + psMetadata *new = psMetadataAlloc();// New cameras to add + while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) { + assert(camerasItem->type == PS_DATA_METADATA); // Only metadata are allowed here! + if (!pmConfigGenerateSkycellVersion(cameras, new, camerasItem->name, site)) { + psError(PS_ERR_UNKNOWN, true, "Failed to build skycell camera description for %s\n", + camerasItem->name); + return false; + } + } + psFree(camerasIter); + + // Now put the new cameras at the top of the list of cameras, so they get recognised first + // Note: going from the top, and putting everything to the top as we get there, so that the last one on + // goes to the top. This preserves the original order of the cameras, putting the skycell versions + // before the originals. + camerasIter = psMetadataIteratorAlloc(new, PS_LIST_HEAD, NULL); // Iterator + while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) { + psMetadataAddItem(cameras, camerasItem, PS_LIST_HEAD, 0); + } + psFree(camerasIter); + psFree(new); + + return true; +} + +// Don't update these skycell concepts; last one MUST be 0 (i.e., NULL). +const static char *skycellConceptsCell[] = { "CELL.BIASSEC", "CELL.TRIMSEC", "CELL.READDIR", "CELL.XPARITY", + "CELL.YPARITY", "CELL.XWINDOW", "CELL.YWINDOW", "CELL.X0", + "CELL.Y0", "CELL.XSIZE", "CELL.YSIZE", 0 }; +const static char *skycellConceptsChip[] = { "CHIP.XPARITY", "CHIP.YPARITY", "CHIP.XSIZE", "CHIP.YSIZE", 0 }; +const static char *skycellConceptsFPA[] = { 0 }; + +// What do we call the skycell concept in the FITS header? +static const char *skycellConceptName(const char *name, // Name of concept + const char **concepts, // List of concepts NOT to update + const psMetadata *site // Site configuration + ) +{ + for (int i = 0; concepts[i]; i++) { + if (strcmp(name, concepts[i]) == 0) { + return NULL; + } + } + + if (!site) { + return name; + } + bool mdok; // Status of MD lookup + psMetadata *skycells = psMetadataLookupMetadata(&mdok, site, "SKYCELLS"); // Skycell concept headers + if (!skycells) { + return name; + } + const char *keyword = psMetadataLookupStr(&mdok, skycells, name); // Keyword to use for this concept + if (!mdok || !keyword || strlen(keyword) == 0) { + return name; + } + return keyword; +} + + +// Generate a skycell version of a camera configuration +bool pmConfigGenerateSkycellVersion(psMetadata *oldCameras, // Old list of camera configurations + psMetadata *newCameras, // New list of camera configurations + const char *name, // Name of original camera configuration + const psMetadata *site // Site configuration + ) +{ + assert(oldCameras); + assert(newCameras); + assert(name); + + // See if the old one is there + psMetadata *camera = psMetadataLookupMetadata(NULL, oldCameras, name); // The camera configuration + if (!camera) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Can't find camera to be skycelled in camera list."); + return false; + } + + // See if the new one is already there + psString newName = NULL; // Name of skycelled camera + psStringAppend(&newName, "_%s-SKYCELL", name); + if (psMetadataLookup(oldCameras, newName)) { + return true; + } + + psMetadata *new = psMetadataCopy(NULL, camera); // Copy of the camera description + + // Fix the FPA description to contain a single chip with single cell + { + psMetadata *fpa = psMetadataAlloc();// The FPA description + psMetadataAddStr(fpa, PS_LIST_HEAD, "SkyChip", 0, "Single chip with single cell", "SkyCell"); + psMetadataAddMetadata(new, PS_LIST_TAIL, "FPA", PS_META_REPLACE, "Description of FPA hierarchy", fpa); + psFree(fpa); + } + + // Clear out the formats, replace them with the One True Format + psMetadata *formats = psMetadataLookupMetadata(NULL, new, "FORMATS"); // The list of formats + if (!formats) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Can't find FORMATS within camera configuration."); + psFree(new); + return false; + } + while (psListLength(formats->list) > 0) { + psMetadataRemoveIndex(formats, PS_LIST_HEAD); + } + psMetadata *format = psMetadataAlloc(); // The One True Format + + { + psMetadata *rule = psMetadataAlloc(); // The RULE --- how to recognise the camera + psMetadataAddStr(rule, PS_LIST_TAIL, "PSCAMERA", 0, "Camera name", name); + psMetadataAddStr(rule, PS_LIST_TAIL, "PSFORMAT", 0, "Camera format", "SKYCELL"); + psString version = psModulesVersion(); + psMetadataAddStr(rule, PS_LIST_TAIL, "ORIGIN", 0, "File origin", version); + psFree(version); + psMetadataAddMetadata(format, PS_LIST_TAIL, "RULE", 0, "How to recognise this type of file", rule); + psFree(rule); + } + + { + psMetadata *file = psMetadataAlloc(); // The FILE --- how to read the data + psMetadataAddStr(file, PS_LIST_TAIL, "PHU", 0, "What level the FITS file represents", "FPA"); + psMetadataAddStr(file, PS_LIST_TAIL, "EXTENSIONS", 0, "What level the extensions represent", "NONE"); + psMetadataAddStr(file, PS_LIST_TAIL, "FPA.NAME", 0, "PHU keyword for unique identifier", "FPA.NAME"); + psMetadataAddMetadata(format, PS_LIST_TAIL, "FILE", 0, "How to read this type of file", file); + psFree(file); + } + + psMetadataAddStr(format, PS_LIST_TAIL, "CONTENTS", 0, "What's in this type of file", + "SkyChip:SkyCell:_skycell"); + + { + psMetadata *cells = psMetadataAlloc(); // The CELLS --- how to read the cells + psMetadata *skycell = psMetadataAlloc(); // How to read the skycell + psMetadataAddStr(skycell, PS_LIST_TAIL, "CELL.TRIMSEC", 0, "Trim section", "CELL.TRIMSEC"); + psMetadataAddStr(skycell, PS_LIST_TAIL, "CELL.BIASSEC", 0, "Bias section", "CELL.BIASSEC"); + psMetadataAddStr(skycell, PS_LIST_TAIL, "CELL.TRIMSEC.SOURCE", 0, "Source for trim section", + "HEADER"); + psMetadataAddStr(skycell, PS_LIST_TAIL, "CELL.BIASSEC.SOURCE", 0, "Source for bias section", + "HEADER"); + psMetadataAddMetadata(cells, PS_LIST_TAIL, "_skycell", 0, "Skycell specification", skycell); + psFree(skycell); + psMetadataAddMetadata(format, PS_LIST_TAIL, "CELLS", 0, "How to read the cells", cells); + psFree(cells); + } + + // Stuffing all concepts into the header, by their PS concept name (e.g., "FPA.AIRMASS"). + // (HIERARCH will take care of the long names, implemented in psLib.) + // Some people may not like this, but it's quick and easy and will do for now. + // An alternative may be provided later. + { + psMetadata *translation = psMetadataAlloc(); // The TRANSLATION --- how to read the FITS headers + + psList *concepts; // List of concepts for each level + psListIterator *iter; // Iterator for concepts + psString name; // Concept name, from iteration + + concepts = pmConceptsList(PM_FPA_LEVEL_FPA); // FPA-level concepts + iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false); + while ((name = psListGetAndIncrement(iter))) { + const char *new = skycellConceptName(name, skycellConceptsFPA, site); // Name for skycell + if (new) { + psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new); + } + } + psFree(iter); + psFree(concepts); + + concepts = pmConceptsList(PM_FPA_LEVEL_CHIP); + iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false); + while ((name = psListGetAndIncrement(iter))) { + const char *new = skycellConceptName(name, skycellConceptsChip, site); // Name for skycell + if (new) { + psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new); + } + } + psFree(iter); + psFree(concepts); + + concepts = pmConceptsList(PM_FPA_LEVEL_CELL); + iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false); + while ((name = psListGetAndIncrement(iter))) { + const char *new = skycellConceptName(name, skycellConceptsCell, site); // Name for skycell + if (new) { + psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new); + } + } + psFree(iter); + psFree(concepts); + + psMetadataAddStr(translation, PS_LIST_TAIL, "CELL.XSIZE", 0, NULL, "NAXIS1"); + psMetadataAddStr(translation, PS_LIST_TAIL, "CELL.YSIZE", 0, NULL, "NAXIS2"); + psMetadataAddStr(translation, PS_LIST_TAIL, "CELL.XWINDOW", 0, NULL, "NAXIS1"); + psMetadataAddStr(translation, PS_LIST_TAIL, "CELL.YWINDOW", 0, NULL, "NAXIS2"); + psMetadataAddStr(translation, PS_LIST_TAIL, "CHIP.XSIZE", 0, NULL, "NAXIS1"); + psMetadataAddStr(translation, PS_LIST_TAIL, "CHIP.YSIZE", 0, NULL, "NAXIS2"); + + psMetadataAddMetadata(format, PS_LIST_TAIL, "TRANSLATION", 0, "How to translate the FITS headers", + translation); + psFree(translation); + } + + { + psMetadata *defaults = psMetadataAlloc(); // Default values for concepts + + psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.XPARITY", 0, NULL, 1); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.YPARITY", 0, NULL, 1); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.XPARITY", 0, NULL, 1); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.YPARITY", 0, NULL, 1); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.Y0", 0, NULL, 0); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.X0", 0, NULL, 0); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.Y0", 0, NULL, 0); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.X0", 0, NULL, 0); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.READDIR", 0, "Read direction (rows)", 1); + + psMetadataAddMetadata(format, PS_LIST_TAIL, "DEFAULTS", 0, "Default values for concepts", defaults); + psFree(defaults); + + } + + { + psMetadata *database = psMetadataAlloc(); // Database values for concepts + psMetadataAddMetadata(format, PS_LIST_TAIL, "DATABASE", 0, "Database values for concepts", database); + psFree(database); + } + + { + psMetadata *conceptFormats = psMetadataAlloc(); // Format peculiarities for various concepts + // These are the only essential formats + psMetadataAddStr(conceptFormats, PS_LIST_TAIL, "FPA.RA", 0, "Units for RA", "HOURS"); + psMetadataAddStr(conceptFormats, PS_LIST_TAIL, "FPA.DEC", 0, "Units for RA", "DEGREES"); + psMetadataAddStr(conceptFormats, PS_LIST_TAIL, "FPA.TIME", 0, "Format for time", "MJD"); + psMetadataAddStr(conceptFormats, PS_LIST_TAIL, "CELL.TIME", 0, "Format for time", "MJD"); + + psMetadataAddMetadata(format, PS_LIST_TAIL, "FORMATS", 0, "Formats for various concepts", + conceptFormats); + psFree(conceptFormats); + } + + psMetadataAddMetadata(formats, PS_LIST_TAIL, "SKYCELL", 0, "The One True Format for skycells", format); + psFree(format); + + // New camera MUST go to the head of the metadata, so that it will be recognised first + // The old camera doesn't contain the PSCAMERA and PSFORMAT headers, so it will match anything! + psMetadataAddMetadata(newCameras, PS_LIST_HEAD, newName, PS_META_REPLACE, + "Automatically generated", new); + psFree(newName); + psFree(new); + + return true; +} + +// Generate the Chip and FPA mosaicked version of a named camera configuration +bool pmConfigCameraMosaickedVersions(psMetadata *site, // The site configuration + const char *name // Name of the un-mosaicked camera + ) +{ + PS_ASSERT_METADATA_NON_NULL(site, false); + PS_ASSERT_STRING_NON_EMPTY(name, false); + + bool mdok; // Status of MD lookup + psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras + if (!mdok || !cameras) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n"); + return false; + } + if (!pmConfigGenerateMosaickedVersion(cameras, cameras, name, PM_FPA_LEVEL_CHIP)) { + psError(PS_ERR_UNKNOWN, true, "Failed to build Chip mosaic camera description for %s\n", name); + return false; + } + if (!pmConfigGenerateMosaickedVersion(cameras, cameras, name, PM_FPA_LEVEL_FPA)) { + psError(PS_ERR_UNKNOWN, true, "Failed to build FPA mosaic camera description for %s\n", name); + return false; + } + return true; +} + +// the operation putting the new entries first is now implemented in pmConfigGenerateMosaickedVersion +// Generate the Chip and FPA mosaicked version of a named camera configuration +bool pmConfigCameraMosaickedVersionsAll(psMetadata *site) +{ + PS_ASSERT_METADATA_NON_NULL(site, false); + + bool mdok; // Status of MD lookup + psMetadata *cameras = psMetadataLookupMetadata(&mdok, site, "CAMERAS"); // List of cameras + if (!mdok || !cameras) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find CAMERAS in the site configuration.\n"); + return false; + } + + psMetadataIterator *camerasIter = psMetadataIteratorAlloc(cameras, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *camerasItem = NULL; // Item from iteration + psMetadata *new = psMetadataAlloc();// New cameras to add + while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) { + assert(camerasItem->type == PS_DATA_METADATA); // Only metadata are allowed here! + if (!pmConfigGenerateMosaickedVersion(cameras, new, camerasItem->name, PM_FPA_LEVEL_CHIP)) { + psError(PS_ERR_UNKNOWN, true, "Failed to build Chip mosaic camera description for %s\n", camerasItem->name); + return false; + } + if (!pmConfigGenerateMosaickedVersion(cameras, new, camerasItem->name, PM_FPA_LEVEL_FPA)) { + psError(PS_ERR_UNKNOWN, true, "Failed to build FPA mosaic camera description for %s\n", camerasItem->name); + return false; + } + } + psFree(camerasIter); + + // Now put the new cameras at the top of the list of cameras, so they get recognised first + // Note: going from the top, and putting everything to the top as we get there, so that the last one on + // goes to the top. This preserves the original order of the cameras, putting the mosaicked versions + // before the originals. + camerasIter = psMetadataIteratorAlloc(new, PS_LIST_HEAD, NULL); // Iterator + while ((camerasItem = psMetadataGetAndIncrement(camerasIter))) { + psMetadataAddItem(cameras, camerasItem, PS_LIST_HEAD, 0); + } + psFree(camerasIter); + psFree(new); + + return true; +} + +// Generate a mosaicked version of a camera configuration +bool pmConfigGenerateMosaickedVersion(psMetadata *oldCameras, // Old list of camera configurations + psMetadata *newCameras, // New list of camera configurations + const char *name, // Name of original camera configuration + pmFPALevel mosaicLevel // Level to which we are mosaicking + ) +{ + assert(oldCameras); + assert(newCameras); + assert(name); + assert(mosaicLevel == PM_FPA_LEVEL_CHIP || mosaicLevel == PM_FPA_LEVEL_FPA); + + // Don't generate a mosaicked version of a skycell + if (name[0] == '_' && strlen(name) > 9 && strcmp(name + strlen(name) - 8, "-SKYCELL") == 0) { + return true; + } + + // See if the old one is there + psMetadata *camera = psMetadataLookupMetadata(NULL, oldCameras, name); // The camera configuration + if (!camera) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Can't find camera to be mosaicked in camera list."); + return false; + } + + // See if the new one is already there + psString newName = NULL; // Name of mosaicked camera + psStringAppend(&newName, "_%s-%s", name, mosaicLevel == PM_FPA_LEVEL_CHIP ? "CHIP" : "FPA"); + if (psMetadataLookup(oldCameras, newName)) { + return true; + } + + psMetadata *new = psMetadataCopy(NULL, camera); // Copy of the camera description + bool mdok; // Status of MD lookups + + // ** Fix up the contents of the FPA description to match the mosaicked camera ** + // select the FPA description + psMetadata *fpa = psMetadataLookupMetadata(NULL, new, "FPA"); // FPA in the camera configuration + if (!fpa) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Can't find FPA within camera configuration."); + psFree(new); + return false; + } + switch (mosaicLevel) { + // For CHIP mosaic, replace the contents of each chip with a single cell + case PM_FPA_LEVEL_CHIP: { + psMetadataIterator *fpaIter = psMetadataIteratorAlloc(fpa, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *fpaItem = NULL; // Item from iteration + while ((fpaItem = psMetadataGetAndIncrement(fpaIter))) { + if (fpaItem->type != PS_DATA_STRING) { + psError(PS_ERR_UNKNOWN, true, "Element %s within FPA in camera configuration is not of type STR.", + fpaItem->name); + psFree(new); + return false; + } + + psFree(fpaItem->data.str); + fpaItem->data.str = psStringCopy("MosaickedCell"); + psFree(fpaItem->comment); + fpaItem->comment = psStringCopy("Mosaicked cell; automatically generated"); + } + psFree(fpaIter); + break; + } + // For FPA mosaic, replace the contents of the FPA with a single chip containing a single cell + case PM_FPA_LEVEL_FPA: { + while (psListLength(fpa->list) > 0) { + psMetadataRemoveIndex(fpa, PS_LIST_TAIL); + } + + psMetadataAddStr(fpa, PS_LIST_HEAD, "MosaickedChip", 0, + "Mosaicked chip with mosaicked cell; automatically generated", + "MosaickedCell"); + break; + } + default: + psAbort("Should never get here.\n"); + } + + // ** Update the camera formats : add a new (mosaicked) format for each existing camera format ** + // select the list of all camera formats + psMetadata *formats = psMetadataLookupMetadata(NULL, new, "FORMATS"); // FORMATS in the configuration + assert(formats); // It had better be there --- we've already read them in + // loop over each of the formats + psMetadataIterator *formatsIter = psMetadataIteratorAlloc(formats, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *formatsItem = NULL; // Item from iteration + while ((formatsItem = psMetadataGetAndIncrement(formatsIter))) { + assert(formatsItem->type == PS_DATA_METADATA); // We should have read it by now! + psMetadata *format = formatsItem->data.V; // The camera format + + // Add a new RULE which uniquely describes the mosaicked format. this is needed so + // that when a mosaic is written to a FITS file, it can be recognised again when read. + psMetadata *rule = psMetadataLookupMetadata(NULL, format, "RULE"); // Way to identify format from PHU + if (!rule) { + // a camera format without a rule is not allowed. + psError(PS_ERR_UNKNOWN, false, "Camera format %s has no RULE", formatsItem->name); + return false; + } + + // the new rule is supplemented by the mosaicLevel + switch (mosaicLevel) { + case PM_FPA_LEVEL_CHIP: + psMetadataAddStr(rule, PS_LIST_TAIL, "PSMOSAIC", 0, "Mosaicked level", "CHIP"); + break; + case PM_FPA_LEVEL_FPA: + psMetadataAddStr(rule, PS_LIST_TAIL, "PSMOSAIC", 0, "Mosaicked level", "FPA"); + break; + default: + psAbort("Should never get here.\n"); + } + + // Fix the FILE information: need to fix the levels for the PHU and EXTENSIONS. + // both of these elements are required in the format; we raise an error if they are not found + // If EXTENSIONS is NONE, then we need to change the CONTENT specifier to point to the chip name. + psMetadata *file = psMetadataLookupMetadata(NULL, format, "FILE"); // File information + if (!file) { + psError(PS_ERR_UNKNOWN, false, "Camera format %s has no FILE", formatsItem->name); + return false; + } + psMetadataItem *phuItem = psMetadataLookup(file, "PHU"); // PHU level + if (!phuItem || phuItem->type != PS_DATA_STRING) { + psError(PS_ERR_UNKNOWN, false, "Camera format %s is missing PHU in the FILE information", formatsItem->name); + return false; + } + psMetadataItem *extensionsItem = psMetadataLookup(file, "EXTENSIONS"); // Extensions level + if (!extensionsItem || extensionsItem->type != PS_DATA_STRING) { + psError(PS_ERR_UNKNOWN, false, "Camera format %s is missing EXTENSIONS in the FILE information", formatsItem->name); + return false; + } + + // mosaicLevel == CHIP: + // Case PHU EXTENSIONS Modifications + // ==== === ========== =========== + // 1. FPA CHIP NONE + // 2. FPA CELL EXT->CHIP + // 3. FPA NONE NONE + // 4. CHIP CELL EXT->NONE + // 5. CHIP NONE NONE + // 6. CELL NONE PHU->CHIP + // possible outcomes: + // FPA CHIP + // FPA NONE + // CHIP NONE + + // mosaicLevel == FPA: + // Case PHU EXTENSIONS Modifications + // ==== === ========== =========== + // 1. FPA CHIP EXT->NONE + // 2. FPA CELL EXT->NONE + // 3. FPA NONE NONE + // 4. CHIP CELL PHU->FPA, EXT->NONE + // 5. CHIP NONE PHU->FPA + // 6. CELL NONE PHU->FPA + // possible outcomes: + // FPA NONE + + // modify the values of phuItem and extensionsItem + switch (mosaicLevel) { + case PM_FPA_LEVEL_CHIP: + if (!strcasecmp(phuItem->data.str, "FPA") && !strcasecmp(extensionsItem->data.str, "CHIP")) { + break; + } + if (!strcasecmp(phuItem->data.str, "FPA") && !strcasecmp(extensionsItem->data.str, "CELL")) { + psFree(extensionsItem->data.str); + extensionsItem->data.str = psStringCopy("CHIP"); + break; + } + if (!strcasecmp(phuItem->data.str, "FPA") && !strcasecmp(extensionsItem->data.str, "NONE")) { + break; + } + if (!strcasecmp(phuItem->data.str, "CHIP") && !strcasecmp(extensionsItem->data.str, "CELL")) { + psFree(extensionsItem->data.str); + extensionsItem->data.str = psStringCopy("NONE"); + break; + } + if (!strcasecmp(phuItem->data.str, "CHIP") && !strcasecmp(extensionsItem->data.str, "NONE")) { + break; + } + if (!strcasecmp(phuItem->data.str, "CELL") && !strcasecmp(extensionsItem->data.str, "NONE")) { + psFree(phuItem->data.str); + phuItem->data.str = psStringCopy("CHIP"); + break; + } + psAbort ("should not reach here"); + + case PM_FPA_LEVEL_FPA: + if (!strcasecmp(phuItem->data.str, "FPA") && !strcasecmp(extensionsItem->data.str, "CHIP")) { + psFree(extensionsItem->data.str); + extensionsItem->data.str = psStringCopy("NONE"); + break; + } + if (!strcasecmp(phuItem->data.str, "FPA") && !strcasecmp(extensionsItem->data.str, "CELL")) { + psFree(extensionsItem->data.str); + extensionsItem->data.str = psStringCopy("NONE"); + break; + } + if (!strcasecmp(phuItem->data.str, "FPA") && !strcasecmp(extensionsItem->data.str, "NONE")) { + break; + } + if (!strcasecmp(phuItem->data.str, "CHIP") && !strcasecmp(extensionsItem->data.str, "CELL")) { + psFree(phuItem->data.str); + phuItem->data.str = psStringCopy("FPA"); + psFree(extensionsItem->data.str); + extensionsItem->data.str = psStringCopy("NONE"); + break; + } + if (!strcasecmp(phuItem->data.str, "CHIP") && !strcasecmp(extensionsItem->data.str, "NONE")) { + psFree(phuItem->data.str); + phuItem->data.str = psStringCopy("FPA"); + break; + } + if (!strcasecmp(phuItem->data.str, "CELL") && !strcasecmp(extensionsItem->data.str, "NONE")) { + psFree(phuItem->data.str); + phuItem->data.str = psStringCopy("FPA"); + break; + } + psAbort ("should not reach here"); + + default: + psAbort("Should never get here.\n"); + } + +#if 0 + // XXXX when do I need to adjust the value of CONTENT, CELL.NAME, CHIP.NAME? + + // Don't need a "CONTENT" to identify the content! + if (psMetadataLookup(file, "CONTENT")) { + psMetadataRemoveKey(file, "CONTENT"); + } + psMetadataAddStr(file, PS_LIST_TAIL, "CONTENT", PS_META_REPLACE, "Key to CONTENTS menu", + "{CHIP.NAME}"); + // Don't need CELL.NAME for chip-mosaicked camera + if (psMetadataLookup(file, "CELL.NAME")) { + psMetadataRemoveKey(file, "CELL.NAME"); + } + // Don't need CHIP.NAME or CELL.NAME for fpa-mosaicked camera + if (psMetadataLookup(file, "CHIP.NAME")) { + psMetadataRemoveKey(file, "CHIP.NAME"); + } + if (psMetadataLookup(file, "CELL.NAME")) { + psMetadataRemoveKey(file, "CELL.NAME"); + } +#endif + + // Fix up the CONTENTS to contain only the mosaicked cell for each chip + switch (mosaicLevel) { + case PM_FPA_LEVEL_FPA: + psMetadataAddStr(format, PS_LIST_TAIL, TABLE_OF_CONTENTS, PS_META_REPLACE, NULL, + "MosaickedChip:MosaickedCell:_mosaic"); + break; + case PM_FPA_LEVEL_CHIP: + if (!strcasecmp(phuItem->data.str, "FPA") && !strcasecmp(extensionsItem->data.str, "CHIP")) { + // ensure the value of CONTENT in the FILE section has the right value + psMetadataAddStr(file, PS_LIST_TAIL, "CONTENT", PS_META_REPLACE, "Key to CONTENTS menu", "{CHIP.NAME}"); + + // List the chipName:chipType for each chip. + psMetadata *contents = psMetadataAlloc(); // List of contents, with chipName:chipType + + psMetadataIterator *fpaIter = psMetadataIteratorAlloc(fpa, PS_LIST_HEAD, NULL); // Iteratr + psMetadataItem *fpaItem; // Item from iteration + while ((fpaItem = psMetadataGetAndIncrement(fpaIter))) { + assert (fpaItem->type == PS_DATA_STRING); + psString content = NULL; // Content to add + psStringAppend(&content, "%s:_mosaicChip ", fpaItem->name); + psMetadataAddStr(contents, PS_LIST_TAIL, fpaItem->name, 0, NULL, content); + psFree(content); + } + psFree(fpaIter); + psMetadataAddMetadata(format, PS_LIST_TAIL, TABLE_OF_CONTENTS, PS_META_REPLACE, + "List of contents", contents); + psFree(contents); + + psMetadata *chips = psMetadataAlloc(); // List of chip types, with cellName:cellType + psMetadataAddStr(chips, PS_LIST_TAIL, "_mosaicChip", 0, NULL, + "MosaickedCell:_mosaic"); + psMetadataAddMetadata(format, PS_LIST_TAIL, CHIP_TYPES, PS_META_REPLACE, + "List of chip types", chips); + psFree(chips); + break; + } + if (!strcasecmp(phuItem->data.str, "FPA") && !strcasecmp(extensionsItem->data.str, "NONE")) { + // List the contents on a single line + psString contentsLine = NULL; // Contents of the PHU + psMetadataIterator *fpaIter = psMetadataIteratorAlloc(fpa, PS_LIST_HEAD, NULL); // Iteratr + psMetadataItem *fpaItem; // Item from iteration + while ((fpaItem = psMetadataGetAndIncrement(fpaIter))) { + assert (fpaItem->type == PS_DATA_STRING); + psStringAppend(&contentsLine, "%s:MosaickedCell:_mosaic ", fpaItem->name); + } + psFree(fpaIter); + psMetadataAddStr(format, PS_LIST_TAIL, TABLE_OF_CONTENTS, PS_META_REPLACE, + NULL, contentsLine); + psFree(contentsLine); + break; + } + if (!strcasecmp(phuItem->data.str, "CHIP") && !strcasecmp(extensionsItem->data.str, "NONE")) { + // XXX recode this to match the structure above (FPA/CHIP)? + // select and remove the old contents + psMetadata *contents = psMetadataLookupMetadata(NULL, format, TABLE_OF_CONTENTS); // File contents + if (!contents) { + psError(PS_ERR_UNKNOWN, false, "Couldn't find %s in the camera format %s.\n", + TABLE_OF_CONTENTS, formatsItem->name); + return false; + } + while (psListLength(contents->list) > 0) { + psMetadataRemoveIndex(contents, PS_LIST_TAIL); + } + + // update with the new contents + psMetadataIterator *fpaIter = psMetadataIteratorAlloc(fpa, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *fpaItem; // Item from iteration + while ((fpaItem = psMetadataGetAndIncrement(fpaIter))) { + assert (fpaItem->type == PS_DATA_STRING); + psMetadataAddStr(contents, PS_LIST_TAIL, fpaItem->name, 0, NULL, "_mosaicChip"); + } + psFree(fpaIter); + + psMetadata *chips = psMetadataAlloc(); // List of chip types, with cellName:cellType + psMetadataAddStr(chips, PS_LIST_TAIL, "_mosaicChip", 0, NULL, + "MosaickedCell:_mosaic"); + psMetadataAddMetadata(format, PS_LIST_TAIL, CHIP_TYPES, PS_META_REPLACE, + "List of chip types", chips); + psFree(chips); + break; + } + default: + psAbort("Should never get here.\n"); + } + + // Fix the cell type + psMetadata *cells = psMetadataLookupMetadata(NULL, format, CELL_TYPES); // CELLS information + if (!cells) { + psError(PS_ERR_UNKNOWN, false, "Couldn't find CELLS of type METADATA in the camera format %s.\n", formatsItem->name); + return false; + } + psMetadata *cell = psMetadataAlloc(); // Cell information + psMetadataAddStr(cell, PS_LIST_TAIL, "CELL.TRIMSEC", 0, "Trim section", "TRIMSEC"); + psMetadataAddStr(cell, PS_LIST_TAIL, "CELL.BIASSEC", 0, "Bias section", "BIASSEC"); + psMetadataAddStr(cell, PS_LIST_TAIL, "CELL.TRIMSEC.SOURCE", 0, "Trim section source", "HEADER"); + psMetadataAddStr(cell, PS_LIST_TAIL, "CELL.BIASSEC.SOURCE", 0, "Bias section source", "HEADER"); + psMetadataAddMetadata(cells, PS_LIST_HEAD, "_mosaic", PS_META_REPLACE, "Mosaic cell information", cell); + psFree(cell); // Drop reference + + // Update the concepts, so that they are all stored in the FITS headers, under headers of the same + // name as the concept + psMetadata *database = psMetadataLookupMetadata(&mdok, format, "DATABASE"); // DATABASE concepts + psMetadata *defaults = psMetadataLookupMetadata(&mdok, format, "DEFAULTS"); // DEFAULTS concepts + if (!mdok || !defaults) { + psWarning("Couldn't find DEFAULTS of type METADATA in the camera format %s.\n", + formatsItem->name); + continue; + } + psMetadata *translation = psMetadataLookupMetadata(&mdok, format, "TRANSLATION"); // TRANSLATION info + if (!mdok || !translation) { + psWarning("Couldn't find TRANSLATION of type METADATA in the camera format %s.\n", + formatsItem->name); + continue; + } + + removeCellConceptsSources(translation); + removeCellConceptsSources(database); + removeCellConceptsSources(defaults); + + // Add in the positioning concepts + psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.XPARITY", 0, NULL, 1); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.YPARITY", 0, NULL, 1); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.X0", 0, NULL, 0); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CELL.Y0", 0, NULL, 0); + if (formats) { + if (psMetadataLookup(formats, "CELL.X0")) { + psMetadataRemoveKey(formats, "CELL.X0"); + } + if (psMetadataLookup(formats, "CELL.Y0")) { + psMetadataRemoveKey(formats, "CELL.Y0"); + } + } + + if (mosaicLevel == PM_FPA_LEVEL_FPA) { + removeChipConceptsSources(translation); + removeChipConceptsSources(database); + removeChipConceptsSources(defaults); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.XPARITY", 0, NULL, 1); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.YPARITY", 0, NULL, 1); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.X0", 0, NULL, 0); + psMetadataAddS32(defaults, PS_LIST_TAIL, "CHIP.Y0", 0, NULL, 0); + if (formats) { + if (psMetadataLookup(formats, "CHIP.X0")) { + psMetadataRemoveKey(formats, "CHIP.X0"); + } + if (psMetadataLookup(formats, "CHIP.Y0")) { + psMetadataRemoveKey(formats, "CHIP.Y0"); + } + } + } + + } + psFree(formatsIter); + + // New camera MUST go to the head of the metadata, so that it will be recognised first + // The old camera doesn't contain the PSMOSAIC header, so it will match anything! + psMetadataAddMetadata(newCameras, PS_LIST_HEAD, newName, PS_META_REPLACE, + "Automatically generated", new); + psFree(newName); + psFree(new); + + return true; +} + +/*** Helper Functions ***/ + +// Remove a concept from the list of sources. Need to check to see if it exists first, to avoid a warning. +static void removeConcept(psMetadata *source, // Source from which to remove concept + const char *concept // Concept name to remove + ) +{ + assert(source); + assert(concept && strlen(concept) > 0); + + if (psMetadataLookup(source, concept)) { + psMetadataRemoveKey(source, concept); + } + + return; +} + +// Remove certain concepts from the list of sources. These concepts are important in the mosaicking process, +// and are added explicitly to the defaults (elsewhere) so that the user can't get them wrong. +static void removeCellConceptsSources(psMetadata *source // Source for concepts + ) +{ + if (!source) { + return; + } + + removeConcept(source, "CELL.BIASSEC"); + removeConcept(source, "CELL.TRIMSEC"); + removeConcept(source, "CELL.XPARITY"); + removeConcept(source, "CELL.YPARITY"); + removeConcept(source, "CELL.X0"); + removeConcept(source, "CELL.Y0"); + + // For the sake of the defaults, include the .DEPEND + removeConcept(source, "CELL.XPARITY.DEPEND"); + removeConcept(source, "CELL.YPARITY.DEPEND"); + removeConcept(source, "CELL.X0.DEPEND"); + removeConcept(source, "CELL.Y0.DEPEND"); + + return; +} + +// Remove certain concepts from the list of sources. These concepts are important in the mosaicking process, +// and are added explicitly to the defaults (elsewhere) so that the user can't get them wrong. +static void removeChipConceptsSources(psMetadata *source // Source for concepts + ) +{ + if (!source) { + return; + } + + removeConcept(source, "CHIP.XPARITY"); + removeConcept(source, "CHIP.YPARITY"); + removeConcept(source, "CHIP.X0"); + removeConcept(source, "CHIP.Y0"); + + // For the sake of the defaults, include the .DEPEND + removeConcept(source, "CHIP.XPARITY.DEPEND"); + removeConcept(source, "CHIP.YPARITY.DEPEND"); + removeConcept(source, "CHIP.X0.DEPEND"); + removeConcept(source, "CHIP.Y0.DEPEND"); + + return; +} Index: /branches/pap_branch_070920/psModules/src/config/pmConfigCamera.h =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfigCamera.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfigCamera.h (revision 14957) @@ -0,0 +1,52 @@ +/* @file pmConfigCamera.h + * @brief Camera Configuration functions + * + * @author Paul Price, IfA + * @author Eugene Magnier, IfA + * + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-08-14 00:17:40 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_CONFIG_CAMERA_H +#define PM_CONFIG_CAMERA_H + +/// @addtogroup Config Configuration System +/// @{ + +// Generate a skycell version of a camera configuration +bool pmConfigGenerateSkycellVersion(psMetadata *oldCameras, // Old list of camera configurations + psMetadata *newCameras, // New list of camera configurations + const char *name, // Name of original camera configuration + const psMetadata *site // The site configuration + ); + +/// Generate the skycell version of a particular camera configuration +bool pmConfigCameraSkycellVersion(psMetadata *site, // The site configuration + const char *name // Name of the un-mosaicked camera + ); + + +/// Generate skycell versions of all the camera configurations +bool pmConfigCameraSkycellVersionsAll(psMetadata *site // Site configuration + ); + +// Generate a mosaicked version of a camera configuration +bool pmConfigGenerateMosaickedVersion(psMetadata *oldCameras, // Old list of camera configurations + psMetadata *newCameras, // New list of camera configurations + const char *name, // Name of original camera configuration + pmFPALevel mosaicLevel // Level to which we are mosaicking + ); + +/// Generate the chip mosaicked version of a particular camera configuration +bool pmConfigCameraMosaickedVersions(psMetadata *site, // Site configuration + const char *name // Name of the un-mosaicked camera + ); + +/// Generate chip- and fpa-mosaicked versions of all the camera configurations +bool pmConfigCameraMosaickedVersionsAll(psMetadata *site // Site configuration + ); + +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/config/pmConfigCommand.c =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfigCommand.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfigCommand.c (revision 14957) @@ -0,0 +1,59 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include "pmConfig.h" +#include "pmConfigCommand.h" + +bool pmConfigDatabaseCommand(psString *command, const pmConfig *config) +{ + PS_ASSERT_PTR_NON_NULL(command, false); + + bool mdok; // Status of MD lookup + const char *dbserver = psMetadataLookupStr(&mdok, config->site, "DBSERVER"); // Database server + if (!mdok || strlen(dbserver) == 0) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find DBSERVER in site configuration.\n"); + return NULL; + } + const char *dbname = psMetadataLookupStr(&mdok, config->site, "DBNAME"); // Database name + if (!mdok || strlen(dbname) == 0) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find DBNAME in site configuration.\n"); + return NULL; + } + const char *dbuser = psMetadataLookupStr(&mdok, config->site, "DBUSER"); // Database user + if (!mdok || strlen(dbuser) == 0) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find DBUSER in site configuration.\n"); + return NULL; + } + const char *dbpassword = psMetadataLookupStr(&mdok, config->site, "DBPASSWORD"); // Database password + if (!mdok || strlen(dbpassword) == 0) { + psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find DBPASSWORD in site configuration.\n"); + return NULL; + } + + psStringAppend(command, " -dbserver %s -dbname %s -dbuser %s -dbpassword %s", + dbserver, dbname, dbuser, dbpassword); + + return true; +} + + +bool pmConfigTraceCommand(psString *command) +{ + PS_ASSERT_PTR_NON_NULL(command, false); + + psMetadata *levels = psTraceLevels(); // Metadata levels + psMetadataIterator *iter = psMetadataIteratorAlloc(levels, PS_LIST_HEAD, NULL); // Iterator for levels + psMetadataItem *item; // Item from iteration + while ((item = psMetadataGetAndIncrement(iter))) { + assert(item->type == PS_TYPE_S32); + psStringAppend(command, " -trace %s %d", item->name, item->data.S32); + } + psFree(iter); + psFree(levels); + + return true; +} Index: /branches/pap_branch_070920/psModules/src/config/pmConfigCommand.h =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfigCommand.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfigCommand.h (revision 14957) @@ -0,0 +1,16 @@ +#ifndef PM_CONFIG_COMMAND_H +#define PM_CONFIG_COMMAND_H + +/// Extend a command-line to include the necessary database flags +/// +/// The command-line is extended with -dbserver, -dbname, -dbuser, -dbpassword +bool pmConfigDatabaseCommand(psString *command, ///< Command to extend + const pmConfig *config ///< Configuration + ); + +/// Extend a command-line to propagate the trace flags +/// +/// The command-line is extended with -trace +bool pmConfigTraceCommand(psString *command ///< Command to extend + ); +#endif Index: /branches/pap_branch_070920/psModules/src/config/pmConfigMask.c =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfigMask.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfigMask.c (revision 14957) @@ -0,0 +1,40 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include "pmConfigMask.h" + + +psMaskType pmConfigMask(const char *masks, const pmConfig *config) +{ + PS_ASSERT_STRING_NON_EMPTY(masks, 0); + + psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, "MASKS"); // The recipe + if (!recipe) { + psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find MASKS recipe."); + return 0; + } + + psMaskType mask = 0; // Mask value, to return + + psArray *names = psStringSplitArray(masks, " ,;", false); // Array of symbolic names + for (int i = 0; i < names->n; i++) { + const char *name = names->data[i]; // Symbolic name of interest + bool mdok; // Status of MD lookup + psMaskType value = psMetadataLookupU8(&mdok, recipe, name); + if (!mdok) { + psError(PS_ERR_BAD_PARAMETER_VALUE, false, + "Unable to find mask value for %s in MASK recipe", name); + psFree(names); + return 0; + } + mask |= value; + } + psFree(names); + + return mask; +} Index: /branches/pap_branch_070920/psModules/src/config/pmConfigMask.h =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfigMask.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfigMask.h (revision 14957) @@ -0,0 +1,30 @@ +/* @file pmConfigMask.h + * @brief Mask configuration functions + * + * @author Paul Price, IfA + * + * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-06-02 03:51:03 $ + * Copyright 2007 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_CONFIG_MASK_H +#define PM_CONFIG_MASK_H + +#include +#include + +#define PM_MASKS_RECIPE "MASKS" + +/// @addtogroup Config Configuration System +/// @{ + +/// Return a mask value given a list of symbolic names +/// +/// The mask values are derived from the MASKS recipe +psMaskType pmConfigMask(const char *masks, ///< List of symbolic names, space/comma delimited + const pmConfig *config ///< Configuration + ); + + +#endif Index: /branches/pap_branch_070920/psModules/src/config/pmConfigRecipes.c =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfigRecipes.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfigRecipes.c (revision 14957) @@ -0,0 +1,548 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include /* for strn?casecmp */ +#include +#include +#include +#include +#include +#include +#include +#include "pmConfig.h" +#include "pmConfigRecipes.h" + +static bool loadRecipeSite(bool *status, pmConfig *config, psMetadata *source); +static bool loadRecipeCamera(bool *status, pmConfig *config, psMetadata *source); +static bool loadRecipeFromArguments(bool *status, pmConfig *config); +static bool loadRecipeSymbols(bool *status, pmConfig *config); +static bool loadRecipeOptions(bool *status, pmConfig *config); + +// use this function to select the options structure for the specified recipe +// add additional command-line options to this metadata (before parsing the camera) +psMetadata *pmConfigRecipeOptions (pmConfig *config, char *recipeName) +{ + bool success; + + // select or create the OPTIONS folder + psMetadata *options = psMetadataLookupMetadata(&success, config->arguments, "OPTIONS"); + if (!options) { + options = psMetadataAlloc (); + success = psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "OPTIONS", PS_DATA_METADATA, "", options); + assert (success); // type mismatch : OPTIONS already defined but wrong type + psFree (options); // drop extra reference + } + + // look for the recipe defined in recipes + // if the recipe is already defined in config->arguments:OPTIONS, supplement + // save the recipe options onto config->arguments:RECIPES + psMetadata *recipe = psMetadataLookupMetadata(&success, options, recipeName); + if (!recipe) { + recipe = psMetadataAlloc(); + success = psMetadataAddPtr(options, PS_LIST_TAIL, recipeName, PS_DATA_METADATA, "", recipe); + assert (success); // type mismatch : OPTIONS already defined but wrong type + psFree (recipe); // drop extra reference + } + return recipe; +} + +// this function may be called several times. it attempts to load the recipe data from one of +// three locations: config->site, config->camera, and argv. We cannot read the recipes +// from config->camera until a camera has been read BUT, the argv recipes must override the +// camera and site recipes. +bool pmConfigReadRecipes(pmConfig *config, pmRecipeSource source) +{ + bool status; + PS_ASSERT_PTR_NON_NULL(config, false); + + if (!config->recipes) { + config->recipes = psMetadataAlloc(); + } + + // Read the recipe file names from the site configuration and camera configuration + // It is an error for config->site:recipes not to exist. all programs install their + // master recipe files in the site:recipe location when they are built. + if (config->site && (source & PM_RECIPE_SOURCE_SITE)) { + if (!loadRecipeSite(&status, config, config->site)) { + psError(PS_ERR_IO, false, "Failed to read recipes from site config"); + return false; + } + psTrace ("psModules.config", 3, "read recipes from site config"); + } + + // camera-specific recipes are not required : note the absence with a message + // camera-specific recipes may be read for a specified camera (in pmConfigRead) or + // for an identified camera (in pmConfigCameraFormatFromHeader). the second + // set should not override the first set + if (config->camera && (source & PM_RECIPE_SOURCE_CAMERA) && !(config->recipesRead & PM_RECIPE_SOURCE_CAMERA)) { + if (!loadRecipeCamera(&status, config, config->camera)) { + psError(PS_ERR_IO, false, "Failed to read recipes from camera config"); + return false; + } + if (status) { + psTrace ("psModules.config", 3, "read recipes from camera config"); + } else { + psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by camera config"); + } + } + + // apply recipes loaded into config->arguments based on command-line arguments + if (config->arguments && (source & PM_RECIPE_SOURCE_CL)) { + if (!loadRecipeFromArguments(&status, config)) { + psError(PS_ERR_IO, false, "Failed to read recipes from command-line arguments"); + return false; + } + if (status) { + psTrace ("psModules.config", 3, "read recipes from command-line arguments"); + } else { + psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments"); + } + if (!loadRecipeSymbols(&status, config)) { + psError(PS_ERR_IO, false, "Failed to read recipes from symbolic references"); + return false; + } + if (status) { + psTrace ("psModules.config", 3, "read recipes from symbolic references"); + } else { + psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied by symbolic reference"); + } + if (!loadRecipeOptions(&status, config)) { + psError(PS_ERR_IO, false, "Failed to read recipes from symbolic references"); + return false; + } + if (status) { + psTrace ("psModules.config", 3, "read recipes from command-line arguments"); + } else { + psLogMsg ("psModules.config", PS_LOG_DETAIL, "no recipe supplied on command-line arguments"); + } + } + return true; +} + +// search for options of the form -D KEY VALUE or -D RECIPE:KEY VALUE +bool pmConfigLoadRecipeOptions (int *argc, char **argv, pmConfig *config, char *flag) +{ + bool success; + int argNum; + + // save the recipes onto config->arguments:RECIPES + // increment so we can free below (is a NOP if 'options' is NULL) + psMetadata *options = psMetadataLookupMetadata(&success, config->arguments, "OPTIONS"); + if (!options) { + options = psMetadataAlloc(); + success = psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "OPTIONS", PS_DATA_METADATA, "Command-line options specified with -D", options); + assert (success); // type mismatch : OPTIONS already defined but wrong type + psFree (options); // drop extra reference + } + + // -D key value (all added as string) + while ((argNum = psArgumentGet (*argc, argv, flag))) { + psArgumentRemove (argNum, argc, argv); + + // do we have enough arguments? + if (argNum + 1 >= *argc) { + psError(PS_ERR_IO, true, "insufficient parameters for command-line argument -D"); + return false; + } + + // is a target recipe specified? + const char *recipeName = NULL; + char *key; + psArray *words = psStringSplitArray(argv[argNum], ":", false); + switch (words->n) { + case 1: + recipeName = config->defaultRecipe; + if (!config->defaultRecipe) { + psError(PS_ERR_IO, true, "syntax error in parameter: no default recipe available; must specify recipe"); + return false; + } + key = words->data[0]; + break; + case 2: + recipeName = words->data[0]; + key = words->data[1]; + break; + default: + psError(PS_ERR_IO, true, "syntax error in parameter"); + return false; + } + + // if this recipe is already defined in options, supplement + psMetadata *recipe = psMetadataLookupMetadata(&success, options, recipeName); + if (!recipe) { + recipe = psMetadataAlloc(); + success = psMetadataAddPtr(options, PS_LIST_TAIL, recipeName, PS_DATA_METADATA, "", recipe); + assert (success); // type mismatch : recipe already defined but wrong type + psFree (recipe); // drop extra reference + } + + bool valid = false; + if (!strcmp (flag, "-D")) { + psMetadataAddStr (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", argv[argNum+1]); + valid = true; + } + if (!strcmp (flag, "-Di")) { + psMetadataAddS32 (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", atoi(argv[argNum+1])); + valid = true; + } + if (!strcmp (flag, "-Df")) { + psMetadataAddF32 (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", atof(argv[argNum+1])); + valid = true; + } + if (!strcmp (flag, "-Db")) { + if (!strcasecmp (argv[argNum+1], "true")) { + psMetadataAddBool (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", true); + } else { + psMetadataAddBool (recipe, PS_LIST_TAIL, key, PS_META_REPLACE, "", false); + } + valid = true; + } + psFree (words); + assert (valid); // flag may be: -D, -Df, -Di, -Db + + psArgumentRemove (argNum, argc, argv); + psArgumentRemove (argNum, argc, argv); + } + return true; +} + +// examine command-line arguments for -recipe KEY VALUE +// if VALUE is an existing file, read as metadata and save on config->arguments with name = KEY +// if VALUE is not an exiting file, it is a symbolic lookup: it is saved on config->recipeSymbols +// for later interpolation (pmConfigReadRecipes with option CL) +bool pmConfigLoadRecipeArguments (int *argc, char **argv, pmConfig *config) +{ + bool success; + + psMetadata *recipes = psMetadataLookupMetadata(&success, config->arguments, "RECIPES"); + if (!recipes) { + recipes = psMetadataAlloc(); + success = psMetadataAddPtr (config->arguments, PS_LIST_TAIL, "RECIPES", PS_DATA_METADATA, "", recipes); + assert (success); + psFree (recipes); + } + + // Go through the command-line arguments + int argNum; // Argument number for "-recipe" + while ((argNum = psArgumentGet(*argc, argv, "-recipe")) > 0) { + psArgumentRemove(argNum, argc, argv); + if (argNum + 1 >= *argc) { + psError(PS_ERR_IO, false, "-recipe command-line switch provided without the required recipe and source\n"); + return false; + } + + char *recipeName = psStringCopy(argv[argNum]); // Name of the recipe + psArgumentRemove(argNum, argc, argv); + char *recipeSource = psStringCopy(argv[argNum]); // Source of the recipe + psArgumentRemove(argNum, argc, argv); + + if (access(recipeSource, R_OK) == 0) { + // The source is a file: load onto config->arguments + // save the recipes onto config->arguments:RECIPES + + psMetadata *recipe = NULL; // Recipe from file + if (pmConfigFileRead(&recipe, recipeSource, "recipe")) { + psString comment = psStringCopy("Recipe added at command line from "); + psStringAppend(&comment, "%s", recipeSource); + psMetadataAdd(recipes, PS_LIST_TAIL, recipeName, PS_DATA_METADATA | PS_META_REPLACE, + comment, recipe); + psFree(comment); + psFree(recipe); // Drop reference + } else { + psAbort("error reading config file %s\n", recipeSource); + } + } else { + // Assume it's a symbolic reference to something that's not yet read in. + // it will be loaded later by pmConfigReadRecipes with option CL + psMetadataAddStr(config->recipeSymbols, PS_LIST_TAIL, recipeName, PS_META_REPLACE, "", + recipeSource); + } + psTrace ("psModules.config", 3, "read recipe %s from %s", recipeName, recipeSource); + psFree(recipeName); + psFree(recipeSource); + } // Iterating through the command-line arguments + + return true; +} + +// Load the recipe files for SITE : REQUIRED +static bool loadRecipeSite(bool *status, + pmConfig *config, // The configuration into which to read the recipes + psMetadata *source // The source configuration, from which to read the filenames + ) +{ + assert(status); + assert(config); + *status = false; + + if (!source) { + psError(PS_ERR_IO, true, "The site configuration has not been read --- cannot read recipes from this location.\n"); + config->recipesRead &= ~PM_RECIPE_SOURCE_SITE; + return false; + } + + psMetadata *recipes = psMetadataLookupMetadata(NULL, source, "RECIPES"); // The list of recipes + if (!recipes) { + psError(PS_ERR_IO, false, "RECIPES not found in the site configuration\n"); + return false; + } + + // Copy contents of the filenames to config->recipes from the "RECIPES" metadata in the source. + // We could use psMetadataCopy for this, but it's better to check that everything's of the correct type. + // If it's not of the correct type, we can tell the user which file it's in, so they can find it easier. + psMetadataIterator *recipesIter = psMetadataIteratorAlloc(recipes, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *fileItem = NULL; // MD item containing the filename, from recipe iteration + while ((fileItem = psMetadataGetAndIncrement(recipesIter))) { + // type mismatch is a serious error + if (fileItem->type != PS_DATA_STRING) { + psError(PS_ERR_IO, true, "%s in site configuration RECIPES is not of type STR", fileItem->name); + return false; + } + + // Read the recipe file. if we fail on a file, give a warning, but continue + psMetadata *recipe = NULL; + if (!pmConfigFileRead(&recipe, fileItem->data.V, "recipe")) { + psError(PS_ERR_IO, false, "Failed to read recipe file %s listed in site configuration\n", (char *)fileItem->data.V); + return false; + } + + // if this named recipe exists, supplement it + psMetadataAdd(config->recipes, PS_LIST_TAIL, fileItem->name, PS_DATA_METADATA | PS_META_REPLACE, + fileItem->comment, recipe); + psFree(recipe); // Drop reference + } + psFree(recipesIter); + config->recipesRead |= PM_RECIPE_SOURCE_SITE; + + *status = true; + return true; +} + +// Load the recipe files (valid for SITE | CAMERA) +// each time we load a specific recipe, it overrides the existing metadata for that recipe +// for sourceType == SITE | CAMERA, RECIPES contains a list of files to be read (pmConfigFileRead) +static bool loadRecipeCamera(bool *status, // status variable + pmConfig *config, // The configuration into which to read the recipes + psMetadata *source // The source configuration, from which to read the filenames + ) +{ + bool success; + + assert(status); + assert(config); + *status = false; + + if (!source) { + psError(PS_ERR_IO, true, "The camera configuration has not been read --- cannot read recipes from this location.\n"); + config->recipesRead &= ~PM_RECIPE_SOURCE_CAMERA; + return false; + } + + // it is not necessary to define any local recipes in the camera config + psMetadata *recipes = psMetadataLookupMetadata(&success, source, "RECIPES"); // The list of recipes + if (!recipes) { + psTrace ("psModules.config", 3, "RECIPES not found in the camera configuration\n"); + return true; + } + + // Copy contents of the filenames to config->recipes from the "RECIPES" metadata in the source. + // We could use psMetadataCopy for this, but it's better to check that everything's of the correct type. + // If it's not of the correct type, we can tell the user which file it's in, so they can find it easier. + psMetadataIterator *recipesIter = psMetadataIteratorAlloc(recipes, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *fileItem = NULL; // MD item containing the filename, from recipe iteration + while ((fileItem = psMetadataGetAndIncrement(recipesIter))) { + char *recipeName = fileItem->name; + char *recipeFile = fileItem->data.V; + + psTrace("psModules.config", 3, "Supplementing %s from %s within camera configuration.\n", recipeName, recipeFile); + + // type mismatch is a serious error + if (fileItem->type != PS_DATA_STRING) { + psAbort("%s in camera configuration RECIPES is not of type STR", recipeName); + } + + // Read the recipe file. if we fail on a file, give a warning, but continue + psMetadata *recipe = NULL; + if (!pmConfigFileRead(&recipe, recipeFile, "recipe")) { + psError(PS_ERR_IO, false, "Failed to read recipe file %s listed in camera configuration\n", recipeFile); + return false; + } + + // the named recipe must exist; supplement it + psMetadata *current = psMetadataLookupMetadata(NULL, config->recipes, recipeName); + if (!current) { + psError(PS_ERR_IO, false, "Failed to find recipe for %s in master recipe list", recipeName); + psFree(recipe); // Drop reference + return false; + } + + if (!psMetadataUpdate(current, recipe)) { + psError(PS_ERR_IO, false, "Failed to update recipe for %s from camera recipe", recipeName); + psFree(recipe); // Drop reference + return false; + } + psFree(recipe); // Drop reference + } + psFree(recipesIter); + config->recipesRead |= PM_RECIPE_SOURCE_CAMERA; + *status = true; + return true; +} + +// Load the recipes from config->arguments (CL) +// Load the recipes: each time we load a specific recipe, it overrides the metadata +// entries for an existing recipe metadata +static bool loadRecipeFromArguments(bool *status, + pmConfig *config // The configuration into which to read the recipes + ) +{ + assert(status); + assert(config); + *status = false; + + if (!config->arguments) { + psTrace("psModules.config", 4, "no config->arguments metadata, nothing to read here"); + return true; + } + + psMetadata *recipes = psMetadataLookupMetadata(NULL, config->arguments, "RECIPES"); // The list of recipes + if (!recipes) { + psTrace("psModules.config", 4, "no RECIPES in config->arguments, nothing to read here"); + return true; + } + + // Copy the recipes from config->arguments:RECIPES to config->recipes. supplement existing recipes. + psMetadataIterator *recipesIter = psMetadataIteratorAlloc(recipes, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *item = NULL; // MD item containing the filename, from recipe iteration + while ((item = psMetadataGetAndIncrement(recipesIter))) { + // type mismatch is a serious error + if (item->type != PS_DATA_METADATA) { + psAbort("%s in config arguments RECIPES is not of type METADATA", item->name); + } + // increment the ref counter to protect the data + + psMetadata *recipe = item->data.V; // Recipe of interest + + // if this named recipe exists, supplement it + psMetadata *current = psMetadataLookupMetadata(NULL, config->recipes, item->name); + if (!current) { + psError(PS_ERR_IO, false, "Failed to find recipe for %s in master recipe list", item->name); + psFree(recipe); // Drop reference + return false; + } + psTrace("psModules.config", 3, "Supplementing %s from arguments.\n", item->name); + + if (!psMetadataUpdate (current, recipe)) { + psError(PS_ERR_IO, false, "Failed to update recipe for %s from camera recipe", item->name); + return false; + } + } + psFree(recipesIter); + *status = true; + return true; +} + +// Load the recipes: each time we load a specific recipe, it overrides the metadata +// entries for an existing recipe metadata +static bool loadRecipeSymbols(bool *status, + pmConfig *config // The configuration into which to read the recipes + ) +{ + bool found = false; + + assert(status); + assert(config); + *status = false; + + // check to see if any symbolic names need to be resolved + // each entry in recipeSymbols are of the form TARGET=SOURCE where TARGET is an existing + // recipe MD and REF is a MD to load over that recipe + psMetadataIterator *iter = psMetadataIteratorAlloc(config->recipeSymbols, PS_LIST_HEAD, NULL); + psMetadataItem *item = NULL; // Item containing source, from iteration + while ((item = psMetadataGetAndIncrement(iter))) { + assert(item->type == PS_DATA_STRING); // It should be this type: we put it in ourselves + const char *sourceName = item->data.V; // The name of the symbolic reference + const char *targetName = item->name; + psTrace("psModules.config", 3, "Supplementing %s from %s.\n", targetName, sourceName); + + // the target recipe must exist; select it + psMetadata *targetMD = psMetadataLookupMetadata(&found, config->recipes, targetName); + if (!targetMD) { + psError(PS_ERR_IO, true, "Failed to find recipe for %s in master recipe list", targetName); + return false; + } + + // search for sourceName : it may be in config->recipes or target MD + psMetadata *sourceMD = NULL; + sourceMD = psMetadataLookupMetadata(&found, config->recipes, sourceName); + if (!sourceMD) { + sourceMD = psMetadataLookupMetadata(&found, targetMD, sourceName); + if (!sourceMD) { + psError(PS_ERR_IO, false, "Selected symbolic name %s does not exist in recipes", sourceName); + return false; + } + } + + if (!psMetadataUpdate(targetMD, sourceMD)) { + psError(PS_ERR_IO, false, "Failed to update recipe for %s from camera recipe", targetName); + return false; + } + } + psFree(iter); + *status = true; + return true; +} + +// Load the recipe options +// Load the recipes: each time we load a specific recipe, it overrides the metadata +// entries for an existing recipe metadata +static bool loadRecipeOptions(bool *status, + pmConfig *config // The configuration into which to read the recipes + ) +{ + bool found; + assert(status); + assert(config); + *status = false; + + if (!config->arguments) { + psTrace("psModules.config", 4, "no config->arguments metadata, nothing to read here"); + return true; + } + + psMetadata *recipes = psMetadataLookupMetadata(&found, config->arguments, "OPTIONS"); // The list of recipes + if (!recipes) { + psTrace("psModules.config", 4, "no OPTIONS in config->arguments, nothing to read here"); + return true; + } + + // Copy the recipes from config->arguments:OPTIONS to config->recipes. supplement existing recipes. + psMetadataIterator *recipesIter = psMetadataIteratorAlloc(recipes, PS_LIST_HEAD, NULL); // Iterator + psMetadataItem *item = NULL; // MD item containing the filename, from recipe iteration + while ((item = psMetadataGetAndIncrement(recipesIter))) { + char *recipeName = item->name; + psMetadata *recipe = item->data.V; + + // type mismatch is a serious error + if (item->type != PS_DATA_METADATA) { + psAbort("%s in config arguments OPTIONS is not of type METADATA", recipeName); + } + + // if this named recipe exists, supplement it + psMetadata *current = psMetadataLookupMetadata(NULL, config->recipes, recipeName); + if (!current) { + psError(PS_ERR_IO, false, "Selected recipe %s is not found in camera recipe", recipeName); + return false; + } + if (!psMetadataUpdate (current, recipe)) { + psError(PS_ERR_IO, false, "Failed to update recipe for %s from camera recipe", recipeName); + return false; + } + } + psFree(recipesIter); + *status = true; + return true; +} Index: /branches/pap_branch_070920/psModules/src/config/pmConfigRecipes.h =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmConfigRecipes.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmConfigRecipes.h (revision 14957) @@ -0,0 +1,33 @@ +/* @file pmConfigRecipes.h + * @brief Configuration Recipe functions + * + * @author ?, MHPCC + * @author Paul Price, IfA + * @author Eugene Magnier, IfA + * + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-04-19 02:10:12 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_CONFIG_RECIPES_H +#define PM_CONFIG_RECIPES_H + +/// @addtogroup Config Configuration System +/// @{ + +/// Read recipes +/// +/// Attempt to read recipes from the sources that are available but have not already been read. Having read a +/// recipe, attempt to resolve symbolic links that were specified on the command line. +bool pmConfigReadRecipes(pmConfig *config, ///< Configuration + pmRecipeSource source ///< desired sources for recipes + ); + + +bool pmConfigLoadRecipeArguments (int *argc, char **argv, pmConfig *config); +bool pmConfigLoadRecipeOptions (int *argc, char **argv, pmConfig *config, char *flag); +psMetadata *pmConfigRecipeOptions (pmConfig *config, char *recipe); + +/// @} +#endif Index: /branches/pap_branch_070920/psModules/src/config/pmErrorCodes.c.in =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmErrorCodes.c.in (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmErrorCodes.c.in (revision 14957) @@ -0,0 +1,25 @@ +/* + * The line + { PM_ERR_$X{ErrorCode}, "$X{ErrorDescription}"}, + * (without the Xs) + * will be replaced by values from errorCodes.dat + */ +#include +#include "pmErrorCodes.h" + +void pmErrorRegister(void) +{ + static psErrorDescription errors[] = { + { PM_ERR_BASE, "First value we use; lower values belong to psLib" }, + { PM_ERR_${ErrorCode}, "${ErrorDescription}"}, + }; + static int nerror = PM_ERR_NERROR - PM_ERR_BASE; // number of values in enum + + for (int i = 0; i < nerror; i++) { + psErrorDescription *tmp = psAlloc(sizeof(psErrorDescription)); + *tmp = errors[i]; + psErrorRegister(tmp, 1); + psFree(tmp); /* it's on the internal list */ + } + nerror = 0; // don't register more than once +} Index: /branches/pap_branch_070920/psModules/src/config/pmErrorCodes.dat =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmErrorCodes.dat (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmErrorCodes.dat (revision 14957) @@ -0,0 +1,18 @@ +# +# This file is used to generate pmErrorCodes.h +# +UNKNOWN Unknown psModules error code +PHOTOM Problem in photometry +PSF Problem in PSF +ASTROM Problem in astrometry +CAMERA Problem in camera +CONCEPTS Problem in concepts +IMCOMBINE Problem in imcombine +OBJECTS Problem in objects +SKY Problem in sky +# these errors correspond to standard exit conditions +ARGUMENTS Incorrect arguments +SYS System error +CONFIG Problem in configure files +PROG Programming error +DATA invalid data Index: /branches/pap_branch_070920/psModules/src/config/pmErrorCodes.h.in =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmErrorCodes.h.in (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmErrorCodes.h.in (revision 14957) @@ -0,0 +1,18 @@ +#if !defined(PM_ERROR_CODES_H) +#define PM_ERROR_CODES_H +/* + * The line + * PM_ERR_$X{ErrorCode}, + * (without the X) + * + * will be replaced by values from errorCodes.dat + */ +typedef enum { + PM_ERR_BASE = 1200, + PM_ERR_${ErrorCode}, + PM_ERR_NERROR +} pmErrorCode; + +void pmErrorRegister(void); + +#endif Index: /branches/pap_branch_070920/psModules/src/config/pmVersion.c =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmVersion.c (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmVersion.c (revision 14957) @@ -0,0 +1,28 @@ +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include +#include "pmVersion.h" + +static const char *cvsTag = "$Name: not supported by cvs2svn $";// CVS tag name + +psString psModulesVersion(void) +{ + psString version = NULL; // Version, to return + psStringAppend(&version, "%s-%s",PACKAGE_NAME,PACKAGE_VERSION); + return version; +} + +psString psModulesVersionLong(void) +{ + psString version = psModulesVersion(); // Version, to return + psString tag = psStringStripCVS(cvsTag, "Name"); // CVS tag + + psStringAppend(&version, " (cvs tag %s) %s, %s", tag, __DATE__, __TIME__); + + psFree(tag); + return version; +} Index: /branches/pap_branch_070920/psModules/src/config/pmVersion.h =================================================================== --- /branches/pap_branch_070920/psModules/src/config/pmVersion.h (revision 14957) +++ /branches/pap_branch_070920/psModules/src/config/pmVersion.h (revision 14957) @@ -0,0 +1,37 @@ +/* @file pmVersion.h + * @brief Version functions + * + * @author Paul Price, IfA + * @author Eugene Magnier, IfA + * + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2007-03-30 21:12:56 $ + * Copyright 2005-2006 Institute for Astronomy, University of Hawaii + */ + +#ifndef PM_VERSION_H +#define PM_VERSION_H + +/// @addtogroup Config Configuration System +/// @{ + +/** Get current psModules version + * + * Returns the current psModules version name as a string. + * + * @return psString: String with version name. + */ +psString psModulesVersion( + void +); + +/** Get current psModules version (full identification) + * + * Returns the current psModules version name and other information identifying the compilation. + * + * @return psString: String with identity. + */ +psString psModulesVersionLong(void); + +/// @} +#endif