Index: /branches/eam_branches/ipp-20130307/dvodist/INSTALL =================================================================== --- /branches/eam_branches/ipp-20130307/dvodist/INSTALL (revision 35279) +++ /branches/eam_branches/ipp-20130307/dvodist/INSTALL (revision 35280) @@ -6,8 +6,13 @@ make php +# the subdirectory on the server is hard-wired in Makefile & depends on the make target +ipp002 version: + psconfigure --htdocs /data/ipp002.0/www/localhost/htdocs/ --rootdir /ippdata --rootwww http://ipp.ifa.hawaii.edu + make ippdata + pikake test examples: -psconfigure --htdocs /var/www/ --rootdir /ippdata --rootwww http://pikake.ifa.hawaii.edu/ippdata -make ippdata + psconfigure --htdocs /var/www/ --rootdir /ippdata --rootwww http://pikake.ifa.hawaii.edu + make ippdata -psconfigure --htdocs /var/www/ --rootdir /dvodist --rootwww http://pikake.ifa.hawaii.edu/ippdata -make dvodist + psconfigure --htdocs /var/www/ --rootdir /dvodist --rootwww http://pikake.ifa.hawaii.edu + make dvodist Index: /branches/eam_branches/ipp-20130307/dvodist/Makefile.in =================================================================== --- /branches/eam_branches/ipp-20130307/dvodist/Makefile.in (revision 35279) +++ /branches/eam_branches/ipp-20130307/dvodist/Makefile.in (revision 35280) @@ -62,6 +62,4 @@ $(TGT-IPPDATA)/catdir.syn.test/n3000/index.php \ $(TGT-IPPDATA)/catdir.syn.test/n3730/index.php \ -$(TGT-IPPDATA)/test.php \ -$(TGT-IPPDATA)/docs.php \ $(TGT-IPPDATA)/help.php \ $(TGT-IPPDATA)/ipp.css Index: /branches/eam_branches/ipp-20130307/dvodist/ippdata/index.mkd =================================================================== --- /branches/eam_branches/ipp-20130307/dvodist/ippdata/index.mkd (revision 35279) +++ /branches/eam_branches/ipp-20130307/dvodist/ippdata/index.mkd (revision 35280) @@ -23,4 +23,22 @@ eventually astrometry) datasets. +**Please include the following acknowledgement text in any publications +which make use of data from Pan-STARRS 1:** + +> The Pan-STARRS1 (PS1) Surveys have been made possible through +contributions of the Institute for Astronomy, the University of +Hawaii, the Pan-STARRS Project Office, the Max-Planck Society and its +participating institutes, the Max Planck Institute for Astronomy, +Heidelberg and the Max Planck Institute for Extraterrestrial Physics, +Garching, The Johns Hopkins University, Durham University, the +University of Edinburgh, Queen's University Belfast, the +Harvard-Smithsonian Center for Astrophysics, the Las Cumbres +Observatory Global Telescope Network Incorporated, the National +Central University of Taiwan, the Space Telescope Science Institute, +the National Aeronautics and Space Administration under Grant +No. NNX08AR22G issued through the Planetary Science Division of the +NASA Science Mission Directorate and the University of Maryland. + + @ Data Product : none : plain : title : Comment @ PS1 Photladder, 12.01 : photladder.20130107.subset : dir : dir1 : Photometric Reference Ladder, Release 12.01 Index: /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/index.mkd =================================================================== --- /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/index.mkd (revision 35279) +++ /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/index.mkd (revision 35280) @@ -3,5 +3,5 @@ # PS1 Photometric Reference Ladder, Release 12.01 -(up to [PS1 Data Release](/ippdata/index.php)) +(up to [PS1 Data Release](@WWWHOST@/index.php)) The PS1 Photometric Reference Ladder (Release 12.01) provides @@ -23,15 +23,40 @@ The relphot tables include objects for which some (or even all) of the filters have been calibrated via relative photometry using image -overlaps to connect them to images in the ubercal set. Please take +overlaps to connect them to images in the ubercal set. **Please take care when using the relphot tables, as the relative photometry tie may allow for substantial drift in certain patches in the sky (see Figure -6 in Magnier et al 2013). +6 in Magnier et al 2013).** -* [Magnier et al, 2012 : Photometric Reference Ladder, Release 12.01 Paper (pdf)](../docs/photladder-1206.20130301.pdf) +The publication describing the photometric ladder has been accepted +for publication in The Astrophysical Journal Supplement and should be reference as: + +> Magnier E.~A., Schlafly E., Finkbeiner D., Juric M., Tonry J.~L., Burgett W.~S., Chambers K.~C., Flewelling H.~A., +Kaiser N., Kudritzki R.-P., Morgan J.~S., Price P.~A., Sweeney W.~E., Stubbs C.~W., 2013 ApJS in press. + +A PDF of the article preprint is linked below: + +* [Magnier et al, 2012 : Photometric Reference Ladder, Release 12.01 Paper (pdf)](@WWWHOST@/docs/photladder-1206.20130301.pdf) + +**Please include the following acknowledgement text in any publications +which make use of data from Pan-STARRS 1:** + +> The Pan-STARRS1 (PS1) Surveys have been made possible through +contributions of the Institute for Astronomy, the University of +Hawaii, the Pan-STARRS Project Office, the Max-Planck Society and its +participating institutes, the Max Planck Institute for Astronomy, +Heidelberg and the Max Planck Institute for Extraterrestrial Physics, +Garching, The Johns Hopkins University, Durham University, the +University of Edinburgh, Queen's University Belfast, the +Harvard-Smithsonian Center for Astrophysics, the Las Cumbres +Observatory Global Telescope Network Incorporated, the National +Central University of Taiwan, the Space Telescope Science Institute, +the National Aeronautics and Space Administration under Grant +No. NNX08AR22G issued through the Planetary Science Division of the +NASA Science Mission Directorate and the University of Maryland. + @ Data Product : none : plain : title : Comment -@ Ubercal FITS tables : ubercal-fits : dir : dir1 : NOTES -@ Ubercal CSV tables : ubercal-csv : dir : dir2 : NOTES -@ Relphot FITS tables : relphot-fits : dir : dir1 : NOTES -@ Relphot CSV tables : relphot-csv : dir : dir2 : NOTES - +@ Ubercal FITS tables : ubercal-fits : dir : dir1 : FITS Table version, photometric data only +@ Ubercal CSV tables : ubercal-csv : dir : dir2 : CSV Table version, photometric data only +@ Relphot FITS tables : relphot-fits : dir : dir1 : FITS Table version, relative photometry calibration (caution!) +@ Relphot CSV tables : relphot-csv : dir : dir2 : CSV Table version, relative photometry calibration (caution!) Index: /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/relphot-csv/index.mkd =================================================================== --- /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/relphot-csv/index.mkd (revision 35279) +++ /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/relphot-csv/index.mkd (revision 35280) @@ -4,9 +4,9 @@ ## Relphot Data in CSV Format -(up to [PS1 Photladder, 12.01](/ippdata/photladder.20130107.subset/index.php)) +(up to [PS1 Photladder, 12.01](@WWWHOST@/photladder.20130107.subset)) Download this entire directory with the following command: - wget -c -r -np -nH @ROOTWWW@/photladder.20130107.subset/relphot-csv + wget -c -r -np -nH @WWWHOST@/photladder.20130107.subset/relphot-csv/index.php @ filename : plain : title : size (bytes) md5sum Index: /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/relphot-fits/index.mkd =================================================================== --- /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/relphot-fits/index.mkd (revision 35279) +++ /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/relphot-fits/index.mkd (revision 35280) @@ -4,38 +4,38 @@ ## Relphot Data in FITS Format -(up to [PS1 Photladder, 12.01](/ippdata/photladder.20130107.subset/index.php)) +(up to [PS1 Photladder, 12.01](@WWWHOST@/photladder.20130107.subset)) Download this entire directory with the following command: - wget -c -r -np -nH @ROOTWWW@/photladder.20130107.subset/relphot-fits + wget -c -r -np -nH @WWWHOST@/photladder.20130107.subset/relphot-fits/index.php @ filename : plain : title : size (bytes) md5sum -@ ps1.ladder.1201.relphot.D+00d.fits : file : file1 : 39398400 | 64ff5ec3d9c76e32b3e6ef8182b1f023 -@ ps1.ladder.1201.relphot.D-25d.fits : file : file2 : 49127040 | 395f8aad559be044aa673624ee49dcc7 -@ ps1.ladder.1201.relphot.D+25d.fits : file : file1 : 46370880 | 96ad6ef5953658f139632521d814a246 -@ ps1.ladder.1201.relphot.D+50d.fits : file : file2 : 43274880 | 3d21e1b27b41182f75e06e0eab15e622 -@ ps1.ladder.1201.relphot.R+00h.fits : file : file1 : 5483520 | 26be0dd339f41791f5ddb18fc8192a40 -@ ps1.ladder.1201.relphot.R+01h.fits : file : file2 : 7263360 | a1957a589d9ddce3cfb4f9dd8c2cb9da -@ ps1.ladder.1201.relphot.R+02h.fits : file : file1 : 7217280 | 28e71fcf3b19485bb86c9bc5af58caeb -@ ps1.ladder.1201.relphot.R+03h.fits : file : file2 : 6108480 | 7fc5f75aa9c412692f1fdaeacd065772 -@ ps1.ladder.1201.relphot.R+04h.fits : file : file1 : 9216000 | 5354af2ec06dfb188f2f0cbde03fb567 -@ ps1.ladder.1201.relphot.R+05h.fits : file : file2 : 10589760 | 9b0472cd92dbdad908b44a9da6f1e6ba -@ ps1.ladder.1201.relphot.R+06h.fits : file : file1 : 12153600 | 043d299e05d5857afbb8f966741886b8 -@ ps1.ladder.1201.relphot.R+07h.fits : file : file2 : 12764160 | b5a11f6f313f4b15b3478d7a385786a1 -@ ps1.ladder.1201.relphot.R+08h.fits : file : file1 : 11554560 | 0b7aab048824b2a333c727f1c7f16215 -@ ps1.ladder.1201.relphot.R+09h.fits : file : file2 : 5463360 | c6243b7ebf27d88beffe6839452817c0 -@ ps1.ladder.1201.relphot.R+10h.fits : file : file1 : 3954240 | 4f87ac1becccf90acc57e8af2e1b7ad3 -@ ps1.ladder.1201.relphot.R+11h.fits : file : file2 : 3130560 | 001d0234ec8b450a0a31fceedf4ee50e -@ ps1.ladder.1201.relphot.R+12h.fits : file : file1 : 4685760 | f6974c449fb4a23107dc1a7a1ba84908 -@ ps1.ladder.1201.relphot.R+13h.fits : file : file2 : 4239360 | dbfc709f6efcb74c93b07bb0a1355faf -@ ps1.ladder.1201.relphot.R+14h.fits : file : file1 : 6243840 | de718b2b96e43390e06905237b39ce1a -@ ps1.ladder.1201.relphot.R+15h.fits : file : file2 : 7669440 | af51be4af06df82f55d9d610dc9aeb34 -@ ps1.ladder.1201.relphot.R+16h.fits : file : file1 : 11528640 | 6897ea57487d17617b70429b938c14f7 -@ ps1.ladder.1201.relphot.R+17h.fits : file : file2 : 12666240 | c3526e9498ad58f665d26459d1643689 -@ ps1.ladder.1201.relphot.R+18h.fits : file : file1 : 12660480 | 22d2917e2dda2dd0e287e928dc8563c7 -@ ps1.ladder.1201.relphot.R+19h.fits : file : file2 : 13204800 | cccbd09b445fa38ce9431d9b1e72e11c -@ ps1.ladder.1201.relphot.R+20h.fits : file : file1 : 13374720 | b5a184414289eb2ce7cb6517d984856a -@ ps1.ladder.1201.relphot.R+21h.fits : file : file2 : 13374720 | d489763dbf47025ed6bc6f30a30db920 -@ ps1.ladder.1201.relphot.R+22h.fits : file : file1 : 12810240 | 15400c02daf6d33f7b4c7087adc77f3e -@ ps1.ladder.1201.relphot.R+23h.fits : file : file2 : 11131200 | 5e6684beff60a325af65b8ab220ee197 -@ ps1.ladder.1201.relphot.R+24h.fits : file : file1 : 4806720 | 5caa7a2e90443d1e1c3ccb3b241d3bf7 +@ ps1.ladder.1201.relphot.D+00d.fits : file : file1 : 39398400 64ff5ec3d9c76e32b3e6ef8182b1f023 +@ ps1.ladder.1201.relphot.D-25d.fits : file : file2 : 49127040 395f8aad559be044aa673624ee49dcc7 +@ ps1.ladder.1201.relphot.D+25d.fits : file : file1 : 46370880 96ad6ef5953658f139632521d814a246 +@ ps1.ladder.1201.relphot.D+50d.fits : file : file2 : 43274880 3d21e1b27b41182f75e06e0eab15e622 +@ ps1.ladder.1201.relphot.R+00h.fits : file : file1 : 5483520 26be0dd339f41791f5ddb18fc8192a40 +@ ps1.ladder.1201.relphot.R+01h.fits : file : file2 : 7263360 a1957a589d9ddce3cfb4f9dd8c2cb9da +@ ps1.ladder.1201.relphot.R+02h.fits : file : file1 : 7217280 28e71fcf3b19485bb86c9bc5af58caeb +@ ps1.ladder.1201.relphot.R+03h.fits : file : file2 : 6108480 7fc5f75aa9c412692f1fdaeacd065772 +@ ps1.ladder.1201.relphot.R+04h.fits : file : file1 : 9216000 5354af2ec06dfb188f2f0cbde03fb567 +@ ps1.ladder.1201.relphot.R+05h.fits : file : file2 : 10589760 9b0472cd92dbdad908b44a9da6f1e6ba +@ ps1.ladder.1201.relphot.R+06h.fits : file : file1 : 12153600 043d299e05d5857afbb8f966741886b8 +@ ps1.ladder.1201.relphot.R+07h.fits : file : file2 : 12764160 b5a11f6f313f4b15b3478d7a385786a1 +@ ps1.ladder.1201.relphot.R+08h.fits : file : file1 : 11554560 0b7aab048824b2a333c727f1c7f16215 +@ ps1.ladder.1201.relphot.R+09h.fits : file : file2 : 5463360 c6243b7ebf27d88beffe6839452817c0 +@ ps1.ladder.1201.relphot.R+10h.fits : file : file1 : 3954240 4f87ac1becccf90acc57e8af2e1b7ad3 +@ ps1.ladder.1201.relphot.R+11h.fits : file : file2 : 3130560 001d0234ec8b450a0a31fceedf4ee50e +@ ps1.ladder.1201.relphot.R+12h.fits : file : file1 : 4685760 f6974c449fb4a23107dc1a7a1ba84908 +@ ps1.ladder.1201.relphot.R+13h.fits : file : file2 : 4239360 dbfc709f6efcb74c93b07bb0a1355faf +@ ps1.ladder.1201.relphot.R+14h.fits : file : file1 : 6243840 de718b2b96e43390e06905237b39ce1a +@ ps1.ladder.1201.relphot.R+15h.fits : file : file2 : 7669440 af51be4af06df82f55d9d610dc9aeb34 +@ ps1.ladder.1201.relphot.R+16h.fits : file : file1 : 11528640 6897ea57487d17617b70429b938c14f7 +@ ps1.ladder.1201.relphot.R+17h.fits : file : file2 : 12666240 c3526e9498ad58f665d26459d1643689 +@ ps1.ladder.1201.relphot.R+18h.fits : file : file1 : 12660480 22d2917e2dda2dd0e287e928dc8563c7 +@ ps1.ladder.1201.relphot.R+19h.fits : file : file2 : 13204800 cccbd09b445fa38ce9431d9b1e72e11c +@ ps1.ladder.1201.relphot.R+20h.fits : file : file1 : 13374720 b5a184414289eb2ce7cb6517d984856a +@ ps1.ladder.1201.relphot.R+21h.fits : file : file2 : 13374720 d489763dbf47025ed6bc6f30a30db920 +@ ps1.ladder.1201.relphot.R+22h.fits : file : file1 : 12810240 15400c02daf6d33f7b4c7087adc77f3e +@ ps1.ladder.1201.relphot.R+23h.fits : file : file2 : 11131200 5e6684beff60a325af65b8ab220ee197 +@ ps1.ladder.1201.relphot.R+24h.fits : file : file1 : 4806720 5caa7a2e90443d1e1c3ccb3b241d3bf7 Index: /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/ubercal-csv/index.mkd =================================================================== --- /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/ubercal-csv/index.mkd (revision 35279) +++ /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/ubercal-csv/index.mkd (revision 35280) @@ -2,11 +2,11 @@ # PS1 Photometric Reference Ladder, Release 12.01 -## Ubercal Data in FITS Format +## Ubercal Data in CSV Format -(up to [PS1 Photladder, 12.01](/ippdata/photladder.20130107.subset/index.php)) +(up to [PS1 Photladder, 12.01](@WWWHOST@/photladder.20130107.subset)) Download this entire directory with the following command: - wget -c -r -np -nH @ROOTWWW@/photladder.20130107.subset/ubercal-fits + wget -c -r -np -nH @WWWHOST@/photladder.20130107.subset/ubercal-csv/index.php @ filename : plain : title : size (bytes) md5sum Index: /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/ubercal-fits/index.mkd =================================================================== --- /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/ubercal-fits/index.mkd (revision 35279) +++ /branches/eam_branches/ipp-20130307/dvodist/ippdata/photladder.20130107.subset/ubercal-fits/index.mkd (revision 35280) @@ -4,9 +4,9 @@ ## Ubercal Data in FITS Format -(up to [PS1 Photladder, 12.01](/ippdata/photladder.20130107.subset/index.php)) +(up to [PS1 Photladder, 12.01](@WWWHOST@/photladder.20130107.subset)) Download this entire directory with the following command: - wget -c -r -np -nH @ROOTWWW@/photladder.20130107.subset/ubercal-fits + wget -c -r -np -nH @WWWHOST@/photladder.20130107.subset/ubercal-fits/index.php @ filename : plain : title : size (bytes) md5sum Index: /branches/eam_branches/ipp-20130307/dvodist/www-util/ippdata.page.mkd =================================================================== --- /branches/eam_branches/ipp-20130307/dvodist/www-util/ippdata.page.mkd (revision 35279) +++ /branches/eam_branches/ipp-20130307/dvodist/www-util/ippdata.page.mkd (revision 35280) @@ -7,13 +7,12 @@ // if we come in directly, the top-level directory should be /dvodist // if we come in from the ippops1 proxy, we need to set the root to / -$ifaProxy = "128.171.227.208"; +$realHost = "ipp.ifa.hawaii.edu"; -// is the request coming from our proxY? -$fromProxy = $_SERVER['HTTP_X_FORWARDED_FOR'] && ($_SERVER['REMOTE_ADDR'] == $ifaProxy); -if ($fromProxy) { +// is the request coming from our proxy? +if ($_SERVER['SERVER_NAME'] == $realHost) { $rootdir = "@ROOTWWW@"; - } else { +} else { $rootdir = "@ROOTWWW@@ROOTDIR@"; - } +} menu("$utils/ippdata.menu.dat", 'Pan-STARRS 1 Data Distribution Server', $rootdir, "$rootdir/ipp.css", '', ''); @@ -24,27 +23,2 @@ menu_end(); ?> - -// generic proxy detection -// if ( $_SERVER['HTTP_X_FORWARDED_FOR'] -// || $_SERVER['HTTP_X_FORWARDED'] -// || $_SERVER['HTTP_FORWARDED_FOR'] -// || $_SERVER['HTTP_CLIENT_IP'] -// || $_SERVER['HTTP_VIA'] -// || in_array($_SERVER['REMOTE_PORT'], array(8080,80,6588,8000,3128,553,554)) -// || @fsockopen($_SERVER['REMOTE_ADDR'], 80, $errno, $errstr, 30)) -// { -// exit('Proxy detected'); -// } - -// list server info: -// $varlist = array ('SCRIPT_NAME', 'HTTP_X_FORWARDED_FOR', 'HTTP_X_FORWARDED', 'HTTP_FORWARDED_FOR', 'HTTP_CLIENT_IP', 'HTTP_VIA', 'REMOTE_ADDR'); -// -// foreach ($varlist as $name) { -// echo "$name : $_SERVER[$name]
\n"; -// } -// -// echo "get list
\n"; -// foreach ($_GET as $key => $value) { -// echo "$key : $value
\n"; -// } -