From 92903f9d7bcb564be9ffad02f66039edc714f1df Mon Sep 17 00:00:00 2001 From: morsch Date: Thu, 9 Nov 2000 17:41:26 +0000 Subject: [PATCH] Correct number of particles in "FINAL" option. (FCA, Ch. Oppedisano) --- THijing/THijing.cxx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/THijing/THijing.cxx b/THijing/THijing.cxx index 4e2adec40b1..f8f1b641914 100644 --- a/THijing/THijing.cxx +++ b/THijing/THijing.cxx @@ -242,6 +242,7 @@ Int_t THijing::ImportParticles(TClonesArray *particles, Option_t *option) TClonesArray &Particles = *particles; Particles.Clear(); Int_t numpart = HIMAIN1.natt; + Int_t nump = 0; if (!strcmp(option,"") || !strcmp(option,"Final")) { for (Int_t i = 0; i<=numpart; i++) { @@ -249,10 +250,11 @@ Int_t THijing::ImportParticles(TClonesArray *particles, Option_t *option) // // Use the common block values for the TParticle constructor // - new(Particles[i]) TParticle( + nump++; + new(Particles[i]) TParticle( HIMAIN2.katt[0][i] , HIMAIN2.katt[1][i] , - HIMAIN2.katt[2][i] , + -1 , -1, -1, -1, @@ -270,6 +272,7 @@ Int_t THijing::ImportParticles(TClonesArray *particles, Option_t *option) } } else if (!strcmp(option,"All")) { + nump=numpart; for (Int_t i = 0; i<=numpart; i++) { Int_t iParent = HIMAIN2.katt[2][i]-1; @@ -283,7 +286,7 @@ Int_t THijing::ImportParticles(TClonesArray *particles, Option_t *option) new(Particles[i]) TParticle( HIMAIN2.katt[0][i] , - HIMAIN2.katt[3][i] , + HIMAIN2.katt[1][i] , iParent, -1, -1, @@ -300,7 +303,7 @@ Int_t THijing::ImportParticles(TClonesArray *particles, Option_t *option) 0); } } - return numpart; + return nump; } //______________________________________________________________________________ -- 2.43.0