AliMUONTrackerIO::DecodeGains : move declaration of iADC in order not to get memory...

when the TString is a concatenation of several .par files (AMORE issue).

AliMUONTrackerDataWrapper.h : add the method UpdateData in order to update the
data without having to Unregister the corresponding wrapper (AMORE issue).

(Guillaume)

diff --git a/MUON/AliMUONTrackerDataWrapper.h b/MUON/AliMUONTrackerDataWrapper.h
index e2f21449516a5dd7dbbd58ebf96df491574c6d8b..4a58afdbb908548bf2855559f475b93095593a0b 100644 (file)
--- a/MUON/AliMUONTrackerDataWrapper.h
+++ b/MUON/AliMUONTrackerDataWrapper.h
@@ -58,6 +58,8 @@ public:
   
   virtual Long64_t Merge(TCollection* li);
   
+  virtual void UpdateData(AliMUONVTrackerData* data=0x0) { fData = data; }
+  
 private:
     /// not implemented.
     AliMUONTrackerDataWrapper(const AliMUONTrackerDataWrapper& rhs);

diff --git a/MUON/AliMUONTrackerIO.cxx b/MUON/AliMUONTrackerIO.cxx
index caa6446cf3fc34122821de46ad49832db6f25b20..6e766d9fa977c50f076a805dd63ae6b64ead2193 100644 (file)
--- a/MUON/AliMUONTrackerIO.cxx
+++ b/MUON/AliMUONTrackerIO.cxx
@@ -280,7 +280,6 @@ AliMUONTrackerIO::DecodeGains(TString data, AliMUONVStore& gainStore,
   Int_t* runs(0x0);
   Int_t* dac(0x0);
   Int_t nDAC(0);
-  Int_t iDAC(0);
   
   while ( in.getline(line,1024) )
   {
@@ -317,6 +316,7 @@ AliMUONTrackerIO::DecodeGains(TString data, AliMUONVStore& gainStore,
             in.getline(line,1024);
             in.getline(line,1024);
             // then get run and dac values
+           Int_t iDAC(0);
             for ( Int_t i = 0; i < nDAC; ++i ) 
             {
               in.getline(line,1024);