Changeset 18089 for trunk/Mars

Timestamp:

01/06/15 16:06:31 (10 years ago)

Author:

smueller

Message:

solving ticket #23, build tests have been performed on La Palma newdaq.

Location:

trunk/Mars

Files:

• . (modified) (1 prop)
• mfileio/MMatrix.cc (modified) (1 diff)
• mfileio/MMatrix.h (modified) (1 diff)
• mfileio/Makefile (modified) (1 diff)

trunk/Mars/mfileio/MMatrix.cc

@@ -43 +43 @@
     fTitle = title ? title : 
     "Parameter container storing a vector of vectors to hold floating numbers";
+        
+    initialize();
+}
+//------------------------------------------------------------------------------
+void MMatrix::initialize() {
+    fDelimiter = ',';
+    fComment = '#';
+    fFileName = "";
+    fLineNumber = 0;
 }
 //------------------------------------------------------------------------------

trunk/Mars/mfileio/MMatrix.h

@@ -32 +32 @@
     // The deilimiter symbol which seperates the data chunks in the file to be 
     // parsed.
-    char fDelimiter = ',';
+    char fDelimiter;
 
     // The data text file to be parsed may have comment lines which are 
     // indicated with the comment character.
     // Leading whitespaces in front of the comment symbol are fine/ are ignored. 
-    char fComment = '#';
+    char fComment;
 
     // The fFileName can only be set using ReadFile( filename ). This is to make
     // sure that the fFileName is always the one of the actual file parsed in.
-    TString fFileName = "";
+    TString fFileName;
 
     // the line number worked on is stored here by the ReadFile( fileneam ) 
     // function so that other functions as the pedantic_strtod() can provide
     // an additional information in case they have to throw exceptions.
-    unsigned int fLineNumber = 0;
+    unsigned int fLineNumber;
+
+    void initialize();
 
     // a more pedantic version of std::strtod()

trunk/Mars/mfileio/Makefile

@@ -33 +33 @@
            MWriteFitsFile.cc \
            MTopFitsGroup.cc \
-           MFitsArray.cc
+           MFitsArray.cc \
+           MMatrix.cc
 
 ############################################################