Commit 86de85a3 authored by Ewelina Maria Lobodzinska's avatar Ewelina Maria Lobodzinska
Browse files

update atlasexternals tag, add Apfel library to Superchic CMakeLists.txt file,...

update atlasexternals tag, add Apfel library to Superchic CMakeLists.txt file, remove call to Jets routine from skel.ABtoEVGEN.py
parent 736656a7
...@@ -366,11 +366,6 @@ if evgenConfig.keywords: ...@@ -366,11 +366,6 @@ if evgenConfig.keywords:
else: else:
evgenLog.warning("keywords = not found ") evgenLog.warning("keywords = not found ")
## Configure and schedule jet finding algorithms
## NOTE: This generates algorithms for jet containers defined in the user's JO fragment
if evgenConfig.findJets:
include("EvgenJobTransforms/Generate_TruthJets.py")
## Configure POOL streaming to the output EVNT format file ## Configure POOL streaming to the output EVNT format file
from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
from AthenaPoolCnvSvc.AthenaPoolCnvSvcConf import AthenaPoolCnvSvc from AthenaPoolCnvSvc.AthenaPoolCnvSvcConf import AthenaPoolCnvSvc
......
...@@ -24,6 +24,8 @@ atlas_depends_on_subdirs( ...@@ -24,6 +24,8 @@ atlas_depends_on_subdirs(
# External dependencies: # External dependencies:
find_package( CLHEP ) find_package( CLHEP )
find_package( HepMC COMPONENTS HepMC HepMCfio ) find_package( HepMC COMPONENTS HepMC HepMCfio )
find_package( Apfel )
find_package( Lhapdf )
find_package( Superchic ) find_package( Superchic )
atlas_disable_as_needed() atlas_disable_as_needed()
......
...@@ -76,7 +76,7 @@ ccc reads input parameters and calculated needed parameters ...@@ -76,7 +76,7 @@ ccc reads input parameters and calculated needed parameters
include 'varsi.f' include 'varsi.f'
include 'spA.f' include 'spA.f'
include 'sAA.f' include 'sAA.f'
include 'mphi.f' c include 'mphi.f'
c include 'init.f' c include 'init.f'
c include 'initpars.f' c include 'initpars.f'
...@@ -272,7 +272,7 @@ cccccccccccccccccccccccccccccccccccccccccccccccccccc ...@@ -272,7 +272,7 @@ cccccccccccccccccccccccccccccccccccccccccccccccccccc
mtau=1.77682d0 mtau=1.77682d0
mpip=0.13957018d0 mpip=0.13957018d0
mkp=0.493677d0 mkp=0.493677d0
mphi=1.019461d0 c mphi=1.019461d0
alpha=7.2974d-3 alpha=7.2974d-3
pi=dacos(-1d0) pi=dacos(-1d0)
conv=389379d3 conv=389379d3
......
...@@ -76,7 +76,7 @@ ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc ...@@ -76,7 +76,7 @@ ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
include 'varsi.f' include 'varsi.f'
include 'spA.f' include 'spA.f'
include 'sAA.f' include 'sAA.f'
include 'mphi.f' c include 'mphi.f'
cccccccccccccccccccccccccccccccccccccccccccccccccccc cccccccccccccccccccccccccccccccccccccccccccccccccccc
cccccccccccccccccccccccccccccccccccccccccccccccccccc cccccccccccccccccccccccccccccccccccccccccccccccccccc
...@@ -120,7 +120,7 @@ cccccccccccccccccccccccccccccccccccccccccccccccccccc ...@@ -120,7 +120,7 @@ cccccccccccccccccccccccccccccccccccccccccccccccccccc
mtau=1.77682d0 mtau=1.77682d0
mpip=0.13957018d0 mpip=0.13957018d0
mkp=0.493677d0 mkp=0.493677d0
mphi=1.019461d0 c mphi=1.019461d0
alpha=7.2974d-3 alpha=7.2974d-3
pi=dacos(-1d0) pi=dacos(-1d0)
conv=389379d3 conv=389379d3
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AtlasExternalsVersion = 1.0.71 AtlasExternalsVersion = 1.0.72
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AthDerivationExternalsVersion = 1.0.71 AthDerivationExternalsVersion = 1.0.72
GaudiVersion = v27r1.018 GaudiVersion = v27r1.018
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AthGenerationExternalsVersion = 1.0.71 AthGenerationExternalsVersion = 1.0.72
GaudiVersion = v27r1.018 GaudiVersion = v27r1.018
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
# File specifying the location of Superchic 3.0 to use. # File specifying the location of Superchic 3.0 to use.
# #
set( SUPERCHIC_LCGVERSION 3.06 ) set( SUPERCHIC_LCGVERSION 4.01 )
set( SUPERCHIC_LCGROOT set( SUPERCHIC_LCGROOT
${LCG_RELEASE_DIR}/MCGenerators/superchic/${SUPERCHIC_LCGVERSION}/${LCG_PLATFORM} ) ${LCG_RELEASE_DIR}/MCGenerators/superchic/${SUPERCHIC_LCGVERSION}/${LCG_PLATFORM} )
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AthSimulationExternalsVersion = 1.0.71 AthSimulationExternalsVersion = 1.0.72
GaudiVersion = v27r1.019 GaudiVersion = v27r1.019
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AthenaExternalsVersion = 1.0.71 AthenaExternalsVersion = 1.0.72
GaudiVersion = v27r1.019 GaudiVersion = v27r1.019
...@@ -5,5 +5,5 @@ ...@@ -5,5 +5,5 @@
# an "origin/" prefix before it. For tags however this is explicitly # an "origin/" prefix before it. For tags however this is explicitly
# forbidden. # forbidden.
AthenaExternalsVersion = 1.0.71 AthenaExternalsVersion = 1.0.72
GaudiVersion = v27r1.018 GaudiVersion = v27r1.018
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