Skip to content

Commit 1b0cc73

Browse files
pyPI conforming changes (#4)
* synthetic injection pipeline frame work, scatter stars to come * synthetic injection pipeline complete, begin bug check * injextnamelist rename * verbose increase for troubleshoot * verbose * is injextnames empty? * injextnames * eliminate injextnames * filter is just a letter but fits header is soooo long... * merge extname, name, and key to key * supress warnings from load nonstd keywords * apparently and ordered dictionary has to be defined... python nonsense * zero safe inversion * redefine cat * make sure to add I before the injected run loop * help with I handling * export outmodel to big dig and pass bigdict tothe save fxn * errant colon * just edit big dict rather than recopy params * update big dict so we can just pass everything to save fxn * change mock cat header name * match Eddie's xy convention, I think psfmod.render will need this * FIX ME number of inject limit * different seed for fits compressin test * update leda to remove by hand list AKS * verbose * more verbose * lift assertion threshold * fix path from scratch to home * recompute coordinates on reduced list * verbose * verbose diam_mod * verbose idx_mod and idx * verbose idx_bad * idx and idx_bad orders seem to have been messed up during the last PR * remove verbose * point to new galmask path * wrap injection write files to clean up deacm_proc * injectfrac fix * psf_shift now just a simple call * seed rng with date of file for reproducible but different inject tests * save decam_proc * import os * add overwrite * injectfrac consistent naming * silent fits files! * indent * indent * force injected sources to be positive * verbose * isnan not is_nan... * verbose gain? * seems to be in the psf shift * print min to confirm it is small and I can set to zero * more psf stats * print key * update size to account for negative stars stripped out * sample star positions with the date seeded rng * save the mock catalogue with the Eddie normalization * psfmod define * scattering returns 6 values * need to have length x now * rename main folder, add pypi required setup.py * remove intermediate files
1 parent 6662e79 commit 1b0cc73

20 files changed

Lines changed: 51 additions & 20 deletions
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
import numpy
1818
import pdb
19-
import psf as psfmod
19+
import crowdsource.psf as psfmod
2020
import scipy.ndimage.filters as filters
2121
from collections import OrderedDict
2222
import sys
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import copy
44
import numpy as np
55
from functools import partial
6-
import psf as psfmod
7-
import decam_proc
6+
import crowdsource.psf as psfmod
7+
import crowdsource.decam_proc as decam_proc
88
from collections import OrderedDict
99
import os
1010

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import argparse
77
import numpy
88
import numpy as np
9-
import psf as psfmod
9+
import crowdsource.psf as psfmod
1010
from astropy.io import fits
1111
from astropy import wcs
1212
from functools import partial
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import numpy
44
from skimage import restoration
55
from astropy.io import fits
6-
import psf
6+
import crowdsource.psf as psf
77

88
filt = 'ugrizY'
99
deconv = {'u': 0.8, 'g': 0.75, 'r': 0.7, 'i': 0.6, 'z': 0.65, 'Y': 0.65}
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,21 @@ python /n/holylfs05/LABS/finkbeiner_lab/Lab/saydjari/ExtSoftware/crowdsource_new
120120

121121
###
122122

123-
cat decaps_1per_run.txt | parallel --eta --delay 2 -j 45 --colsep ' ' --joblog log/runtask.log --resume "python /n/holylfs05/LABS/finkbeiner_lab/Lab/saydjari/ExtSoftware/crowdsource_new/python/decam_proc.py --nthreads 15 -v -r -c -q -g -m -d cat -e mod --inject 1 {1} {2} {3} {4} >>log/{2/.}.log 2>&1"
123+
cat decaps_1per_run.txt | parallel --eta --delay 2 -j 45 --colsep ' ' --joblog log/runtask.log --resume "python /n/holylfs05/LABS/finkbeiner_lab/Lab/saydjari/ExtSoftware/crowdsource_new/python/decam_proc.py --nthreads 15 -v -r -c -q -g -m -d cat -e mod --inject 1 {1} {2} {3} {4} >>log/{2/.}.log 2>&1"
124+
125+
###
126+
127+
python /n/holylfs05/LABS/finkbeiner_lab/Lab/saydjari/ExtSoftware/crowdsource_new/python/decam_proc.py -v -r -c -q -g -m -d cat -e mod --ccdlist N12 --injccdlist N12 --inject -1 /n/fink2/decaps/c4d_ 170504_045213 Y v1
128+
129+
srun --exclusive -N1 -n1 --mem-per-cpu=4000 python /n/holylfs05/LABS/finkbeiner_lab/Lab/saydjari/ExtSoftware/crowdsource_new/python/decam_proc.py -v -r -c -q -g -m -d cat -e mod --ccdlist N2 --injccdlist N2 --inject -1 /n/fink2/decaps/c4d_ 170504_045213 Y v1
130+
131+
###
132+
133+
cgcreate -g memory:holyfink01
134+
cgset -r memory.limit_in_bytes=7G holyfink01
135+
136+
###
137+
138+
cat decaps_1per_run.txt | parallel --eta --workdir . --sshloginfile nodefile --delay 2 --colsep ' ' --joblog log/runtask.log --resume "python /n/holylfs05/LABS/finkbeiner_lab/Lab/saydjari/Working/2021_09_07/test.py {1} {2} {3} {4} >>log/{2/.}.log 2>&1"
139+
140+
cat decaps_1per_run.txt | parallel --eta --workdir . --filter-hosts --sshloginfile nodefile --delay 2 --colsep ' ' --joblog log/runtask.log --resume "python /n/holylfs05/LABS/finkbeiner_lab/Lab/saydjari/Working/2021_09_07/test.py {1} {2} {3} {4} >>log/{2/.}.log 2>&1"

0 commit comments

Comments
 (0)