From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Mon, 26 Jun 2006 12:23:51 +0000 (+0000)
Subject: Updates needed for HERWIG 6.507 (R. Guernane, AM)
X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=5cd3389ec00d9cf3539e477b0befcbd7c78484c9;hp=31d78ebd647a6c5cc4c6d706bfa0a87f779049db

Updates needed for HERWIG 6.507 (R. Guernane, AM)
---

diff --git a/HERWIG/herwig6_address.c b/HERWIG/herwig6_address.c
index beb5bcd3691..d8a2c6f6a4a 100644
--- a/HERWIG/herwig6_address.c
+++ b/HERWIG/herwig6_address.c
@@ -2,6 +2,7 @@
 #  define herwig6_addressf herwig6_addressf_
 #  define herwig6_addressi herwig6_addressi_
 #  define herwig6_addressd herwig6_addressd_
+#  define herwig6_addressl herwig6_addressl_
 #  define type_of_call
 
 
@@ -21,3 +22,8 @@ double* type_of_call herwig6_addressd(double *arg)
 {
   return arg;
 }
+
+int* type_of_call herwig6_addressl(int *arg)
+{
+  return arg;
+}
diff --git a/HERWIG/herwig6_common_block_address.f b/HERWIG/herwig6_common_block_address.f
index f9ed2582264..897878552fc 100644
--- a/HERWIG/herwig6_common_block_address.f
+++ b/HERWIG/herwig6_common_block_address.f
@@ -1,14 +1,16 @@
       integer function herwig6_common_block_address(common_block_name)
 c-----------------------------------------------------------------------
-      include "HERWIG61.INC"
+      include "HERWIG65.INC"
 
       character*(*) common_block_name
       external      HWUDAT
 c-----------------------------------------------------------------------
       integer       herwig6_addressc, herwig6_addressi
       integer       herwig6_addressd, herwig6_addressf
+      integer       herwig6_addressl
       external      herwig6_addressc, herwig6_addressi
       external      herwig6_addressd, herwig6_addressf
+      external      herwig6_addressl
       integer       common_block_address
 c-----------------------------------------------------------------------
       common_block_address = 0
@@ -63,6 +65,40 @@ c-----------------------------------------------------------------------
         common_block_address = herwig6_addressd(PMBN1)
       elseif (common_block_name.eq."HWCLUS") then
         common_block_address = herwig6_addressd(PPCL)
+      elseif (common_block_name.eq."HWGRAV") then
+        common_block_address = herwig6_addressd(GRVLAM)
+      elseif (common_block_name.eq."HW6202") then
+        common_block_address = herwig6_addressd(VIPWID)
+      elseif (common_block_name.eq."HW6203") then
+        common_block_address = herwig6_addressd(ABWGT)
+      elseif (common_block_name.eq."HW6300") then
+        common_block_address = herwig6_addressd(MJJMIN)
+      elseif (common_block_name.eq."HWPMRS") then
+        common_block_address = herwig6_addressd(FMRS)
+      elseif (common_block_name.eq."HWCIRC") then
+        common_block_address = herwig6_addressi(CIRCOP)
+      elseif (common_block_name.eq."HWDSPB") then
+        common_block_address = herwig6_addressd(ABMODE)
+      elseif (common_block_name.eq."HWDSP2") then
+        common_block_address = herwig6_addressd(A2MODE)
+      elseif (common_block_name.eq."HWDSP3") then
+        common_block_address = herwig6_addressd(A3MODE)
+      elseif (common_block_name.eq."HWDSP4") then
+        common_block_address = herwig6_addressd(A4MODE)
+      elseif (common_block_name.eq."HWDSPN") then
+        common_block_address = herwig6_addressi(NDECSY)
+      elseif (common_block_name.eq."HWSPIN") then
+        common_block_address = herwig6_addressd(MESPN)
+      elseif (common_block_name.eq."HWSTAU") then
+        common_block_address = herwig6_addressi(JAK1)
+      elseif (common_block_name.eq."HWGUPR") then
+        common_block_address = herwig6_addressd(LHWGT)
+      elseif (common_block_name.eq."HW6500") then
+        common_block_address = herwig6_addressl(PRESPL)
+      elseif (common_block_name.eq."HW6504") then
+        common_block_address = herwig6_addressi(ITOPRD)
+      elseif (common_block_name.eq."HW6506") then
+        common_block_address = herwig6_addressd(PDFX0)
       endif
 c-----------------------------------------------------------------------
       herwig6_common_block_address = common_block_address
diff --git a/HERWIG/libherwig.pkg b/HERWIG/libherwig.pkg
index ace0fc62b79..b394eb35736 100644
--- a/HERWIG/libherwig.pkg
+++ b/HERWIG/libherwig.pkg
@@ -10,29 +10,6 @@ main.c herwig6_address.c
 FSRCS:= \
 herwig6_called_from_cc.f \
 herwig6_common_block_address.f \
-src/decadd.f src/eudini.f src/fragmt.f src/hvcbvi.f src/hvhbvi.f \
-src/hwbazf.f src/hwbcon.f src/hwbfin.f src/hwbran.f src/hwbrc2.f \
-src/hwbspa.f src/hwbspn.f src/hwbsu1.f src/hwbsu2.f src/hwbsud.f \
-src/hwbsul.f src/hwbtim.f src/hwcbct.f src/hwccut.f src/hwcfor.f \
-src/hwdcle.f src/hwdhgf.f src/hwdhig.f src/hwdpwt.f src/hwdrm3.f \
-src/hwdrm4.f src/hwdrm5.f src/hwdthr.f src/hwdtwo.f src/hwdwwt.f \
-src/hwdxlm.f src/hwegam.f src/hwhbgf.f src/hwhbsg.f src/hwhdis.f \
-src/hwhew1.f src/hwhew2.f src/hwhew3.f src/hwhew4.f src/hwhew5.f \
-src/hwheww.f src/hwhiga.f src/hwhigb.f src/hwhigj.f src/hwhigw.f \
-src/hwhigz.f src/hwhppe.f src/hwhqpm.f src/hwhrbb.f src/hwhss1.f \
-src/hwhssg.f src/hwhssq.f src/hwhv1j.f src/hwissp.f src/hwmodk.f \
-src/hwmult.f src/hwrexp.f src/hwrexq.f src/hwrext.f src/hwrgau.f \
-src/hwrgen.f src/hwrint.f src/hwrlog.f src/hwrpip.f src/hwrpow.f \
-src/hwruni.f src/hwsbrn.f src/hwsdgq.f src/hwsfbr.f src/hwsgen.f \
-src/hwsgqq.f src/hwsspc.f src/hwstab.f src/hwsval.f src/hwuaer.f \
-src/hwualf.f src/hwuant.f src/hwuats.f src/hwubpr.f src/hwubst.f \
-src/hwucff.f src/hwuci2.f src/hwudat.f src/hwudkl.f src/hwudks.f \
-src/hwudpr.f src/hwuecm.f src/hwuedt.f src/hwueec.f src/hwufne.f \
-src/hwuldo.f src/hwulf4.f src/hwuli2.f src/hwulob.f src/hwulof.f \
-src/hwulor.f src/hwumas.f src/hwumbw.f src/hwunst.f src/hwupcm.f \
-src/hwurap.f src/hwures.f src/hwurof.f src/hwurot.f src/hwusor.f \
-src/hwusta.f src/hwvdif.f src/hwvdot.f src/hwvequ.f src/hwvsca.f \
-src/hwvsum.f src/hwvzri.f src/hwvzro.f src/hwwarn.f src/ieupdg.f \
-src/ipdgeu.f src/qqinit.f src/qqlmat.f src/sasano.f src/sasbeh.f \
-src/sasdir.f src/sasgam.f src/sasvmd.f
-
+herwig6507.f \
+hwlhin.f \
+str.f