extra setters for using tprofile or TH2D (Ante)

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

diff --git a/HIJING/hijing1_36/hijsft.F b/HIJING/hijing1_36/hijsft.F
index eee4bae4d9f1ae522887df83682e52a20c7c5617..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,6 +86,9 @@ 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
@@ -110,8 +114,8 @@ C
              IF(ABS(COS(PHI)).LT.1.0E-5) THEN
 C AM            DD1=R1
 C AM            DD2=R1
-                 DD1 = ABS(SQRT(R1**2-XT0**2) - YT0)
-                 DD2 = ABS(SQRT(R1**2-XT0**2) + YT0)
+                 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)
@@ -213,27 +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
 
-       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
+       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
@@ -295,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