Changeset 18089
- Timestamp:
- 01/06/15 16:06:31 (10 years ago)
- Location:
- trunk/Mars
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Mars
- Property svn:mergeinfo changed
/branches/removing_cpp11_features (added) merged: 18086-18088
- Property svn:mergeinfo changed
-
trunk/Mars/mfileio/MMatrix.cc
r18009 r18089 43 43 fTitle = title ? title : 44 44 "Parameter container storing a vector of vectors to hold floating numbers"; 45 46 initialize(); 47 } 48 //------------------------------------------------------------------------------ 49 void MMatrix::initialize() { 50 fDelimiter = ','; 51 fComment = '#'; 52 fFileName = ""; 53 fLineNumber = 0; 45 54 } 46 55 //------------------------------------------------------------------------------ -
trunk/Mars/mfileio/MMatrix.h
r18009 r18089 32 32 // The deilimiter symbol which seperates the data chunks in the file to be 33 33 // parsed. 34 char fDelimiter = ',';34 char fDelimiter; 35 35 36 36 // The data text file to be parsed may have comment lines which are 37 37 // indicated with the comment character. 38 38 // Leading whitespaces in front of the comment symbol are fine/ are ignored. 39 char fComment = '#';39 char fComment; 40 40 41 41 // The fFileName can only be set using ReadFile( filename ). This is to make 42 42 // sure that the fFileName is always the one of the actual file parsed in. 43 TString fFileName = "";43 TString fFileName; 44 44 45 45 // the line number worked on is stored here by the ReadFile( fileneam ) 46 46 // function so that other functions as the pedantic_strtod() can provide 47 47 // an additional information in case they have to throw exceptions. 48 unsigned int fLineNumber = 0; 48 unsigned int fLineNumber; 49 50 void initialize(); 49 51 50 52 // a more pedantic version of std::strtod() -
trunk/Mars/mfileio/Makefile
r18040 r18089 33 33 MWriteFitsFile.cc \ 34 34 MTopFitsGroup.cc \ 35 MFitsArray.cc 35 MFitsArray.cc \ 36 MMatrix.cc 36 37 37 38 ############################################################
Note:
See TracChangeset
for help on using the changeset viewer.