diff --git a/analysis/skyval/results.tex b/analysis/skyval/results.tex index de01ce0..7a01d42 100644 --- a/analysis/skyval/results.tex +++ b/analysis/skyval/results.tex @@ -1,17 +1,17 @@ \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 & $3.8\pm0.9$ & $4.6\pm1.6$ & $5.7\pm0.9$ & $7.0\pm1.9$ & $1.0\pm0.8$ & $1.6\pm1.5$ & $1.7\pm0.9$ & $2.7\pm1.9$\\ - \hspace{25pt}modified & $3.8\pm0.5$ & $4.5\pm0.6$ & $5.8\pm0.4$ & $6.9\pm0.7$ & $1.0\pm0.3$ & $1.5\pm0.5$ & $1.7\pm0.4$ & $2.7\pm0.7$\\ - \hspace{25pt}w. dilated masks & $2.9\pm0.6$ & $3.8\pm0.9$ & $4.4\pm0.6$ & $5.8\pm0.9$ & $0.2\pm0.5$ & $0.9\pm0.8$ & $0.5\pm0.5$ & $1.5\pm0.9$\\ - \hspace{25pt}w. modelled masks & $2.3\pm0.7$ & $2.4\pm1.0$ & $3.4\pm0.9$ & $3.5\pm1.2$ & $-0.3\pm0.6$ & $-0.5\pm0.9$ & $-0.3\pm0.7$ & $-0.7\pm1.2$\\ + \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$\\ \hline \Gnuastro & & & & & & & & \\ - \hspace{25pt}default & $2.3\pm0.5$ & $3.2\pm0.6$ & $3.3\pm0.5$ & $4.4\pm0.6$ & $-0.0\pm0.3$ & $0.6\pm0.5$ & $-0.0\pm0.4$ & $0.8\pm0.6$\\ - \hspace{25pt}modified & $1.6\pm0.9$ & $2.4\pm0.9$ & $2.4\pm1.0$ & $3.5\pm1.0$ & $-0.4\pm0.7$ & $0.1\pm0.8$ & $-0.5\pm0.7$ & $0.1\pm0.8$\\ - \hspace{25pt}w. dilated masks & $2.0\pm0.5$ & $2.5\pm0.5$ & $3.2\pm0.5$ & $3.8\pm0.6$ & $-0.2\pm0.4$ & $0.1\pm0.4$ & $-0.2\pm0.4$ & $0.2\pm0.4$\\ - \hspace{25pt}w. modelled masks & $2.3\pm0.5$ & $3.1\pm0.6$ & $3.5\pm0.5$ & $4.4\pm0.7$ & $0.0\pm0.4$ & $0.3\pm0.6$ & $0.1\pm0.4$ & $0.5\pm0.6$\\ + \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$\\ + \hspace{25pt}modified & $5.8\pm3.4$ & $8.7\pm3.4$ & $8.6\pm3.6$ & $12.8\pm3.7$ & $-1.4\pm2.6$ & $0.5\pm2.8$ & $-1.8\pm2.6$ & $0.3\pm2.8$\\ + \hspace{25pt}w. dilated masks & $7.4\pm1.9$ & $9.3\pm2.0$ & $11.5\pm2.0$ & $13.8\pm2.1$ & $-0.7\pm1.4$ & $0.4\pm1.5$ & $-0.8\pm1.5$ & $0.7\pm1.4$\\ + \hspace{25pt}w. modelled masks & $8.5\pm1.7$ & $11.1\pm2.1$ & $12.6\pm1.9$ & $16.0\pm2.4$ & $0.0\pm1.3$ & $1.2\pm2.1$ & $0.3\pm1.5$ & $1.9\pm2.3$\\ \hline - \DMStack & & & & & & & & \\ - \hspace{25pt}NA & $3.4\pm0.1$ & $4.4\pm0.4$ & $5.1\pm0.1$ & $6.6\pm0.4$ & $0.6\pm0.1$ & $1.4\pm0.3$ & $0.9\pm0.1$ & $2.2\pm0.4$\\ - \hspace{25pt}NA & $2.7\pm0.4$ & $3.2\pm1.4$ & $3.9\pm0.5$ & $5.5\pm1.6$ & $0.9\pm0.3$ & $0.9\pm1.3$ & $0.1\pm0.4$ & $1.5\pm1.7$\\ \ No newline at end of file + \LSSTPs & & & & & & & & \\ + \hspace{25pt}\DMA & $12.6\pm0.4$ & $16.1\pm1.4$ & $18.3\pm0.5$ & $23.9\pm1.5$ & $2.2\pm0.3$ & $5.1\pm1.3$ & $3.4\pm0.4$ & $8.1\pm1.4$\\ + \hspace{25pt}\DMB & $10.0\pm1.5$ & $11.9\pm4.9$ & $14.2\pm1.8$ & $19.8\pm5.9$ & $3.2\pm1.3$ & $3.3\pm4.9$ & $0.2\pm1.5$ & $5.3\pm6.1$\\ \ No newline at end of file diff --git a/analysis/skyval/skyval-a.pdf b/analysis/skyval/skyval-a.pdf index 2ca95cc..7e3b81c 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 27565a1..9a77956 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 a8b0e98..e884d9b 100755 --- a/analysis/skyval/skyval.R +++ b/analysis/skyval/skyval.R @@ -94,8 +94,9 @@ for(i in 1:length(datmeans)){ # print latex tabular data oo = c(1,3,2,4,1,3,2,4) -gainlo = 557.926737435189 -gainhi = 563.915070480379 +# gainlo = 557.926737435189 +# gainhi = 563.915070480379 +nJy = 57.543993733715446 / (0.168*0.168) means = cbind(datmeans[[1]][,oo[1]], datmeans[[1]][,oo[2]], datmeans[[1]][,oo[3]], datmeans[[1]][,oo[4]], datmeans[[2]][,oo[1]], datmeans[[2]][,oo[2]], datmeans[[2]][,oo[3]], datmeans[[2]][,oo[4]]) colnames(means) = c(colnames(datmeans[[1]])[oo[1:4]], colnames(datmeans[[2]])[oo[5:8]]) stds = cbind(datstds[[1]][,oo[1]], datstds[[1]][,oo[2]], datstds[[1]][,oo[3]], datstds[[1]][,oo[4]], datstds[[2]][,oo[1]], datstds[[2]][,oo[2]], datstds[[2]][,oo[3]], datstds[[2]][,oo[4]]) @@ -106,18 +107,20 @@ for(i in 1:nrow(means)){ } if(i==1){cat("\\hline\n \\SExtractor & & & & & & & & \\\\\n ", file="results.tex", append=TRUE)} if(i==5){cat("\\hline\n \\Gnuastro & & & & & & & & \\\\\n ", file="results.tex", append=TRUE)} - if(i==9){cat("\\hline\n \\DMStack & & & & & & & & \\\\\n ", file="results.tex", append=TRUE)} + if(i==9){cat("\\hline\n \\LSSTPs & & & & & & & & \\\\\n ", file="results.tex", append=TRUE)} if(i>=1 & i<=4){frontmatter = strsplit(rownames(means)[i], "SExtractor ")[[1]][2]} if(i>=5 & i<=8){frontmatter = strsplit(rownames(means)[i], "Gnuastro ")[[1]][2]} - if(i>=9 & i<=10){frontmatter = strsplit(rownames(means)[i], "DM stack ")[[1]][2]} + # if(i>=9 & i<=10){frontmatter = strsplit(rownames(means)[i], "DM stack ")[[1]][2]} + if(i==9){frontmatter = '\\DMA'} + if(i==10){frontmatter = '\\DMB'} cat(paste0("\\hspace{25pt}", frontmatter), file="results.tex", append=TRUE) for(j in 1:ncol(means)){ - jgain = ifelse((length(grep("denlo", colnames(means)[j])) > 0), gainlo, gainhi) + #jgain = ifelse((length(grep("denlo", colnames(means)[j])) > 0), gainlo, gainhi) cat(" & ", file="results.tex", append=TRUE) - cat("$", formatC(means[i,j]*jgain, format='f', digits=1), sep="", file="results.tex", append=TRUE) + cat("$", formatC(means[i,j]*nJy, format='f', digits=1), sep="", file="results.tex", append=TRUE) cat("\\pm", file="results.tex", append=TRUE) - cat(formatC(stds[i,j]*jgain, format='f', digits=1), "$", sep="", file="results.tex", append=TRUE) + cat(formatC(stds[i,j]*nJy, format='f', digits=1), "$", sep="", file="results.tex", append=TRUE) } if(j==ncol(means) & i!=nrow(means)){ cat("\\\\\n ", file="results.tex", append=TRUE) @@ -127,22 +130,22 @@ for(i in 1:nrow(means)){ } # print mean binary offset statistics -denlo1a = as.numeric(datmeans[[1]][,"denlo1a"] * gainlo) -denlo4a = as.numeric(datmeans[[1]][,"denlo4a"] * gainlo) -denlo1b = as.numeric(datmeans[[2]][,"denlo1b"] * gainlo) -denlo4b = as.numeric(datmeans[[2]][,"denlo4b"] * gainlo) -denhi1a = as.numeric(datmeans[[1]][,"denhi1a"] * gainhi) -denhi4a = as.numeric(datmeans[[1]][,"denhi4a"] * gainhi) -denhi1b = as.numeric(datmeans[[2]][,"denhi1b"] * gainhi) -denhi4b = as.numeric(datmeans[[2]][,"denhi4b"] * gainhi) -std_denlo1a = as.numeric(datstds[[1]][,"denlo1a"] * gainlo) -std_denlo4a = as.numeric(datstds[[1]][,"denlo4a"] * gainlo) -std_denlo1b = as.numeric(datstds[[2]][,"denlo1b"] * gainlo) -std_denlo4b = as.numeric(datstds[[2]][,"denlo4b"] * gainlo) -std_denhi1a = as.numeric(datstds[[1]][,"denhi1a"] * gainhi) -std_denhi4a = as.numeric(datstds[[1]][,"denhi4a"] * gainhi) -std_denhi1b = as.numeric(datstds[[2]][,"denhi1b"] * gainhi) -std_denhi4b = as.numeric(datstds[[2]][,"denhi4b"] * gainhi) +denlo1a = as.numeric(datmeans[[1]][,"denlo1a"] * nJy) +denlo4a = as.numeric(datmeans[[1]][,"denlo4a"] * nJy) +denlo1b = as.numeric(datmeans[[2]][,"denlo1b"] * nJy) +denlo4b = as.numeric(datmeans[[2]][,"denlo4b"] * nJy) +denhi1a = as.numeric(datmeans[[1]][,"denhi1a"] * nJy) +denhi4a = as.numeric(datmeans[[1]][,"denhi4a"] * nJy) +denhi1b = as.numeric(datmeans[[2]][,"denhi1b"] * nJy) +denhi4b = as.numeric(datmeans[[2]][,"denhi4b"] * nJy) +std_denlo1a = as.numeric(datstds[[1]][,"denlo1a"] * nJy) +std_denlo4a = as.numeric(datstds[[1]][,"denlo4a"] * nJy) +std_denlo1b = as.numeric(datstds[[2]][,"denlo1b"] * nJy) +std_denlo4b = as.numeric(datstds[[2]][,"denlo4b"] * nJy) +std_denhi1a = as.numeric(datstds[[1]][,"denhi1a"] * nJy) +std_denhi4a = as.numeric(datstds[[1]][,"denhi4a"] * nJy) +std_denhi1b = as.numeric(datstds[[2]][,"denhi1b"] * nJy) +std_denhi4b = as.numeric(datstds[[2]][,"denhi4b"] * nJy) sampa = c(denlo1a, denlo4a, denhi1a, denhi4a) sampb = c(denlo1b, denlo4b, denhi1b, denhi4b) #sampstd = c(std_denlo1a, std_denlo4a, std_denhi1a, std_denhi4a) diff --git a/paper b/paper index bd01247..9f9ad09 160000 --- a/paper +++ b/paper @@ -1 +1 @@ -Subproject commit bd01247b1e17101321ef2bb761bda35a7e29f2e9 +Subproject commit 9f9ad09f1f3f69961802dfb24b649cbc08eaef14