Additional protection (macosx with gfortran)
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 30 Jan 2009 14:54:39 +0000 (14:54 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 30 Jan 2009 14:54:39 +0000 (14:54 +0000)
HIJING/hijing1_36/hijing.F
HIJING/hipyset1_35/pysigh_hijing.F

index 4f9d0c9..fb077dc 100644 (file)
@@ -629,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)
index 1858437..6091526 100644 (file)
@@ -230,14 +230,17 @@ C...Phase space integral in tau and y*.
 C...2 -> 1 processes: reduction in angular part of phase space integral 
 C...for case of decaying resonance. 
       ACTH0=CTNMAX-CTNMIN+CTPMAX-CTPMIN 
-      IF((ISET(ISUB).EQ.1.OR.ISET(ISUB).EQ.3).AND.  
-     &MDCY(KFPR(ISUB,1),1).EQ.1) THEN   
-        IF(KFPR(ISUB,1).EQ.25.OR.KFPR(ISUB,1).EQ.37) THEN   
-          COMFAC=COMFAC*0.5*ACTH0   
-        ELSE    
-          COMFAC=COMFAC*0.125*(3.*ACTH0+CTNMAX**3-CTNMIN**3+    
-     &    CTPMAX**3-CTPMIN**3)  
-        ENDIF   
+      IF((ISET(ISUB).EQ.1.OR.ISET(ISUB).EQ.3)) THEN
+         IF( KFPR(ISUB,1).GT.0) THEN
+            IF (MDCY(KFPR(ISUB,1),1).EQ.1) THEN   
+               IF(KFPR(ISUB,1).EQ.25.OR.KFPR(ISUB,1).EQ.37) THEN   
+                  COMFAC=COMFAC*0.5*ACTH0   
+               ELSE    
+                  COMFAC=COMFAC*0.125*(3.*ACTH0+CTNMAX**3-CTNMIN**3+    
+     &                 CTPMAX**3-CTPMIN**3)  
+               ENDIF
+            ENDIF
+         ENDIF   
     
 C...2 -> 2 processes: angular part of phase space integral. 
       ELSEIF(ISET(ISUB).EQ.2.OR.ISET(ISUB).EQ.4) THEN