source: trunk/src/duchamp.hh @ 142

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

Large range of changes -- related to image cutouts and spectral units mostly.

duchamp.hh -- changed name of spectral type, and introduced one for frequency.
Cubes/getImage.cc -- changed the way the spectral type and spectral units are

looked at. Now is able to use frequency units (defaults
to MHz) when there isn't a good velocity transformation
possible (ie. if there is no restfreq defined).

Cubes/drawMomentCutout.cc -- Range of changes here:

  • improved the way unwanted pixels (those BLANK and outside image coundaries) are dealt with in the image array in drawMomentCutout
  • removed the way the blank pixel information was changed. Now behaves in a consistent way whether or not there are blank pixels
  • improved call to plotBlankEdges()
  • added call to drawFieldEdge() -- a new function that draws a yellow line around the boundary of the pixels of the image.
  • improved the tick mark that shows the angular scale of the cutout. Now adaptable to any pixel scale.
  • added calls to cpgtest() to all functions

Also these files were changed in relation to these edits:
Utils/drawBlankEdges.cc -- improved execution, with "blank" array.
Cubes/cubes.cc -- added call to Param::drawBlankEdge in Cube::plotBlankEdges()
Cubes/outputSpectra.cc -- moved spectra away from left and right axes.
param.cc -- added necessary calls for the new parameter. Other minor changes

to formatting. Added a missed call to stringize.

mainDuchamp.cc -- added #include <param.hh>
param.hh -- Added a new parameter: blankEdge
Cubes/cubes.hh -- improved appearance of comments
Cubes/plots.hh -- improved appearance of comments
InputComplete? -- added new parameter.
docs/Guide.tex -- added text about blank edge plotting.
All six images were changed as well.

CHANGES -- some of these changes -- not up to date yet!

File size: 2.5 KB
RevLine 
[110]1/* src/duchamp.hh.  Generated by configure.  */
[105]2#ifndef DUCHAMP_HH
3#define DUCHAMP_HH
4
[125]5#include <string>
6
[141]7#undef PACKAGE_BUGREPORT
8#undef PACKAGE_NAME
9#undef PACKAGE_STRING
10#undef PACKAGE_TARNAME
11#undef PACKAGE_VERSION
[110]12#include "config.h"
13
[71]14// how to convey whether a function has worked
15enum OUTCOME {SUCCESS, FAILURE};
16
17
[110]18const std::string ERR_USAGE_MSG =
[85]19"Usage:: Duchamp -p [parameter file]\n\
[57]20  Other options:\n\
[85]21    -f <file>  Use default parameters with imageFile=<file>\n\
22    -v         Version number\n\
23    -h         This help information\n";
[57]24
[142]25const std::string ERR_USAGE_MSG_SHORT="Usage:: Duchamp -p [parameter file]\n";
[57]26
[110]27const std::string PROGNAME = PACKAGE_NAME;
[57]28
[110]29const std::string VERSION = PACKAGE_VERSION;
[71]30
[120]31// Specialised functions to report warnings and errors.
32// These are defined in duchamp.cc
33void duchampWarning(std::string subroutine, std::string warning);
34void duchampError(std::string subroutine, std::string error);
35
[103]36// The spectral type that we want the wcsprm structs to be in
[142]37const char duchampVelocityType[9] = "VELO-F2V";
38const char duchampFrequencyType[9] = "FREQ";
[103]39
[110]40// The following are the FITS Header Keywords corresponding to the
[71]41//  parameters related to the atrous reconstruction.
42const std::string keyword_scaleMin   = "DU_MINSC";
43const std::string keyword_snrRecon   = "DU_ATCUT";
[103]44const std::string keyword_reconDim   = "DU_ATDIM";
[71]45const std::string keyword_filterCode = "DU_FILTR";
[142]46const std::string keyword_ReconResid = "DU_RECON"; //reconstruction or residual?
[105]47const std::string keyword_subsection = "DU_IMSUB";
[142]48
[71]49// And these are the comments corresponding to the relevant keywords
50const std::string comment_scaleMin   = "Duchamp parameter scaleMin";
51const std::string comment_snrRecon   = "Duchamp parameter snrRecon";
[103]52const std::string comment_reconDim   = "Duchamp parameter reconDim";
[71]53const std::string comment_filterCode = "Duchamp parameter filterCode";
54const std::string comment_ReconResid = "Is this the reconstruction or residual?";
[105]55const std::string comment_subsection = "Subsection of the original image";
[71]56// Descriptive Headers:
57const std::string header_history1 = "Reconstructed with a trous wavelet technique";
58const std::string header_history2 = "Reconstruction by Duchamp v." + VERSION;
[105]59const std::string header_history_input = "Original (input) image used by Duchamp follows";
60const std::string header_subsection_comment  = "A subsection of the original was reconstructed by Duchamp";
61const std::string header_atrous_comment  = "The following are the Duchamp parameters used in reconstruction";
62
63#endif
64
Note: See TracBrowser for help on using the repository browser.