Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
atlas
athena
Commits
b8c80ada
Commit
b8c80ada
authored
Jul 02, 2019
by
Ewelina Maria Lobodzinska
Browse files
fix synatax problem in MadGraphControl
change GENERATOR_VERSION -> GENERATOR_LCGVERSION
parent
2c38c495
Changes
39
Hide whitespace changes
Inline
Side-by-side
Generators/Epos_i/EposEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -9,7 +9,7 @@ find_package( Crmc )
if
(
CRMC_FOUND
)
set
(
EPOSENVIRONMENT_ENVIRONMENT
FORCESET EPOSVER
${
CRMC_VERSION
}
)
FORCESET EPOSVER
${
CRMC_
LCG
VERSION
}
)
endif
()
# Silently declare the module found:
...
...
Generators/EvtGen_i/EvtGenEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -9,7 +9,7 @@ find_package( EvtGen )
if
(
EVTGEN_FOUND
)
set
(
EVTGENENVIRONMENT_ENVIRONMENT
FORCESET EVTGENVER
${
EVTGEN_VERSION
}
)
FORCESET EVTGENVER
${
EVTGEN_
LCG
VERSION
}
)
endif
()
# Silently declare the module found:
...
...
Generators/Herwig7_i/CMakeLists.txt
View file @
b8c80ada
...
...
@@ -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_
LCG
VERSION
}
\"
LINK_LIBRARIES
${
HERWIG3_LCGROOT
}
/lib/Herwig/libHerwigAPI.so
${
Boost_LIBRARIES
}
${
HERWIG7_LIBRARIES
}
${
THEPEG_LIBRARIES
}
${
GSL_LIBRARIES
}
GeneratorModulesLib EventInfo GaudiKernel PathResolver
)
...
...
Generators/Herwig7_i/Herwig7EnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -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_
LCG
VERSION
}
FORCESET THEPEGVER
${
THEPEG_
LCG
VERSION
}
)
unset
(
_herwig3Path
)
endif
()
...
...
Generators/Herwig_i/CMakeLists.txt
View file @
b8c80ada
...
...
@@ -30,7 +30,7 @@ find_package( Jimmy )
find_package
(
Lhapdf
)
find_package
(
GSL
)
add_definitions
(
-DHWVERSION=
"
${
HERWIG_VERSION
}
"
)
add_definitions
(
-DHWVERSION=
"
${
HERWIG_
LCG
VERSION
}
"
)
# Remove the --as-needed linker flags:
atlas_disable_as_needed
()
...
...
Generators/Herwigpp_i/CMakeLists.txt
View file @
b8c80ada
...
...
@@ -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_
LCG
VERSION
}
\"
LINK_LIBRARIES
${
Boost_LIBRARIES
}
${
GSL_LIBRARIES
}
${
HERWIGPP_LIBRARIES
}
${
THEPEG_LIBRARIES
}
GeneratorModulesLib EventInfo GaudiKernel PathResolver
)
...
...
Generators/Hijing_i/CMakeLists.txt
View file @
b8c80ada
...
...
@@ -23,7 +23,7 @@ find_package( HepMC )
find_package
(
Hijing
)
find_package
(
ROOT COMPONENTS minicern Core Tree MathCore Hist RIO pthread
)
add_definitions
(
-DHIJINGVERSION=\"
${
H
HIJING_VERSION
}
\"
)
add_definitions
(
-DHIJINGVERSION=\"
${
HIJING_
LCG
VERSION
}
\"
)
# Remove the --as-needed linker flags:
atlas_disable_as_needed
()
...
...
Generators/MadGraphControl/MadGraphControlEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -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_
LCG
VERSION
}
)
unset
(
_fastjetPath
)
endif
()
...
...
Generators/MadGraphControl/python/MadGraphUtils.py
View file @
b8c80ada
...
...
@@ -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
...
...
Generators/Photospp_i/PhotosppEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -9,7 +9,7 @@ find_package( Photospp )
if
(
PHOTOSPP_FOUND
)
set
(
PHOTOSPPENVIRONMENT_ENVIRONMENT
FORCESET PHOTOSPPVER
${
PHOTOSPP_VERSION
}
)
FORCESET PHOTOSPPVER
${
PHOTOSPP_
LCG
VERSION
}
)
endif
()
# Silently declare the module found:
...
...
Generators/Pythia8_i/CMakeLists.txt
View file @
b8c80ada
...
...
@@ -26,7 +26,7 @@ find_package( CLHEP )
find_package
(
Lhapdf
)
find_package
(
Pythia8
)
add_definitions
(
-DPY8VERSION=\"
${
PYTHIA8_VERSION
}
\"
)
add_definitions
(
-DPY8VERSION=\"
${
PYTHIA8_
LCG
VERSION
}
\"
)
# Remove the --as-needed linker flags:
atlas_disable_as_needed
()
...
...
Generators/Pythia8_i/Pythia8EnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -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_
LCG
VERSION
}
FORCESET LHAPDFVER
${
LHAPDF_
LCG
VERSION
}
)
endif
()
# Silently declare the module found:
...
...
Generators/Pythia_i/CMakeLists.txt
View file @
b8c80ada
...
...
@@ -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_
LCG
VERSION
}
"
)
# Remove the --as-needed linker flags:
atlas_disable_as_needed
()
...
...
Generators/QGSJet_i/QGSJetEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -9,7 +9,7 @@ find_package( Crmc )
if
(
CRMC_FOUND
)
set
(
QGSJETENVIRONMENT_ENVIRONMENT
FORCESET QGSJETVER
${
CRMC_VERSION
}
)
FORCESET QGSJETVER
${
CRMC_
LCG
VERSION
}
)
endif
()
# Silently declare the module found:
...
...
Generators/Rivet_i/RivetEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -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_
LCG
VERSION
}
FORCESET YODAVER
${
YODA_
LCG
VERSION
}
FORCESET RIVET_PATH
${
_rivetPath
}
/
${
LCG_PLATFORM
}
)
unset
(
_rivetPath
)
endif
()
...
...
Generators/Sherpa_i/SherpaEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -9,7 +9,7 @@ find_package( Sherpa )
if
(
SHERPA_FOUND
)
set
(
SHERPAENVIRONMENT_ENVIRONMENT
FORCESET SHERPAVER
${
SHERPA_VERSION
}
)
FORCESET SHERPAVER
${
SHERPA_
LCG
VERSION
}
)
endif
()
# Silently declare the module found:
...
...
Generators/Starlight_i/StarlightEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -9,7 +9,7 @@ find_package( Starlight )
if
(
STARLIGHT_FOUND
)
set
(
STARLIGHTENVIRONMENT_ENVIRONMENT
FORCESET STARLIGHTVER
${
HERWIG3_
VERSION
}
)
FORCESET STARLIGHTVER
${
STARLIGHT_LCG
VERSION
}
)
endif
()
# Silently declare the module found:
...
...
Generators/Tauolapp_i/TauolappEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -9,7 +9,7 @@ find_package( Tauolapp )
if
(
TAUOLAPP_FOUND
)
set
(
TAUOLAPPENVIRONMENT_ENVIRONMENT
FORCESET TAUOLAPPVER
${
TAUOLAPP_VERSION
}
)
FORCESET TAUOLAPPVER
${
TAUOLAPP_
LCG
VERSION
}
)
endif
()
# Silently declare the module found:
...
...
Generators/TruthUtils/TruthUtilsEnvironmentConfig.cmake
View file @
b8c80ada
...
...
@@ -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_
LCG
VERSION
}
FORCESET HEPUTILSVER
${
HEPUTILS_
LCG
VERSION
}
)
endif
()
# Silently declare the module found:
...
...
Projects/AthGeneration/externals/Crmc.cmake
View file @
b8c80ada
...
...
@@ -2,6 +2,6 @@
# File specifying the location of Crmc to use.
#
set
(
CRMC_VERSION 1.
5.4
)
set
(
CRMC_
LCG
VERSION 1.
6.0
)
set
(
CRMC_LCGROOT
${
LCG_RELEASE_DIR
}
/MCGenerators/crmc/
${
CRMC_VERSION
}
/
${
LCG_PLATFORM
}
)
${
LCG_RELEASE_DIR
}
/MCGenerators/crmc/
${
CRMC_
LCG
VERSION
}
/
${
LCG_PLATFORM
}
)
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment