Changes to make code work for pp collisions.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 1 Jun 2004 09:16:30 +0000 (09:16 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 1 Jun 2004 09:16:30 +0000 (09:16 +0000)
DPMJET/dpmjet3.0-4.f
DPMJET/phojet1.12-35c.f
TDPMjet/AliGenDPMjet.cxx
TDPMjet/AliGenDPMjet.h
TDPMjet/AliIonPDGCodes.cxx
TDPMjet/AliIonPDGCodes.h

index 382eb94..d98f765 100644 (file)
@@ -55,10 +55,10 @@ CDECK  ID>, DT_INIT
       CHARACTER*8 BTYPE
       COMMON /DTPAIN/ BTYPE(30)
 
-      INCLUDE './flukapro/(DIMPAR)'
-      INCLUDE './flukapro/(PAREVT)'
-      INCLUDE './flukapro/(EVAPAR)'
-      INCLUDE './flukapro/(FRBKCM)'
+      INCLUDE '(DIMPAR)'
+      INCLUDE '(PAREVT)'
+      INCLUDE '(EVAPAR)'
+      INCLUDE '(FRBKCM)'
 
       PARAMETER (NCOMPX=20,NEB=8,NQB= 5,KSITEB=50)
 
@@ -258,9 +258,10 @@ C      READ(LINP,'(A78)',END=9999) CLINE
       CALL GETENVF('ALICE_ROOT',ALIROOT)
       LNROOT = LNBLNK(ALIROOT)
 
-      FILNAM=ALIROOT(1:LNROOT)//'/DPMJET/inp/PbPbLHC.inp'
+      FILNAM=ALIROOT(1:LNROOT)//'/DPMJET/inp/ppLHC.inp'
       OPEN(UNIT=7,FILE=FILNAM,STATUS='OLD')
-
+      OPEN(UNIT=14,FILE="nuclear.bin",STATUS='OLD')
+*     OPEN(UNIT=6,FILE="dpm.out",STATUS='UNKNOWN')
 
       READ(7,'(A78)',END=9999) CLINE
 
@@ -293,7 +294,6 @@ C1000 FORMAT(A10,6E10.0,A8)
  1002    FORMAT(/,1X,'---> ',A10,': invalid control-card !',/)
          GOTO 10
       ENDIF
-
       GOTO(
 *------------------------------------------------------------
 *       TITLE   ,  PROJPAR ,  TARPAR  ,  ENERGY  ,  MOMENTUM,
@@ -2103,8 +2103,8 @@ C     IF (IDP.EQ.27) IDP = 6
 
 *  initialize evaporation if the code is not used as Fluka event generator
       IF (ITRSPT.NE.1) THEN
-         CALL BERTTP
-         CALL INCINI
+*         CALL BERTTP
+*         CALL INCINI
       ENDIF
       IF (LEVPRT) LHEAVY = .TRUE.
 
@@ -5304,7 +5304,7 @@ CDECK  ID>, DT_KKEVNT
       CALL DT_ININUC(IJPROJ,IP,IPZ,PKOO,JSSH,1)
       MODE = 2
       IF (EPROJ.LE.EHADTH) MODE = 3
-      CALL DT_ININUC(IJTARG,IT,ITZ,TKOO,JTSH,MODE)
+            CALL DT_ININUC(IJTARG,IT,ITZ,TKOO,JTSH,MODE)
 
       IF ((MCGENE.NE.3).AND.(MCGENE.NE.4)) THEN
 
@@ -5629,11 +5629,13 @@ C     IF (IMODE.GE.2) NPOINT(1) = NHKK+1
             PHKK(5,NHKK) = AAM(IDX)
          ELSE
 *   treatment for hadrons
+
             IDHKK(NHKK)  = IDT_IPDGHA(ID)
             IDBAM(NHKK)  = ID
             PHKK(4,NHKK) = AAM(ID)
             PHKK(5,NHKK) = AAM(ID)
-C* VDM assumption
+            
+C     * VDM assumption
 C            IF (IDHKK(NHKK).EQ.22) THEN
 C               PHKK(4,NHKK) = AAM(33)
 C               PHKK(5,NHKK) = AAM(33)
@@ -15843,8 +15845,8 @@ CDECK  ID>, DT_INITJS
 
       LOGICAL LFIRST,LFIRDT,LFIRPH
 
-      INCLUDE './flukapro/(DIMPAR)'
-      INCLUDE './flukapro/(PART)'
+      INCLUDE '(DIMPAR)'
+      INCLUDE '(PART)'
 
       COMMON/PYDAT1/MSTU(200),PARU(200),MSTJ(200),PARJ(200)
 
@@ -18940,9 +18942,9 @@ CDECK  ID>, DT_FICONF
       COMMON /DTFLG1/ IFRAG(2),IRESCO,IMSHL,IRESRJ,IOULEV(6),
      &                LEMCCK,LHADRO(0:9),LSEADI,LEVAPO,IFRAME,ITRSPT
 
-      INCLUDE './flukapro/(DIMPAR)'
-      INCLUDE './flukapro/(FINUC)'
-      INCLUDE './flukapro/(RESNUC)'
+      INCLUDE '(DIMPAR)'
+      INCLUDE '(FINUC)'
+      INCLUDE '(RESNUC)'
       PARAMETER ( EMVGEV = 1.0                D-03 )
       PARAMETER ( AMUGEV = 0.93149432         D+00 )
       PARAMETER ( AMPRTN = 0.93827231         D+00 )
@@ -18957,9 +18959,9 @@ CDECK  ID>, DT_FICONF
       PARAMETER ( BEXC12 = FERTHO * 72.40715579499394D+00 )
       PARAMETER ( AMUNMU = HLFHLF * AMELCT - BEXC12 / 12.D+00 )
       PARAMETER ( AMUC12 = AMUGEV - AMUNMU )
-      INCLUDE './flukapro/(NUCDAT)'
-      INCLUDE './flukapro/(PAREVT)'
-      INCLUDE './flukapro/(FHEAVY)'
+      INCLUDE '(NUCDAT)'
+      INCLUDE '(PAREVT)'
+      INCLUDE '(FHEAVY)'
 
 * event flag
       COMMON /DTEVNO/ NEVENT,ICASCA
@@ -19390,10 +19392,10 @@ CDECK  ID>, DT_EVA2HE
      &                NTOT(2),NPRO(2),NN(2),NH(2),NHPOS(2),NQ(2),
      &                NTOTFI(2),NPROFI(2)
 
-      INCLUDE './flukapro/(DIMPAR)'
-      INCLUDE './flukapro/(FINUC)'
-      INCLUDE './flukapro/(RESNUC)'
-      INCLUDE './flukapro/(FHEAVY)'
+      INCLUDE '(DIMPAR)'
+      INCLUDE '(FINUC)'
+      INCLUDE '(RESNUC)'
+      INCLUDE '(FHEAVY)'
 
       DIMENSION IPTOKP(39)
       DATA IPTOKP / 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
@@ -27258,8 +27260,8 @@ CDECK  ID>, DT_SWPFSP
       COMMON /DTFLG1/ IFRAG(2),IRESCO,IMSHL,IRESRJ,IOULEV(6),
      &                LEMCCK,LHADRO(0:9),LSEADI,LEVAPO,IFRAME,ITRSPT
 
-      INCLUDE './flukapro/(DIMPAR)'
-      INCLUDE './flukapro/(PAREVT)'
+      INCLUDE '(DIMPAR)'
+      INCLUDE '(PAREVT)'
 
 * temporary storage for one final state particle
       LOGICAL LFRAG,LGREY,LBLACK
@@ -27703,10 +27705,10 @@ CDECK  ID>, DT_HISTAT
       LOGICAL LPAULI
       COMMON /DTFOTI/ TAUFOR,KTAUGE,ITAUVE,INCMOD,LPAULI
 
-      INCLUDE './flukapro/(DIMPAR)'
-      INCLUDE './flukapro/(PAREVT)'
-      INCLUDE './flukapro/(FRBKCM)'
-      INCLUDE './flukapro/(EVAPAR)'
+      INCLUDE '(DIMPAR)'
+      INCLUDE '(PAREVT)'
+      INCLUDE '(FRBKCM)'
+      INCLUDE '(EVAPAR)'
 
 * temporary storage for one final state particle
       LOGICAL LFRAG,LGREY,LBLACK
index 04e3270..2fc7ef9 100644 (file)
@@ -32049,7 +32049,6 @@ C  particle ID translation table
      &                ID_pdg_max
 
       integer Nin,Nout
-
       Nin = abs(IDpdg)
 
       if((Nin.gt.99999).or.(Nin.eq.0)) then
index 70b6acd..5902af6 100644 (file)
@@ -83,6 +83,10 @@ AliGenDPMjet::AliGenDPMjet(Int_t npart)
     AliDpmJetRndm::SetDpmJetRandom(GetRandom());
 }
 
+AliGenDPMjet::AliGenDPMjet(const AliGenDPMjet &/*Dpmjet*/)
+:AliGenMC()
+{
+}
 
 //______________________________________________________________________________
 AliGenDPMjet::~AliGenDPMjet()
@@ -108,6 +112,8 @@ void AliGenDPMjet::Init()
     // fICentr<-99 -> fraction of x-sec. = XSFRAC                
     // fICentr=-1. -> evaporation/fzc suppressed                 
     // fICentr<-1. -> evaporation/fzc suppressed                 
+    if (fAProjectile == 1 && fZProjectile == 1) fDPMjet->SetfIdp(1);
+    
     fDPMjet->SetfFCentr(fICentr);  
     fDPMjet->SetbRange(fMinImpactParam,fMaxImpactParam); 
     
@@ -267,7 +273,7 @@ void AliGenDPMjet::Generate()
       for (i = 0; i<np; i++) {
          TParticle *  iparticle = (TParticle *) fParticles->At(i);
          Bool_t  hasMother   = (iparticle->GetFirstMother()>=0);
-         Bool_t  hasDaughter = (iparticle->GetFirstDaughter()>=0);
+//       Bool_t  hasDaughter = (iparticle->GetFirstDaughter()>=0);
 
          if (pSelected[i]) {
              
@@ -544,7 +550,7 @@ void AliGenDPMjet::MakeHeader()
 
 
 //______________________________________________________________________________
-AliGenDPMjet& AliGenDPMjet::operator=(const  AliGenDPMjet& rhs)
+AliGenDPMjet& AliGenDPMjet::operator=(const  AliGenDPMjet& /*rhs*/)
 {
 // Assignment operator
     return *this;
index 966b46f..a9c2f2b 100644 (file)
@@ -22,7 +22,7 @@ class AliGenDPMjet : public AliGenMC
  public:
     AliGenDPMjet();
     AliGenDPMjet(Int_t npart);
-    AliGenDPMjet(const AliGenDPMjet &Dpmjet){;}
+    AliGenDPMjet(const AliGenDPMjet &Dpmjet);
     virtual ~AliGenDPMjet(); 
     virtual void    Generate();
     virtual void    Init();
@@ -51,8 +51,8 @@ class AliGenDPMjet : public AliGenMC
                        {a = fATarget; z = fZTarget;}    
     virtual void    GetImpactParameterRange(Float_t& bmin, Float_t& bmax)
                        {bmin = fMinImpactParam; bmax = fMaxImpactParam;}
-    virtual Int_t   GetSpectators(Int_t spects=1)        {return fSpectators;}
-    virtual Int_t   GetFlavor(Int_t flag=0)              {return fFlavor;}
+    virtual Int_t   GetSpectators()        {return fSpectators;}
+    virtual Int_t   GetFlavor()            {return fFlavor;}
 
     // Temporeaneo!?!
     virtual void    SetGenImpPar(Float_t bValue) {fGenImpPar=bValue;}
index 5e5a874..9b812af 100644 (file)
@@ -35,6 +35,11 @@ AliIonPDGCodes::AliIonPDGCodes()
 
 }
 
+AliIonPDGCodes::AliIonPDGCodes(const AliIonPDGCodes &/*PDGCodes*/)
+    :TObject()
+{
+}
+
 //______________________________________________________________________________
 void AliIonPDGCodes::AddParticlesToPdgDataBase()
 {
index 073ad76..d7bdfd8 100644 (file)
@@ -18,7 +18,7 @@ public:
   
   AliIonPDGCodes();
   virtual ~AliIonPDGCodes() {;}
-  AliIonPDGCodes(const AliIonPDGCodes &PDGCodes) {;}
+  AliIonPDGCodes(const AliIonPDGCodes &PDGCodes);
   virtual void AddParticlesToPdgDataBase();
 //  virtual void MapPDGGEant3Codes();
   virtual void SetPDGCode(Int_t i, Int_t val) {fPDGCode[i]=val;}