Analysis code updated

[u/mrichter/AliRoot.git] / TPC / AliTPCConfigParser.cxx

diff --git a/TPC/AliTPCConfigParser.cxx b/TPC/AliTPCConfigParser.cxx
index caa4c94ae6eca3e4896eaddaed4af59d67645ffb..aa8b4a52e095a409a4a2380cc88a535236f890f1 100644 (file)
--- a/TPC/AliTPCConfigParser.cxx
+++ b/TPC/AliTPCConfigParser.cxx
@@ -42,6 +42,7 @@
 //header
 #include "AliTPCConfigParser.h"
 
+using std::ifstream;
 
 AliTPCConfigParser::AliTPCConfigParser() :
 TObject(),
@@ -143,7 +144,7 @@ Int_t AliTPCConfigParser::ParseConfigFileTxt(const char* cfgfile)
     TObjArray  *objArr=0x0;
     if (nentries==2){
       TObject *objVal=arrValues->At(1);
-      const TString &str=((TObjString*)objVal)->GetString();
+      const TString str=objVal->GetName();
       if (str.Contains(","))
         objArr=str.Tokenize(",");
       else{
@@ -180,10 +181,10 @@ const char* AliTPCConfigParser::GetData(const char *key, UInt_t position)
   //Get value for the speciefied key
   //
   TObjArray *arr=((TObjArray*)fConfigMap->FindObject(key));
-  if (position>=arr->GetEntries()) return "";
+  if (position>=(UInt_t)(arr->GetEntries())) return "";
   TObject *val=arr->At(position);
   if ( !val ) return "";
-  return (((TObjString*)val)->GetString()).Data();
+  return val->GetName();
 }
 //_____________________________________________________________________
 Float_t AliTPCConfigParser::GetValue(const TObject *key, UInt_t position)
@@ -203,10 +204,10 @@ const char* AliTPCConfigParser::GetData(const TObject *key, UInt_t position)
   //Get value for the speciefied key
   //
   TObjArray *arr=((TObjArray*)fConfigMap->FindObject(key));
-  if (position>=arr->GetEntries()) return "";
+  if (position>=((UInt_t)arr->GetEntries())) return "";
   TObject *val=arr->At(position);
   if ( !val ) return "";
-  return (((TObjString*)val)->GetString()).Data();
+  return val->GetName();
 }
 //_____________________________________________________________________
 Int_t AliTPCConfigParser::GetNumberOfValues(const char* key) const
@@ -246,7 +247,10 @@ TObject* AliTPCConfigParser::NextValue(TObject *key){
 TObject* AliTPCConfigParser::NextValueIter(TObjArray *key){
   if (!key) return 0;
   //check if the collection has changed
-  if (fValIter && key!=fValIter->GetCollection()) delete fValIter;
+  if (fValIter && key!=fValIter->GetCollection()) {
+    delete fValIter;
+    fValIter=0x0;
+  }
   if (!fValIter) fValIter=key->MakeIterator();
   TObject *value=fValIter->Next();
   if (!value) {