Update

[u/mrichter/AliRoot.git] / HIJING / hijing1_36 / hijing.F

diff --git a/HIJING/hijing1_36/hijing.F b/HIJING/hijing1_36/hijing.F
index 875a266cd8ce3bade1b606336a19b250d0d26d80..fb077dcbcc4cbfd052030306e36fa32c9b68535b 100644 (file)
--- a/HIJING/hijing1_36/hijing.F
+++ b/HIJING/hijing1_36/hijing.F
@@ -155,6 +155,7 @@ C****************************************************************
        CHARACTER FRAME*8
        DIMENSION SCIP(300,300),RNIP(300,300),SJIP(300,300),JTP(3),
      &                 IPCOL(90000),ITCOL(90000)
+#define BLANKET_SAVE
 #include "hiparnt.inc"
 C
 #include "hijcrdn.inc"
@@ -343,6 +344,8 @@ C                           suffered
           NLOP=NLOP+1
            IF(NLOP.LE.20.OR.
      &           (IHNT2(1).EQ.1.AND.IHNT2(3).EQ.1)) GO TO 60
+
+
            RETURN
        ENDIF
 C               ********At large impact parameter, there maybe no
@@ -598,28 +601,23 @@ C                 ********check errors
 C
                N_ST=1
                IDSTR=92
+
+               NFTP=NFP(J_JTP,5)
+               IF(NTP.EQ.2) NFTP=10+NFT(J_JTP,5)
+
                IF(IHPR2(21).EQ.0) THEN
                   CALL LUEDIT_HIJING(2)
-               ELSE
+               ELSE IF (NFTP.EQ. 3 .OR. NFTP .EQ. 13) THEN
 381               N_ST=N_ST+1
-C     PH Problem if N_ST > 9000, some additional protection added
-C     PH 9000 is the first dimension of LUJETS/K(...)
-           IF (N_ST.GT.9000) THEN
-                     call LULIST_HIJING(1)
-                     WRITE(6,*) 'error occured, repeat the event'
-              GOTO 50
-                  ENDIF             
                   IF(K(N_ST,2).LT.91.OR.K(N_ST,2).GT.93) GO TO  381
                   IDSTR=K(N_ST,2)
                   N_ST=N_ST+1
-               ENDIF
+                ENDIF
                IF(FRAME.EQ.'LAB') THEN
                        CALL HIBOOST
                ENDIF
 C              ******** boost back to lab frame(if it was in)
 C
-               NFTP=NFP(J_JTP,5)
-               IF(NTP.EQ.2) NFTP=10+NFT(J_JTP,5)
                N_STR=0
                DO 390 I=N_ST,N
                   IF(K(I,2).EQ.IDSTR) THEN
@@ -631,10 +629,14 @@ C
                   KATT(NATT,1)=K(I,2)
                   KATT(NATT,2)=NFTP
                   KATT(NATT,4)=K(I,1)
-                  IF(K(I,3).EQ.0 .OR. K(K(I,3),2).EQ.IDSTR) THEN
+                  IF(K(I,3).EQ.0 ) THEN
                      KATT(NATT,3)=0
-                  ELSE
-                     KATT(NATT,3)=NATT-I+K(I,3)+N_STR-K(K(I,3),4)
+                   ELSE
+                      IF(K(K(I,3),2).EQ.IDSTR) THEN
+                         KATT(NATT,3)=0
+                      ELSE
+                         KATT(NATT,3)=NATT-I+K(I,3)+N_STR-K(K(I,3),4)
+                      ENDIF
                   ENDIF
 C       ****** identify the mother particle
                   PATT(NATT,1)=P(I,1)
@@ -678,5 +680,6 @@ C
 C              call LULIST_HIJING(1)
                GO TO 50
        ENDIF
+
        RETURN
        END