Commit b8c80ada authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska
Browse files

fix synatax problem in MadGraphControl

change GENERATOR_VERSION -> GENERATOR_LCGVERSION
parent 2c38c495
......@@ -9,7 +9,7 @@ find_package( Crmc )
if( CRMC_FOUND )
set( EPOSENVIRONMENT_ENVIRONMENT
FORCESET EPOSVER ${CRMC_VERSION} )
FORCESET EPOSVER ${CRMC_LCGVERSION} )
endif()
# Silently declare the module found:
......
......@@ -9,7 +9,7 @@ find_package( EvtGen )
if( EVTGEN_FOUND )
set( EVTGENENVIRONMENT_ENVIRONMENT
FORCESET EVTGENVER ${EVTGEN_VERSION} )
FORCESET EVTGENVER ${EVTGEN_LCGVERSION} )
endif()
# Silently declare the module found:
......
......@@ -29,7 +29,7 @@ atlas_add_component( Herwig7_i
Herwig7_i/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${HERWIG3_INCLUDE_DIRS}
${THEPEG_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS}
PRIVATE_DEFINITIONS -DHWVERSION=\"${HERWIG7_VERSION}\"
PRIVATE_DEFINITIONS -DHWVERSION=\"${HERWIG7_LCGVERSION}\"
LINK_LIBRARIES ${HERWIG3_LCGROOT}/lib/Herwig/libHerwigAPI.so ${Boost_LIBRARIES}
${HERWIG7_LIBRARIES} ${THEPEG_LIBRARIES} ${GSL_LIBRARIES}
GeneratorModulesLib EventInfo GaudiKernel PathResolver )
......
......@@ -12,8 +12,8 @@ if( HERWIG3_FOUND AND THEPEG_FOUND )
get_filename_component( _herwig3Path "${HERWIG3_LCGROOT}" DIRECTORY )
set( HERWIG7ENVIRONMENT_ENVIRONMENT
FORCESET HERWIG7_PATH ${_herwig3Path}/${LCG_PLATFORM}
FORCESET HERWIG7VER ${HERWIG3_VERSION}
FORCESET THEPEGVER ${THEPEG_VERSION})
FORCESET HERWIG7VER ${HERWIG3_LCGVERSION}
FORCESET THEPEGVER ${THEPEG_LCGVERSION})
unset( _herwig3Path )
endif()
......
......@@ -30,7 +30,7 @@ find_package( Jimmy )
find_package( Lhapdf )
find_package( GSL )
add_definitions(-DHWVERSION="${HERWIG_VERSION}")
add_definitions(-DHWVERSION="${HERWIG_LCGVERSION}")
# Remove the --as-needed linker flags:
atlas_disable_as_needed()
......
......@@ -29,7 +29,7 @@ atlas_add_component( Herwigpp_i
Herwigpp_i/*.h src/*.cxx src/components/*.cxx
INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS} ${HERWIG3_INCLUDE_DIRS}
${THEPEG_INCLUDE_DIRS}
PRIVATE_DEFINITIONS -DHWVERSION=\"${HERWIGPP_VERSION}\"
PRIVATE_DEFINITIONS -DHWVERSION=\"${HERWIGPP_LCGVERSION}\"
LINK_LIBRARIES ${Boost_LIBRARIES} ${GSL_LIBRARIES} ${HERWIGPP_LIBRARIES} ${THEPEG_LIBRARIES}
GeneratorModulesLib EventInfo GaudiKernel PathResolver )
......
......@@ -23,7 +23,7 @@ find_package( HepMC )
find_package( Hijing )
find_package( ROOT COMPONENTS minicern Core Tree MathCore Hist RIO pthread )
add_definitions(-DHIJINGVERSION=\"${HHIJING_VERSION}\")
add_definitions(-DHIJINGVERSION=\"${HIJING_LCGVERSION}\")
# Remove the --as-needed linker flags:
atlas_disable_as_needed()
......
......@@ -11,7 +11,7 @@ if( FASTJET_FOUND AND MADGRAPH_FOUND )
get_filename_component( _fastjetPath "${FASTJET_INCLUDE_DIR}" DIRECTORY )
set( MADGRAPHCONTROLENVIRONMENT_ENVIRONMENT
FORCESET FASTJETPATH ${_fastjetPath}
FORCESET MADGRAPHVER ${MADGRAPH5AMC_VERSION})
FORCESET MADGRAPHVER ${MADGRAPH5AMC_LCGVERSION})
unset( _fastjetPath )
endif()
......
......@@ -104,14 +104,14 @@ def new_process(card_loc='proc_card_mg5.dat',grid_pack=None):
mglog.info('Finished process generation at '+str(time.asctime()))
thedir = None
for adir in glob( os.getcwd()+'/*PROC*~' ).sort(reverse=True):
for adir in glob.glob( os.getcwd()+'/*PROC*~' ).sort(reverse=True):
if os.access('%s/SubProcesses/subproc.mg'%thedir,os.R_OK):
if thedir==None: thedir=adir
else:
mglog.warning('Additional possible process directory, '+adir+' found. Had '+thedir)
mglog.warning('Likely this is because you did not run from a clean directory, and this may cause errors later.')
if thedir==None:
raise RuntimeError('No diagrams for this process in dir='+str(thedir)+' from list: '+glob( os.getcwd()+'/*PROC*~' ).sort(reverse=True))
raise RuntimeError('No diagrams for this process in dir='+str(thedir)+' from list: '+glob.glob( os.getcwd()+'/*PROC*~' ).sort(reverse=True))
# Special catch related to path setting and using afs
import os
......
......@@ -9,7 +9,7 @@ find_package( Photospp )
if( PHOTOSPP_FOUND )
set( PHOTOSPPENVIRONMENT_ENVIRONMENT
FORCESET PHOTOSPPVER ${PHOTOSPP_VERSION})
FORCESET PHOTOSPPVER ${PHOTOSPP_LCGVERSION})
endif()
# Silently declare the module found:
......
......@@ -26,7 +26,7 @@ find_package( CLHEP )
find_package( Lhapdf )
find_package( Pythia8 )
add_definitions(-DPY8VERSION=\"${PYTHIA8_VERSION}\")
add_definitions(-DPY8VERSION=\"${PYTHIA8_LCGVERSION}\")
# Remove the --as-needed linker flags:
atlas_disable_as_needed()
......
......@@ -10,8 +10,8 @@ find_package( Lhapdf )
if( PYTHIA8_FOUND AND LHAPDF_FOUND )
set( PYTHIA8ENVIRONMENT_ENVIRONMENT
FORCESET PYTHIA8VER ${PYTHIA8_VERSION}
FORCESET LHAPDFVER ${LHAPDF_VERSION} )
FORCESET PYTHIA8VER ${PYTHIA8_LCGVERSION}
FORCESET LHAPDFVER ${LHAPDF_LCGVERSION} )
endif()
# Silently declare the module found:
......
......@@ -28,7 +28,7 @@ find_package( HepMC COMPONENTS HepMC HepMCfio )
find_package( Lhapdf )
find_package( Pythia6 )
add_definitions(-DPY6VERSION="${PYTHIA6_VERSION}")
add_definitions(-DPY6VERSION="${PYTHIA6_LCGVERSION}")
# Remove the --as-needed linker flags:
atlas_disable_as_needed()
......
......@@ -9,7 +9,7 @@ find_package( Crmc )
if( CRMC_FOUND )
set( QGSJETENVIRONMENT_ENVIRONMENT
FORCESET QGSJETVER ${CRMC_VERSION} )
FORCESET QGSJETVER ${CRMC_LCGVERSION} )
endif()
# Silently declare the module found:
......
......@@ -11,8 +11,8 @@ find_package( YODA )
if( RIVET_FOUND AND YODA_FOUND )
get_filename_component( _rivetPath "${RIVET_LCGROOT}" DIRECTORY )
set( RIVETENVIRONMENT_ENVIRONMENT
FORCESET RIVETVER ${RIVET_VERSION}
FORCESET YODAVER ${YODA_VERSION}
FORCESET RIVETVER ${RIVET_LCGVERSION}
FORCESET YODAVER ${YODA_LCGVERSION}
FORCESET RIVET_PATH ${_rivetPath}/${LCG_PLATFORM})
unset( _rivetPath )
endif()
......
......@@ -9,7 +9,7 @@ find_package( Sherpa )
if( SHERPA_FOUND )
set( SHERPAENVIRONMENT_ENVIRONMENT
FORCESET SHERPAVER ${SHERPA_VERSION} )
FORCESET SHERPAVER ${SHERPA_LCGVERSION} )
endif()
# Silently declare the module found:
......
......@@ -9,7 +9,7 @@ find_package( Starlight )
if( STARLIGHT_FOUND )
set( STARLIGHTENVIRONMENT_ENVIRONMENT
FORCESET STARLIGHTVER ${HERWIG3_VERSION} )
FORCESET STARLIGHTVER ${STARLIGHT_LCGVERSION} )
endif()
# Silently declare the module found:
......
......@@ -9,7 +9,7 @@ find_package( Tauolapp )
if( TAUOLAPP_FOUND )
set( TAUOLAPPENVIRONMENT_ENVIRONMENT
FORCESET TAUOLAPPVER ${TAUOLAPP_VERSION})
FORCESET TAUOLAPPVER ${TAUOLAPP_LCGVERSION})
endif()
# Silently declare the module found:
......
......@@ -10,8 +10,8 @@ find_package( MCUtils )
if( HEPUTILS_FOUND AND MCUTILS_FOUND )
set( TRUTHUTILSENVIRONMENT_ENVIRONMENT
FORCESET MCUTILSVER ${MCUTILS_VERSION}
FORCESET HEPUTILSVER ${HEPUTILS_VERSION} )
FORCESET MCUTILSVER ${MCUTILS_LCGVERSION}
FORCESET HEPUTILSVER ${HEPUTILS_LCGVERSION} )
endif()
# Silently declare the module found:
......
......@@ -2,6 +2,6 @@
# File specifying the location of Crmc to use.
#
set( CRMC_VERSION 1.5.4 )
set( CRMC_LCGVERSION 1.6.0 )
set( CRMC_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_VERSION}/${LCG_PLATFORM} )
${LCG_RELEASE_DIR}/MCGenerators/crmc/${CRMC_LCGVERSION}/${LCG_PLATFORM} )
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment