commented logging message

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

diff --git a/MUON/AliMUONV2DStore.cxx b/MUON/AliMUONV2DStore.cxx
index 7d9a2cdefa9c9511168dc3c394366a28c19d7ca6..577043f85e00364cc89aacb8752718bfb8c05c98 100644 (file)
--- a/MUON/AliMUONV2DStore.cxx
+++ b/MUON/AliMUONV2DStore.cxx
@@ -31,53 +31,51 @@
 ClassImp(AliMUONV2DStore)
 /// \endcond
 
-#include "AliMpIntPair.h"
+#include "AliLog.h"
 #include "AliMUONObjectPair.h"
 #include "AliMUONVDataIterator.h"
-#include "Riostream.h"
-#include "TMap.h"
-#include "TObjArray.h"
-#include "TObjString.h"
-#include "TString.h"
-
-//_____________________________________________________________________________
-AliMUONV2DStore::AliMUONV2DStore()
-{
-/// Default constructor
-}
+#include "AliMpIntPair.h"
+#include <TMap.h>
+#include <TString.h>
+#include <TObjString.h>
+#include <TObjArray.h>
+#include <Riostream.h>
 
-//_____________________________________________________________________________
-AliMUONV2DStore::~AliMUONV2DStore()
+namespace
 {
-/// Destructor
-}
-
-TMap* Decode(const TString& s)
+  //_____________________________________________________________________________
+  void Decode(TMap& m, const TString& s, const char* sep)
 {
-  TString ss(s);
-  ss.ToUpper();
-  
-  TMap* m = new TMap;
-  m->SetOwner(true);
-  
-  TObjArray* a = ss.Tokenize(";");
-  TIter next(a);
-  TObjString* o;
-  
-  while ( ( o = static_cast<TObjString*>(next()) ) )
-  {
-    TString& os(o->String());
-    TObjArray* b = os.Tokenize("=");
-    if (b->GetEntries()==2)
+    /// Fills the map m with (key,value) extracted from s
+    /// where s is of the form :
+    /// key1=value1;key2=value2;key3=value3
+    
+    TString ss(s);
+    ss.ToUpper();
+    
+    m.SetOwner(true);
+    
+    TObjArray* a = ss.Tokenize(sep);
+    TIter next(a);
+    TObjString* o;
+    
+    while ( ( o = static_cast<TObjString*>(next()) ) )
     {
-      m->Add(b->At(0),b->At(1));
+      TString& os(o->String());
+      TObjArray* b = os.Tokenize("=");
+      if (b->GetEntries()==2)
+      {
+        m.Add(b->At(0),b->At(1));
+      }
     }
-  }
-  return m;
 }
 
-Bool_t Decode(const TMap& m, const TString& key, TString& value)
+//_____________________________________________________________________________
+Bool_t FindValue(const TMap& m, const TString& key, TString& value)
 {
+  /// Find value corresponding to key in map m.
+  /// Return false if key not found.
+  
   TString skey(key);
   skey.ToUpper();
   value = "";
@@ -90,6 +88,21 @@ Bool_t Decode(const TMap& m, const TString& key, TString& value)
   return kFALSE;
 }
 
+}
+
+//_____________________________________________________________________________
+AliMUONV2DStore::AliMUONV2DStore()
+{
+/// Default constructor
+}
+
+//_____________________________________________________________________________
+AliMUONV2DStore::~AliMUONV2DStore()
+{
+/// Destructor
+}
+
+
 //_____________________________________________________________________________
 void
 AliMUONV2DStore::Print(Option_t* opt) const
@@ -99,22 +112,20 @@ AliMUONV2DStore::Print(Option_t* opt) const
   /// e.g opt="I=12;J=1;opt=Full" to see complete values, but only for the 
   /// (12,1) pair.
   /// Warning : decoding of opt format is not really bullet-proof (yet?)
-  
+
   AliMUONVDataIterator* it = this->Iterator();
   
   AliMUONObjectPair* pair;
   
-  TMap* m = Decode(opt);
+  TMap m;
+  Decode(m,opt,";");
   
   TString si;  
-  Bool_t selectI = Decode(*m,"i",si);
+  Bool_t selectI = FindValue(m,"i",si);
   TString sj;
-  Bool_t selectJ = Decode(*m,"j",sj);
+  Bool_t selectJ = FindValue(m,"j",sj);
   TString sopt;
-  Decode(*m,"opt",sopt);
-  
-  m->DeleteAll();
-  delete m;
+  FindValue(m,"opt",sopt);
   
   while ( ( pair = static_cast<AliMUONObjectPair*>(it->Next() ) ) )
   {
@@ -129,9 +140,9 @@ AliMUONV2DStore::Print(Option_t* opt) const
     {
       o->Print(sopt.Data());
     }
+    if ( it->IsOwner() ) delete pair;
   }
-  
   delete it;
-}
+}