Fixes for #88468 Request to commit and include in the new tag the changes in AMPT

diff --git a/TAmpt/AMPT/amptsetdef.f b/TAmpt/AMPT/amptsetdef.f
index 56ac72379f9e7776fce8fcbfd76db8fff99dfe0c..75a5c33bd09ba1c48ec4cc4ecae1b2fe3747f91d 100644 (file)
--- a/TAmpt/AMPT/amptsetdef.f
+++ b/TAmpt/AMPT/amptsetdef.f
@@ -28,7 +28,7 @@ c     initialization value for hadron cascade:
      &   IMOMEN, NFREQ, ICFLOW, ICRHO, ICOU, KPOTEN, KMUL
       common/oscar1/iap,izp,iat,izt
       common/oscar2/FRAME,amptvn
-      common/resdcy/NSAV,iksdcy
+      common/resdcy/NSAV,iksdcy,ikstardcy
 clin-6/2009:
 c      common/phidcy/iphidcy
       common/phidcy/iphidcy,pttrig,ntrig,maxmiss
@@ -73,6 +73,7 @@ c     2 seeds for random number generators in HIJING/hadron cascade and ZPC:
       nseed    = 53153511      ! random seed for HIJING
       iseedp   = 8             ! random seed for parton cascade
       iksdcy   = 0             ! flag for Ks0 weak decays (D=0,no; 1,yes)
+      ikstardcy   = 0          ! flag for K* weak decays (D=0,no; 1,yes)
       iphidcy  = 0             ! flag for phi decays at end of hadron cascade (D=1,yes; 0,no)
 c     flag for OSCAR output for final partons and hadrons:
       ioscar   = 0             ! optional OSCAR output (D=0,no; 1,yes; 2&3,more parton info)
@@ -116,6 +117,7 @@ c$$$        and 2.2814d0 for 6mb. Using 1d4 effectively turns off parton cascade.
 c$$$ihjsed: if =11, take HIJING random seed at runtime so that 
 c$$$   every run may be automatically different (see file 'exec').
 c$$$iksdcy: flag for Ks0 weak decays for comparison with data.
+c$$$ikstardcy: flag for K* weak decays for comparison with data.
 c$$$iphidcy: flag for phi meson decays at the end of hadron cascade for comparison 
 c$$$   with data; default is yes; use 0 to turn off these decays. 
 c$$$   Note: phi meson decay during hadron cascade is always enabled.

diff --git a/TAmpt/AMPT/art1f.f b/TAmpt/AMPT/art1f.f
index baf3f032fffcf4d6f2a26b04b18b85886ef7ddbd..7c40ea4f46cf0decd2fc9baec9f97de395f71ab6 100644 (file)
--- a/TAmpt/AMPT/art1f.f
+++ b/TAmpt/AMPT/art1f.f
@@ -1828,6 +1828,8 @@ cc             WID=0.40
              pdecay=1.1
 clin-5b/2008 forbid phi decay at the end of hadronic cascade:
              if(iphidcy.eq.0.and.iabs(LB1).eq.29) pdecay=0.
+cpchrist forbid K* decay at the end of hadronic cascade:
+             if(ikstardcy.eq.0.and.iabs(LB1).eq.30) pdecay=0.
           else
              T0=0.19733/WID
              GFACTR=E1/EM1

diff --git a/TAmpt/AMPT/linana.f b/TAmpt/AMPT/linana.f
index 142017cddd04b017dfed23a6e559fb37a03d85b8..ec55085685372d0de0210a707a4386b155030bcc 100644 (file)
--- a/TAmpt/AMPT/linana.f
+++ b/TAmpt/AMPT/linana.f
@@ -1614,6 +1614,7 @@ cc      SAVE /RNDF77/
         irun=idecay
         if(lb1.eq.0.or.lb1.eq.25.or.lb1.eq.26.or.lb1.eq.27
      &       .or.lb1.eq.28.or.lb1.eq.29.or.iabs(lb1).eq.30
+c     &       .or.lb1.eq.28.or.lb1.eq.29
      &       .or.lb1.eq.24.or.(iabs(lb1).ge.6.and.iabs(lb1).le.9) 
      &       .or.iabs(lb1).eq.16) then
            kf=INVFLV(lb1)

diff --git a/TAmpt/TAmpt.cxx b/TAmpt/TAmpt.cxx
index aa8325661df36652fc0a739a0616be3d14b35209..ad487c05886569ed6ef754c9b0d0cc6c73d60269 100644 (file)
--- a/TAmpt/TAmpt.cxx
+++ b/TAmpt/TAmpt.cxx
@@ -128,14 +128,14 @@ TObjArray* TAmpt::ImportParticles(Option_t */*option*/)
     Double_t py = HBT.plast[i][1];//GeV/c
     Double_t pz = HBT.plast[i][2];//GeV/c
     Double_t ma = HBT.plast[i][3];//GeV/c/c
-//    Double_t vx = 0;//HBT.xlast[i][0]*1e-12;//mm
-//    Double_t vy = 0;//HBT.xlast[i][1]*1e-12;//mm
-//    Double_t vz = 0;//HBT.xlast[i][2]*1e-12;//mm
-//    Double_t vt = 0;//HBT.xlast[i][3]*1e-12;//mm/c
-    Double_t vx = HBT.xlast[i][0]*1e-12;//mm
-    Double_t vy = HBT.xlast[i][1]*1e-12;//mm
-    Double_t vz = HBT.xlast[i][2]*1e-12;//mm
-    Double_t vt = HBT.xlast[i][3]*1e-12;//mm/c
+    Double_t vx = 0;//HBT.xlast[i][0]*1e-12;//mm
+    Double_t vy = 0;//HBT.xlast[i][1]*1e-12;//mm
+    Double_t vz = 0;//HBT.xlast[i][2]*1e-12;//mm
+    Double_t vt = 0;//HBT.xlast[i][3]*1e-12;//mm/c
+    //Double_t vx = HBT.xlast[i][0]*1e-12;//mm
+    //Double_t vy = HBT.xlast[i][1]*1e-12;//mm
+    //Double_t vz = HBT.xlast[i][2]*1e-12;//mm
+    //Double_t vt = HBT.xlast[i][3]*1e-12;//mm/c
     Int_t pdg   = invflv(HBT.lblast[i]);
     TParticle *p = new TParticle(pdg,
                                  status,

diff --git a/TAmpt/macros/fastGenAmpt.C b/TAmpt/macros/fastGenAmpt.C
index 54d1471b0c9ca7dcf8b78fdc9c30b5d8335629b9..2e01a129ea14109eab7afebd3b2cbf244ed8d6cb 100644 (file)
--- a/TAmpt/macros/fastGenAmpt.C
+++ b/TAmpt/macros/fastGenAmpt.C
@@ -23,7 +23,7 @@
 #include "AliGenAmpt.h"
 #endif
 
-void fastGenAmpt(Int_t nev = 10, const char* filename = "galice.root")
+void fastGenAmpt(Int_t nev = 100, const char* filename = "galice.root")
 {
   AliPDG::AddParticlesToPdgDataBase();
   TDatabasePDG::Instance();
@@ -56,13 +56,16 @@ void fastGenAmpt(Int_t nev = 10, const char* filename = "galice.root")
   genHi->SetReferenceFrame("CMS");
   genHi->SetProjectile("A", 208, 82);
   genHi->SetTarget    ("A", 208, 82);
+  genHi->SetIsoft(4); //1: defaul - 4: string melting
   genHi->SetPtHardMin (3);
   //genHi->SetImpactParameterRange(9.,9.5);
   genHi->SetImpactParameterRange(0.,20.0);
-  genHi->SetJetQuenching(1); // enable jet quenching
+  genHi->SetNtMax(150); //NTMAX: number of timesteps (D=150)
+  genHi->SetXmu(3.2264); //parton screening mass in fm^(-1) (D=3.2264d0)
+  genHi->SetJetQuenching(0); // enable jet quenching
   genHi->SetShadowing(1);    // enable shadowing
   genHi->SetDecaysOff(1);    // neutral pion and heavy particle decays switched off
-  genHi->SetSpectators(1);   // track spectators 
+  genHi->SetSpectators(0);   // track spectators 
   genHi->Init();
 
   rl->CdGAFile();