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

Generators/EvgenJobTransforms/share/skel.ABtoEVGEN.py

@@ -366,11 +366,6 @@ if evgenConfig.keywords:
     else:
         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
 from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
 from AthenaPoolCnvSvc.AthenaPoolCnvSvcConf import AthenaPoolCnvSvc

Generators/Superchic_i/CMakeLists.txt

@@ -24,6 +24,8 @@ atlas_depends_on_subdirs(
 # External dependencies:
 find_package( CLHEP )
 find_package( HepMC COMPONENTS HepMC HepMCfio )
+find_package( Apfel )
+find_package( Lhapdf )
 find_package( Superchic )
 
 atlas_disable_as_needed()

Generators/Superchic_i/src/calcparam.F

@@ -76,7 +76,7 @@ ccc   reads input parameters and calculated needed parameters
       include 'varsi.f'
       include 'spA.f'
       include 'sAA.f'
-      include 'mphi.f'
+c      include 'mphi.f'
 
 c      include 'init.f'      
 c      include 'initpars.f'
@@ -272,7 +272,7 @@ cccccccccccccccccccccccccccccccccccccccccccccccccccc
       mtau=1.77682d0
       mpip=0.13957018d0
       mkp=0.493677d0
-      mphi=1.019461d0
+c      mphi=1.019461d0
       alpha=7.2974d-3
       pi=dacos(-1d0)
       conv=389379d3

Generators/Superchic_i/src/superchicrun.F

@@ -76,7 +76,7 @@ ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
       include 'varsi.f'
       include 'spA.f'
       include 'sAA.f'
-      include 'mphi.f'
+c      include 'mphi.f'
 
 cccccccccccccccccccccccccccccccccccccccccccccccccccc
 cccccccccccccccccccccccccccccccccccccccccccccccccccc
@@ -120,7 +120,7 @@ cccccccccccccccccccccccccccccccccccccccccccccccccccc
       mtau=1.77682d0
       mpip=0.13957018d0
       mkp=0.493677d0
-      mphi=1.019461d0
+c      mphi=1.019461d0
       alpha=7.2974d-3
       pi=dacos(-1d0)
       conv=389379d3

Projects/AthDataQuality/externals.txt

@@ -5,4 +5,4 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AtlasExternalsVersion = 1.0.71
+AtlasExternalsVersion = 1.0.72

Projects/AthDerivation/externals.txt

@@ -5,5 +5,5 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AthDerivationExternalsVersion = 1.0.71
+AthDerivationExternalsVersion = 1.0.72
 GaudiVersion = v27r1.018

Projects/AthGeneration/externals.txt

@@ -5,5 +5,5 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AthGenerationExternalsVersion = 1.0.71
+AthGenerationExternalsVersion = 1.0.72
 GaudiVersion = v27r1.018

Projects/AthGeneration/externals/Superchic.cmake

@@ -2,6 +2,6 @@
 # File specifying the location of Superchic 3.0 to use.
 #
 
-set( SUPERCHIC_LCGVERSION 3.06 )
+set( SUPERCHIC_LCGVERSION 4.01 )
 set( SUPERCHIC_LCGROOT
    ${LCG_RELEASE_DIR}/MCGenerators/superchic/${SUPERCHIC_LCGVERSION}/${LCG_PLATFORM} )

Projects/AthSimulation/externals.txt

@@ -5,5 +5,5 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AthSimulationExternalsVersion = 1.0.71
+AthSimulationExternalsVersion = 1.0.72
 GaudiVersion = v27r1.019

Projects/Athena/externals.txt

@@ -5,5 +5,5 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AthenaExternalsVersion = 1.0.71
+AthenaExternalsVersion = 1.0.72
 GaudiVersion = v27r1.019

Projects/AthenaP1/externals.txt

@@ -5,5 +5,5 @@
 # an "origin/" prefix before it. For tags however this is explicitly
 # forbidden.
 
-AthenaExternalsVersion = 1.0.71
+AthenaExternalsVersion = 1.0.72
 GaudiVersion = v27r1.018