Index: /trunk/ippconfig/Makefile.am =================================================================== --- /trunk/ippconfig/Makefile.am (revision 11575) +++ /trunk/ippconfig/Makefile.am (revision 11576) @@ -1,132 +1,31 @@ -config_files = \ - ./ipprc.config \ - ./gpc1/camera.config \ - ./gpc1/format_raw.config \ - ./ctio_mosaic2/camera.config \ - ./ctio_mosaic2/format.config \ - ./ctio_mosaic2/ppImage.config \ - ./ctio_mosaic2/psphot.config \ - ./ctio_mosaic2_chip/camera.config \ - ./ctio_mosaic2_chip/format.config \ - ./ctio_mosaic2_chip/psphot.config \ - ./ipprc.config \ - ./megacam_alternate/camera.config \ - ./megacam_alternate/format.config \ - ./megacam_alternate/phase2.config \ - ./megacam_alternate/psphot.config \ - ./isp/cmp.config \ - ./isp/phase2.config \ - ./isp/ppMerge.config \ - ./isp/psastro.config \ - ./isp/camera.config \ - ./isp/format.config \ - ./isp/ppImage.config \ - ./isp/ppStats.config \ - ./isp/psphot.config \ - ./ucam/camera.config \ - ./ucam/format_raw.config \ - ./ucam/ppImage.config \ - ./ucam/ppImage_b.config \ - ./ucam/ppImage_d.config \ - ./ucam/ppImage_f.config \ - ./ucam/ppImage_j.config \ - ./ucam/ppImage_o.config \ - ./ucam/ppImage_ob.config \ - ./ucam/ppImage_obd.config \ - ./ucam/ppImage_obdf.config \ - ./ucam/ppMerge_bias.config \ - ./ucam/ppMerge_dark.config \ - ./ucam/ppMerge_flat.config \ - ./ucam/ppStats.config \ - ./ucam/psastro.config \ - ./ucam/psphot.config \ - ./recipes/ppImage.config \ - ./recipes/ppMerge.config \ - ./recipes/ppStats.config \ - ./recipes/ppStats_phase0.config \ - ./recipes/psastro.config \ - ./recipes/psphot.config \ - ./recipes/ppStac.config \ - ./megacam_chipmosaic/camera.config \ - ./megacam_chipmosaic/format_mosaic.config \ - ./megacam_fpamosaic/camera.config \ - ./megacam_fpamosaic/format_mosaic.config \ - ./mcshort_chip/camera.config \ - ./mcshort_chip/format_mosaic.config \ - ./ctio_mosaic2_fpa/camera.config \ - ./ctio_mosaic2_fpa/format.config \ - ./mcshort_fpa/camera.config \ - ./mcshort_fpa/format_mosaic.config \ - ./ucam_mosaic/camera.config \ - ./ucam_mosaic/format_mosaic.config \ - ./ucam_mosaic/ppImage.config \ - ./ucam_mosaic/ppImage_b.config \ - ./ucam_mosaic/ppImage_d.config \ - ./ucam_mosaic/ppImage_f.config \ - ./ucam_mosaic/ppImage_j.config \ - ./ucam_mosaic/ppImage_o.config \ - ./ucam_mosaic/ppImage_ob.config \ - ./ucam_mosaic/ppImage_obd.config \ - ./ucam_mosaic/ppImage_obdf.config \ - ./ucam_mosaic/ppMerge_bias.config \ - ./ucam_mosaic/ppMerge_dark.config \ - ./ucam_mosaic/ppMerge_flat.config \ - ./ucam_mosaic/ppStats.config \ - ./ucam_mosaic/psastro.config \ - ./ucam_mosaic/psphot.config \ - ./lris_blue/camera.config \ - ./lris_blue/format_raw.config \ - ./lris_blue/format_mef.config \ - ./lris_red/camera.config \ - ./lris_red/format_raw.config \ - ./lris_red/format_spec.config \ - ./mcshort/camera.config \ - ./mcshort/format_raw.config \ - ./mcshort/format_spliced.config \ - ./mcshort/format_split.config \ - ./megacam/camera.config \ - ./megacam/format_raw.config \ - ./megacam/format_spliced.config \ - ./megacam/format_split.config \ - ./megacam/format_split_mask.config \ - ./megacam/ppImage.config \ - ./megacam/psphot.config \ - ./megacam/format_spliced_mask.config \ - ./megacam/psastro.config \ - ./megacam/ppStats.config \ - ./megacam/ppMerge_bias.config \ - ./megacam/ppMerge_dark.config \ - ./megacam/ppMerge_flat.config \ - ./megacam/ppMerge_fringe.config \ - ./megacam_detrended/camera.config \ - ./megacam_detrended/format_spliced.config \ - ./megacam_detrended/format_split.config \ - ./megacam_detrended/phase2.config \ - ./megacam_detrended/psphot.config \ - ./megacam_detrended/psastro.config \ - ./simple/camera.config \ - ./simple/format.config \ - ./simple/psphot.config \ - ./simple/phase2.config \ - ./simple/psastro.config \ - ./simple/ppImage.config +SUBDIRS = \ + dvo.cameras \ + recipes \ + isp \ + megacam \ + simple +install_files = \ + GSCregions.tbl \ + dvo.photcodes -ippconfigdir = $(datadir)/ippconfig -ippconfig_DATA = $(config_files) +built_sources = \ + ipprc.config.in \ + dvo.site.in -dvoconfigdir = $(datadir)/ippconfig -dvo_files = \ - dvo.photcodes \ - dvo.cameras/ISP-Apogee.config +built_files = \ + ipprc.config \ + dvo.site -dvoconfig_DATA = $(dvo_files) dvo.site +installdir = $(datadir)/ippconfig + +install_DATA = $(install_files) $(built_files) install-data-hook: - chmod 0755 $(ippconfigdir) + chmod 0755 $(installdir) -EXTRA_DIST = $(config_files) $(dvo_files) dvo.site.in +EXTRA_DIST = $(install_files) $(built_sources) -BUILT_SOURCES = dvo.site +BUILT_SOURCES = $(built_files) ACLOCAL_AMFLAGS = -I m4 Index: /trunk/ippconfig/configure.ac =================================================================== --- /trunk/ippconfig/configure.ac (revision 11575) +++ /trunk/ippconfig/configure.ac (revision 11576) @@ -2,5 +2,5 @@ AC_INIT([ippConfig], [0.0.1], [jhoblitt@cpan.org]) -AC_CONFIG_SRCDIR([ipprc.config]) +AC_CONFIG_SRCDIR([ipprc.config.in]) AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2]) @@ -14,4 +14,10 @@ AC_CONFIG_FILES([ Makefile + dvo.cameras/Makefile + recipes/Makefile + isp/Makefile + megacam/Makefile + simple/Makefile + ipprc.config dvo.site ]) Index: /trunk/ippconfig/dvo.cameras/.cvsignore =================================================================== --- /trunk/ippconfig/dvo.cameras/.cvsignore (revision 11576) +++ /trunk/ippconfig/dvo.cameras/.cvsignore (revision 11576) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /trunk/ippconfig/dvo.cameras/Makefile.am =================================================================== --- /trunk/ippconfig/dvo.cameras/Makefile.am (revision 11576) +++ /trunk/ippconfig/dvo.cameras/Makefile.am (revision 11576) @@ -0,0 +1,14 @@ + +installdir = $(datadir)/ippconfig/dvo.cameras + +install_files = \ + ISP-Apogee.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /trunk/ippconfig/dvo.photcodes =================================================================== --- /trunk/ippconfig/dvo.photcodes (revision 11575) +++ /trunk/ippconfig/dvo.photcodes (revision 11576) @@ -12,40 +12,51 @@ # 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, +# 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 - 1 - 2 r sec 0.0 - - 1003 1004 0.008 - 2 - 3 i sec 0.0 - - 1003 1004 0.028 - 3 - 4 z sec 0.0 - - 1003 1004 0.107 - 4 - 5 y sec 0.0 - - - - - - 5 - - 1050 u_SDSS ref - - - - - - - - - 1051 g_SDSS ref - - - - - - - - - 1052 r_SDSS ref - - - - - - - - - 1053 i_SDSS ref - - - - - - - - - 1054 z_SDSS ref - - - - - - - - - - 1002 U_L92 ref - - - - - - - - - 1003 B_L92 ref - - - - - - - - - 1004 V_L92 ref - - - - - - - - - 1005 R_L92 ref - - - - - - - - - 1007 I_L92 ref - - - - - - - - - - 1012 U_STET ref - - - - - - - - - 1013 B_STET ref - - - - - - - - - 1014 V_STET ref - - - - - - - - - 1015 R_STET ref - - - - - - - - - 1017 I_STET ref - - - - - - - - + 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 - - - - - - - - - 1200 TYCHO_B ref - - - - - - - - - 1201 TYCHO_V ref - - - - - - - - + 2020 TYCHO_B ref - - - - - - - - + 2021 TYCHO_V ref - - - - - - - - 2011 2MASS_J ref - - - - - - - - @@ -338,70 +349,68 @@ 611 CFH12K.Ha.11 dep 25.000 0.04 - - - - - 5 - 600 CFH12K.HaOff.00 dep 25.000 0.04 - - - - - 5 - 601 CFH12K.HaOff.01 dep 25.000 0.04 - - - - - 5 - 602 CFH12K.HaOff.02 dep 25.000 0.04 - - - - - 5 - 603 CFH12K.HaOff.03 dep 25.000 0.04 - - - - - 5 - 604 CFH12K.HaOff.04 dep 25.000 0.04 - - - - - 5 - 605 CFH12K.HaOff.05 dep 25.000 0.04 - - - - - 5 - 606 CFH12K.HaOff.06 dep 25.000 0.04 - - - - - 5 - 607 CFH12K.HaOff.07 dep 25.000 0.04 - - - - - 5 - 608 CFH12K.HaOff.08 dep 25.000 0.04 - - - - - 5 - 609 CFH12K.HaOff.09 dep 25.000 0.04 - - - - - 5 - 610 CFH12K.HaOff.10 dep 25.000 0.04 - - - - - 5 - 611 CFH12K.HaOff.11 dep 25.000 0.04 - - - - - 5 - 612 CFH12K.CN.00 dep 25.000 0.04 - - - - - 5 - 613 CFH12K.CN.01 dep 25.000 0.04 - - - - - 5 - 614 CFH12K.CN.02 dep 25.000 0.04 - - - - - 5 - 615 CFH12K.CN.03 dep 25.000 0.04 - - - - - 5 - 616 CFH12K.CN.04 dep 25.000 0.04 - - - - - 5 - 617 CFH12K.CN.05 dep 25.000 0.04 - - - - - 5 - 618 CFH12K.CN.06 dep 25.000 0.04 - - - - - 5 - 619 CFH12K.CN.07 dep 25.000 0.04 - - - - - 5 - 620 CFH12K.CN.08 dep 25.000 0.04 - - - - - 5 - 621 CFH12K.CN.09 dep 25.000 0.04 - - - - - 5 - 622 CFH12K.CN.10 dep 25.000 0.04 - - - - - 5 - 623 CFH12K.CN.11 dep 25.000 0.04 - - - - - 5 - 624 CFH12K.TiO.00 dep 25.000 0.04 - - - - - 5 - 625 CFH12K.TiO.01 dep 25.000 0.04 - - - - - 5 - 626 CFH12K.TiO.02 dep 25.000 0.04 - - - - - 5 - 627 CFH12K.TiO.03 dep 25.000 0.04 - - - - - 5 - 628 CFH12K.TiO.04 dep 25.000 0.04 - - - - - 5 - 629 CFH12K.TiO.05 dep 25.000 0.04 - - - - - 5 - 630 CFH12K.TiO.06 dep 25.000 0.04 - - - - - 5 - 631 CFH12K.TiO.07 dep 25.000 0.04 - - - - - 5 - 632 CFH12K.TiO.08 dep 25.000 0.04 - - - - - 5 - 633 CFH12K.TiO.09 dep 25.000 0.04 - - - - - 5 - 634 CFH12K.TiO.10 dep 25.000 0.04 - - - - - 5 - 635 CFH12K.TiO.11 dep 25.000 0.04 - - - - - 5 - 636 CFH12K.NB920.00 dep 25.000 0.04 - - - - - 5 - 637 CFH12K.NB920.01 dep 25.000 0.04 - - - - - 5 - 638 CFH12K.NB920.02 dep 25.000 0.04 - - - - - 5 - 639 CFH12K.NB920.03 dep 25.000 0.04 - - - - - 5 - 640 CFH12K.NB920.04 dep 25.000 0.04 - - - - - 5 - 641 CFH12K.NB920.05 dep 25.000 0.04 - - - - - 5 - 642 CFH12K.NB920.06 dep 25.000 0.04 - - - - - 5 - 643 CFH12K.NB920.07 dep 25.000 0.04 - - - - - 5 - 644 CFH12K.NB920.08 dep 25.000 0.04 - - - - - 5 - 645 CFH12K.NB920.09 dep 25.000 0.04 - - - - - 5 - 646 CFH12K.NB920.10 dep 25.000 0.04 - - - - - 5 - 647 CFH12K.NB920.11 dep 25.000 0.04 - - - - - 5 - 648 CFH12K.B2F.00 dep 25.000 0.04 - - - - - 5 - 649 CFH12K.B2F.01 dep 25.000 0.04 - - - - - 5 - 650 CFH12K.B2F.02 dep 25.000 0.04 - - - - - 5 - 651 CFH12K.B2F.03 dep 25.000 0.04 - - - - - 5 - 652 CFH12K.B2F.04 dep 25.000 0.04 - - - - - 5 - 653 CFH12K.B2F.05 dep 25.000 0.04 - - - - - 5 - 654 CFH12K.B2F.06 dep 25.000 0.04 - - - - - 5 - 655 CFH12K.B2F.07 dep 25.000 0.04 - - - - - 5 - 678 CFH12K.B2F.08 dep 25.000 0.04 - - - - - 5 - 679 CFH12K.B2F.09 dep 25.000 0.04 - - - - - 5 - 680 CFH12K.B2F.10 dep 25.000 0.04 - - - - - 5 - 681 CFH12K.B2F.11 dep 25.000 0.04 - - - - - 5 - - 2100 ISP-Apogee-01.i dep 15.0 0.10 - - - - - 1 - -g : 19.25 -r : 19.15 -i : 18.50 -z : 17.25 -y : 14.15 + 612 CFH12K.HaOff.00 dep 25.000 0.04 - - - - - 5 + 613 CFH12K.HaOff.01 dep 25.000 0.04 - - - - - 5 + 614 CFH12K.HaOff.02 dep 25.000 0.04 - - - - - 5 + 615 CFH12K.HaOff.03 dep 25.000 0.04 - - - - - 5 + 616 CFH12K.HaOff.04 dep 25.000 0.04 - - - - - 5 + 617 CFH12K.HaOff.05 dep 25.000 0.04 - - - - - 5 + 618 CFH12K.HaOff.06 dep 25.000 0.04 - - - - - 5 + 619 CFH12K.HaOff.07 dep 25.000 0.04 - - - - - 5 + 620 CFH12K.HaOff.08 dep 25.000 0.04 - - - - - 5 + 621 CFH12K.HaOff.09 dep 25.000 0.04 - - - - - 5 + 622 CFH12K.HaOff.10 dep 25.000 0.04 - - - - - 5 + 623 CFH12K.HaOff.11 dep 25.000 0.04 - - - - - 5 + 624 CFH12K.CN.00 dep 25.000 0.04 - - - - - 5 + 625 CFH12K.CN.01 dep 25.000 0.04 - - - - - 5 + 626 CFH12K.CN.02 dep 25.000 0.04 - - - - - 5 + 627 CFH12K.CN.03 dep 25.000 0.04 - - - - - 5 + 628 CFH12K.CN.04 dep 25.000 0.04 - - - - - 5 + 629 CFH12K.CN.05 dep 25.000 0.04 - - - - - 5 + 630 CFH12K.CN.06 dep 25.000 0.04 - - - - - 5 + 631 CFH12K.CN.07 dep 25.000 0.04 - - - - - 5 + 632 CFH12K.CN.08 dep 25.000 0.04 - - - - - 5 + 633 CFH12K.CN.09 dep 25.000 0.04 - - - - - 5 + 634 CFH12K.CN.10 dep 25.000 0.04 - - - - - 5 + 635 CFH12K.CN.11 dep 25.000 0.04 - - - - - 5 + 636 CFH12K.TiO.00 dep 25.000 0.04 - - - - - 5 + 637 CFH12K.TiO.01 dep 25.000 0.04 - - - - - 5 + 638 CFH12K.TiO.02 dep 25.000 0.04 - - - - - 5 + 639 CFH12K.TiO.03 dep 25.000 0.04 - - - - - 5 + 640 CFH12K.TiO.04 dep 25.000 0.04 - - - - - 5 + 641 CFH12K.TiO.05 dep 25.000 0.04 - - - - - 5 + 642 CFH12K.TiO.06 dep 25.000 0.04 - - - - - 5 + 643 CFH12K.TiO.07 dep 25.000 0.04 - - - - - 5 + 644 CFH12K.TiO.08 dep 25.000 0.04 - - - - - 5 + 645 CFH12K.TiO.09 dep 25.000 0.04 - - - - - 5 + 646 CFH12K.TiO.10 dep 25.000 0.04 - - - - - 5 + 647 CFH12K.TiO.11 dep 25.000 0.04 - - - - - 5 + 648 CFH12K.NB920.00 dep 25.000 0.04 - - - - - 5 + 649 CFH12K.NB920.01 dep 25.000 0.04 - - - - - 5 + 650 CFH12K.NB920.02 dep 25.000 0.04 - - - - - 5 + 651 CFH12K.NB920.03 dep 25.000 0.04 - - - - - 5 + 652 CFH12K.NB920.04 dep 25.000 0.04 - - - - - 5 + 653 CFH12K.NB920.05 dep 25.000 0.04 - - - - - 5 + 654 CFH12K.NB920.06 dep 25.000 0.04 - - - - - 5 + 655 CFH12K.NB920.07 dep 25.000 0.04 - - - - - 5 + 678 CFH12K.NB920.08 dep 25.000 0.04 - - - - - 5 + 679 CFH12K.NB920.09 dep 25.000 0.04 - - - - - 5 + 680 CFH12K.NB920.10 dep 25.000 0.04 - - - - - 5 + 681 CFH12K.NB920.11 dep 25.000 0.04 - - - - - 5 + 682 CFH12K.B2F.00 dep 25.000 0.04 - - - - - 5 + 683 CFH12K.B2F.01 dep 25.000 0.04 - - - - - 5 + 684 CFH12K.B2F.02 dep 25.000 0.04 - - - - - 5 + 685 CFH12K.B2F.03 dep 25.000 0.04 - - - - - 5 + 686 CFH12K.B2F.04 dep 25.000 0.04 - - - - - 5 + 687 CFH12K.B2F.05 dep 25.000 0.04 - - - - - 5 + 688 CFH12K.B2F.06 dep 25.000 0.04 - - - - - 5 + 689 CFH12K.B2F.07 dep 25.000 0.04 - - - - - 5 + 690 CFH12K.B2F.08 dep 25.000 0.04 - - - - - 5 + 691 CFH12K.B2F.09 dep 25.000 0.04 - - - - - 5 + 692 CFH12K.B2F.10 dep 25.000 0.04 - - - - - 5 + 693 CFH12K.B2F.11 dep 25.000 0.04 - - - - - 5 + + 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 Index: unk/ippconfig/ipprc.config =================================================================== --- /trunk/ippconfig/ipprc.config (revision 11575) +++ (revision ) @@ -1,53 +1,0 @@ -### Example .ipprc file - -PATH STR .:$HOME/.ipp # Default search path for configuration files - -# place your data directories here and refer to as path://PATH/remainder -DATAPATH METADATA - DATA1 STR /data/alala/ - PAP_MC STR /data/alala/price/megacam/ - ESSENCE STR /data/sn7/ipp/ - ISPTEST STR /data/alala/eugene/swtests/pantasks/isp - SIMTEST STR /data/alala/eugene/swtests/pantasks/sim - SAN1 STR /s01/price/ -END - -### Database configuration -DBSERVER STR alala # Database host name (for psDBInit) -DBNAME STR ipp # Database name (for psDBInit) -DBUSER STR ipp # Database user name (for psDBInit) -DBPASSWORD STR ipp # Database password (for psDBInit) - -### Setups for each camera system -CAMERAS METADATA - CTIO_MOSAIC2 STR ctio_mosaic2/camera.config # CTIO MOSAIC2 camera, for ESSENCE -# MEGACAM_DET STR megacam_detrended/camera.config -# MCSHORT STR mcshort/camera.config - MEGACAM STR megacam/camera.config - ISP STR isp/camera.config - UCAM STR ucam/camera.config - GPC1 STR gpc1/camera.config -# LRIS_BLUE STR lris_blue/camera.config -# LRIS_RED STR lris_red/camera.config - SIMPLE STR simple/camera.config -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 -END - -RECIPES METADATA # Site-level recipes - PPIMAGE STR recipes/ppImage.config # Image reduction - PPMERGE STR recipes/ppMerge.config # Image combination - PPSTATS STR recipes/ppStats.config # Image statistics - PPSTATS_PHASE0 STR recipes/ppStats_phase0.config # Image statistics for Phase 0 - PSPHOT STR recipes/psphot.config # Photometry - PSASTRO STR recipes/psastro.config # Astrometry - PPSTAC STR recipes/ppStac.config # Combination -END Index: /trunk/ippconfig/ipprc.config.in =================================================================== --- /trunk/ippconfig/ipprc.config.in (revision 11576) +++ /trunk/ippconfig/ipprc.config.in (revision 11576) @@ -0,0 +1,52 @@ +### Example .ipprc file + +PATH STR @IPP_CONFIG_DIR@:$HOME/.ipp:. # Default search path for configuration files + +# place your data directories here and refer to as path://PATH/remainder +DATAPATH METADATA + DATA1 STR /data/alala/ + PAP_MC STR /data/alala/price/megacam/ + ESSENCE STR /data/sn7/ipp/ + ISPTEST STR /data/alala/eugene/swtests/pantasks/isp + SIMTEST STR /data/alala/eugene/swtests/pantasks/sim + SAN1 STR /s01/price/ +END + +### 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 + ISP-Apogee STR isp/camera.config +# CTIO_MOSAIC2 STR ctio_mosaic2/camera.config # CTIO MOSAIC2 camera, for ESSENCE +# UCAM STR ucam/camera.config +# GPC1 STR gpc1/camera.config +# LRIS_BLUE STR lris_blue/camera.config +# LRIS_RED STR lris_red/camera.config + SIMPLE STR simple/camera.config +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 +# place default trace lines here +# example: +# psLib.db S32 10 +END + +RECIPES METADATA # Site-level recipes + 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 + PPSTAC STR recipes/ppStac.config # Combination +END Index: /trunk/ippconfig/isp/.cvsignore =================================================================== --- /trunk/ippconfig/isp/.cvsignore (revision 11576) +++ /trunk/ippconfig/isp/.cvsignore (revision 11576) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /trunk/ippconfig/isp/Makefile.am =================================================================== --- /trunk/ippconfig/isp/Makefile.am (revision 11576) +++ /trunk/ippconfig/isp/Makefile.am (revision 11576) @@ -0,0 +1,20 @@ + +installdir = $(datadir)/ippconfig/isp + +install_files = \ + camera.config \ + format.config \ + ppImage.config \ + ppMerge.config \ + ppStats.config \ + psastro.config \ + psphot.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: unk/ippconfig/isp/cmp.config =================================================================== --- /trunk/ippconfig/isp/cmp.config (revision 11575) +++ (revision ) @@ -1,84 +1,0 @@ -# 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: unk/ippconfig/isp/phase2.config =================================================================== --- /trunk/ippconfig/isp/phase2.config (revision 11575) +++ (revision ) @@ -1,79 +1,0 @@ -### Phase 2 recipe configuration file - -# List of tasks to perform -MASK BOOL FALSE # Mask bad pixels -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 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 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 Index: /trunk/ippconfig/megacam/.cvsignore =================================================================== --- /trunk/ippconfig/megacam/.cvsignore (revision 11576) +++ /trunk/ippconfig/megacam/.cvsignore (revision 11576) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /trunk/ippconfig/megacam/Makefile.am =================================================================== --- /trunk/ippconfig/megacam/Makefile.am (revision 11576) +++ /trunk/ippconfig/megacam/Makefile.am (revision 11576) @@ -0,0 +1,22 @@ + +installdir = $(datadir)/ippconfig/megacam + +install_files = \ + camera.config \ + format_raw.config \ + format_split.config \ + format_spliced.config \ + ppImage.config \ + ppMerge.config \ + ppStats.config \ + psastro.config \ + psphot.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: unk/ippconfig/megacam/format_spliced_mask.config =================================================================== --- /trunk/ippconfig/megacam/format_spliced_mask.config (revision 11575) +++ (revision ) @@ -1,143 +1,0 @@ -# The spliced MecaCam data is stored in single extensions for each chip - -# How to recognise this type -RULE METADATA - OBSTYPE STR MASK - ORIGIN STR CFHT - INSTRUME STR MegaPrime - 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 FILENAME # A PHU keyword for unique identifier -END - -# What's in the FITS file? -CONTENTS METADATA - # Extension name, chip name:component cell - ccd00 STR ccd00:LeftAmp:left ccd00:RightAmp:right - ccd01 STR ccd01:LeftAmp:left ccd01:RightAmp:right - ccd02 STR ccd02:LeftAmp:left ccd02:RightAmp:right - ccd03 STR ccd03:LeftAmp:left ccd03:RightAmp:right - ccd04 STR ccd04:LeftAmp:left ccd04:RightAmp:right - ccd05 STR ccd05:LeftAmp:left ccd05:RightAmp:right - ccd06 STR ccd06:LeftAmp:left ccd06:RightAmp:right - ccd07 STR ccd07:LeftAmp:left ccd07:RightAmp:right - ccd08 STR ccd08:LeftAmp:left ccd08:RightAmp:right - ccd09 STR ccd09:LeftAmp:left ccd09:RightAmp:right - ccd10 STR ccd10:LeftAmp:left ccd10:RightAmp:right - ccd11 STR ccd11:LeftAmp:left ccd11:RightAmp:right - ccd12 STR ccd12:LeftAmp:left ccd12:RightAmp:right - ccd13 STR ccd13:LeftAmp:left ccd13:RightAmp:right - ccd14 STR ccd14:LeftAmp:left ccd14:RightAmp:right - ccd15 STR ccd15:LeftAmp:left ccd15:RightAmp:right - ccd16 STR ccd16:LeftAmp:left ccd16:RightAmp:right - ccd17 STR ccd17:LeftAmp:left ccd17:RightAmp:right - ccd18 STR ccd18:LeftAmp:left ccd18:RightAmp:right - ccd19 STR ccd19:LeftAmp:left ccd19:RightAmp:right - ccd20 STR ccd20:LeftAmp:left ccd20:RightAmp:right - ccd21 STR ccd21:LeftAmp:left ccd21:RightAmp:right - ccd22 STR ccd22:LeftAmp:left ccd22:RightAmp:right - ccd23 STR ccd23:LeftAmp:left ccd23:RightAmp:right - ccd24 STR ccd24:LeftAmp:left ccd24:RightAmp:right - ccd25 STR ccd25:LeftAmp:left ccd25:RightAmp:right - ccd26 STR ccd26:LeftAmp:left ccd26:RightAmp:right - ccd27 STR ccd27:LeftAmp:left ccd27:RightAmp:right - ccd28 STR ccd28:LeftAmp:left ccd28:RightAmp:right - ccd29 STR ccd29:LeftAmp:left ccd29:RightAmp:right - ccd30 STR ccd30:LeftAmp:left ccd30:RightAmp:right - ccd31 STR ccd31:LeftAmp:left ccd31:RightAmp:right - ccd32 STR ccd32:LeftAmp:left ccd32:RightAmp:right - ccd33 STR ccd33:LeftAmp:left ccd33:RightAmp:right - ccd34 STR ccd34:LeftAmp:left ccd34:RightAmp:right - ccd35 STR ccd35:LeftAmp:left ccd35:RightAmp:right -END - -# Specify the cells -CELLS METADATA - left METADATA - CELL.NAME STR LeftSide - CELL.BIASSEC.SOURCE STR VALUE - CELL.TRIMSEC.SOURCE STR VALUE - CELL.BIASSEC STR [1:32,1:4644] - CELL.TRIMSEC STR [33:1056,1:4612] - CELL.X0 S32 0 - END - - right METADATA - CELL.NAME STR RightSide - CELL.BIASSEC.SOURCE STR VALUE - CELL.TRIMSEC.SOURCE STR VALUE - CELL.BIASSEC STR [2081:2112,1:4644] - CELL.TRIMSEC STR [1057:2080,1:4612] - CELL.X0 S32 1024 - 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 - 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 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.TIMESYS STR UTC - CELL.XPARITY S32 1 - CELL.YPARITY S32 1 - CELL.Y0 S32 0 -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 - CELL.TIME STR MJD -END - -# Recipe options -RECIPES METADATA - PHASE2 STR phase2.config # Phase 2 recipe details -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: unk/ippconfig/megacam/format_split_mask.config =================================================================== --- /trunk/ippconfig/megacam/format_split_mask.config (revision 11575) +++ (revision ) @@ -1,284 +1,0 @@ -# The split MecaCam data is stored in single file for each chip - -# How to recognise this type -RULE METADATA - OBSTYPE STR MASK - ORIGIN STR CFHT - DETECTOR STR MegaCam -END - -# How to read this dataF -FILE METADATA - PHU STR CHIP # The FITS file represents an entire FPA - EXTENSIONS STR NONE # The extensions represent chips - FPA.NAME STR FILENAME # A PHU keyword for the FPA name - CHIP.NAME STR EXTNAME # A PHU keyword for the chip name - CONTENT STR {CHIP.NAME} # A string to index the CONTENTS menu; required because EXT=NONE -END - -# What's in the FITS file? -CONTENTS METADATA - # Chip name, components - ccd00 STR LeftAmp:left RightAmp:right - ccd01 STR LeftAmp:left RightAmp:right - ccd02 STR LeftAmp:left RightAmp:right - ccd03 STR LeftAmp:left RightAmp:right - ccd04 STR LeftAmp:left RightAmp:right - ccd05 STR LeftAmp:left RightAmp:right - ccd06 STR LeftAmp:left RightAmp:right - ccd07 STR LeftAmp:left RightAmp:right - ccd08 STR LeftAmp:left RightAmp:right - ccd09 STR LeftAmp:left RightAmp:right - ccd10 STR LeftAmp:left RightAmp:right - ccd11 STR LeftAmp:left RightAmp:right - ccd12 STR LeftAmp:left RightAmp:right - ccd13 STR LeftAmp:left RightAmp:right - ccd14 STR LeftAmp:left RightAmp:right - ccd15 STR LeftAmp:left RightAmp:right - ccd16 STR LeftAmp:left RightAmp:right - ccd17 STR LeftAmp:left RightAmp:right - ccd18 STR LeftAmp:left RightAmp:right - ccd19 STR LeftAmp:left RightAmp:right - ccd20 STR LeftAmp:left RightAmp:right - ccd21 STR LeftAmp:left RightAmp:right - ccd22 STR LeftAmp:left RightAmp:right - ccd23 STR LeftAmp:left RightAmp:right - ccd24 STR LeftAmp:left RightAmp:right - ccd25 STR LeftAmp:left RightAmp:right - ccd26 STR LeftAmp:left RightAmp:right - ccd27 STR LeftAmp:left RightAmp:right - ccd28 STR LeftAmp:left RightAmp:right - ccd29 STR LeftAmp:left RightAmp:right - ccd30 STR LeftAmp:left RightAmp:right - ccd31 STR LeftAmp:left RightAmp:right - ccd32 STR LeftAmp:left RightAmp:right - ccd33 STR LeftAmp:left RightAmp:right - ccd34 STR LeftAmp:left RightAmp:right - ccd35 STR LeftAmp:left RightAmp:right -END - -# Specify the cells -CELLS METADATA - left METADATA - CELL.BIASSEC.SOURCE STR HEADER - CELL.TRIMSEC.SOURCE STR VALUE - CELL.BIASSEC STR BSECA - CELL.TRIMSEC STR [33:1056,1:4612] - CELL.X0 S32 0 - END - - right METADATA - CELL.BIASSEC.SOURCE STR HEADER - CELL.TRIMSEC.SOURCE STR VALUE - CELL.BIASSEC STR BSECB - CELL.TRIMSEC STR [1057:2080,1:4612] - CELL.X0 S32 1024 - 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 - 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 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.TIMESYS STR UTC - 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 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 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 - CELL.TIME STR MJD -END - Index: /trunk/ippconfig/megacam/ppMerge.config =================================================================== --- /trunk/ippconfig/megacam/ppMerge.config (revision 11576) +++ /trunk/ippconfig/megacam/ppMerge.config (revision 11576) @@ -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: unk/ippconfig/megacam/ppMerge_bias.config =================================================================== --- /trunk/ippconfig/megacam/ppMerge_bias.config (revision 11575) +++ (revision ) @@ -1,6 +1,0 @@ -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: Index: unk/ippconfig/megacam/ppMerge_dark.config =================================================================== --- /trunk/ippconfig/megacam/ppMerge_dark.config (revision 11575) +++ (revision ) @@ -1,6 +1,0 @@ -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: Index: unk/ippconfig/megacam/ppMerge_flat.config =================================================================== --- /trunk/ippconfig/megacam/ppMerge_flat.config (revision 11575) +++ (revision ) @@ -1,8 +1,0 @@ -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: Index: /trunk/ippconfig/recipes/.cvsignore =================================================================== --- /trunk/ippconfig/recipes/.cvsignore (revision 11576) +++ /trunk/ippconfig/recipes/.cvsignore (revision 11576) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /trunk/ippconfig/recipes/Makefile.am =================================================================== --- /trunk/ippconfig/recipes/Makefile.am (revision 11576) +++ /trunk/ippconfig/recipes/Makefile.am (revision 11576) @@ -0,0 +1,19 @@ + +installdir = $(datadir)/ippconfig/recipes + +install_files = \ + ppImage.config \ + ppMerge.config \ + ppStac.config \ + ppStats.config \ + psastro.config \ + psphot.config + +install_DATA = $(install_files) + +install-data-hook: + chmod 0755 $(installdir) + +EXTRA_DIST = $(install_files) + +ACLOCAL_AMFLAGS = -I m4 Index: /trunk/ippconfig/recipes/ppStats.config =================================================================== --- /trunk/ippconfig/recipes/ppStats.config (revision 11575) +++ /trunk/ippconfig/recipes/ppStats.config (revision 11576) @@ -6,9 +6,36 @@ # Define the outputs as MULTI -HEADER MULTI -CONCEPT MULTI -STAT MULTI +HEADER MULTI +CONCEPT MULTI +STAT MULTI # Values to return -STAT STR ROBUST_MEDIAN # Background estimator -STAT STR ROBUST_STDEV # Background standard deviation estimator +STAT STR ROBUST_MEDIAN # Background estimator +STAT STR ROBUST_STDEV # Background standard deviation estimator + +PPSTATS_PHASE0 METADATA + ### ppStats recipe for Phase 0 with MegaCam + + # Options governing statistics + SAMPLE F32 0.1 # Fraction of cell to sample + MASKVAL U8 0xff # Mask value to use for statistics + + # Define the outputs as MULTI + HEADER MULTI + CONCEPT MULTI + STAT MULTI + + # Values to return + 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 CHIP.TEMP # Detector temperature + CONCEPT STR CELL.EXPOSURE # Exposure time + STAT STR ROBUST_MEDIAN # Background estimator + STAT STR ROBUST_STDEV # Background standard deviation estimator +END Index: unk/ippconfig/recipes/ppStats_phase0.config =================================================================== --- /trunk/ippconfig/recipes/ppStats_phase0.config (revision 11575) +++ (revision ) @@ -1,24 +1,0 @@ -### ppStats recipe for Phase 0 with MegaCam - -# Options governing statistics -SAMPLE F32 0.1 # Fraction of cell to sample -MASKVAL U8 0xff # Mask value to use for statistics - -# Define the outputs as MULTI -HEADER MULTI -CONCEPT MULTI -STAT MULTI - -# Values to return -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 CHIP.TEMP # Detector temperature -CONCEPT STR CELL.EXPOSURE # Exposure time -STAT STR ROBUST_MEDIAN # Background estimator -STAT STR ROBUST_STDEV # Background standard deviation estimator Index: /trunk/ippconfig/simple/.cvsignore =================================================================== --- /trunk/ippconfig/simple/.cvsignore (revision 11576) +++ /trunk/ippconfig/simple/.cvsignore (revision 11576) @@ -0,0 +1,2 @@ +Makefile +Makefile.in Index: /trunk/ippconfig/simple/Makefile.am =================================================================== --- /trunk/ippconfig/simple/Makefile.am (revision 11576) +++ /trunk/ippconfig/simple/Makefile.am (revision 11576) @@ -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: unk/ippconfig/simple/phase2.config =================================================================== --- /trunk/ippconfig/simple/phase2.config (revision 11575) +++ (revision ) @@ -1,79 +1,0 @@ -### Phase 2 recipe configuration file - -# List of tasks to perform -MASK BOOL FALSE # Mask bad pixels -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 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 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