Skip to content

Commit 74c59e1

Browse files
AthanaseusAthanaseus
authored
Merge pull request #791 from ratt-ru/add_montage_mProject
Add montage mProject
2 parents 3e8e361 + ce8e1aa commit 74c59e1

5 files changed

Lines changed: 164 additions & 64 deletions

File tree

‎stimela/cargo/base/montage/Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
FROM quay.io/stimela/astropy:1.7.1
2-
RUN docker-apt-install montage vim
1+
FROM quay.io/stimela/base:1.7.1
2+
RUN docker-apt-install montage python3-montagepy vim
33
RUN pip install --upgrade pip setuptools
4-
RUN pip install -U montage-wrapper>=0.9.9 astroquery>=0.3.8 git+https://github.com/ratt-ru/scabha.git@positional
5-
4+
RUN pip install -U astroquery>=0.3.8 scabha==0.3.2

‎stimela/cargo/cab/mProject/parameters.json‎

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
{
2+
"task": "mProject",
3+
"base": "stimela/montage",
4+
"tag": "1.7.9",
5+
"description": "mProject reprojects a single image to the scale defined in a FITS header template file (read more about header templates here). The program produces a pair of images: the reprojected image and an 'area' image consisting of the fraction input pixel sky area that went into each output pixel. The 'drizzle' algorithm is implemented. The algorithm proceeds by mapping pixel corners (as adjusted by drizzle, if called) from the input pixel space to the output pixel space, calculating overlap area with each output pixel, and accumulating an appropriate fraction of the input flux into the output image pixels. In addition, the appropriate fraction of the input pixel area is accumulated into the area image pixels. Projection of points from input pixel space to output pixel space is calculated in two steps: first map from input pixel space to sky coordinates; second map from sky coordinates to output pixel space.",
6+
"prefix": "-",
7+
"binary": "mProject",
8+
"junk": [],
9+
"msdir": false,
10+
"parameters": [
11+
{
12+
"info": "Input FITS file to be reprojected",
13+
"dtype": "file",
14+
"name": "in.fits",
15+
"io": "input",
16+
"positional": true
17+
},
18+
{
19+
"info": "Path of output FITS file to be created.",
20+
"dtype":"file",
21+
"name": "out.fits",
22+
"io": "output",
23+
"positional": true
24+
},
25+
{
26+
"info": "FITS header template to be used in generation of output image",
27+
"name": "hdr.template",
28+
"dtype": "file",
29+
"io": "input",
30+
"positional": true
31+
},
32+
{
33+
"info": "Processing is done utilizing the drizzle algorithm. factor is a floating point number; recommended drizzle factors are from 0.5 to 1.",
34+
"name": "z",
35+
"dtype": "float"
36+
},
37+
{
38+
"info": "Causes additional debugging information to be printed to stdout. Valid levels are 1-5 (for higher debugging levels, it is recommended to redirect the output to a file).",
39+
"name": "d",
40+
"dtype": "int"
41+
},
42+
{
43+
"info": "Use the specified FITS extension (default is to use the first HDU with image data)",
44+
"name": "h",
45+
"dtype": "str"
46+
},
47+
{
48+
"info": "Apply a correction factor of scale to each pixel.",
49+
"name": "x",
50+
"dtype": "bool"
51+
},
52+
{
53+
"info": "Path to a weight map to be used when reading values from the input image.",
54+
"name": "w",
55+
"io": "input",
56+
"dtype": "file"
57+
},
58+
{
59+
"info": "Use constant weight value for the whole image",
60+
"name": "W",
61+
"dtype": "bool"
62+
},
63+
{
64+
"info": "Pixels with weights below threshold will be treated as blank.",
65+
"name": "t",
66+
"dtype": "float"
67+
},
68+
{
69+
"info": "Makes the output region (originally defined in the header template) big enough to include all of the input images.",
70+
"name": "X",
71+
"dtype": "bool"
72+
},
73+
{
74+
"info": "Define a border width or border pixel corners outside of which all pixels are set to NaN.",
75+
"name": "b",
76+
"dtype": "str"
77+
},
78+
{
79+
"info": "Process the data as total energy rather than the default energy density (scale values by relative pixel areas).",
80+
"name": "e",
81+
"dtype": "bool"
82+
},
83+
{
84+
"info": "Output the full region requested even if there is a border of NULL values (default is to shrinkwrap to just the pixels with values).",
85+
"name": "f",
86+
"dtype": "bool"
87+
}
88+
]
89+
}

‎stimela/cargo/cab/mProject/src/run.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# -*- coding: future_fstrings -*-
2+
import sys
3+
4+
from scabha import config, parse_parameters, prun
5+
6+
# If a list of fields is given, insert them as repeated arguments.
7+
# Other arguments not allowed to be lists.
8+
args = [config.binary] + parse_parameters(repeat=True)
9+
10+
# run the command
11+
if prun(args) != 0:
12+
raise SystemError(f" {config.binary} exited with a non-zero code. See logs for details")

‎stimela/cargo/cab/mProjectCube/parameters.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"task": "mProjectCube",
3-
"base": "stimela/montage",
4-
"tag": "1.7.1",
5-
"description": "mProjectCube reprojects a single cube to the scale defined in a FITS header template file (read more about header templates here). The program produces a pair of files: the reprojected cube and an 'area' image consisting of the fraction input pixel sky area that went into each output pixel. The 'drizzle' algorithm is implemented. The algorithm proceeds by mapping pixel corners (as adjusted by drizzle, if called) from the input pixel space to the output pixel space, calculating overlap area with each output pixel, and accumulating an appropriate fraction of the input flux into the output cube pixels. In addition, the appropriate fraction of the input pixel area is accumulated into the area image pixels. Projection of points from input pixel space to output pixel space is calculated in two steps: first map from input pixel space to sky coordinates; second map from sky coordinates to output pixel space.",
6-
"prefix": "-",
2+
"task": "mProjectCube",
3+
"base": "stimela/montage",
4+
"tag": "1.7.9",
5+
"description": "mProjectCube reprojects a single cube to the scale defined in a FITS header template file (read more about header templates here). The program produces a pair of files: the reprojected cube and an 'area' image consisting of the fraction input pixel sky area that went into each output pixel. The 'drizzle' algorithm is implemented. The algorithm proceeds by mapping pixel corners (as adjusted by drizzle, if called) from the input pixel space to the output pixel space, calculating overlap area with each output pixel, and accumulating an appropriate fraction of the input flux into the output cube pixels. In addition, the appropriate fraction of the input pixel area is accumulated into the area image pixels. Projection of points from input pixel space to output pixel space is calculated in two steps: first map from input pixel space to sky coordinates; second map from sky coordinates to output pixel space.",
6+
"prefix": "-",
77
"binary": "mProjectCube",
88
"junk": [],
9-
"msdir": false,
9+
"msdir": false,
1010
"parameters": [
1111
{
12-
"info": "Input FITS file to be reprojected",
13-
"dtype": "file",
14-
"name": "in.fits",
12+
"info": "Input FITS file to be reprojected",
13+
"dtype": "file",
14+
"name": "in.fits",
1515
"io": "input",
1616
"positional": true
1717
},

‎stimela/cargo/cab/montage/parameters.json‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,85 @@
11
{
2-
"task": "montage",
3-
"base": "stimela/montage",
4-
"tag": "1.7.1",
5-
"description": "Combine FITS files into a mosaic",
6-
"prefix": "-",
2+
"task": "montage",
3+
"base": "stimela/montage",
4+
"tag": "1.7.9",
5+
"description": "Combine FITS files into a mosaic",
6+
"prefix": "-",
77
"binary": "montage.mosiac",
88
"junk": [],
9-
"msdir": false,
9+
"msdir": false,
1010
"parameters": [
1111
{
12-
"info": "The directory containing the input FITS files",
13-
"dtype": "file",
14-
"name": "input_dir",
12+
"info": "The directory containing the input FITS files",
13+
"dtype": "file",
14+
"name": "input_dir",
1515
"io": "input"
16-
},
16+
},
1717
{
18-
"info": "The header to project to. If this is not specified, then an optimal header is chosen.",
19-
"dtype": "str",
18+
"info": "The header to project to. If this is not specified, then an optimal header is chosen.",
19+
"dtype": "str",
2020
"name": "header"
21-
},
21+
},
2222
{
23-
"info": "The table file containing the list of input images. This can be specified to avoid recomputing it every time a mosaic is made from the same set of input files.",
24-
"dtype": "file",
25-
"name": "image_table",
23+
"info": "The table file containing the list of input images. This can be specified to avoid recomputing it every time a mosaic is made from the same set of input files.",
24+
"dtype": "file",
25+
"name": "image_table",
2626
"io": "input"
27-
},
27+
},
2828
{
29-
"info": "Montage output directory",
30-
"dtype": "file",
31-
"name": "output_dir",
29+
"info": "Montage output directory",
30+
"dtype": "file",
31+
"name": "output_dir",
3232
"io": "output"
33-
},
33+
},
3434
{
35-
"info": "Whether to use MPI whenever possible (requires the MPI-enabled Montage binaries to be installed).",
36-
"dtype": "bool",
35+
"info": "Whether to use MPI whenever possible (requires the MPI-enabled Montage binaries to be installed).",
36+
"dtype": "bool",
3737
"name": "mpi"
38-
},
38+
},
3939
{
40-
"info": "The number of processes to use if `mpi` is set to `True`",
41-
"dtype": "int",
40+
"info": "The number of processes to use if `mpi` is set to `True`",
41+
"dtype": "int",
4242
"name": "n_proc"
43-
},
43+
},
4444
{
45-
"info": "Whether to include a background-matching step",
46-
"dtype": "bool",
45+
"info": "Whether to include a background-matching step",
46+
"dtype": "bool",
4747
"name": "background_match"
48-
},
48+
},
4949
{
50-
"info": "A list of images to use (useful if not all the files inside `input_dir` should be combined).",
51-
"dtype": "list:str",
50+
"info": "A list of images to use (useful if not all the files inside `input_dir` should be combined).",
51+
"dtype": "list:str",
5252
"name": "imglist"
53-
},
53+
},
5454
{
55-
"info": "How to combine the images",
56-
"dtype": "str",
57-
"name": "combine",
55+
"info": "How to combine the images",
56+
"dtype": "str",
57+
"name": "combine",
5858
"choices": [
59-
"mean",
60-
"median",
59+
"mean",
60+
"median",
6161
"count"
6262
]
63-
},
63+
},
6464
{
65-
"info": "Whether the output mosaic should match the input header exactly, or whether the mosaic should be trimmed if possible.",
66-
"dtype": "bool",
65+
"info": "Whether the output mosaic should match the input header exactly, or whether the mosaic should be trimmed if possible.",
66+
"dtype": "bool",
6767
"name": "exact_size"
68-
},
68+
},
6969
{
70-
"info": "Whether to remove any temporary directories used for mosaicking",
71-
"dtype": "bool",
72-
"default": "true",
70+
"info": "Whether to remove any temporary directories used for mosaicking",
71+
"dtype": "bool",
72+
"default": "true",
7373
"name": "cleanup"
74-
},
74+
},
7575
{
76-
"info": "BITPIX value for the ouput FITS file (default is -32). Possible values are: 8 (character or unsigned binary integer), 16 (16-bit integer), 32 (32-bit integer), -32 (single precision floating point), -64 (double precision floating point).",
77-
"dtype": "int",
76+
"info": "BITPIX value for the ouput FITS file (default is -32). Possible values are: 8 (character or unsigned binary integer), 16 (16-bit integer), 32 (32-bit integer), -32 (single precision floating point), -64 (double precision floating point).",
77+
"dtype": "int",
7878
"name": "bitpix"
79-
},
79+
},
8080
{
81-
"info": "When doing background matching, whether to only allow changes in the level of frames, not the slope.",
82-
"dtype": "bool",
81+
"info": "When doing background matching, whether to only allow changes in the level of frames, not the slope.",
82+
"dtype": "bool",
8383
"name": "level_only"
8484
}
8585
]

0 commit comments

Comments
 (0)