AliRoot - Bugs: bug #99770, commit and port AMPT fixes
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 14 Jan 2013 10:29:02 +0000 (10:29 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Mon, 14 Jan 2013 10:29:02 +0000 (10:29 +0000)
  Panos Christakoglou

TAmpt/AMPT/art1f.f
TAmpt/AliGenAmpt.cxx

index 7c40ea4..425925e 100644 (file)
@@ -2234,6 +2234,7 @@ clin-7/26/03 improve speed
 
          ISS=NINT(SRT/ESBIN)
 clin-4/2008 use last bin if ISS is out of EKAON's upper bound of 2000:
+         if(ISS.lt.0) GOTO 400 
          if(ISS.gt.2000) ISS=2000
 *Sort collisions
 c
@@ -3291,6 +3292,7 @@ c        IF(IC.EQ.-1)GO TO 400
            GO TO 400
         endif
 
+c        print *,"ISS (3294) is ",iss
         ekaon(3,iss)=ekaon(3,iss)+1
 * CALCULATE KAON PRODUCTION PROBABILITY FROM NUCLEON + BARYON RESONANCE 
 * COLLISIONS
@@ -3661,6 +3663,7 @@ clin-4/03/02 rho rho <-> eta eta:
        if(ppel.eq.0)go to 400
 * the collision can happen
 * check what kind collision has happened
+c        print *,"ISS (3665) is ",iss
        ekaon(5,iss)=ekaon(5,iss)+1
         CALL CRPP(PX1CM,PY1CM,PZ1CM,SRT,I1,I2,
      1  IBLOCK,ppel,ppin,spprho,ipp)
index 1b1dcfa..0424e0b 100644 (file)
@@ -359,19 +359,27 @@ void AliGenAmpt::Generate()
                  //arr.Print();
                  // iparticle->SetStatusCode(2);  to be compatible with Hijing
                  iparticle->SetFirstDaughter(np2);
-                 for (Int_t jj = 1; jj < ndecayed; jj++) {
+                 for (Int_t jj = 1; jj < ndecayed; jj++) {
                  TParticle *jp = (TParticle *)arr.At(jj);
                    if (jp->GetFirstMother()!=1)
                      continue;
-                 TParticle *newp = new(fParticles[np2]) TParticle(jp->GetPdgCode(),
+
+                   TParticle *newp = new(fParticles[np2]) TParticle(jp->GetPdgCode(),
                                                                   0, //1,  //to be compatible with Hijing
                                                                   i,
                                                                   -1,
                                                                   -1,
                                                                   -1,
                                                                   jp->Px(),jp->Py(),jp->Pz(),jp->Energy(),
-                                                                  jp->Vx(),jp->Vy(),jp->Vz(),jp->T());
-                 newp->SetUniqueID( jp->GetStatusCode() );
+                                                                    jp->Vx(),jp->Vy(),jp->Vz(),jp->T());
+                   //take care of the phi
+                   //if((kf == 333)||(kf == 313)) {
+                   if(IsThisAKnownParticle(iparticle)) {
+                     //Printf("=============PANOS===================");
+                     //Printf("Phi detected - daughet is: %d",jp->GetPdgCode());
+                     newp->SetUniqueID(4);
+                   }
+                   else newp->SetUniqueID( jp->GetStatusCode() );
                  np2++;
                } // end of jj->nDecayedParticles
                iparticle->SetLastDaughter(np2-1);