diff --git a/analysis/datacollect/datacollect.R b/analysis/datacollect/datacollect.R index d78bc5e..e5a0ad3 100755 --- a/analysis/datacollect/datacollect.R +++ b/analysis/datacollect/datacollect.R @@ -6,10 +6,10 @@ set.seed(3125) # definitions -files = c( "SExtractor default"="../../source_extraction/sex_default/stats_sex_default.csv" - ,"SExtractor modified"="../../source_extraction/sex_optimised/stats_sex_optimised.csv" - ,"SExtractor w. dilated masks"="../../source_extraction/sex_dilated/stats_sex_dilated.csv" - ,"SExtractor w. modelled masks"="../../source_extraction/sex_modelled/stats_sex_modelled.csv" +files = c( "Source Extractor default"="../../source_extraction/sex_default/stats_sex_default.csv" + ,"Source Extractor modified"="../../source_extraction/sex_optimised/stats_sex_optimised.csv" + ,"Source Extractor w. dilated masks"="../../source_extraction/sex_dilated/stats_sex_dilated.csv" + ,"Source Extractor w. modelled masks"="../../source_extraction/sex_modelled/stats_sex_modelled.csv" ,"Gnuastro default"="../../source_extraction/gnuastro_default/stats_gnuastro_default.csv" ,"Gnuastro modified"="../../source_extraction/gnuastro_optimised/stats_gnuastro_optimised.csv" ,"Gnuastro w. dilated masks"="../../source_extraction/gnuastro_dilated/stats_gnuastro_dilated.csv" diff --git a/analysis/datacollect/skydata.rds b/analysis/datacollect/skydata.rds index 43eef4b..b559639 100644 Binary files a/analysis/datacollect/skydata.rds and b/analysis/datacollect/skydata.rds differ diff --git a/analysis/lumfrac/lumfrac.R b/analysis/lumfrac/lumfrac.R index bfce768..d218990 100755 --- a/analysis/lumfrac/lumfrac.R +++ b/analysis/lumfrac/lumfrac.R @@ -68,7 +68,7 @@ for(j in 1:ncol(lfA)){ par("xpd"=NA) mtext(side=1, line=2.5, text=bquote(paste("median recovered luminosity fraction: f = median(", L["out"], " / ", L["in"], ")")), outer=T) mtext(side=2, line=2, text=bquote(paste(f[25])), outer=T, las=1) -alegend("top", legend=names(dat$files), ncol=4, byrow=T, inset=0.5, outer=TRUE, seg.len=0.8, seg.gap=0.4, type=setNames(apply(cbind(pch=metpch,lwd=lwd,col=metcol,cex=cex), 1, as.list), rep("p",length(dat$files))), bty="o", cex=1, box.pad=0.25, line.spacing=1.15) +alegend("top", legend=names(dat$files), ncol=4, byrow=T, inset=0.5, outer=TRUE, seg.len=0.8, seg.gap=0.4, type=setNames(apply(cbind(pch=metpch,lwd=lwd,col=metcol,cex=cex), 1, as.list), rep("p",length(dat$files))), bty="o", cex=0.9, box.pad=0.25, line.spacing=1.15) # finish up graphics.off() diff --git a/analysis/lumfrac/lumfrac.pdf b/analysis/lumfrac/lumfrac.pdf index 327bae4..4c487ba 100644 Binary files a/analysis/lumfrac/lumfrac.pdf and b/analysis/lumfrac/lumfrac.pdf differ diff --git a/analysis/lumfrac/lumfrac.png b/analysis/lumfrac/old/lumfrac.png similarity index 100% rename from analysis/lumfrac/lumfrac.png rename to analysis/lumfrac/old/lumfrac.png diff --git a/analysis/maskstamps/mkmodmask.R b/analysis/maskstamps/mkmodmask.R index 4521f77..a252875 100755 --- a/analysis/maskstamps/mkmodmask.R +++ b/analysis/maskstamps/mkmodmask.R @@ -17,7 +17,7 @@ xcen = 370 ycen = 2650 xdim = 535 ydim = 535 -codebase = "sex" +codebase = "gnuastro" simzipped = paste0("../../sims/simdat/v5/calexp-HSC-R-8283-38.simulated-n4-a.fits.fz") defmapzipped = paste0("../../source_extraction/",codebase,"_default/map/denlo4a.map.fits.gz") model0zipped = paste0("../../source_extraction/",codebase,"_modelled/model/denlo4a.model0.fits.fz") @@ -122,7 +122,7 @@ layout(rbind(c(1,2),c(3,4))) line = 0.25 aimage(model0dat, col.map=colmap, scale.type=ztype, axes=FALSE, scale.lo=zlo, scale.hi=zhi, xlab="", ylab="", smooth.fwhm=0) -mtext(side=3, line=line, text="SExtractor model image") +mtext(side=3, line=line, text="Source Extractor model image") mtext(side=2, line=line, text="standard stretch") aimage(model1dat, col.map=colmap, scale.type=ztype, axes=FALSE, scale.lo=zlo, scale.hi=zhi, xlab="", ylab="", smooth.fwhm=0) diff --git a/analysis/maskstamps/modmaskcomp_gnuastro.png b/analysis/maskstamps/modmaskcomp_gnuastro.png index 577aa3e..2d8eaf7 100644 Binary files a/analysis/maskstamps/modmaskcomp_gnuastro.png and b/analysis/maskstamps/modmaskcomp_gnuastro.png differ diff --git a/analysis/maskstamps/modmaskcomp_sex.png b/analysis/maskstamps/modmaskcomp_sex.png index 2669645..d3c4a78 100644 Binary files a/analysis/maskstamps/modmaskcomp_sex.png and b/analysis/maskstamps/modmaskcomp_sex.png differ diff --git a/analysis/ndetnmatch/ndetnmatch-a.pdf b/analysis/ndetnmatch/ndetnmatch-a.pdf index 6a5aff5..2f4b7a0 100644 Binary files a/analysis/ndetnmatch/ndetnmatch-a.pdf and b/analysis/ndetnmatch/ndetnmatch-a.pdf differ diff --git a/analysis/ndetnmatch/ndetnmatch-b.pdf b/analysis/ndetnmatch/ndetnmatch-b.pdf index 0bfd186..26cad6b 100644 Binary files a/analysis/ndetnmatch/ndetnmatch-b.pdf and b/analysis/ndetnmatch/ndetnmatch-b.pdf differ diff --git a/analysis/ndetnmatch/ndetnmatch.R b/analysis/ndetnmatch/ndetnmatch.R index f6dd1b1..23ebd4b 100755 --- a/analysis/ndetnmatch/ndetnmatch.R +++ b/analysis/ndetnmatch/ndetnmatch.R @@ -107,7 +107,7 @@ for(i in 1:length(xdats)){ mtext(side=1, line=2, text=alabs[i], outer=T) mtext(side=2, line=2.5, text=bquote(paste("number of matched objects")), outer=T) #mtext(side=3, line=1.5, text=simsources[i], outer=T) - alegend("top", legend=names(dat$files), ncol=4, byrow=T, inset=0.5, outer=TRUE, seg.len=0.8, seg.gap=0.4, type=setNames(apply(cbind(pch=metpch,lwd=lwd,col=metcol,cex=cex), 1, as.list), rep("p",length(dat$files))), bty="o", cex=0.9, box.pad=0.25, line.spacing=1.25) + alegend("top", legend=names(dat$files), ncol=4, byrow=T, inset=0.5, outer=TRUE, seg.len=0.8, seg.gap=0.4, type=setNames(apply(cbind(pch=metpch,lwd=lwd,col=metcol,cex=cex), 1, as.list), rep("p",length(dat$files))), bty="o", cex=0.8, box.pad=0.25, line.spacing=1.25) # finish up graphics.off() diff --git a/analysis/skymaps/mkskymaps.R b/analysis/skymaps/mkskymaps.R index 7a373b5..3e96828 100755 --- a/analysis/skymaps/mkskymaps.R +++ b/analysis/skymaps/mkskymaps.R @@ -101,10 +101,10 @@ xat = -0.02 ysex = 0.773 #; abline(h=ysex) ygnu = 0.365 #; abline(h=ygnu) ydm = 0.061 #; abline(h=ydm) -mtext(side=2, line=xlabline, at=ysex, text="SExtractor", cex=cex) -arrows(x0=xat, y0=ysex+0.05, y1=ysex+0.185, length=arrowlength, angle=90, code=2, lend=1) -arrows(x0=xat, y0=ysex-0.05, y1=ysex-0.185, length=arrowlength, angle=90, code=2, lend=1) -lines(x=c(xat,xat), y=c(ysex-0.05,ysex-0.15)) +mtext(side=2, line=xlabline, at=ysex, text="Source Extractor", cex=cex) +arrows(x0=xat, y0=ysex+0.08, y1=ysex+0.185, length=arrowlength, angle=90, code=2, lend=1) +arrows(x0=xat, y0=ysex-0.08, y1=ysex-0.185, length=arrowlength, angle=90, code=2, lend=1) +#lines(x=c(xat,xat), y=c(ysex-0.05,ysex-0.15)) mtext(side=2, line=xlabline, at=ygnu, text="Gnuastro", cex=cex) arrows(x0=xat, y0=ygnu+0.05, y1=ygnu+0.185, length=arrowlength, angle=90, code=2, lend=1) arrows(x0=xat, y0=ygnu-0.05, y1=ygnu-0.185, length=arrowlength, angle=90, code=2, lend=1) diff --git a/analysis/skymaps/skymaps.png b/analysis/skymaps/skymaps.png index a781014..5d3d650 100644 Binary files a/analysis/skymaps/skymaps.png and b/analysis/skymaps/skymaps.png differ diff --git a/analysis/skyval/results.tex b/analysis/skyval/results.tex index 7a01d42..40f3a2f 100644 --- a/analysis/skyval/results.tex +++ b/analysis/skyval/results.tex @@ -1,10 +1,10 @@ \multicolumn{1}{r}{label :} & \multicolumn{1}{c}{(denlo1a)} & \multicolumn{1}{c}{(denlo4a)} & \multicolumn{1}{c}{(denhi1a)} & \multicolumn{1}{c}{(denhi4a)} & \multicolumn{1}{c}{(denlo1b)} & \multicolumn{1}{c}{(denlo4b)} & \multicolumn{1}{c}{(denhi1b)} & \multicolumn{1}{c}{(denhi4b)}\\ \hline \SExtractor & & & & & & & & \\ - \hspace{25pt}default & $13.9\pm3.1$ & $16.7\pm5.7$ & $20.7\pm3.3$ & $25.4\pm6.8$ & $3.6\pm2.8$ & $5.7\pm5.6$ & $6.0\pm3.1$ & $9.9\pm6.9$\\ - \hspace{25pt}modified & $14.0\pm1.7$ & $16.5\pm2.2$ & $20.9\pm1.4$ & $24.9\pm2.5$ & $3.6\pm1.1$ & $5.6\pm1.8$ & $6.1\pm1.4$ & $9.6\pm2.7$\\ - \hspace{25pt}w. dilated masks & $10.5\pm2.1$ & $13.8\pm3.2$ & $16.0\pm2.3$ & $20.8\pm3.3$ & $0.9\pm1.8$ & $3.2\pm2.8$ & $1.7\pm1.8$ & $5.4\pm3.3$\\ - \hspace{25pt}w. modelled masks & $8.4\pm2.6$ & $8.7\pm3.5$ & $12.5\pm3.3$ & $12.5\pm4.5$ & $-1.0\pm2.3$ & $-1.7\pm3.3$ & $-1.3\pm2.6$ & $-2.4\pm4.2$\\ + \hspace{25pt}NA & $13.9\pm3.1$ & $16.7\pm5.7$ & $20.7\pm3.3$ & $25.4\pm6.8$ & $3.6\pm2.8$ & $5.7\pm5.6$ & $6.0\pm3.1$ & $9.9\pm6.9$\\ + \hspace{25pt}NA & $14.0\pm1.7$ & $16.5\pm2.2$ & $20.9\pm1.4$ & $24.9\pm2.5$ & $3.6\pm1.1$ & $5.6\pm1.8$ & $6.1\pm1.4$ & $9.6\pm2.7$\\ + \hspace{25pt}NA & $10.5\pm2.1$ & $13.8\pm3.2$ & $16.0\pm2.3$ & $20.8\pm3.3$ & $0.9\pm1.8$ & $3.2\pm2.8$ & $1.7\pm1.8$ & $5.4\pm3.3$\\ + \hspace{25pt}NA & $8.4\pm2.6$ & $8.7\pm3.5$ & $12.5\pm3.3$ & $12.5\pm4.5$ & $-1.0\pm2.3$ & $-1.7\pm3.3$ & $-1.3\pm2.6$ & $-2.4\pm4.2$\\ \hline \Gnuastro & & & & & & & & \\ \hspace{25pt}default & $8.3\pm1.7$ & $11.6\pm2.1$ & $11.9\pm1.8$ & $15.8\pm2.3$ & $-0.0\pm1.2$ & $2.1\pm1.9$ & $-0.1\pm1.3$ & $2.9\pm2.0$\\ diff --git a/analysis/skyval/skyval-a.pdf b/analysis/skyval/skyval-a.pdf index 7e3b81c..0ab444e 100644 Binary files a/analysis/skyval/skyval-a.pdf and b/analysis/skyval/skyval-a.pdf differ diff --git a/analysis/skyval/skyval-b.pdf b/analysis/skyval/skyval-b.pdf index 9a77956..d88bd4e 100644 Binary files a/analysis/skyval/skyval-b.pdf and b/analysis/skyval/skyval-b.pdf differ diff --git a/analysis/skyval/skyval.R b/analysis/skyval/skyval.R index e884d9b..72f88bf 100755 --- a/analysis/skyval/skyval.R +++ b/analysis/skyval/skyval.R @@ -85,7 +85,7 @@ for(i in 1:length(datmeans)){ #mtext(side=1, line=2, text="sky estimation method", outer=T) #mtext(side=3, line=1, text=simsources[i], outer=T) mtext(side=2, line=2.5, text=bquote(paste("mean estimated sky level / mag ", arcsec^{-2})), outer=T) - alegend("bottom", legend=names(dat$files), ncol=4, byrow=T, inset=0.5, outer=TRUE, seg.len=0.8, seg.gap=0.4, type=setNames(apply(cbind(pch=metpch,lwd=lwd,col=metcol,cex=cex), 1, as.list), rep("p",length(dat$files))), bty="o", cex=0.9, box.pad=0.25, line.spacing=1.25) + alegend("bottom", legend=names(dat$files), ncol=4, byrow=T, inset=0.5, outer=TRUE, seg.len=0.8, seg.gap=0.4, type=setNames(apply(cbind(pch=metpch,lwd=lwd,col=metcol,cex=cex), 1, as.list), rep("p",length(dat$files))), bty="o", cex=0.8, box.pad=0.25, line.spacing=1.25) # finish up graphics.off() diff --git a/paper b/paper index 9f9ad09..d37a755 160000 --- a/paper +++ b/paper @@ -1 +1 @@ -Subproject commit 9f9ad09f1f3f69961802dfb24b649cbc08eaef14 +Subproject commit d37a7553c6caf178d9f87a9af9412563376fa374