If present, pass header to container.

diff --git a/PYTHIA6/AliGenPythia.cxx b/PYTHIA6/AliGenPythia.cxx
index 90f714450ce72c695c8cebeea3e119829da9cd64..f505b7eeb33889d16eaec201fec2d52adffc6066 100644 (file)
--- a/PYTHIA6/AliGenPythia.cxx
+++ b/PYTHIA6/AliGenPythia.cxx
@@ -872,11 +872,21 @@ void AliGenPythia::MakeHeader()
        }
     
 //
-//  Pass header to RunLoader
+//  Pass header
 //
-    AliRunLoader::GetRunLoader()->GetHeader()->SetGenEventHeader(fHeader);   
+    AddHeader(fHeader);
 }
-       
+
+void AliGenPythia::AddHeader(AliGenEventHeader* header)
+{
+    // Add header to container or runloader
+    if (fContainer) {
+       fContainer->AddHeader(header);
+    } else {
+       AliRunLoader::GetRunLoader()->GetHeader()->SetGenEventHeader(header);   
+    }
+}
+
 
 Bool_t AliGenPythia::CheckTrigger(TParticle* jet1, TParticle* jet2)
 {

diff --git a/PYTHIA6/AliGenPythia.h b/PYTHIA6/AliGenPythia.h
index c3381a518e29b614ddb16f78b60291fa78bad8e6..2c28671921cc7f7c1f0ea54a22f5da0f10fae2f9 100644 (file)
--- a/PYTHIA6/AliGenPythia.h
+++ b/PYTHIA6/AliGenPythia.h
@@ -3,6 +3,7 @@
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
+
 /* $Id$ */
 
 //
@@ -21,6 +22,7 @@
 class AliPythia;
 class TParticle;
 class AliGenPythiaEventHeader;
+class AliGenEventHeader;
 class AliStack;
 class AliRunLoader;
 
@@ -91,11 +93,9 @@ class AliGenPythia : public AliGenMC
     virtual void SetQuench(Int_t flag = 0) {fQuench = flag;}
     virtual void SetHadronisation(Int_t flag = 1) {fHadronisation = flag;}
     virtual void SetReadFromFile(const Text_t *filname) {fFileName = filname;  fReadFromFile = 1;}    
-    
     // Get interaction rate for pileup studies
     virtual void    SetInteractionRate(Float_t rate,Float_t timewindow = 90.e-6);
     virtual Float_t GetInteractionRate() const {return fInteractionRate;}
-    
     // get cross section of process
     virtual Float_t GetXsection() const {return fXsection;}
     // get triggered jets
@@ -128,16 +128,15 @@ class AliGenPythia : public AliGenMC
     
     // Assignment Operator
     AliGenPythia & operator=(const AliGenPythia & rhs);
-
     void     GetSubEventTime();
-
+    void     AddHeader(AliGenEventHeader* header);
+    
  protected:
     // adjust the weight from kinematic cuts
     void     AdjustWeights();
     Int_t    GenerateMB();
     void     MakeHeader();    
     void     GeneratePileup();
-    
     Process_t   fProcess;           //Process type
     StrucFunc_t fStrucFunc;         //Structure Function
     Float_t     fEnergyCMS;         //Centre of mass energy

diff --git a/THijing/AliGenHijing.cxx b/THijing/AliGenHijing.cxx
index 35a5a1127c07f4412c0954dcb557e927090759a4..c34d2cab37b9014e2c72f60a1dcab2e6fee51643 100644 (file)
--- a/THijing/AliGenHijing.cxx
+++ b/THijing/AliGenHijing.cxx
@@ -316,7 +316,6 @@ void AliGenHijing::Generate()
          TParticle *  iparticle = (TParticle *) fParticles->At(i);
          Bool_t  hasMother   = (iparticle->GetFirstMother()     >=0);
          Bool_t  hasDaughter = (iparticle->GetFirstDaughter()   >=0);
-
          if (pSelected[i]) {
              kf   = iparticle->GetPdgCode();
              ks   = iparticle->GetStatusCode();
@@ -337,6 +336,8 @@ void AliGenHijing::Generate()
              Bool_t tFlag = (fTrackIt && !hasDaughter);
              PushTrack(tFlag,imo,kf,p,origin,polar,
                       tof,kPNoProcess,nt, 1., ks);
+
+             
              KeepTrack(nt);
              newPos[i] = nt;
          } // if selected
@@ -539,10 +540,21 @@ void AliGenHijing::MakeHeader()
     ((AliGenHijingEventHeader*) header)->SetTrials(fTrials);
 // Event Vertex
     header->SetPrimaryVertex(fVertex);
-    if (gAlice) gAlice->SetGenEventHeader(header);   
+    AddHeader(header);
     fCollisionGeometry = (AliGenHijingEventHeader*)  header;
 }
 
+void AliGenHijing::AddHeader(AliGenEventHeader* header)
+{
+    // Passes header either to the container or to gAlice
+    if (fContainer) {
+       fContainer->AddHeader(header);
+    } else {
+       gAlice->SetGenEventHeader(header);      
+    }
+}
+
+
 Bool_t AliGenHijing::CheckTrigger()
 {
 // Check the kinematic trigger condition

diff --git a/THijing/AliGenHijing.h b/THijing/AliGenHijing.h
index 6d341b0c4288060b9ff1ef3ed149accf21726e2a..e9bd34b52c7a3f76287e6ec5960bba969977c1a2 100644 (file)
--- a/THijing/AliGenHijing.h
+++ b/THijing/AliGenHijing.h
@@ -55,6 +55,7 @@ class AliGenHijing : public AliGenMC
        {fPhiMinJet = TMath::Pi()*phimin/180.; fPhiMaxJet = TMath::Pi()*phimax/180.;}
     virtual void    SetBoostLHC(Int_t flag = 0)         {fLHC        = flag;}
     virtual void    SetRandomPz(Bool_t flag = 0)        {fRandomPz   = flag;}
+    virtual void    AddHeader(AliGenEventHeader* header);
     virtual void    SwitchOffHeavyQuarks(Bool_t flag = kTRUE) {fNoHeavyQuarks = flag;}