pipeline bug fix. randoms timing.

SgmAstro · Jan 18, 2022 · 8f4205a · 8f4205a
1 parent dcf4085
commit 8f4205a
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 429 deletions.
diff --git a/bin/gold_d8_pipeline.log b/bin/gold_d8_pipeline.log
diff --git a/bin/gold_pipeline.log b/bin/gold_pipeline.log
diff --git a/bin/pipeline b/bin/pipeline
@@ -3,7 +3,6 @@ export RESET=1
 
 export DRYRUN=''
 # export DRYRUN='--dryrun'                                                                                                                                                                           
-
 export CODE_ROOT=$HOME/DESI/
 
 export TILING_CATDIR=/cosma5/data/durham/dc-wils7/

diff --git a/bin/rand_d8_pipeline.log b/bin/rand_d8_pipeline.log
diff --git a/bin/rand_pipeline b/bin/rand_pipeline
@@ -72,9 +72,6 @@ python fillfactor.py --field $FIELD $DRYRUN > logs/fillfactor_$FIELD.log
 # Uses Pool, should be on interactive.
 python bound_dist.py --field $FIELD $DRYRUN > logs/bound_dist_$FIELD.log
 
-# Assumes python gen_ddp_N8.py has been run. 
-python gen_rand_ddp_N8.py --field $FIELD $DRYRUN > logs/rand_ddp_N8_$FIELD.log
-
 # TODO:  QA scripts need updated to point to RANDOMS_DIR, GOLD_DIR
 # pytest
 

diff --git a/bin/rand_pipeline.log b/bin/rand_pipeline.log
diff --git a/bound_dist.py b/bound_dist.py
@@ -1,4 +1,5 @@
 import os
+import time
 import fitsio
 import numpy as np
 import astropy.io.fits as fits
@@ -18,13 +19,15 @@
 parser.add_argument('-f', '--field', type=str, help='Select equatorial GAMA field: G9, G12, G15', required=True)
 parser.add_argument('-d', '--dryrun', help='Dryrun.', action='store_true')
 
-args = parser.parse_args()
+args   = parser.parse_args()
 
-field = args.field.upper()
+field  = args.field.upper()
 dryrun = args.dryrun
 
 np.random.seed(314)
 
+start = time.time()
+
 nproc = 12
 realz = 0
 
@@ -108,3 +111,5 @@ def process_one(split):
 print('Writing {}.'.format(opath))
 
 rand.write(opath, format='fits', overwrite=True)
+
+print('Finished in {} mins.'.format((time.time() - start) / 60.))
diff --git a/fillfactor.py b/fillfactor.py
@@ -1,4 +1,5 @@
 import os
+import time
 import fitsio
 import numpy as np
 import astropy.io.fits as fits
@@ -15,16 +16,18 @@
 parser.add_argument('-f', '--field', type=str, help='Sselect equatorial GAMA field: G9, G12, G15', required=True)
 parser.add_argument('-d', '--dryrun', help='Dryrun.', action='store_true')
 
-args = parser.parse_args()
+args   = parser.parse_args()
 
-field = args.field.upper()
+field  = args.field.upper()
 dryrun = args.dryrun
 
 nproc = 16
 realz = 0
 
 fpath = os.environ['RANDOMS_DIR'] + '/randoms_{}_{:d}.fits'.format(field, realz)
 
+start = time.time()
+
 print('Reading rand.')
 
 if dryrun:
@@ -73,8 +76,8 @@ def process_one(split):
 for rr in result:
     flat_result += rr
 
-rand['N8'] = np.array(flat_result).astype(np.int32)
-rand['FILLFACTOR']  = rand['N8'] / rand.meta['NRAND8']
+rand['RAND_N8'] = np.array(flat_result).astype(np.int32)
+rand['FILLFACTOR']  = rand['RAND_N8'] / rand.meta['NRAND8']
 
 rand.meta['RSPHERE'] = 8.
 
@@ -86,3 +89,5 @@ def process_one(split):
 print('Writing {}.'.format(opath))
 
 rand.write(opath, format='fits', overwrite=True)
+
+print('Finished in {} mins.'.format((time.time() - start) / 60.))
diff --git a/gen_rand_ddp_N8.py b/gen_rand_ddp_N8.py
@@ -1,4 +1,5 @@
 import os
+import time
 import fitsio
 import numpy as np
 import matplotlib.pyplot as plt
@@ -18,6 +19,8 @@
 field  = args.field.upper()
 dryrun = args.dryrun
 
+start  = time.time()
+
 realz  = 0
 
 fpath  = os.environ['GOLD_DIR'] + '/gama_gold_ddp.fits'
@@ -91,3 +94,5 @@
 print('Writing {}'.format(opath))
 
 rand.write(opath, format='fits', overwrite=True)
+
+print('Finished in {} mins.'.format((time.time() - start) / 60.))
diff --git a/randoms.py b/randoms.py
@@ -1,4 +1,5 @@
 import os
+import time
 import numpy as np
 import argparse
 
@@ -12,14 +13,16 @@
 parser.add_argument('-f', '--field',  type=str, help='select equatorial GAMA field: G9, G12, G15', required=True)
 parser.add_argument('-d', '--dryrun', help='Dryrun.', action='store_true')
 
-args = parser.parse_args()
-field = args.field.upper()
+args   = parser.parse_args()
+field  = args.field.upper()
 dryrun = args.dryrun
 
 np.random.seed(314)
 
+start = time.time()
+
 realz = 0
-Area = 60. 
+Area  = 60. 
 
 dz   = 1.e-4
 
@@ -121,3 +124,5 @@
 print('Writing {}.'.format(opath))
 
 randoms.write(opath, format='fits', overwrite=True)
+
+print('Finished in {} mins.'.format((time.time() - start) / 60.))
diff --git a/test_allnb.py b/test_allnb.py
@@ -4,9 +4,9 @@
 def test_allnbs():
     print('Running all tests.')
 
-    # run_randomqa()
+    run_randomqa()
 
-    run_delta8qa()
+    # run_delta8qa()
 
     print('Done.')