Avoid duplicated SAVE statements for G95

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

diff --git a/HIJING/hijing1_36/hijsft.F b/HIJING/hijing1_36/hijsft.F
index 120a9922a93403acea584506db1d9fa653f7eafa..e90b1c4ead091739021271a78b21d2886f33140b 100644 (file)
--- a/HIJING/hijing1_36/hijsft.F
+++ b/HIJING/hijing1_36/hijsft.F
@@ -8,6 +8,7 @@ C                                                                  *
 C  Scatter two excited strings, JP from proj and JT from target    *
 C*******************************************************************
        SUBROUTINE HIJSFT(JP,JT,JOUT,IERROR)
+#define BLANKET_SAVE
 #include "hijcrdn.inc"
 #include "hiparnt.inc"
 #include "hijdat.inc"
@@ -85,14 +86,21 @@ C
              PKC21=PT(JT,10)
              PKC22=PT(JT,11)
           ENDIF
+C
+C Quenching requested ?
+C
           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 +112,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-BX)**2) - YT0)
+                 DD2 = ABS(SQRT(R1**2-(XT0-BX)**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)
@@ -207,15 +217,30 @@ C
                    PT(JT,4)=PT(JT,4)-DPE2
                 ENDIF
              ENDIF
- 16          DPKC11=-(PP(JP,10)-PKC11)/2.0
-             DPKC12=-(PP(JP,11)-PKC12)/2.0
-             DPKC21=-(PT(JT,10)-PKC21)/2.0
-             DPKC22=-(PT(JT,11)-PKC22)/2.0
+ 16           CONTINUE
+             PKC11=0.
+             PKC12=0.
+             PKC21=0.
+             PKC22=0.
+             DPKC11=0.
+             DPKC12=0.
+             DPKC21=0.
+             DPKC22=0.
+
              WP=EPP+ETP
              WM=EPM+ETM
              SW=WP*WM
           ENDIF
        ENDIF
+
+       IF(NFP(JP,10).EQ.1) THEN
+          PPJET=SQRT(PP(JP,10)**2+PP(JP,11)**2)
+          PKC1=PPJET
+       ENDIF
+       IF(NFT(JT,10).EQ.1) THEN
+          PTJET=SQRT(PT(JT,10)**2+PT(JT,11)**2)
+          PKC2=PTJET
+       ENDIF
 C              ********If jet is quenched the pt from valence quark
 C                      hard scattering has to reduced by d*kapa
 C
@@ -277,7 +302,6 @@ C*****give some PT kick to the two exited strings******************
        ENDIF
 C              ********maximun PT kick
 C*********************************************************
-C
        IF(NFP(JP,10).EQ.1.OR.NFT(JT,10).EQ.1) THEN
                IF(PKC1.GT.PKCMX) THEN
                        PKC1=PKCMX