Migrate from .fits to .npy as per #9

DarkEnergySurvey · Jun 10, 2019 · d0cf07d · d0cf07d
1 parent cf06519
commit d0cf07d
Show file tree

Hide file tree

Showing 15 changed files with 83 additions and 626 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ If you have fracdet or maglim files, those should also be copied or linked here;
 
 To run the simple binning search, run `farm_simple.py` in `simple_run/`.
 This will run `search_algorithm.py` over the given data set and write the output to `results_dir/`, logging each job in `results_dir/log_dir`.
-The results can then be compiled into a candidate list by running `make_list.py` from `simple_run/` (this is saved as a `.fits` file).
+The results can then be compiled into a candidate list by running `make_list.py` from `simple_run/` (this is saved as a `.npy` file).
 
 To produce plots from a candidate list, run `farm_plots.py` in `simple_run/`.
 The output will be written to `save_dir/` with logs in `save_dir/log_dir/`.
@@ -43,5 +43,3 @@ The output will be written to `save_dir/` with logs in `save_dir/log_dir/`.
 
 By default, `farm_plots.py` will only produce plots for hotspots with statistical significance greater than 5.5 sigma.
 This threshold has intentionally chosen to be low (such that investigations can be made of very low-significance hotsposts and candidates) but also to minimize junk.
-
-This code is currently going through an architectural overhaul to capitalize on the OOP nature of python.
diff --git a/config.yaml b/config.yaml
@@ -1,6 +1,5 @@
 setup:
     simple_dir : '/home/s1/smau/software/simple/simple'
-    #simple_dir : '/Users/keithbechtol/Documents/DES/code/simple'
 
 output:
     results_dir : 'results_dir'
@@ -38,52 +37,10 @@ y3_gold_2_0:
     mag_err: 'SOF_PSF_MAG_ERR_{}'
     mag_dered: 'MAG_DERED_{}'
 
-    mag_g : 'MAG_G'
-    mag_r : 'MAG_R'
-    mag_g_err : 'SOF_PSF_MAG_ERR_G'
-    mag_r_err : 'SOF_PSF_MAG_ERR_R'
-
     #star_galaxy_classification : 'EXTENDED_CLASS_MASH_SOF'
 
-    #maglim_g : '/home/s1/kadrlica/projects/y3q2/v6/release/depth/y2q1_maglim_g_n1024_ring.fits.gz'
-    #maglim_r : '/home/s1/kadrlica/projects/y2q/v6/release/depth/y2q1_maglim_r_n1024_ring.fits.gz'
-
     fracdet_gz : 'y3a2_griz_o.4096_t.32768_coverfoot_EQU.fits.gz'
     fracdet : 'y3a2_griz_o.4096_t.32768_coverfoot_EQU_decompressed.fits'
-
-y3a2:
-    mode : 1 # 0: real, 1: real+sim
-    sim_population : 'v3/sim_population_v3.fits'
-    sim_dir: 'v3'
-    nside          : 32
-    datadir        : '/home/s1/kadrlica/projects/y3a2/dsphs/v2/skim'
-    candidate_list : 'candidate_list.fits'
-    mag_max : 24.5
-    #candidate_list : '/home/s1/kadrlica/projects/y3a2/dsphs/v2/v2.1/search/ugali_candidates.fits' # ugali
-    isoname: 'Bressan2012'
-    isosurvey: 'des'
-
-    basis_1: 'RA'
-    basis_2: 'DEC'
-    mag_g : 'MAG_G'
-    mag_r : 'MAG_R'
-    mag_g_err             : 'PSF_MAG_ERR_G'
-    mag_r_err             : 'PSF_MAG_ERR_R'
-
-    mag_g_dred_flag : 'PSF_MAG_SFD_G'
-    mag_r_dred_flag : 'PSF_MAG_SFD_R'
-    mag_err_g_flag  : 'PSF_MAG_ERR_G'
-    mag_err_r_flag  : 'PSF_MAG_ERR_R'
-    flags_g         : 'SEXTRACTOR_FLAGS_G'
-    flags_r         : 'SEXTRACTOR_FLAGS_R'
-
-    star_galaxy_classification : 'EXTENDED_CLASS_MASH'
-
-    maglim_g : '/home/s1/kadrlica/projects/y3q2/v6/release/depth/y2q1_maglim_g_n1024_ring.fits.gz'
-    maglim_r : '/home/s1/kadrlica/projects/y2q/v6/release/depth/y2q1_maglim_r_n1024_ring.fits.gz'
-
-    fracdet : 'y3a2_griz_o.4096_t.32768_coverfoot_EQU.fits.gz'
-
 bliss: # Need to update this
     mode: 0
     sim_population: None
@@ -106,13 +63,6 @@ bliss: # Need to update this
     mag_err: 'WAVG_MAGERR_PSF_{}'
     mag_dered: 'MAG_DERED_{}'
 
-    mag_g : 'MAG_G'
-    mag_r : 'MAG_R'
-    mag_g_err : 'WAVG_MAGERR_PSF_G'
-    mag_r_err : 'WAVG_MAGERR_PSF_R'
-    #mag_g_err             : 'PSF_MAG_ERR_G'
-    #mag_r_err             : 'PSF_MAG_ERR_R'
-
     fracdet : None
 
 maglites: # Update
@@ -125,22 +75,13 @@ maglites: # Update
 
     basis_1: 'RA'
     basis_2: 'DEC'
-    mag_g : 'MAG_G'
-    mag_r : 'MAG_R'
-    #mag_g_dred_flag            : 'PSF_MAG_SFD_G'
-    #mag_r_dred_flag            : 'PSF_MAG_SFD_R'
-    mag_g_flag                  : 'WAVG_MAG_PSF_G'
-    mag_r_flag                  : 'WAVG_MAG_PSF_R'
-    mag_err_g_flag              : 'WAVG_MAGERR_PSF_G'
-    mag_err_r_flag              : 'WAVG_MAGERR_PSF_R'
-    extinction_g_flag           : 'EXTINCTION_G'
-    extinction_r_flag           : 'EXTINCTION_R'
-    #star_galaxy_classification : 'EXTENDED_CLASS_MASH' # adapt this for dif data sets
-
-    spread_model_r_flag         : 'WAVG_SPREAD_MODEL_R' # use for BISS/MagLiteS
-    spread_model_r_err_flag     : 'SPREADERR_MODEL_R'
-    flags_g                     : 'SEXTRACTOR_FLAGS_G'
-    flags_r                     : 'SEXTRACTOR_FLAGS_R'
+    basis_1: 'RA'
+    basis_2: 'DEC'
+    band_1: 'G'
+    band_2: 'R'
+    mag: 'MAG_PSF_SFD_{}'
+    mag_err: 'WAVG_MAGERR_PSF_{}'
+    mag_dered: 'MAG_DERED_{}'
 
     fracdet : None
 
@@ -163,12 +104,6 @@ panstarrs:
 
     basis_1: 'RA'
     basis_2: 'DEC'
-    mag_g : 'MAG_G'
-    mag_r : 'MAG_R'
-    mag_g_err : 'GFPSFMAGERR'
-    mag_r_err : 'RFPSFMAGERR'
-    flags_g : 'GFLAGS'
-    flags_r : 'RFLAGS'
 
     band_1: 'G'
     band_2: 'R'
@@ -178,4 +113,3 @@ panstarrs:
 
     fracdet_gz : 'panstarrs_pseudo_fracdet.fits.gz'
     fracdet : 'panstarrs_pseudo_fracdet.fits'
-    #fracdet : '/Users/keithbechtol/Documents/DES/external_data/pan-starrs/simple/sid/simple_v2/panstarrs_pseudo_fracdet.fits.gz'