Improved merging.

diff --git a/STEER/STEER/AliTransportMonitor.cxx b/STEER/STEER/AliTransportMonitor.cxx
index b86eff3816cc61e73b497583554c568ec5257663..b768d963969cd0b28f7c0b7b1b9f8bb235fcf94d 100644 (file)
--- a/STEER/STEER/AliTransportMonitor.cxx
+++ b/STEER/STEER/AliTransportMonitor.cxx
@@ -116,7 +116,9 @@ PMonData &AliTransportMonitor::AliTransportMonitorVol::GetPMonData(Int_t pdg)
 
 void AliTransportMonitor::AliTransportMonitorVol::Merge(AliTransportMonitorVol* volM) 
 {
+  //
   // Merging
+  //
   fTotalTime = (fTotalTime + volM->GetTotalTime());
   if (fTimeRZ && volM->GetHistogram()) {
     fTimeRZ->Add(volM->GetHistogram()); 
@@ -125,13 +127,11 @@ void AliTransportMonitor::AliTransportMonitorVol::Merge(AliTransportMonitorVol*
   }
 
   Int_t ntypes = volM->GetNtypes();
-  Int_t ntypes2 = GetNtypes();
   for (Int_t i = 0; i < ntypes; i++) {
     Int_t pdg = volM->GetPDG(i);
-    //PMonData &data  = GetPMonData(pdg);
-    //PMonData &dataM = volM->GetPMonData(pdg);
-    //data.fEdt  += dataM.fEdt;
-    //data.fTime += dataM.fTime;
+     PMonData &data  = GetPMonData(pdg);
+     data.fEdt  += (volM->GetEmed(i) * volM->GetTotalTime());
+     data.fTime += (volM->GetTime(i));
   }
 }
 
@@ -203,7 +203,8 @@ void AliTransportMonitor::Print(Option_t *volName) const
       timeperpart[i] = volMon->GetTime(i); 
       timepervol += timeperpart[i];
     }
-    printf("Volume %s: Transport time: %g%% of %g [s]\n", volMon->GetName(), 100.*timepervol/fTotalTime, fTotalTime);
+    printf("Volume %s: Transport time: %g%% of %g %g [s]\n", volMon->GetName(), 100.*timepervol/fTotalTime, fTotalTime,
+          volMon->GetTotalTime());
     TMath::Sort(ntypes, timeperpart, isort, kTRUE);
     TString particle;
     TDatabasePDG *pdgDB = TDatabasePDG::Instance();    
@@ -307,7 +308,22 @@ void AliTransportMonitor::Export(const char *fname)
 //______________________________________________________________________________
 void AliTransportMonitor::Merge(AliTransportMonitor* mergeMon)
 {
+
   // merge with monitor 
+  if (!fVolumeMon) 
+    {
+      TObjArray* arr = mergeMon->GetVolumes();
+      Int_t nvol = arr->GetEntriesFast();
+      fVolumeMon = new TObjArray(nvol);
+      fVolumeMon->SetOwner();
+      for (Int_t i = 0; i < nvol; i++) {
+       AliTransportMonitorVol *volMon = new AliTransportMonitorVol();
+       volMon->SetName(arr->At(i)->GetName());
+       fVolumeMon->Add(volMon);
+      }
+    } // first time
+
+
   Int_t n = fVolumeMon->GetEntriesFast();
   TObjArray* mergeVols = mergeMon->GetVolumes();
   fTotalTime = 0;

diff --git a/STEER/STEER/AliTransportMonitor.h b/STEER/STEER/AliTransportMonitor.h
index a28e4b1f6d995a0605d83255b0d08b80c8f0da48..90d073885473219699b64c67e7ef34d9d8c0b719 100644 (file)
--- a/STEER/STEER/AliTransportMonitor.h
+++ b/STEER/STEER/AliTransportMonitor.h
@@ -37,7 +37,6 @@ public:
       Double_t      fEdt;        // Energy * dt integral
       Double_t      fTime;       // Total transport time for the particle in this volume
       AliPMonData() : fPDG(0), fEdt(0), fTime(0) {}
-      void          Merge(AliPMonData* pdata) {fTime = 0.5*(fTime+pdata->fTime); fEdt = 0.5 * (fEdt+pdata->fEdt);}
       virtual ~AliPMonData() {}
       ClassDef(AliPMonData, 1)     // Basic monitoring info structure
     };