Use calls to pdfset_alice and structm_alice for proton structure functions

to allow the use of nuclear structure functions.

diff --git a/PYTHIA6/pythia6150.f b/PYTHIA6/pythia6150.f
index bd912462b2aaea6fdf40befaabda68a273bf013f..46b82e37b52df507252fa3a6c9125f7f0dbc244c 100644 (file)
--- a/PYTHIA6/pythia6150.f
+++ b/PYTHIA6/pythia6150.f
@@ -228,6 +228,8 @@ C  S   PYTIME   dummy routine for giving date and time               *
 C                                                                    *
 C*********************************************************************
  
+C*********************************************************************
+ 
 C...PYDATA
 C...Default values for switches and parameters,
 C...and particle, decay and process data.
@@ -1623,8 +1625,6 @@ C...Data for histogramming routines.
  
       END
  
-C*********************************************************************
- 
 C...PYTEST
 C...A simple program (disguised as subroutine) to run at installation
 C...as a check that the program works as intended.
@@ -2293,7 +2293,8 @@ C...Initialize parton distributions: PDFLIB.
         VALUE(3)=MOD(MSTP(51),1000)
         PARM(4)='TMAS'
         VALUE(4)=PMAS(6,1)
-        CALL PDFSET(PARM,VALUE)
+C...ALICE
+        CALL PDFSET_ALICE(PARM,VALUE)
         MINT(93)=1000000+MSTP(51)
       ENDIF
  
@@ -7248,6 +7249,10 @@ C...Calculate parton distribution weights.
             MINT(105)=MINT(102+I)
             MINT(109)=MINT(106+I)
             VINT(120)=VINT(2+I)
+C.... ALICE
+C.... Store side in MINT(124)
+            MINT(124) = I
+C.... 
             IF(MSTP(57).LE.1) THEN
               CALL PYPDFU(MINT(10+I),VINT(40+I),Q2UP(0),XPQ)
             ELSE
@@ -10467,6 +10472,14 @@ C...Weighting with new parton distributions.
       MINT(105)=MINT(102+JT)
       MINT(109)=MINT(106+JT)
       VINT(120)=VINT(2+JT)
+C.... ALICE
+C.... Store side in MINT(124)
+      MINT(124)=JT
+C....
+C.... ALICE
+C.... Store side in MINT(124)
+      MINT(124)=JT
+C....
       IF(MSTP(57).LE.1) THEN
         CALL PYPDFU(KFBEAM(JT),XB,Q2REF,XFN)
       ELSE
@@ -10495,6 +10508,10 @@ C...Weighting with new parton distributions.
         XFB(KFL)=XFN(KFL)
   240 CONTINUE
       XA=XB/Z
+C.... ALICE
+C.... Store side in MINT(124)
+      MINT(124) = JT
+C....
       IF(MSTP(57).LE.1) THEN
         CALL PYPDFU(KFBEAM(JT),XA,Q2REF,XFA)
       ELSE
@@ -18939,6 +18956,10 @@ C...Calculate parton distributions
           MINT(105)=MINT(102+I)
           MINT(109)=MINT(106+I)
           VINT(120)=VINT(2+I)
+C.... ALICE
+C.... Store side in MINT(124)
+          MINT(124)=I
+C....
           IF(MSTP(57).LE.1) THEN
             CALL PYPDFU(MINT(10+I),XSF,Q2SF,XPQ)
           ELSE
@@ -24676,13 +24697,16 @@ C...Call PDFLIB parton distributions.
           PARM(3)='NSET'
           VALUE(3)=MOD(MSTP(51),1000)
           IF(MINT(93).NE.1000000+MSTP(51)) THEN
-            CALL PDFSET(PARM,VALUE)
+C...ALICE
+            CALL PDFSET_ALICE(PARM,VALUE)
             MINT(93)=1000000+MSTP(51)
           ENDIF
           XX=X
           QQ=SQRT(MAX(0D0,Q2MIN,Q2))
           IF(MSTP(57).EQ.0) QQ=SQRT(Q2MIN)
-          CALL STRUCTM(XX,QQ,UPV,DNV,USEA,DSEA,STR,CHM,BOT,TOP,GLU)
+C...ALICE
+          CALL STRUCTM_ALICE(
+     +         XX,QQ,UPV,DNV,USEA,DSEA,STR,CHM,BOT,TOP,GLU)
           VINT(231)=Q2MIN
           XPQ(0)=GLU
           XPQ(1)=DNV+DSEA