Skip to content

Commit

Permalink
cannon updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Vedant Chandra committed May 29, 2023
1 parent 84f72e8 commit ad70783
Show file tree
Hide file tree
Showing 13 changed files with 60,900 additions and 58,535 deletions.
Binary file modified pipeline/__pycache__/runMS.cpython-39.pyc
Binary file not shown.
1,719 changes: 1,658 additions & 61 deletions pipeline/nb/03_preview_cals.ipynb

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pipeline/radagast.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ class bcolors:
newlines.append(' [[wavelengths]]\n')
newlines.append(' rms_threshold=0.4\n')
newlines.append(' [[slitedges]]\n')
newlines.append(' edge_thresh=3\n')
newlines.append(' edge_thresh=1\n')

newlines.append('[reduce]\n')
newlines.append(' [[findobj]]\n')
Expand Down
12 changes: 7 additions & 5 deletions pipeline/runMS.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,9 @@ def run(GaiaID=None,version='VX', npoints = 250,catalog = None,
inputdict['priordict']['Dist'] = {'pv_uniform':[max([1.0,mindist]), maxdist]}
inputdict['priordict']['Av'] = {'pv_tgaussian':[0.0,3.0*Av,Av,Av*0.15]}

inputdict['priordict']['Age'] = {'uniform':[1.0,17.0]}
#inputdict['priordict']['Age'] = {'uniform':[1.0,17.0]}
inputdict['priordict']['Age'] = {'tgaussian':[4.0,14.0,10.0,4]}
#inputdict['priordict']['Age'] = {'uniform':[4.0,14.0]}
inputdict['priordict']['Parallax'] = {'gaussian':[parallax,parallax_error]}

numpoly = 4
Expand All @@ -241,12 +243,12 @@ def run(GaiaID=None,version='VX', npoints = 250,catalog = None,

#inputdict['priordict']['GAL'] = {'lb_coords':[float(data['phot']['L']),float(data['phot']['B'])]}

#inputdict['priordict']['GALAGE'] = {}
#inputdict['priordict']['GALAGE']['lb_coords'] = [float(data['phot']['L']),float(data['phot']['B'])]
#inputdict['priordict']['GALAGE']['pars'] = ({
# inputdict['priordict']['GALAGE'] = {}
# inputdict['priordict']['GALAGE']['lb_coords'] = [float(data['phot']['L']),float(data['phot']['B'])]
# inputdict['priordict']['GALAGE']['pars'] = ({
# 'thin': {'min':1.0,'max':14.0},
# 'thick':{'min':6.0,'max':14.0,'mean':10.0,'sigma':2.0},
# 'halo': {'min':8.0,'max':14.0,'mean':12.0,'sigma':2.0},
# 'halo': {'min':6.0,'max':14.0,'mean':10.0,'sigma':5.0},
# })

# inputdict['priordict']['VROT'] = {'giant':{'a':-10.0,'c':7.0,'n':1.0},'dwarf':{'a':-10.0,'c':10.0,'n':0.4}}
Expand Down
24 changes: 24 additions & 0 deletions pipeline/slurm/04_reduce_2023_04_29_0.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash
#SBATCH -J r2023_04_29
#SBATCH -n 8 # Number of cores requested
#SBATCH -N 1 # Ensure that all cores are on one machine
#SBATCH -t 05:00:00 # Runtime
#SBATCH --mem-per-cpu 4500 # Memory
#SBATCH -p conroy_priority,shared,itc_cluster # Partition to submit to
#SBATCH --constraint='intel'
#SBATCH -o /n/holyscratch01/conroy_lab/vchandra/mage/logs/reduce/reduce_2023_04_29_v0.out
#SBATCH -e /n/holyscratch01/conroy_lab/vchandra/mage/logs/reduce/reduce_2023_04_29_v0.err

module load python
source ~/.bashrc
conda activate pypeit

cd /n/home03/vchandra/outerhalo/08_mage/pipeline/
echo 'CPU USED: '
cat /proc/cpuinfo | grep 'model name' | head -n 1
echo 'QUEUE NAME:'
echo $SLURM_JOB_PARTITION
echo 'NODE NAME:'
echo $SLURMD_NODENAME

python -u radagast.py --dir=/n/holyscratch01/conroy_lab/vchandra/mage/data/2023_04_29/ --version=0 --skipred=False
24 changes: 24 additions & 0 deletions pipeline/slurm/04_reduce_2023_04_30_0.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash
#SBATCH -J r2023_04_30
#SBATCH -n 8 # Number of cores requested
#SBATCH -N 1 # Ensure that all cores are on one machine
#SBATCH -t 05:00:00 # Runtime
#SBATCH --mem-per-cpu 4500 # Memory
#SBATCH -p conroy_priority,shared,itc_cluster # Partition to submit to
#SBATCH --constraint='intel'
#SBATCH -o /n/holyscratch01/conroy_lab/vchandra/mage/logs/reduce/reduce_2023_04_30_v0.out
#SBATCH -e /n/holyscratch01/conroy_lab/vchandra/mage/logs/reduce/reduce_2023_04_30_v0.err

module load python
source ~/.bashrc
conda activate pypeit

cd /n/home03/vchandra/outerhalo/08_mage/pipeline/
echo 'CPU USED: '
cat /proc/cpuinfo | grep 'model name' | head -n 1
echo 'QUEUE NAME:'
echo $SLURM_JOB_PARTITION
echo 'NODE NAME:'
echo $SLURMD_NODENAME

python -u radagast.py --dir=/n/holyscratch01/conroy_lab/vchandra/mage/data/2023_04_30/ --version=0 --skipred=False
2 changes: 1 addition & 1 deletion pipeline/slurm/04_runms_mage_V0.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#SBATCH --constraint='intel'
#SBATCH -o /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.0/%a.out
#SBATCH -e /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.0/%a.err
#SBATCH --array=0,1,3,4,6,7,8,9,10,11,12,13,14,15,16,17,21,23,25,26,27,28,29,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,53,54,55,56,57,60,61,62,63,64,65,66,72,73,75,78,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,126,127,128,129,130,131,132,133,134,135,136,137,138,139,142,143,146,147,148,149,150,151,152,153,154,155,156,166,168,172,173,175,176,182,183,184,185,186,187,188,190,191,193,195,196,197,199,244,257,258,268,269,270,271,272,273,274,275
#SBATCH --array=137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331

source /n/home03/vchandra/warmup.sh

Expand Down
23 changes: 23 additions & 0 deletions pipeline/slurm/04_runms_mage_V0.04.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash
#SBATCH -J MS_MagE
#SBATCH -n 1 # Number of cores requested
#SBATCH -N 1 # Ensure that all cores are on one machine
#SBATCH -t 05:00:00 # Runtime
#SBATCH --mem 5000 # Memory
#SBATCH -p conroy,shared,itc_cluster,serial_requeue # Partition to submit to
#SBATCH --constraint='intel'
#SBATCH -o /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.04/%a.out
#SBATCH -e /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.04/%a.err
#SBATCH --array=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295

source /n/home03/vchandra/warmup.sh

cd /n/home03/vchandra/outerhalo/08_mage/pipeline/
echo 'CPU USED: '
cat /proc/cpuinfo | grep 'model name' | head -n 1
echo 'QUEUE NAME:'
echo $SLURM_JOB_PARTITION
echo 'NODE NAME:'
echo $SLURMD_NODENAME

python 04_runms_star.py --catalog=mage --ind=$SLURM_ARRAY_TASK_ID --version=V0.04 --npoints=500 --skipfit=0
23 changes: 23 additions & 0 deletions pipeline/slurm/04_runms_mage_V0.05.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash
#SBATCH -J MS_MagE
#SBATCH -n 1 # Number of cores requested
#SBATCH -N 1 # Ensure that all cores are on one machine
#SBATCH -t 15:00:00 # Runtime
#SBATCH --mem 5000 # Memory
#SBATCH -p conroy,shared,itc_cluster,serial_requeue # Partition to submit to
#SBATCH --constraint='intel'
#SBATCH -o /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.05/%a.out
#SBATCH -e /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.05/%a.err
#SBATCH --array=0-331

source /n/home03/vchandra/warmup.sh

cd /n/home03/vchandra/outerhalo/08_mage/pipeline/
echo 'CPU USED: '
cat /proc/cpuinfo | grep 'model name' | head -n 1
echo 'QUEUE NAME:'
echo $SLURM_JOB_PARTITION
echo 'NODE NAME:'
echo $SLURMD_NODENAME

python 04_runms_star.py --catalog=mage --ind=$SLURM_ARRAY_TASK_ID --version=V0.05 --npoints=1000 --skipfit=0
23 changes: 23 additions & 0 deletions pipeline/slurm/04_runms_mage_V0.06.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash
#SBATCH -J MS_MagE
#SBATCH -n 1 # Number of cores requested
#SBATCH -N 1 # Ensure that all cores are on one machine
#SBATCH -t 10:00:00 # Runtime
#SBATCH --mem 5000 # Memory
#SBATCH -p conroy,shared,itc_cluster,serial_requeue # Partition to submit to
#SBATCH --constraint='intel'
#SBATCH -o /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.06/%a.out
#SBATCH -e /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.06/%a.err
#SBATCH --array=0-331

source /n/home03/vchandra/warmup.sh

cd /n/home03/vchandra/outerhalo/08_mage/pipeline/
echo 'CPU USED: '
cat /proc/cpuinfo | grep 'model name' | head -n 1
echo 'QUEUE NAME:'
echo $SLURM_JOB_PARTITION
echo 'NODE NAME:'
echo $SLURMD_NODENAME

python 04_runms_star.py --catalog=mage --ind=$SLURM_ARRAY_TASK_ID --version=V0.06 --npoints=1000 --skipfit=0
23 changes: 23 additions & 0 deletions pipeline/slurm/04_runms_mage_V0.061.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/bin/bash
#SBATCH -J MS_MagE
#SBATCH -n 1 # Number of cores requested
#SBATCH -N 1 # Ensure that all cores are on one machine
#SBATCH -t 15:00:00 # Runtime
#SBATCH --mem 5000 # Memory
#SBATCH -p conroy,shared,itc_cluster,serial_requeue # Partition to submit to
#SBATCH --constraint='intel'
#SBATCH -o /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.061/%a.out
#SBATCH -e /n/holyscratch01/conroy_lab/vchandra/mage/logs/mage/V0.061/%a.err
#SBATCH --array=0-331

source /n/home03/vchandra/warmup.sh

cd /n/home03/vchandra/outerhalo/08_mage/pipeline/
echo 'CPU USED: '
cat /proc/cpuinfo | grep 'model name' | head -n 1
echo 'QUEUE NAME:'
echo $SLURM_JOB_PARTITION
echo 'NODE NAME:'
echo $SLURMD_NODENAME

python 04_runms_star.py --catalog=mage --ind=$SLURM_ARRAY_TASK_ID --version=V0.061 --npoints=1000 --skipfit=0
Loading

0 comments on commit ad70783

Please sign in to comment.