Skip to content

Commit

Permalink
added dr3 tables and indexing commanding
Browse files Browse the repository at this point in the history
  • Loading branch information
kaylanb committed Aug 27, 2016
1 parent 1135f8c commit e6dde2a
Show file tree
Hide file tree
Showing 7 changed files with 376 additions and 1 deletion.
2 changes: 2 additions & 0 deletions bin/decam_cluster
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLUSTER q3c_decam_cand_idx ON decam_cand;
ANALYZE decam_cand;
11 changes: 11 additions & 0 deletions bin/decam_index
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CREATE INDEX decam_aper_cand_id_idx ON decam_aper (cand_id);
CREATE INDEX decam_decam_cand_id_idx ON decam_decam (cand_id);
CREATE INDEX decam_decam_gflux_idx ON decam_decam (gflux);
CREATE INDEX decam_decam_rflux_idx ON decam_decam (rflux);
CREATE INDEX decam_decam_zflux_idx ON decam_decam (zflux);
CREATE INDEX decam_cand_id_idx ON decam_cand (id);
CREATE INDEX decam_cand_brickid_idx ON decam_cand (brickid);
CREATE INDEX q3c_decam_cand_idx ON decam_cand (q3c_ang2ipix(ra, dec));
CREATE INDEX decam_wise_cand_id_idx ON decam_wise (cand_id);
CREATE INDEX decam_wise_w1flux_idx ON decam_wise (w1flux);
CREATE INDEX decam_wise_w2flux_idx ON decam_wise (w2flux);
150 changes: 150 additions & 0 deletions bin/decam_table_aper
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
CREATE SEQUENCE decam_table_aper_id_seq;

CREATE TABLE decam_table_aper (
id bigint primary key not null default nextval('decam_table_aper_id_seq'::regclass),
cand_id bigint REFERENCES decam_table_cand (id),
yapflux_0 real,
yapflux_1 real,
yapflux_2 real,
yapflux_3 real,
yapflux_4 real,
yapflux_5 real,
yapflux_6 real,
yapflux_7 real,
yapflux_ivar_0 real,
yapflux_ivar_1 real,
yapflux_ivar_2 real,
yapflux_ivar_3 real,
yapflux_ivar_4 real,
yapflux_ivar_5 real,
yapflux_ivar_6 real,
yapflux_ivar_7 real,
yapflux_resid_0 real,
yapflux_resid_1 real,
yapflux_resid_2 real,
yapflux_resid_3 real,
yapflux_resid_4 real,
yapflux_resid_5 real,
yapflux_resid_6 real,
yapflux_resid_7 real,
gapflux_0 real,
gapflux_1 real,
gapflux_2 real,
gapflux_3 real,
gapflux_4 real,
gapflux_5 real,
gapflux_6 real,
gapflux_7 real,
gapflux_ivar_0 real,
gapflux_ivar_1 real,
gapflux_ivar_2 real,
gapflux_ivar_3 real,
gapflux_ivar_4 real,
gapflux_ivar_5 real,
gapflux_ivar_6 real,
gapflux_ivar_7 real,
gapflux_resid_0 real,
gapflux_resid_1 real,
gapflux_resid_2 real,
gapflux_resid_3 real,
gapflux_resid_4 real,
gapflux_resid_5 real,
gapflux_resid_6 real,
gapflux_resid_7 real,
iapflux_0 real,
iapflux_1 real,
iapflux_2 real,
iapflux_3 real,
iapflux_4 real,
iapflux_5 real,
iapflux_6 real,
iapflux_7 real,
iapflux_ivar_0 real,
iapflux_ivar_1 real,
iapflux_ivar_2 real,
iapflux_ivar_3 real,
iapflux_ivar_4 real,
iapflux_ivar_5 real,
iapflux_ivar_6 real,
iapflux_ivar_7 real,
iapflux_resid_0 real,
iapflux_resid_1 real,
iapflux_resid_2 real,
iapflux_resid_3 real,
iapflux_resid_4 real,
iapflux_resid_5 real,
iapflux_resid_6 real,
iapflux_resid_7 real,
rapflux_0 double precision,
rapflux_1 double precision,
rapflux_2 double precision,
rapflux_3 double precision,
rapflux_4 double precision,
rapflux_5 double precision,
rapflux_6 double precision,
rapflux_7 double precision,
rapflux_ivar_0 double precision,
rapflux_ivar_1 double precision,
rapflux_ivar_2 double precision,
rapflux_ivar_3 double precision,
rapflux_ivar_4 double precision,
rapflux_ivar_5 double precision,
rapflux_ivar_6 double precision,
rapflux_ivar_7 double precision,
rapflux_resid_0 double precision,
rapflux_resid_1 double precision,
rapflux_resid_2 double precision,
rapflux_resid_3 double precision,
rapflux_resid_4 double precision,
rapflux_resid_5 double precision,
rapflux_resid_6 double precision,
rapflux_resid_7 double precision,
uapflux_0 real,
uapflux_1 real,
uapflux_2 real,
uapflux_3 real,
uapflux_4 real,
uapflux_5 real,
uapflux_6 real,
uapflux_7 real,
uapflux_ivar_0 real,
uapflux_ivar_1 real,
uapflux_ivar_2 real,
uapflux_ivar_3 real,
uapflux_ivar_4 real,
uapflux_ivar_5 real,
uapflux_ivar_6 real,
uapflux_ivar_7 real,
uapflux_resid_0 real,
uapflux_resid_1 real,
uapflux_resid_2 real,
uapflux_resid_3 real,
uapflux_resid_4 real,
uapflux_resid_5 real,
uapflux_resid_6 real,
uapflux_resid_7 real,
zapflux_0 real,
zapflux_1 real,
zapflux_2 real,
zapflux_3 real,
zapflux_4 real,
zapflux_5 real,
zapflux_6 real,
zapflux_7 real,
zapflux_ivar_0 real,
zapflux_ivar_1 real,
zapflux_ivar_2 real,
zapflux_ivar_3 real,
zapflux_ivar_4 real,
zapflux_ivar_5 real,
zapflux_ivar_6 real,
zapflux_ivar_7 real,
zapflux_resid_0 real,
zapflux_resid_1 real,
zapflux_resid_2 real,
zapflux_resid_3 real,
zapflux_resid_4 real,
zapflux_resid_5 real,
zapflux_resid_6 real,
zapflux_resid_7 real
);
50 changes: 50 additions & 0 deletions bin/decam_table_cand
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
CREATE SEQUENCE decam_table_cand_id_seq;

CREATE TABLE decam_table_cand (
id bigint primary key not null default nextval('decam_table_cand_id_seq'::regclass),
blob integer,
blob_height integer,
blob_nimages integer,
blob_npix integer,
blob_totalpix integer,
blob_width integer,
brick_primary boolean,
brickid integer,
brickname text,
bx real,
bx0 real,
by real,
by0 real,
cpu_blob real,
cpu_source real,
dchisq_0 real,
dchisq_1 real,
dchisq_2 real,
dchisq_3 real,
dchisq_4 real,
dec double precision,
dec_ivar double precision,
ebv real,
fracdev real,
fracdev_ivar real,
left_blob boolean,
ninblob integer,
objid integer,
out_of_bounds boolean,
ra double precision,
ra_ivar double precision,
shapedev_e1 real,
shapedev_e1_ivar real,
shapedev_e2 real,
shapedev_e2_ivar real,
shapedev_r real,
shapedev_r_ivar real,
shapeexp_e1 real,
shapeexp_e1_ivar real,
shapeexp_e2 real,
shapeexp_e2_ivar real,
shapeexp_r real,
shapeexp_r_ivar real,
tycho2inblob boolean,
type text
);
72 changes: 72 additions & 0 deletions bin/decam_table_flux
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
CREATE SEQUENCE decam_table_flux_id_seq;

CREATE TABLE decam_table_flux (
id bigint primary key not null default nextval('decam_table_flux_id_seq'::regclass),
cand_id bigint REFERENCES decam_table_cand (id),
y_allmask integer,
y_anymask integer,
y_ext real,
y_psfsize real,
y_rchi2 real,
yflux real,
yflux_ivar real,
yfracflux real,
yfracin real,
yfracmasked real,
ynobs integer,
g_allmask integer,
g_anymask integer,
g_ext real,
g_psfsize real,
g_rchi2 real,
gflux real,
gflux_ivar real,
gfracflux real,
gfracin real,
gfracmasked real,
gnobs integer,
i_allmask integer,
i_anymask integer,
i_ext real,
i_psfsize real,
i_rchi2 real,
iflux real,
iflux_ivar real,
ifracflux real,
ifracin real,
ifracmasked real,
inobs integer,
r_allmask integer,
r_anymask integer,
r_ext real,
r_psfsize real,
r_rchi2 real,
rflux real,
rflux_ivar real,
rfracflux real,
rfracin real,
rfracmasked real,
rnobs integer,
u_allmask integer,
u_anymask integer,
u_ext real,
u_psfsize real,
u_rchi2 real,
uflux real,
uflux_ivar real,
ufracflux real,
ufracin real,
ufracmasked real,
unobs integer,
z_allmask integer,
z_anymask integer,
z_ext real,
z_psfsize real,
z_rchi2 real,
zflux real,
zflux_ivar real,
zfracflux real,
zfracin real,
zfracmasked real,
znobs integer
);
90 changes: 90 additions & 0 deletions bin/decam_table_wise
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
CREATE SEQUENCE decam_table_wise_id_seq;

CREATE TABLE decam_table_wise (
id bigint primary key not null default nextval('decam_table_wise_id_seq'::regclass),
cand_id bigint REFERENCES decam_table_cand (id),
w1_ext real,
w1_lc_flux_0 real,
w1_lc_flux_1 real,
w1_lc_flux_2 real,
w1_lc_flux_3 real,
w1_lc_flux_4 real,
w1_lc_flux_ivar_0 real,
w1_lc_flux_ivar_1 real,
w1_lc_flux_ivar_2 real,
w1_lc_flux_ivar_3 real,
w1_lc_flux_ivar_4 real,
w1_lc_fracflux_0 real,
w1_lc_fracflux_1 real,
w1_lc_fracflux_2 real,
w1_lc_fracflux_3 real,
w1_lc_fracflux_4 real,
w1_lc_mjd_0 real,
w1_lc_mjd_1 real,
w1_lc_mjd_2 real,
w1_lc_mjd_3 real,
w1_lc_mjd_4 real,
w1_lc_nobs_0 integer,
w1_lc_nobs_1 integer,
w1_lc_nobs_2 integer,
w1_lc_nobs_3 integer,
w1_lc_nobs_4 integer,
w1_lc_rchi2_0 real,
w1_lc_rchi2_1 real,
w1_lc_rchi2_2 real,
w1_lc_rchi2_3 real,
w1_lc_rchi2_4 real,
w1_rchi2 real,
w1flux real,
w1flux_ivar real,
w1fracflux real,
w1nobs integer,
w2_ext real,
w2_lc_flux_0 real,
w2_lc_flux_1 real,
w2_lc_flux_2 real,
w2_lc_flux_3 real,
w2_lc_flux_4 real,
w2_lc_flux_ivar_0 real,
w2_lc_flux_ivar_1 real,
w2_lc_flux_ivar_2 real,
w2_lc_flux_ivar_3 real,
w2_lc_flux_ivar_4 real,
w2_lc_fracflux_0 real,
w2_lc_fracflux_1 real,
w2_lc_fracflux_2 real,
w2_lc_fracflux_3 real,
w2_lc_fracflux_4 real,
w2_lc_mjd_0 real,
w2_lc_mjd_1 real,
w2_lc_mjd_2 real,
w2_lc_mjd_3 real,
w2_lc_mjd_4 real,
w2_lc_nobs_0 integer,
w2_lc_nobs_1 integer,
w2_lc_nobs_2 integer,
w2_lc_nobs_3 integer,
w2_lc_nobs_4 integer,
w2_lc_rchi2_0 real,
w2_lc_rchi2_1 real,
w2_lc_rchi2_2 real,
w2_lc_rchi2_3 real,
w2_lc_rchi2_4 real,
w2_rchi2 real,
w2flux real,
w2flux_ivar real,
w2fracflux real,
w2nobs integer,
w3_ext real,
w3_rchi2 real,
w3flux real,
w3flux_ivar real,
w3fracflux real,
w3nobs integer,
w4_ext real,
w4_rchi2 real,
w4flux real,
w4flux_ivar real,
w4fracflux real,
w4nobs integer
);
2 changes: 1 addition & 1 deletion bin/submit_edison_loaddb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ echo "SLURM_JOBID="$SLURM_JOBID >> ${sanity}
export OMP_NUM_THREADS=24
echo cores=${OMP_NUM_THREADS}
date
srun -n 1 -c ${OMP_NUM_THREADS} python tractor_load.py --cores ${OMP_NUM_THREADS} --list_of_cats remaining_dr3_cats.out --schema dr3 --load_db
srun -n 1 -c ${OMP_NUM_THREADS} python tractor_load.py --cores ${OMP_NUM_THREADS} --list_of_cats remaining_cats.txt --schema dr3 --load_db
date

##serial
Expand Down

0 comments on commit e6dde2a

Please sign in to comment.