Merge branch 'dev'

Author: JohnGood

Makefile

@@ -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

Montage/Makefile.Darwin

@@ -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)
 

Montage/Makefile.LINUX

@@ -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)
 

Montage/Makefile.SunOS

@@ -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)
 

MontageLib/Add/mAdd.c

@@ -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);
    }
 }

MontageLib/Add/mAdd.h

@@ -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      ();    

MontageLib/Add/mAdd.json

@@ -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)."}
    ]
 }