Reinitialization after soft scattering, bug fixes in the calculation of angle and...
authorhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 19 Dec 2003 16:11:51 +0000 (16:11 +0000)
committerhristov <hristov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 19 Dec 2003 16:11:51 +0000 (16:11 +0000)
HIJING/hijing1_36/hijsft.F

index 120a992..eee4bae 100644 (file)
@@ -86,13 +86,17 @@ C
              PKC22=PT(JT,11)
           ENDIF
           IF(IHPR2(4).GT.0.AND.IHNT2(1).GT.1.AND.IHNT2(3).GT.1) THEN
-             IF(NFP(JP,10).EQ.0) THEN
-                PHI=-PHI2
-             ELSE IF(NFT(JT,10).EQ.0) THEN
-                PHI=PHI1
-             ELSE
-                PHI=(PHI1+PHI2-HIPR1(40))/2.0
-             ENDIF
+              IF(NFP(JP,10).EQ.0) THEN
+                 PHI=-PHI2
+              ELSE IF(NFT(JT,10).EQ.0) THEN
+                 PHI=PHI1
+              ELSE
+                 IF (PHI1.LT.0. .AND. PHI2.GT.0) THEN ! PH AM
+                    PHI=(PHI1+PHI2-HIPR1(40))/2.0     ! PH AM
+                 ELSE                                 ! PH AM
+                    PHI=(PHI1+PHI2+HIPR1(40))/2.0     ! PH AM
+                 ENDIF                                ! PH AM
+              ENDIF
              BX=HINT1(19)*COS(HINT1(20))
              BY=HINT1(19)*SIN(HINT1(20))
              XP0=YP(1,JP)
@@ -104,8 +108,10 @@ C
              R2=MAX(1.2*IHNT2(3)**0.3333333,
      &               SQRT((XT0-BX)**2+(YT0-BY)**2))
              IF(ABS(COS(PHI)).LT.1.0E-5) THEN
-                DD1=R1
-                DD2=R1
+C AM            DD1=R1
+C AM            DD2=R1
+                 DD1 = ABS(SQRT(R1**2-XT0**2) - YT0)
+                 DD2 = ABS(SQRT(R1**2-XT0**2) + YT0)
 C PH            DD3=ABS(BY+SQRT(R2**2-(XP0-BX)**2)-YP0)
 C PH            DD4=ABS(BY-SQRT(R2**2-(XP0-BX)**2)-YP0)
                 DD3=ABS(BY+SQRT(R2**2-(XT0-BX)**2)-YP0)
@@ -216,6 +222,18 @@ C
              SW=WP*WM
           ENDIF
        ENDIF
+
+       MISS=0
+       PKC1=0.0
+       PKC2=0.0
+       PKC11=0.0
+       PKC12=0.0
+       PKC21=0.0
+       PKC22=0.0
+       DPKC11=0.0
+       DPKC12=0.0
+       DPKC21=0.0
+       DPKC22=0.0
 C              ********If jet is quenched the pt from valence quark
 C                      hard scattering has to reduced by d*kapa
 C