Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- master
- develop

jobs:

Expand Down Expand Up @@ -34,3 +35,4 @@ jobs:
run: |
conda activate shapepipe
python setup.py test
shapepipe_run -c example/config.ini
2 changes: 1 addition & 1 deletion example/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ NUMBERING_SCHEME = _0
## ShapePipe job handling options
[JOB]
# BATCH_SIZE (optional) default is 1, i.e. run all jobs in serial
SMP_BATCH_SIZE = 3
SMP_BATCH_SIZE = 2
# SMP_BACKEND (opional) options are loky, multiprocessing or threading, default is loky
; SMP_BACKEND = multiprocessing
# TIMEOUT (optional) default is None, i.e. no timeout limit applied
Expand Down
6 changes: 4 additions & 2 deletions shapepipe/modules/galsim_shapes_v2_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -712,8 +712,10 @@ def process(tile_cat_path, tile_weight_path, gal_vignet_path, bkg_vignet_path,

if skip_col:
# Skip this object if marked, also if mark is nan
if tile_skip[i_tile] == skip_val \
or (np.isnan(tile_skip[i_tile]) and np.isnan(skip_val)):
if (
tile_skip[i_tile] == skip_val
or (np.isnan(tile_skip[i_tile]) and np.isnan(skip_val))
):
continue

count = count + 1
Expand Down
14 changes: 14 additions & 0 deletions shapepipe/modules/python_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,20 @@
from numpy.random import randint
from shapepipe.modules.module_decorator import module_runner

# Test import of key dependencies
import astropy
import galsim
import joblib
import mccd
import ngmix
import pandas
import pysap
import scipy
import sf_tools
import sip_tpv
import sqlitedict
import treecorr


class Dummy(object):

Expand Down
3 changes: 2 additions & 1 deletion shapepipe/utilities/canfar.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"""

import os
import sys
import sys

try:
import vos.commands as vosc
Expand Down Expand Up @@ -92,6 +92,7 @@ def __call__(self, *args, **kwargs):
raise vosError('Error in VOs command: {}'
''.format(self._command.__name__))


def download(source, target, verbose=False):
"""Download file from vos.

Expand Down