Skip to content
Snippets Groups Projects
Commit d5a22055 authored by Alexander Kutkin's avatar Alexander Kutkin
Browse files

some adjustments

parent 7060adbf
No related branches found
No related tags found
No related merge requests found
...@@ -145,6 +145,7 @@ RUN cd /software/makemask && \ ...@@ -145,6 +145,7 @@ RUN cd /software/makemask && \
# Imcal # Imcal
ADD imcal.py /opt/imcal.py ADD imcal.py /opt/imcal.py
ADD cluster.py /opt/cluster.py
ADD imcal.yml /opt/imcal.yml ADD imcal.yml /opt/imcal.yml
RUN ln -s /opt/imcal.py /usr/local/bin/imcal.py RUN ln -s /opt/imcal.py /usr/local/bin/imcal.py
......
...@@ -199,7 +199,6 @@ def dical(msin, srcdb, msout=None, h5out=None, solint=1, startchan=0, split_ncha ...@@ -199,7 +199,6 @@ def dical(msin, srcdb, msout=None, h5out=None, solint=1, startchan=0, split_ncha
check_return_code(return_code) check_return_code(return_code)
return msout return msout
# TODO add minvisratio to te config
def ddecal(msin, srcdb, msout=None, h5out=None, solint=120, nfreq=30, def ddecal(msin, srcdb, msout=None, h5out=None, solint=120, nfreq=30,
startchan=0, nchan=0, minvisratio=0.6, mode='diagonal', uvlambdamin=500, subtract=True): startchan=0, nchan=0, minvisratio=0.6, mode='diagonal', uvlambdamin=500, subtract=True):
""" Perform direction dependent calibration with DPPP """ """ Perform direction dependent calibration with DPPP """
...@@ -284,7 +283,6 @@ def view_sols(h5param, outname=None): ...@@ -284,7 +283,6 @@ def view_sols(h5param, outname=None):
# plt.show() # plt.show()
# TODO
def remove_model_components_below_level(model, level=0.0, out=None): def remove_model_components_below_level(model, level=0.0, out=None):
""" """
Clip the model to be above the given level Clip the model to be above the given level
...@@ -359,8 +357,7 @@ def main(msin, outbase=None, cfgfile='imcal.yml'): ...@@ -359,8 +357,7 @@ def main(msin, outbase=None, cfgfile='imcal.yml'):
logging.info('The final image exists. Exiting...') logging.info('The final image exists. Exiting...')
return 0 return 0
# TODO check if splitting is needed if (not os.path.exists(ms_split)) and (cfg['split1']['startchan'] or cfg['split1']['nchan']):
if not os.path.exists(ms_split):
ms_split = split_ms(msin, msout_path=ms_split, **cfg['split1']) ms_split = split_ms(msin, msout_path=ms_split, **cfg['split1'])
# Clean + DIcal # Clean + DIcal
......
...@@ -14,12 +14,10 @@ split1: ...@@ -14,12 +14,10 @@ split1:
startchan: 0 # start channel to split from startchan: 0 # start channel to split from
nchan: 0 # 0 means till the end nchan: 0 # 0 means till the end
# TODO: skip
clean0: # initial clean clean0: # initial clean
max_over_thresh: 250 # the threshold for initial CLEAN is set to image_max/max_over_thresh max_over_thresh: 250 # the threshold for initial CLEAN is set to image_max/max_over_thresh
# TODO add fixed threshold of 100 uJy # TODO add fixed threshold of 100 uJy
clean1: # wsclean setup clean1: # wsclean setup
imagesize: 3072 imagesize: 3072
pixelsize: 3 pixelsize: 3
...@@ -29,7 +27,7 @@ clean1: # wsclean setup ...@@ -29,7 +27,7 @@ clean1: # wsclean setup
autothresh: 5 autothresh: 5
multiscale: False multiscale: False
clip_model_level: null # use a float number to clip the model to above this level. null is None. clip_model_level: null # use a float number to clip the model to above this level. null is None.
kwstring: '-use-wgridder -parallel-deconvolution 1400' # use this for additional wsclean options, e.g. '-weight uniform -use-idg' kwstring: '-use-wgridder -parallel-deconvolution 1400 -weight briggs 0.0' # use this for additional wsclean options, e.g. '-weight uniform -use-idg'
dical1: # DPPP setup for direction independent calibration dical1: # DPPP setup for direction independent calibration
solint: 20 solint: 20
...@@ -46,7 +44,7 @@ clean2: ...@@ -46,7 +44,7 @@ clean2:
autothresh: 5 autothresh: 5
multiscale: True multiscale: True
clip_model_level: null clip_model_level: null
kwstring: '-use-wgridder -parallel-deconvolution 1400 -parallel-gridding 8 -deconvolution-channels 3' kwstring: '-use-wgridder -parallel-deconvolution 1400 -parallel-gridding 8 -deconvolution-channels -weight briggs 0.0'
dical2: dical2:
solint: 1 solint: 1
...@@ -62,7 +60,7 @@ clean3: ...@@ -62,7 +60,7 @@ clean3:
autothresh: 3.5 autothresh: 3.5
multiscale: True multiscale: True
clip_model_level: null clip_model_level: null
kwstring: '-use-wgridder -parallel-deconvolution 1400 -parallel-gridding 8 -deconvolution-channels 3' kwstring: '-use-wgridder -parallel-deconvolution 1400 -parallel-gridding 8 -deconvolution-channels 3 -weight briggs 0.0'
dical3: dical3:
solint: 240 solint: 240
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment