source: branches/fitshead-branch/Makefile @ 1441

Last change on this file since 1441 was 95, checked in by Matthew Whiting, 18 years ago

Large collection of changes. Mostly minor fixes, but major additions are:

  • ability to store flagMW in the recon FITS file
  • slight change to way precision is dealt with in output files
  • improvement to VOTable output
  • generalisation of spectral plotting.

Summary of changes:
duchamp.hh -- added keywords/comments for storing flagMW in FITS files
Utils/wcsFunctions.cc -- minor correction
Cubes/plotting.cc -- minor corrections
Cubes/saveImage.cc -- writing flagMW as header keyword
Cubes/readRecon.cc -- able to read in flagMW. Improved formatting of comments
Cubes/detectionIO.cc -- made VOTable output able to cope with Column

definitions. Added new columns.

Cubes/cubes.hh -- added frontends to wcs-pix functions. Changed prototypes

of some plotting functions.

Cubes/plots.hh -- generalised some functionality of the classes
Cubes/drawMomentCutout.cc -- made a class function
Cubes/outputSpectra.cc -- made a Cube class function that plots a

single spectrum.

param.cc -- improved calling of local variables, and the way units are

dealt with.

docs/example_moment_map.pdf -- new version
docs/cover_image.ps -- new version
docs/example_spectrum.pdf -- new version
docs/cover_image.pdf -- new version
docs/example_moment_map.ps -- new version
docs/example_spectrum.ps -- new version
mainDuchamp.cc -- fixed order of some function calls. Other minor corrections.
ATrous/atrous_2d_reconstruct.cc -- improved speed of loop execution
ATrous/atrous_3d_reconstruct.cc -- improved speed of loop execution
Makefile -- addition of columns.cc
Detection/detection.cc -- minor corrections (removal of commented code)
Detection/outputDetection.cc -- minor change to output style and

precision variable name.

Detection/columns.cc -- use new precision variable
Detection/columns.hh -- new precision variables for position and position

width columns

param.hh -- added prototype for makelower(string) function.
File size: 2.1 KB
Line 
1CFLAGS = -c -g
2
3FFLAGS = -C -fast -O4
4
5CC=     g++ $(CFLAGS)
6F77=    g77 $(FFLAGS)
7
8BASE = .
9
10PGDIR = /u/whi550/pgplot/
11PGPLOTLIB = -L$(PGDIR) -L/usr/X11R6/lib/ -lcpgplot -lpgplot -lX11
12
13#CFITSIOLIB = -lcfitsio
14CFITSIOINC = /DATA/SITAR_1/whi550/cfitsio
15#CFITSIODIR = /usr/local/lib
16CFITSIODIR = /DATA/SITAR_1/whi550/cfitsio
17CFITSIOLIB = -L$(CFITSIODIR) -lcfitsio
18
19WCSDIR = /DATA/SITAR_1/whi550/wcslib-4.2
20WCSLIB = -L$(WCSDIR)/C -lwcs -L$(WCSDIR)/pgsbox/ -lpgsbox
21
22CINC= -I$(PGDIR) -I$(WCSDIR)/C/ -I$(WCSDIR)/pgsbox/ -I$(CFITSIOINC) -I$(BASE)
23
24LIBS =  $(WCSLIB) $(PGPLOTLIB) $(CFITSIOLIB) -lm -lg2c -lstdc++
25
26ATROUSDIR = $(BASE)/ATrous
27ATROUS = $(ATROUSDIR)/atrous_1d_reconstruct.o\
28        $(ATROUSDIR)/atrous_2d_reconstruct.o\
29        $(ATROUSDIR)/atrous_3d_reconstruct.o\
30        $(ATROUSDIR)/baselineSubtract.o\
31        $(ATROUSDIR)/ReconSearch.o
32
33DETECTIONDIR = $(BASE)/Detection
34DETECTION = $(DETECTIONDIR)/areClose.o\
35        $(DETECTIONDIR)/growObject.o\
36        $(DETECTIONDIR)/lutz_detect.o\
37        $(DETECTIONDIR)/mergeIntoList.o\
38        $(DETECTIONDIR)/outputDetection.o\
39        $(DETECTIONDIR)/sorting.o\
40        $(DETECTIONDIR)/spectrumDetect.o\
41        $(DETECTIONDIR)/thresholding_functions.o
42
43CUBESDIR = $(BASE)/Cubes
44CUBES = $(CUBESDIR)/baseline.o\
45        $(CUBESDIR)/cubicSearch.o\
46        $(CUBESDIR)/detectionIO.o\
47        $(CUBESDIR)/drawMomentCutout.o\
48        $(CUBESDIR)/getImage.o\
49        $(CUBESDIR)/invertCube.o\
50        $(CUBESDIR)/Merger.o\
51        $(CUBESDIR)/outputSpectra.o\
52        $(CUBESDIR)/plotting.o\
53        $(CUBESDIR)/readRecon.o\
54        $(CUBESDIR)/saveImage.o\
55        $(CUBESDIR)/trimImage.o
56
57UTILDIR = $(BASE)/Utils
58UTIL =  $(UTILDIR)/cpgwedg_log.o\
59        $(UTILDIR)/getStats.o\
60        $(UTILDIR)/linear_regression.o\
61        $(UTILDIR)/position_related.o\
62        $(UTILDIR)/sort.o\
63        $(UTILDIR)/wcsFunctions.o\
64        $(UTILDIR)/zscale.o
65
66HEADS = $(BASE)/param.o\
67        $(DETECTIONDIR)/detection.o\
68        $(DETECTIONDIR)/columns.o\
69        $(CUBESDIR)/cubes.o\
70        $(ATROUSDIR)/atrous.o
71
72duchamp : mainDuchamp.o $(HEADS) $(CUBES) $(ATROUS) $(DETECTION) $(UTIL)
73        $(F77) -o Duchamp mainDuchamp.o $(HEADS) $(CUBES) $(ATROUS) $(DETECTION) $(UTIL) $(LIBS)
74
75.cc.o:
76        $(CC) $< $(CINC) -o $@
77
78.c.o:
79        $(CC) $< $(CINC) -o $@
80
81clean :
82        rm -f *.o $(ATROUSDIR)/*.o $(CUBESDIR)/*.o $(DETECTIONDIR)/*.o $(UTILDIR)/*.o
Note: See TracBrowser for help on using the repository browser.