From ff63cfd1e6cb30249a01682fb52035bbb51a8a3a Mon Sep 17 00:00:00 2001 From: Peter Hristov Date: Wed, 16 Jun 2021 08:02:36 +0200 Subject: [PATCH] Updates for DPMJET v19.1.2-alice1 (#1362) * Updated common blocks for DPMJET v19.1.2-alice1 * Fixes for Root6 Co-authored-by: hristov --- TDPMjet/DPMcommon.h | 28 ++++++++++++++-------------- test/generators/phojet/sim.C | 18 +++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/TDPMjet/DPMcommon.h b/TDPMjet/DPMcommon.h index ede9b27c3af..609d50e2741 100644 --- a/TDPMjet/DPMcommon.h +++ b/TDPMjet/DPMcommon.h @@ -6,7 +6,7 @@ #include "cfortran.h" //*KEND. #endif - +const Int_t NMXHKK=250000; extern "C" { /*========================================================*/ /* COMMON/DTEVNO/NEVENT,ICASCA */ @@ -33,13 +33,13 @@ COMMON_BLOCK_DEF(DtevnoCommon,DTEVNO); typedef struct { Int_t nhkk; Int_t nevhkk; - Int_t isthkk[200000]; - Int_t idhkk[200000]; - Int_t jmohkk[200000][2]; - Int_t jdahkk[200000][2]; - Double_t phkk[200000][5]; - Double_t vhkk[200000][4]; - Double_t whkk[200000][4]; + Int_t isthkk[NMXHKK]; + Int_t idhkk[NMXHKK]; + Int_t jmohkk[NMXHKK][2]; + Int_t jdahkk[NMXHKK][2]; + Double_t phkk[NMXHKK][5]; + Double_t vhkk[NMXHKK][4]; + Double_t whkk[NMXHKK][4]; } Dtevt1Common; #define DTEVT1 COMMON_BLOCK(DTEVT1,dtevt1) @@ -107,13 +107,13 @@ COMMON_BLOCK_DEF(Dtevt1Common,DTEVT1); /* IHIST(2,NMXHKK) */ /*--------------------------------------------------------*/ typedef struct { - Int_t idres[200000]; - Int_t idxres[200000]; - Int_t nobam[200000]; - Int_t idbam[200000]; - Int_t idch[200000]; + Int_t idres[NMXHKK]; + Int_t idxres[NMXHKK]; + Int_t nobam[NMXHKK]; + Int_t idbam[NMXHKK]; + Int_t idch[NMXHKK]; Int_t npoint[10]; - Int_t ihist[200000][2]; + Int_t ihist[NMXHKK][2]; } Dtevt2Common; #define DTEVT2 COMMON_BLOCK(DTEVT2,dtevt2) diff --git a/test/generators/phojet/sim.C b/test/generators/phojet/sim.C index f2c2b42ac33..20772af910b 100644 --- a/test/generators/phojet/sim.C +++ b/test/generators/phojet/sim.C @@ -1,14 +1,14 @@ -void sim(Int_t nev=5) { - // Libraries required by the simulation - - gSystem->Load("liblhapdf"); // Parton density functions - gSystem->Load("libEGPythia6"); // TGenerator interface - gSystem->Load("libgeant321"); + R__LOAD_LIBRARY(libDPMJET) // DPMJET, PhoJet and Pythia6115 library + R__LOAD_LIBRARY(liblhapdf) // Parton density functions + R__LOAD_LIBRARY(libpythia6) // Parton density functions + R__LOAD_LIBRARY(libEGPythia6) // TGenerator interface + R__LOAD_LIBRARY(libgeant321) - gSystem->Load("libDPMJET"); // DPMJET, PhoJet and Pythia6115 library - gSystem->Load("libAliPythia6"); // ALICE specific implementations - gSystem->Load("libTDPMjet"); // DPMJET interface + R__LOAD_LIBRARY(libAliPythia6) // ALICE specific implementations + R__LOAD_LIBRARY(libTDPMjet) // DPMJET interface +void sim(Int_t nev=5) { + // Libraries required by the simulation AliSimulation simulator; simulator.SetMakeSDigits("TRD TOF PHOS HMPID EMCAL MUON FMD ZDC PMD T0 VZERO");