Added new method DisIntegrate(AliMUONHit&, TList& digits) to replace the one in

[u/mrichter/AliRoot.git] / MUON / AliMUONSt1IniReader.cxx

diff --git a/MUON/AliMUONSt1IniReader.cxx b/MUON/AliMUONSt1IniReader.cxx
index 1a22e158c51e28f98dc69a0e673b60bd531052cb..4606b7dcc45c78afd1784f354c41d2ef1462fe89 100644 (file)
--- a/MUON/AliMUONSt1IniReader.cxx
+++ b/MUON/AliMUONSt1IniReader.cxx
@@ -13,13 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.1  2003/01/28 13:21:06  morsch
-Improved response simulation for station 1.
-(M. Mac Cormick, I. Hrivnacova, D. Guez)
-
-*/
+/* $Id$ */
 
 // Authors: David Guez, Ivana Hrivnacova, Marion MacCormick; IPN Orsay
 //
@@ -33,6 +27,7 @@ Improved response simulation for station 1.
 //
 // comment lines can be introduced if the first non-blank character
 // is either ';' or '#'
+// Included in AliRoot 2003/01/28
 
 #if !defined(__HP_aCC) && !defined(__alpha)
   #include <sstream>
@@ -114,17 +109,17 @@ bool AliMUONSt1IniReader::ReadNextLine()
   
   if (c=='[') {             // this is a chapter name
     getline(l,fCurrentName,']');
-    fCurrentName=trail(fCurrentName);
+    fCurrentName=Trail(fCurrentName);
     fCurrentType=kChapter;
     return true;
   } else {
     if (line.find_first_of("=") != string::npos ) {
       l.putback(c);
       getline(l,fCurrentName,'=');
-      fCurrentName = trail(fCurrentName);
+      fCurrentName = Trail(fCurrentName);
        
       getline(l,fCurrentValue);
-      fCurrentValue = trail(fCurrentValue);
+      fCurrentValue = Trail(fCurrentValue);
       fCurrentType=kValue;
       return true;
     } else {
@@ -139,17 +134,17 @@ bool AliMUONSt1IniReader::ReadNextLine()
 }
 
 //______________________________________________________________________
-AliMUONSt1IniReader::TValueList AliMUONSt1IniReader::MakeCurrentValueList()
+AliMUONSt1IniReader::ValueList AliMUONSt1IniReader::MakeCurrentValueList()
 {
 // Read the next lines in the file
 // until eof() or a new section is found. 
 // Return the list of (name,value) pairs read.
 // ---
 
-  TValueList ans;
+  ValueList ans;
   while (true){
     if (fCurrentType==kValue){
-      ans.push_back( TValuePair(fCurrentName,fCurrentValue));
+      ans.push_back( ValuePair(fCurrentName,fCurrentValue));
     } else break;
     ReadNextLine();
   }
@@ -157,34 +152,34 @@ AliMUONSt1IniReader::TValueList AliMUONSt1IniReader::MakeCurrentValueList()
 }
 
 //______________________________________________________________________
-AliMUONSt1IniReader::TChapter AliMUONSt1IniReader::MakeCurrentChapter()
+AliMUONSt1IniReader::Chapter AliMUONSt1IniReader::MakeCurrentChapter()
 {
 // Searches in the rest file for a new section
 // and return it's name and the list of (name,value) pairs in it
 // ---
 
   while ((!Eof()) && (fCurrentType != kChapter)) ReadNextLine();
-  if (Eof()) return TChapter();
+  if (Eof()) return Chapter();
   string name = fCurrentName;
   ReadNextLine();
-  return TChapter(name,MakeCurrentValueList());
+  return Chapter(name,MakeCurrentValueList());
 }
 
 //______________________________________________________________________
-AliMUONSt1IniReader::TChapterList AliMUONSt1IniReader::MakeChapterList()
+AliMUONSt1IniReader::ChapterList AliMUONSt1IniReader::MakeChapterList()
 {
 // Read the rest of the file and return all the chapter names and
 // (name,value) pair lists found after the current position
 // ---
 
-  TChapterList ans;
+  ChapterList ans;
   while (true) {
     if (fCurrentType==kChapter) {
       string s= fCurrentName;
       ReadNextLine();
-      //ans.insert(TChapter(s,MakeCurrentValueList()));
+      //ans.insert(Chapter(s,MakeCurrentValueList()));
                    // does not compile on SunOS
-      ans.insert(TChapterList::value_type(s,MakeCurrentValueList()));
+      ans.insert(ChapterList::value_type(s,MakeCurrentValueList()));
     } else ReadNextLine();
     if (fEndOfFile) break;
   }
@@ -192,7 +187,7 @@ AliMUONSt1IniReader::TChapterList AliMUONSt1IniReader::MakeChapterList()
 }
 
 //______________________________________________________________________
-string AliMUONSt1IniReader::trail(const string& s) const
+string AliMUONSt1IniReader::Trail(const string& s) const
 {
 // Utility function: clear the blanks before and after the string <s>
 // ---