From e60d29695a8aa157c2b838f852e9b1948cd45841 Mon Sep 17 00:00:00 2001 From: morsch Date: Wed, 15 Aug 2007 16:07:43 +0000 Subject: [PATCH] Correct setting of number of primaries in header. --- THijing/AliGenHijing.cxx | 17 ++++------------- THijing/AliGenHijing.h | 2 -- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/THijing/AliGenHijing.cxx b/THijing/AliGenHijing.cxx index d9dd4847bea..31fe03d5a08 100644 --- a/THijing/AliGenHijing.cxx +++ b/THijing/AliGenHijing.cxx @@ -231,6 +231,7 @@ void AliGenHijing::Generate() fTrials = 0; + for (j = 0;j < 3; j++) origin0[j] = fOrigin[j]; if(fVertexSmear == kPerEvent) { Vertex(); @@ -250,6 +251,7 @@ void AliGenHijing::Generate() // -------------------------------------------------------------------------- fHijing->GenerateEvent(); fTrials++; + fNprimaries = 0; fHijing->ImportParticles(fParticles,"All"); if (fTrigger != kNoTrigger) { if (!CheckTrigger()) continue; @@ -380,8 +382,7 @@ void AliGenHijing::Generate() } // if has mother Bool_t tFlag = (fTrackIt && !hasDaughter); PushTrack(tFlag,imo,kf,p,origin,polar,tof,kPNoProcess,nt, 1., ks); - - + fNprimaries++; KeepTrack(nt); newPos[i] = nt; } // if selected @@ -545,7 +546,7 @@ void AliGenHijing::MakeHeader() { // Builds the event header, to be called after each event AliGenEventHeader* header = new AliGenHijingEventHeader("Hijing"); - ((AliGenHijingEventHeader*) header)->SetNProduced(fHijing->GetNATT()); + ((AliGenHijingEventHeader*) header)->SetNProduced(fNprimaries); ((AliGenHijingEventHeader*) header)->SetImpactParameter(fHijing->GetHINT1(19)); ((AliGenHijingEventHeader*) header)->SetTotalEnergy(fHijing->GetEATT()); ((AliGenHijingEventHeader*) header)->SetHardScatters(fHijing->GetJATT()); @@ -591,16 +592,6 @@ void AliGenHijing::MakeHeader() 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() { diff --git a/THijing/AliGenHijing.h b/THijing/AliGenHijing.h index c03bf5b7416..b70a15de8b9 100644 --- a/THijing/AliGenHijing.h +++ b/THijing/AliGenHijing.h @@ -54,7 +54,6 @@ 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;} @@ -120,7 +119,6 @@ class AliGenHijing : public AliGenMC Int_t fRadiation; // Flag to switch on/off initial and final state radiation Int_t fSimpleJet; // Flag to produce simple tiggered jet topology Int_t fNoGammas; // Don't write gammas if flag "on" - // ZDC proposal (by Chiara) to store num. of SPECTATORS protons and neutrons Int_t fProjectileSpecn;// Num. of spectator neutrons from projectile nucleus Int_t fProjectileSpecp;// Num. of spectator protons from projectile nucleus -- 2.43.0