Ticket #16: SHERPA-MC-1.1.3-hepevt.patch

SHERPA-MC-1.1.3

@@ -519 +519 @@
   fi
   AM_CONDITIONAL(PYTHIA_SUPPORT, test "$pythia" = "true")
 
+dnl
+dnl Setting HEPEVT common block size. Default is 4000.
+dnl
+
+  AC_ARG_ENABLE(
+    hepevt,
+    AC_HELP_STRING([--enable-hepevt=HEPEVT_SIZE], [HEPEVT common block size @<:@default=4000@:>@]),
+    [ AC_MSG_CHECKING(whether HEPEVT common block size is defined);
+      echo HEPEVT size=$enableval
+      if test ${enableval} -gt 0 2>/dev/null ; then
+         hepevt_size=${enableval}
+         AC_MSG_RESULT(${hepevt_size})
+      fi
+    ],
+    [ hepevt_size=4000 ]
+  )
+  if test "x$hepevt_size" = "xno" ; then
+        exit 1
+  else
+        AC_DEFINE_UNQUOTED(_HEPEVT_SIZE_, ${hepevt_size} , [HEPEVT common block size])
+  fi
+
   AC_ARG_ENABLE(amisicinclude,
     AC_HELP_STRING([--disable-amisicinclude], [Disable inclusion of AMISIC headers]),
     [ AC_MSG_CHECKING(whether to include AMISIC headers);

SHERPA/LundTools/Lund_Interface.C

@@ -38 +38 @@
   m_path(_m_path),m_file(_m_file), m_maxtrials(2),
   p_hepevt(NULL), 
   m_compress(true),m_writeout(false),
-  p_phep(new double[5*10000]),
-  p_vhep(new double[4*10000]),
-  p_jmohep(new int[2*10000]),
-  p_jdahep(new int[2*10000])
+  p_phep(new double[5*_HEPEVT_SIZE_]),
+  p_vhep(new double[4*_HEPEVT_SIZE_]),
+  p_jmohep(new int[2*_HEPEVT_SIZE_]),
+  p_jdahep(new int[2*_HEPEVT_SIZE_])
 {
   exh->AddTerminatorObject(this);
   double win;

SHERPA/LundTools/Lund_Wrapper.H

@@ -7 +7 @@
 #include "Exception.H"
 #include <cstring>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#else
+#ifndef _HEPEVT_SIZE_
+#define _HEPEVT_SIZE_ (4000)
+#endif
+#endif
+
 using namespace SHERPA;
 
 extern "C" {
@@ -118 +126 @@
 const int nmaxdecay = 8000;
 const int nmaxpup   = 100;
 
-const int nmxhep    = 10000;
+
+const int nmxhep    = _HEPEVT_SIZE_;
 
 extern "C" {
 extern struct {

SHERPA/LundTools/Makefile.am

@@ -1 +1 @@
 pkglib_LTLIBRARIES       =      libLundTools.la
 
-PYTHIASOURCES = pythia6214.f pydata.f pyalps.f pypdfu.f pyplst.f pymult.f \
+PYTHIASOURCES = pythia6214.F pydata.f pyalps.f pypdfu.f pyplst.f pymult.f \
                 Lund_Interface.C
 PYTHIAHEADERS = Lund_Wrapper.H Lund_Interface.H
 

SHERPA/LundTools/pythia6214.F

@@ +1 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#else
+#ifndef _HEPEVT_SIZE_
+#define _HEPEVT_SIZE_ 4000
+#endif
+#endif
+
+
 C*********************************************************************
 C*********************************************************************
 C*                                                                  **
@@ -722 +731 @@
       COMMON/SPDAT2/KCHG(500,4),PMAS(500,4),PARF(2000),VCKM(4,4)
       SAVE /SPJETS/,/SPDAT1/,/SPDAT2/
 C...HEPEVT commonblock.
-      PARAMETER (NMXHEP=10000)
+      PARAMETER (NMXHEP=_HEPEVT_SIZE_)
       COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
      &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
       DOUBLE PRECISION PHEP,VHEP
@@ -51866 +51875 @@
      &KEXCIT=4000000,KDIMEN=5000000)
  
 C...HEPEVT commonblock.
-      PARAMETER (NMXHEP=10000)
+      PARAMETER (NMXHEP=_HEPEVT_SIZE_)
       COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP),
      &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP)
       DOUBLE PRECISION PHEP,VHEP

SHERPA/Tools/HepEvt_Interface.H

@@ -6 +6 @@
 #include "Particle.H"
 #include <map>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#else
+#ifndef _HEPEVT_SIZE_
+#define _HEPEVT_SIZE_ (4000)
+#endif
+#endif
+
 namespace ATOOLS {
   class Blob;
   class Blob_List;
@@ -37 +45 @@
     long int m_filesize,m_evtcount;
     gtp::code m_generator;
 
-    static const int s_maxentries = 4000;
+    static const int s_maxentries = _HEPEVT_SIZE_;
     double * p_phep,   * p_vhep;
     int    * p_jmohep, * p_jdahep,  * p_isthep, * p_idhep;
     double   m_weight, m_Q2, m_x1, m_x2;