Corrected behaviour for IHPR2(21).
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 30 Oct 2003 08:19:46 +0000 (08:19 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 30 Oct 2003 08:19:46 +0000 (08:19 +0000)
HIJING/hijing1_36/hijing.F

index 875a266..2839d26 100644 (file)
@@ -343,6 +343,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 +600,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
@@ -678,5 +675,6 @@ C
 C              call LULIST_HIJING(1)
                GO TO 50
        ENDIF
+
        RETURN
        END