Correct adding of headers in case object is part of cocktail.

diff --git a/EVGEN/AliGenBox.cxx b/EVGEN/AliGenBox.cxx
index 46c3b9781fa25196e75983f1b4013a32fa02c83f..9c0440b3894f3e6df58344c54a222c552ec368b4 100644 (file)
--- a/EVGEN/AliGenBox.cxx
+++ b/EVGEN/AliGenBox.cxx
@@ -105,7 +105,14 @@ void AliGenBox::Generate()
 
     AliGenEventHeader* header = new AliGenEventHeader("BOX");
     header->SetPrimaryVertex(fVertex);
-    gAlice->SetGenEventHeader(header); 
+    header->SetNProduced(fNpart);
+    
+ // Passes header either to the container or to gAlice
+    if (fContainer) {
+       fContainer->AddHeader(header);
+    } else {
+       gAlice->SetGenEventHeader(header);      
+    }
 }
 
 //_____________________________________________________________________________

diff --git a/EVGEN/AliGenExtFile.cxx b/EVGEN/AliGenExtFile.cxx
index a123e7e1f8383383c034217d89a52b3a6a9fc6fc..891ebf8eb582c064b72e44d04fc92860eb24bbae 100644 (file)
--- a/EVGEN/AliGenExtFile.cxx
+++ b/EVGEN/AliGenExtFile.cxx
@@ -133,6 +133,7 @@ void AliGenExtFile::Generate()
     //
     // Stack filling loop
     //
+    fNprimaries = 0;
     for (i = 0; i < nTracks; i++) {
        TParticle* iparticle = fReader->NextParticle();
        Bool_t selected = KinematicSelection(iparticle,0); 
@@ -161,15 +162,15 @@ void AliGenExtFile::Generate()
        
        PushTrack(doTracking,parent,idpart,p,origin,polar,0,kPPrimary,nt);
        KeepTrack(nt);
+       fNprimaries++;
     } // track loop
 
     // Generated event header
     
     AliGenEventHeader * header = new AliGenEventHeader();
-    header->SetNProduced(nt+1);
+    header->SetNProduced(fNprimaries);
     header->SetPrimaryVertex(fVertex);
-    AliRunLoader::GetRunLoader()->GetHeader()->SetGenEventHeader(header);
-
+    AddHeader(header);
     break;
     
   } // event loop

diff --git a/EVGEN/AliGenParam.cxx b/EVGEN/AliGenParam.cxx
index 9c897e97b06e13a0ddd26f50abf9b11823475a43..ab0a0fcca525a11caa264a334e18b88d99d55c2a 100644 (file)
--- a/EVGEN/AliGenParam.cxx
+++ b/EVGEN/AliGenParam.cxx
@@ -38,6 +38,7 @@
 #include "AliGenParam.h"
 #include "AliMC.h"
 #include "AliRun.h"
+#include "AliGenEventHeader.h"
 
 ClassImp(AliGenParam)
 
@@ -283,6 +284,8 @@ void AliGenParam::Generate()
   Int_t ipa=0;
   
 // Generating fNpart particles
+  fNprimaries = 0;
+  
   while (ipa<fNpart) {
       while(1) {
 //
@@ -437,6 +440,8 @@ void AliGenParam::Generate()
                  PushTrack(0, -1, iPart, p, origin0, polar, 0, kPPrimary, nt, wgtp);
                  pParent[0] = nt;
                  KeepTrack(nt); 
+                 fNprimaries++;
+                 
 //
 // Decay Products
 //               
@@ -464,6 +469,7 @@ void AliGenParam::Generate()
                                           0, kPDecay, nt, wgtch);
                          pParent[i] = nt;
                          KeepTrack(nt); 
+                         fNprimaries++;
                      } // Selected
                  } // Particle loop 
              }  // Decays by Lujet
@@ -478,11 +484,18 @@ void AliGenParam::Generate()
            gAlice->GetMCApp()->
                PushTrack(fTrackIt,-1,iPart,p,origin0,polar,0,kPPrimary,nt,wgtp);
             ipa++; 
+           fNprimaries++;
          }
          break;
     } // while
   } // event loop
+  
   SetHighWaterMark(nt);
+
+  AliGenEventHeader* header = new AliGenEventHeader("PARAM");
+  header->SetPrimaryVertex(fVertex);
+  header->SetNProduced(fNprimaries);
+  AddHeader(header);
 }
 //____________________________________________________________________________________
 Float_t AliGenParam::GetRelativeArea(Float_t ptMin, Float_t ptMax, Float_t yMin, Float_t yMax, Float_t phiMin, Float_t phiMax)