Commit 1cd3c25a authored by Ole Streicher's avatar Ole Streicher

New upstream version 6.0+dfsg

parent 12b60edf

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

Montage Release Change History
5.0 21Dec2016 Version 5.0 offers a new fast reprojection module, mProjectQL,
that is suitable for creating images for visualization; support
for FITS files containing data written in the HEALPix sky-
tesselation scheme; and support for creating images that can be
consumed by the World Wide Telescope (WWT). This release also
allows the core modules to be built and used as a statically or
dynamically linked library.The Montage library is built at the
same time as the toolbox modules with the make command; no
special build procedure is needed. A list of the library functions
and the library API is here.
mProjectQL uses the Lanczos image interpolation scheme to provide
higher performance in reprojection at the expense of conservation
of flux; we recommend mProjectQL primarily for creating images
for quick-look visualization rather than for science analysis. It
offers a speed-up of approximately x20 over mProject.
Support for HEALPix: Montage treats HEALPix as if it were a spherical
projection that can processed with the existing reprojection routines
in Montage. It is managed through a local version of the WCStools library
users who prefer to use the SAO library should note that will lose
HEALPix and TOAST support). The distribution includes a copy of the
HPXcvt module to convert HEALPix data from FITS table form to FITS
image form; this module is part of the WCSLib distribution at
http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib. (Copyright (C)
1995-2016, Mark Calabretta).
Support for the WWT: As with HEALPix, Montage treats TOAST, the
sky-tessellation scheme used by the WWT, as if they were a spherical
projection that can processed with the existing reprojection routines
in Montage. It is managed through the same local version of the WCStools
library used to manage HEALPix data. The WWT consumes PNG or JPEG files
organized and named to conform to the TOAST sky-tessellation scheme.
Montage includes custom routines to organize TOAST files for display
in the WWT. These modules are:
mHdrWWT: Create a TOAST tile header file given a tile ID (in Z-order
digits such as"2320") and an output file name.
mHdrWWTExec: Recursively creates all the headers for an all-sky set
using mHdrWWT.
mProjWWTExec: Runs mProjectQL to reproject an all-sky input image
into a set of FITS tile images using the headers created by mHdrWWT
and mHdrWWTExec . It writes all these into a directory, given an an
argument.
mPNGWWTExe: Runs mViewer for each FITS file, using a pregenerated
histogram and a color table given as arguments. The histogram is generated
by mHistogram and can be based on one of the WWT image set or from the
original image(s)from which the WWT images were derived.
4.0 30Sep2015 New modules to support working with data cubes :
......
......@@ -11,7 +11,7 @@ all:
clean:
mkdir -p bin
mkdir -p lib/include
rm -f bin/*
rm -rf bin/*
if test -d lib/src; then (cd lib/src; make clean); fi
if test -d Montage; then (cd Montage; make clean); fi
if test -d util; then (cd util; make clean); fi
......
......@@ -52,13 +52,8 @@ CFLAGS = -g -I. -I../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std
LIBS = -L../lib -lwcs -lcfitsio -lcoord -lmtbl -lsvc \
-lwww -lboundaries -lpixbounds -ltwoplane -lm
SBINS = mAdd mAddCube mAddExec mBackground mBgExec mBgModel mConvert mCoverageCheck mDiff mDiffExec \
mDiffFitExec mFitExec mFitplane mFlattenExec mGetHdr mHdrCheck mHdrtbl mImgtbl mMakeHdr mMakeImg \
mOverlaps mProject mProjectCube mProjectPP mProjExec mPutHdr mShrink mShrinkCube mSubCube mSubimage \
mSubset mTANHdr mTblSort mTileHdr mTileImage
MBINS = mProjExecMPI mFitExecMPI mDiffExecMPI mBgExecMPI mAddMPI \
mAddExecMPI
SBINS = mConvert mFlattenExec mHdrCheck mHdrtbl mTblSort mTileHdr mTileImage
MBINS = mProjExecMPI mFitExecMPI mDiffExecMPI mBgExecMPI mAddMPI mAddExecMPI
BINS = $(SBINS)
......
......@@ -52,13 +52,8 @@ CFLAGS = -g -I. -I../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std
LIBS = -L../lib -lwcs -lcfitsio -lcoord -lmtbl -lsvc \
-lwww -lboundaries -lpixbounds -ltwoplane -lnsl -lm
SBINS = mAdd mAddCube mAddExec mBackground mBgExec mBgModel mConvert mCoverageCheck mDiff mDiffExec \
mDiffFitExec mFitExec mFitplane mFlattenExec mGetHdr mHdrCheck mHdrtbl mImgtbl mMakeHdr mMakeImg \
mOverlaps mProject mProjectCube mProjectPP mProjExec mPutHdr mShrink mShrinkCube mSubCube mSubimage \
mSubset mTANHdr mTblSort mTileHdr mTileImage
MBINS = mProjExecMPI mFitExecMPI mDiffExecMPI mBgExecMPI mAddMPI \
mAddExecMPI
SBINS = mConvert mFlattenExec mHdrCheck mHdrtbl mTblSort mTileHdr mTileImage
MBINS = mProjExecMPI mFitExecMPI mDiffExecMPI mBgExecMPI mAddMPI mAddExecMPI
BINS = $(SBINS)
......
......@@ -52,13 +52,8 @@ CFLAGS = -g -I. -I../lib/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -std
LIBS = -L../lib -lwcs -lcfitsio -lcoord -lmtbl -lsvc \
-lwww -lboundaries -lpixbounds -ltwoplane -lsocket -lnsl -lm
SBINS = mAdd mAddCube mAddExec mBackground mBgExec mBgModel mConvert mCoverageCheck mDiff mDiffExec \
mDiffFitExec mFitExec mFitplane mFlattenExec mGetHdr mHdrCheck mHdrtbl mImgtbl mMakeHdr mMakeImg \
mOverlaps mProject mProjectCube mProjectPP mProjExec mPutHdr mShrink mShrinkCube mSubCube mSubimage \
mSubset mTANHdr mTblSort mTileHdr mTileImage
MBINS = mProjExecMPI mFitExecMPI mDiffExecMPI mBgExecMPI mAddMPI \
mAddExecMPI
SBINS = mConvert mFlattenExec mHdrCheck mHdrtbl mTblSort mTileHdr mTileImage
MBINS = mProjExecMPI mFitExecMPI mDiffExecMPI mBgExecMPI mAddMPI mAddExecMPI
BINS = $(SBINS)
......
......@@ -45,7 +45,7 @@ int main(int argc, char **argv)
/* Process the command-line parameters */
/***************************************/
strcpy(path, "");
strcpy(path, ".");
montage_status = stdout;
......@@ -64,6 +64,7 @@ int main(int argc, char **argv)
if (strcmp(argument, "mean" ) == 0) coadd = MEAN;
else if (strcmp(argument, "median") == 0) coadd = MEDIAN;
else if (strcmp(argument, "count" ) == 0) coadd = COUNT;
else if (strcmp(argument, "sum" ) == 0) coadd = SUM;
else
{
printf("[struct stat=\"ERROR\", msg=\"Invalid argument for -a flag\"]\n");
......@@ -174,7 +175,7 @@ int main(int argc, char **argv)
}
else
{
fprintf(montage_status, "[struct stat=\"OK\", %s]\n", returnStruct->msg);
fprintf(montage_status, "[struct stat=\"OK\", module=\"mAdd\", %s]\n", returnStruct->msg);
exit(0);
}
}
......@@ -8,14 +8,13 @@
#define MEAN 0
#define MEDIAN 1
#define COUNT 2
#define SUM 3
/***********************************/
/* Define mAdd function prototypes */
/***********************************/
char *filePath (char *path, char *fname);
int mAdd_readTemplate (char *filename);
void mAdd_parseLine (char *line);
int mAdd_avg_count (double data[], double area[], double *outdata,
......@@ -24,6 +23,8 @@ int mAdd_avg_mean (double data[], double area[], double *outdata,
double *outarea, int count);
int mAdd_avg_median (double data[], double area[], double *outdata,
double *outarea, int n, double nom_area);
int mAdd_avg_sum (double data[], double area[], double *outdata,
double *outarea, int count);
void mAdd_sort (double *data, double *area, int n);
int mAdd_listInit ();
......
......@@ -7,7 +7,7 @@
"arguments":
[
{"type":"string", "default":"./", "name":"path", "desc":"Directory containing files to be coadded."},
{"type":"string", "name":"path", "desc":"Directory containing files to be coadded."},
{"type":"string", "name":"tblfile", "desc":"Table file list of reprojected files to coadded."},
{"type":"string", "name":"template_file", "desc":"FITS header file used to define the desired output."},
{"type":"string", "name":"outfile", "desc":"Final mosaic FITS file."},
......@@ -19,6 +19,8 @@
"return":
[
{"type":"int", "name":"status", "desc":"Return status (0: OK, 1:ERROR)."},
{"type":"string", "name":"msg", "desc":"Return message (for errors)."},
{"type":"double", "name":"time", "desc":"Total processing time (sec)."}
]
}
This diff is collapsed.
......@@ -45,7 +45,7 @@ int main(int argc, char **argv)
/* Process the command-line parameters */
/***************************************/
strcpy(path, "");
strcpy(path, ".");
montage_status = stdout;
......@@ -174,7 +174,7 @@ int main(int argc, char **argv)
}
else
{
fprintf(montage_status, "[struct stat=\"OK\", %s]\n", returnStruct->msg);
fprintf(montage_status, "[struct stat=\"OK\", module=\"mAddCube\", %s]\n", returnStruct->msg);
exit(0);
}
}
......@@ -7,7 +7,7 @@
"arguments":
[
{"type":"string", "default":"./", "name":"path", "desc":"Directory containing files to be coadded."},
{"type":"string", "name":"path", "desc":"Directory containing files to be coadded."},
{"type":"string", "name":"tblfile", "desc":"Table file list of reprojected files to coadded."},
{"type":"string", "name":"template_file", "desc":"FITS header file used to define the desired output."},
{"type":"string", "name":"outfile", "desc":"Final mosaic FITS file."},
......@@ -19,6 +19,8 @@
"return":
[
{"type":"int", "name":"status", "desc":"Return status (0: OK, 1:ERROR)."},
{"type":"string", "name":"msg", "desc":"Return message (for errors)."},
{"type":"double", "name":"time", "desc":"Total processing time (sec)."}
]
}
This diff is collapsed.
# Filename: Makefile.SunOS
# Version Developer Date Change
# ------- --------------- ------- -----------------
# 1.0 John Good 15Dec04 Original Makefile
.SUFFIXES:
.SUFFIXES: .c .o
CC = gcc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CFLAGS = -g -I. -I.. -I../../lib/include -fPIC
LIBS = -L../../lib -lwcs -lmtbl -lbz2
.c.o:
$(CC) $(CFLAGS) -c $*.c
mArchiveExec: mArchiveExec.o montageArchiveExec.o ../ArchiveGet/montageArchiveGet.o
$(CC) -o mArchiveExec mArchiveExec.o montageArchiveExec.o ../ArchiveGet/montageArchiveGet.o $(LIBS)
install:
cp mArchiveExec ../../bin