67,7 → 67,7 |
return nprt; |
} |
|
int CombineParticles(TClonesArray *plist1 ,TClonesArray *plist2 , float masslow, float massup, SIMPLEPID pid, TClonesArray *pout){ |
int CombineParticles(TClonesArray *plist1 ,TClonesArray *plist2 , int same, float masslow, float massup, SIMPLEPID pid, TClonesArray *pout){ |
// Loop over all the particles in both lists. |
pout->Clear(); |
int nprt=0; |
74,7 → 74,7 |
|
for(TIter next1(plist1);BParticle * p1 =(BParticle *) next1();) { |
// the second loop |
for(TIter next2(plist2); BParticle * p2 =(BParticle *) next2();) { |
for( TIter next2 = (plist1!=plist2 && same==0) ? TIter(plist2): TIter(next1) ; BParticle * p2 =(BParticle *) next2();) { |
BParticle p = *p1 + *p2; // Combine two particles into a new particle |
if (p.InMassRange(masslow, massup)){ |
p.SetPid(pid); |