From b25ab6b665feb5020cb7dd58890a6bfc9df46754 Mon Sep 17 00:00:00 2001 From: Gloria Corti <gloria.corti@cern.ch> Date: Fri, 6 Mar 2020 18:51:18 +0000 Subject: [PATCH 1/7] Versions of generators with increase HEPEVT size --- generators_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generators_versions.txt b/generators_versions.txt index d1012c03a..f02279404 100644 --- a/generators_versions.txt +++ b/generators_versions.txt @@ -2,8 +2,8 @@ alpgen 2.1.4 herwig++ 2.7.1 hijing 1.383bs.2 lhapdf 6.2.3 -photos++ 3.56 -pythia6 427.2 +photos++ 3.56.lhcb +pythia6 427.2.lhcb pythia8 240.lhcb4 rivet 2.7.2b tauola++ 1.1.6b.lhcb -- GitLab From 7929442adefe22cf33006bb1b9c75c6035e623ad Mon Sep 17 00:00:00 2001 From: Gloria Corti <gloria.corti@cern.ch> Date: Tue, 10 Mar 2020 10:15:19 +0000 Subject: [PATCH 2/7] Update photos version with new fix from SFT --- generators_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators_versions.txt b/generators_versions.txt index f02279404..3365cb382 100644 --- a/generators_versions.txt +++ b/generators_versions.txt @@ -2,7 +2,7 @@ alpgen 2.1.4 herwig++ 2.7.1 hijing 1.383bs.2 lhapdf 6.2.3 -photos++ 3.56.lhcb +photos++ 3.56.lhcb1 pythia6 427.2.lhcb pythia8 240.lhcb4 rivet 2.7.2b -- GitLab From c94ecef0057d796e5051f55eb8e71517922f1210 Mon Sep 17 00:00:00 2001 From: Dominik Muller <dominik.muller@cern.ch> Date: Tue, 10 Mar 2020 15:24:59 +0100 Subject: [PATCH 3/7] Changed all max hepevt particle numbers in Gauss 10000 -> 200000 --- Gen/LbCRMC/src/Lib/CRMCWrapper.cpp | 5 +++-- Gen/LbHidValley/src/Components/HidValleyProduction.cpp | 2 +- Gen/LbHijing/src/component/HijingProduction.cpp | 2 +- Gen/LbPythia/src/Lib/PythiaProduction.cpp | 2 +- Gen/LbPythia/src/component/JetProduction.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gen/LbCRMC/src/Lib/CRMCWrapper.cpp b/Gen/LbCRMC/src/Lib/CRMCWrapper.cpp index 606cb328f..007703ca7 100644 --- a/Gen/LbCRMC/src/Lib/CRMCWrapper.cpp +++ b/Gen/LbCRMC/src/Lib/CRMCWrapper.cpp @@ -51,7 +51,7 @@ struct CRMCData { void Clean() { fNParticles = 0; } // fortran output - const static unsigned int fMaxParticles = 10000; + const static unsigned int fMaxParticles = 200000; int fNParticles; double fImpactParameter; @@ -194,8 +194,9 @@ CRMCWrapper::CRMCWrapper() : { // Instantiate an IO strategy for reading from HEPEVT hepevtio = new HepMC::IO_HEPEVT(); - HepMC::HEPEVT_Wrapper::set_max_number_entries(10000); + HepMC::HEPEVT_Wrapper::set_max_number_entries(200000); HepMC::HEPEVT_Wrapper::set_sizeof_real(8); + HepMC::HEPEVT_Wrapper::set_sizeof_int(4) ; } //================================================================================= diff --git a/Gen/LbHidValley/src/Components/HidValleyProduction.cpp b/Gen/LbHidValley/src/Components/HidValleyProduction.cpp index cc8c14536..69a675a5b 100755 --- a/Gen/LbHidValley/src/Components/HidValleyProduction.cpp +++ b/Gen/LbHidValley/src/Components/HidValleyProduction.cpp @@ -106,7 +106,7 @@ StatusCode HidValleyProduction::initialize() // HepMC::HEPEVT_Wrapper::set_sizeof_int ( 4 ) ; HepMC::HEPEVT_Wrapper::set_sizeof_real ( 8 ) ; - HepMC::HEPEVT_Wrapper::set_max_number_entries ( 10000 ) ; + HepMC::HEPEVT_Wrapper::set_max_number_entries ( 200000 ) ; // use PYGIVE commands (if any) (as THE LAST action) for ( CommandVector::const_iterator item = diff --git a/Gen/LbHijing/src/component/HijingProduction.cpp b/Gen/LbHijing/src/component/HijingProduction.cpp index 4bcbc458a..2427bb69c 100755 --- a/Gen/LbHijing/src/component/HijingProduction.cpp +++ b/Gen/LbHijing/src/component/HijingProduction.cpp @@ -103,7 +103,7 @@ StatusCode HijingProduction::initialize() { // Set size of common blocks in HEPEVT: note these correspond to stdhep HepMC::HEPEVT_Wrapper::set_sizeof_int( 4 ) ; HepMC::HEPEVT_Wrapper::set_sizeof_real( 8 ) ; - HepMC::HEPEVT_Wrapper::set_max_number_entries( 10000 ) ; + HepMC::HEPEVT_Wrapper::set_max_number_entries( 200000 ) ; //To boost to Lab frame from CMS frame, by zhwyang m_beta = 0. ; diff --git a/Gen/LbPythia/src/Lib/PythiaProduction.cpp b/Gen/LbPythia/src/Lib/PythiaProduction.cpp index 515fb58f9..e68628d26 100755 --- a/Gen/LbPythia/src/Lib/PythiaProduction.cpp +++ b/Gen/LbPythia/src/Lib/PythiaProduction.cpp @@ -281,7 +281,7 @@ StatusCode PythiaProduction::initialize( ) { // Set size of common blocks in HEPEVT: note these correspond to stdhep HepMC::HEPEVT_Wrapper::set_sizeof_int( 4 ) ; HepMC::HEPEVT_Wrapper::set_sizeof_real( 8 ) ; - HepMC::HEPEVT_Wrapper::set_max_number_entries( 10000 ) ; + HepMC::HEPEVT_Wrapper::set_max_number_entries( 200000 ) ; sc = initializeGenerator() ; if ( ! sc.isSuccess() ) return sc ; diff --git a/Gen/LbPythia/src/component/JetProduction.cpp b/Gen/LbPythia/src/component/JetProduction.cpp index c33d0fd55..4e782560c 100755 --- a/Gen/LbPythia/src/component/JetProduction.cpp +++ b/Gen/LbPythia/src/component/JetProduction.cpp @@ -241,7 +241,7 @@ StatusCode JetProduction::initialize( ) { // Set size of common blocks in HEPEVT: note these correspond to stdhep HepMC::HEPEVT_Wrapper::set_sizeof_int( 4 ) ; HepMC::HEPEVT_Wrapper::set_sizeof_real( 8 ) ; - HepMC::HEPEVT_Wrapper::set_max_number_entries( 10000 ) ; + HepMC::HEPEVT_Wrapper::set_max_number_entries( 200000 ) ; return initializeGenerator() ; } -- GitLab From 6cf1cc052ddf929247c6743dee05beaefd53030e Mon Sep 17 00:00:00 2001 From: Dominik Muller <dominik.muller@cern.ch> Date: Fri, 13 Mar 2020 10:47:30 +0100 Subject: [PATCH 4/7] Corrected nmxhep in LbPythia Fortran code --- Gen/LbPythia/src/Lib/lunhep.F | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gen/LbPythia/src/Lib/lunhep.F b/Gen/LbPythia/src/Lib/lunhep.F index af2df895c..c3b4c376b 100755 --- a/Gen/LbPythia/src/Lib/lunhep.F +++ b/Gen/LbPythia/src/Lib/lunhep.F @@ -17,7 +17,7 @@ C...Commonblocks. COMMON/PYDAT2/KCHG(500,4),PMAS(500,4),PARF(2000),VCKM(4,4) SAVE /PYJETS/,/PYDAT1/,/PYDAT2/ C...HEPEVT commonblock. - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), &JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP) DOUBLE PRECISION PHEP,VHEP -- GitLab From 0e4cb60eddd602e2158ee3577d322b7406ed234b Mon Sep 17 00:00:00 2001 From: Gloria Corti <gloria.corti@cern.ch> Date: Fri, 13 Mar 2020 15:49:01 +0000 Subject: [PATCH 5/7] Found one more common block in LbHijing --- Gen/LbHijing/src/Lib/hilunhep.F | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gen/LbHijing/src/Lib/hilunhep.F b/Gen/LbHijing/src/Lib/hilunhep.F index cb50ae7b9..c35091071 100755 --- a/Gen/LbHijing/src/Lib/hilunhep.F +++ b/Gen/LbHijing/src/Lib/hilunhep.F @@ -18,7 +18,7 @@ C DOUBLE PRECISION DUMMY COMMON/HIMAIN2/KATT(130000,4),PATT(130000,4) C...HEPEVT commonblock. - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) COMMON/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), & JMOHEP(2,NMXHEP),JDAHEP(2,NMXHEP),PHEP(5,NMXHEP),VHEP(4,NMXHEP) DOUBLE PRECISION PHEP,VHEP -- GitLab From 4662878b0841de43f9ada35b10404804995a05ed Mon Sep 17 00:00:00 2001 From: philten <philten@cern.ch> Date: Wed, 18 Mar 2020 17:06:25 +0000 Subject: [PATCH 6/7] Updated additional HEPEVNT common block sizes. --- Gen/LPair/src/lpair_hepevt.inc | 2 +- Gen/LPair/src/phobos.F | 2 +- Gen/LPair/src/phochk.F | 2 +- Gen/LPair/src/phocin.F | 2 +- Gen/LPair/src/phoin.F | 2 +- Gen/LPair/src/phoinf.F | 2 +- Gen/LPair/src/phomak.F | 2 +- Gen/LPair/src/phoout.F | 2 +- Gen/LPair/src/photos_get.F | 4 ++-- Gen/LPair/src/photos_make.F | 2 +- Gen/LPair/src/photos_set.F | 4 ++-- Gen/LPair/src/phtype.F | 2 +- Gen/SuperChic2/src/common/hepevt.f | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Gen/LPair/src/lpair_hepevt.inc b/Gen/LPair/src/lpair_hepevt.inc index 65f49f848..2862cc00f 100644 --- a/Gen/LPair/src/lpair_hepevt.inc +++ b/Gen/LPair/src/lpair_hepevt.inc @@ -1,6 +1,6 @@ c for PHOTOS202 integer NMXHEP - parameter (NMXHEP=4000) + parameter (NMXHEP=200000) real *8 PHEP,VHEP integer NEVHEP,NHEP,ISTHEP,IDHEP,JMOHEP,JDAHEP common/HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), diff --git a/Gen/LPair/src/phobos.F b/Gen/LPair/src/phobos.F index 3888125b3..25fdb06a5 100644 --- a/Gen/LPair/src/phobos.F +++ b/Gen/LPair/src/phobos.F @@ -28,7 +28,7 @@ C.---------------------------------------------------------------------- INTEGER STACK(MAXSTA) REAL*8 PBOOS1(5),PBOOS2(5) INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) INTEGER IDHEP,ISTHEP,JDAHEP,JMOHEP,NEVHEP,NHEP REAL*8 PHEP,VHEP COMMON/PH_HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), diff --git a/Gen/LPair/src/phochk.F b/Gen/LPair/src/phochk.F index 0cfdabc79..5ee3d68c9 100644 --- a/Gen/LPair/src/phochk.F +++ b/Gen/LPair/src/phochk.F @@ -24,7 +24,7 @@ C ******************** LOGICAL CHKIF COMMON/PHOIF/CHKIF(NMXPHO) INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) LOGICAL QEDRAD COMMON/PHOQED/QEDRAD(NMXHEP) INTEGER JFIRST diff --git a/Gen/LPair/src/phocin.F b/Gen/LPair/src/phocin.F index 5ccdf4ba6..14659dc51 100644 --- a/Gen/LPair/src/phocin.F +++ b/Gen/LPair/src/phocin.F @@ -16,7 +16,7 @@ C. C.---------------------------------------------------------------------- IMPLICIT NONE INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) LOGICAL QEDRAD COMMON/PHOQED/QEDRAD(NMXHEP) INTEGER PHLUN diff --git a/Gen/LPair/src/phoin.F b/Gen/LPair/src/phoin.F index eae399c35..1da8e10be 100644 --- a/Gen/LPair/src/phoin.F +++ b/Gen/LPair/src/phoin.F @@ -19,7 +19,7 @@ C. C.---------------------------------------------------------------------- IMPLICIT NONE INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) INTEGER IDHEP,ISTHEP,JDAHEP,JMOHEP,NEVHEP,NHEP REAL*8 PHEP,VHEP COMMON/PH_HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), diff --git a/Gen/LPair/src/phoinf.F b/Gen/LPair/src/phoinf.F index bcdfa14ee..557774fae 100644 --- a/Gen/LPair/src/phoinf.F +++ b/Gen/LPair/src/phoinf.F @@ -93,6 +93,6 @@ C-- Print info & ,T81,'*',/, 1H ,'*',9X, & ' WARNING (2): check dims. of /hepevt/ /phoqed/ /ph_hepevt/.' & ,T81,'*',/, 1H ,'*',9X, - & ' HERE: d_h_nmxhep=4000 and NMXHEP=10000' + & ' HERE: d_h_nmxhep=200000 and NMXHEP=200000' & ,T81,'*') END diff --git a/Gen/LPair/src/phomak.F b/Gen/LPair/src/phomak.F index bb66fb930..fb76ed762 100644 --- a/Gen/LPair/src/phomak.F +++ b/Gen/LPair/src/phomak.F @@ -27,7 +27,7 @@ C.---------------------------------------------------------------------- REAL*8 RN,WT,PHINT LOGICAL BOOST INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) INTEGER IDHEP,ISTHEP,JDAHEP,JMOHEP,NEVHEP,NHEP REAL*8 PHEP,VHEP COMMON/PH_HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), diff --git a/Gen/LPair/src/phoout.F b/Gen/LPair/src/phoout.F index d6fc2444f..1d7e3a3d9 100644 --- a/Gen/LPair/src/phoout.F +++ b/Gen/LPair/src/phoout.F @@ -19,7 +19,7 @@ C. C.---------------------------------------------------------------------- IMPLICIT NONE INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) INTEGER IDHEP,ISTHEP,JDAHEP,JMOHEP,NEVHEP,NHEP REAL*8 PHEP,VHEP COMMON/PH_HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), diff --git a/Gen/LPair/src/photos_get.F b/Gen/LPair/src/photos_get.F index ee4ebb623..ebdbc4ce4 100644 --- a/Gen/LPair/src/photos_get.F +++ b/Gen/LPair/src/photos_get.F @@ -18,7 +18,7 @@ C.---------------------------------------------------------------------- IMPLICIT NONE INTEGER d_h_nmxhep ! maximum number of particles - PARAMETER ( d_h_nmxhep=4000) + PARAMETER ( d_h_nmxhep=200000) REAL*8 d_h_phep, d_h_vhep ! to be real*4 or *8 depending on host INTEGER d_h_nevhep,d_h_nhep,d_h_isthep,d_h_idhep,d_h_jmohep, $ d_h_jdahep @@ -36,7 +36,7 @@ C.---------------------------------------------------------------------- ! COMMON /phoqed/ ! $ d_h_qedrad(d_h_nmxhep) ! Photos flag INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) INTEGER IDHEP,ISTHEP,JDAHEP,JMOHEP,NEVHEP,NHEP REAL*8 PHEP,VHEP COMMON/PH_HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), diff --git a/Gen/LPair/src/photos_make.F b/Gen/LPair/src/photos_make.F index c7f13b603..e23e5c845 100644 --- a/Gen/LPair/src/photos_make.F +++ b/Gen/LPair/src/photos_make.F @@ -26,7 +26,7 @@ C.---------------------------------------------------------------------- INTEGER MOTHER,POSPHO LOGICAL CASCAD INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) INTEGER IDHEP,ISTHEP,JDAHEP,JMOHEP,NEVHEP,NHEP REAL*8 PHEP,VHEP COMMON/PH_HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), diff --git a/Gen/LPair/src/photos_set.F b/Gen/LPair/src/photos_set.F index 431e5eb32..a34654d6c 100644 --- a/Gen/LPair/src/photos_set.F +++ b/Gen/LPair/src/photos_set.F @@ -18,7 +18,7 @@ C. C.---------------------------------------------------------------------- IMPLICIT NONE INTEGER d_h_nmxhep ! maximum number of particles - PARAMETER ( d_h_nmxhep=4000) + PARAMETER ( d_h_nmxhep=200000) REAL*8 d_h_phep, d_h_vhep ! to be real*4 or *8 depending on host INTEGER d_h_nevhep,d_h_nhep,d_h_isthep,d_h_idhep,d_h_jmohep, $ d_h_jdahep @@ -36,7 +36,7 @@ C.---------------------------------------------------------------------- ! COMMON /phoqed/ ! $ d_h_qedrad(d_h_nmxhep) ! Photos flag INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) INTEGER IDHEP,ISTHEP,JDAHEP,JMOHEP,NEVHEP,NHEP REAL*8 PHEP,VHEP COMMON/PH_HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), diff --git a/Gen/LPair/src/phtype.F b/Gen/LPair/src/phtype.F index e6bc108b2..d855959dc 100644 --- a/Gen/LPair/src/phtype.F +++ b/Gen/LPair/src/phtype.F @@ -17,7 +17,7 @@ C. C.---------------------------------------------------------------------- IMPLICIT NONE INTEGER NMXHEP - PARAMETER (NMXHEP=10000) + PARAMETER (NMXHEP=200000) INTEGER IDHEP,ISTHEP,JDAHEP,JMOHEP,NEVHEP,NHEP REAL*8 PHEP,VHEP COMMON/PH_HEPEVT/NEVHEP,NHEP,ISTHEP(NMXHEP),IDHEP(NMXHEP), diff --git a/Gen/SuperChic2/src/common/hepevt.f b/Gen/SuperChic2/src/common/hepevt.f index 1e8e81f24..420f63f89 100644 --- a/Gen/SuperChic2/src/common/hepevt.f +++ b/Gen/SuperChic2/src/common/hepevt.f @@ -1,6 +1,6 @@ ccccc hepevt output integer nmxhep - parameter (nmxhep=4000) + parameter (nmxhep=200000) integer nevhep,nhep,isthep,idhep,jmohep,jdahep double precision phep,vhep common /hepevt/ nevhep,nhep,isthep(nmxhep),idhep(nmxhep), -- GitLab From 47b90300eab36128381e788342d2ed5c032facdf Mon Sep 17 00:00:00 2001 From: Michal Kreps <michal.kreps@cern.ch> Date: Thu, 19 Mar 2020 09:36:02 +0000 Subject: [PATCH 7/7] Update phoinf.F to fix line length not to exceed 72 characters. --- Gen/LPair/src/phoinf.F | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gen/LPair/src/phoinf.F b/Gen/LPair/src/phoinf.F index 557774fae..afa053906 100644 --- a/Gen/LPair/src/phoinf.F +++ b/Gen/LPair/src/phoinf.F @@ -93,6 +93,6 @@ C-- Print info & ,T81,'*',/, 1H ,'*',9X, & ' WARNING (2): check dims. of /hepevt/ /phoqed/ /ph_hepevt/.' & ,T81,'*',/, 1H ,'*',9X, - & ' HERE: d_h_nmxhep=200000 and NMXHEP=200000' + & ' HERE: d_h_nmxhep=200000 and NMXHEP=200000' & ,T81,'*') END -- GitLab