Merge branch 'AFII_QS_master' into 'master'

Manual sweep of !22053 from '21.0' to 'master': Extend ISF configuration to allow Quasi-stable particle simulation in ATLFASTII jobs

See merge request !22175

Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfigDb.py

@@ -11,7 +11,6 @@ addService("G4AtlasServices.G4AtlasUserActionConfig.getISFUserActionSvc","G4UA::
 addService("G4AtlasServices.G4AtlasUserActionConfig.getISFFullUserActionSvc","G4UA::ISFFullUserActionSvc")
 addService("G4AtlasServices.G4AtlasUserActionConfig.getISFPassBackUserActionSvc","G4UA::ISFPassBackUserActionSvc")
 addService("G4AtlasServices.G4AtlasUserActionConfig.getISF_AFIIUserActionSvc","G4UA::ISF_AFIIUserActionSvc")
-addService("G4AtlasServices.G4AtlasUserActionConfig.getISFQuasiStableUserActionSvc","G4UA::ISFQuasiStableUserActionSvc")
 addService("G4AtlasServices.G4AtlasUserActionConfig.getCTBUserActionSvc","G4UA::CTBUserActionSvc")
 
 addService("G4AtlasServices.G4AtlasServicesConfig.getStandardFieldSvc","StandardField")

Simulation/G4Atlas/G4AtlasServices/python/G4AtlasUserActionConfig.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon import CfgGetter,CfgMgr,Logging
 
@@ -90,7 +90,10 @@ def getCTBUserActionSvc(name="G4UA::CTBUserActionSvc", **kwargs):
 
 def getISFUserActionSvc(name="G4UA::ISFUserActionSvc", **kwargs):
     TrackProcessorUserAction = kwargs.pop('TrackProcessorUserAction',[])
-    PhysicsValidationUserAction = kwargs.pop('PhysicsValidationUserAction',[])
+    PhysicsValidationUserAction = []
+    from ISF_Config.ISF_jobProperties import ISF_Flags
+    if ISF_Flags.ValidationMode.get_Value():
+        PhysicsValidationUserAction = ['ISFG4PhysicsValidationUserActionTool']
     MCTruthUserAction = kwargs.pop('MCTruthUserAction',['ISFMCTruthUserActionTool'])
 
     from G4AtlasApps.SimFlags import simFlags
@@ -107,36 +110,19 @@ def getISFUserActionSvc(name="G4UA::ISFUserActionSvc", **kwargs):
     return CfgMgr.G4UA__UserActionSvc(name, **kwargs)
 
 def getISFFullUserActionSvc(name="G4UA::ISFFullUserActionSvc", **kwargs):
-    # this configuration needs ISFMCTruthUserAction,
-    # G4OnlyPhysicsValidationUserAction, and FullG4TrackProcessorUserAction
-    from ISF_Config.ISF_jobProperties import ISF_Flags
-    if ISF_Flags.ValidationMode.get_Value():
-        kwargs.setdefault('PhysicsValidationUserAction',['G4OnlyPhysicsValidationUserActionTool'])
+    # this configuration needs ISFMCTruthUserAction
+    # and FullG4TrackProcessorUserAction
     kwargs.setdefault('TrackProcessorUserAction', ['FullG4TrackProcessorUserActionTool'])
     return getISFUserActionSvc(name, **kwargs)
 
 def getISFPassBackUserActionSvc(name="G4UA::ISFPassBackUserActionSvc", **kwargs):
-    # this configuration needs ISFMCTruthUserAction,
-    # G4OnlyPhysicsValidationUserAction, and PassBackG4TrackProcessorUserAction
-    from ISF_Config.ISF_jobProperties import ISF_Flags
-    if ISF_Flags.ValidationMode.get_Value():
-        kwargs.setdefault('PhysicsValidationUserAction',['G4OnlyPhysicsValidationUserActionTool'])
+    # this configuration needs ISFMCTruthUserAction and
+    # PassBackG4TrackProcessorUserAction
     kwargs.setdefault('TrackProcessorUserAction', ['PassBackG4TrackProcessorUserActionTool'])
     return getISFUserActionSvc(name, **kwargs)
 
 def getISF_AFIIUserActionSvc(name="G4UA::ISF_AFIIUserActionSvc", **kwargs):
-    # this configuration needs ISFMCTruthUserAction,
-    # AFII_G4PhysicsValidationUserAction, and AFII_G4TrackProcessorUserAction
-    from ISF_Config.ISF_jobProperties import ISF_Flags
-    if ISF_Flags.ValidationMode.get_Value():
-        kwargs.setdefault('PhysicsValidationUserAction',['AFII_G4PhysicsValidationUserActionTool'])
+    # this configuration needs ISFMCTruthUserAction and
+    # AFII_G4TrackProcessorUserAction
     kwargs.setdefault('TrackProcessorUserAction', ['AFII_G4TrackProcessorUserActionTool'])
     return getISFUserActionSvc(name, **kwargs)
-
-def getISFQuasiStableUserActionSvc(name="G4UA::ISFQuasiStableUserActionSvc", **kwargs):
-    # this configuration needs ISFMCTruthUserAction,
-    # QuasiStableG4PhysicsValidationUserAction, and FullG4TrackProcessorUserAction
-    from ISF_Config.ISF_jobProperties import ISF_Flags
-    if ISF_Flags.ValidationMode.get_Value():
-        kwargs.setdefault('PhysicsValidationUserAction',['QuasiStableG4PhysicsValidationUserActionTool'])
-    return getISFFullUserActionSvc(name, **kwargs)

Simulation/ISF/ISF_Config/python/ISF_ConfigConfigDb.py

@@ -37,6 +37,7 @@ addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_PassBackG4MT",        "ISF_Ker
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_CosmicsG4",           "ISF_Kernel_CosmicsG4")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTII",           "ISF_Kernel_ATLFASTII")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTIIMT",         "ISF_Kernel_ATLFASTIIMT")
+addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTII_QS",        "ISF_Kernel_ATLFASTII_QS")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTIIF",          "ISF_Kernel_ATLFASTIIF")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTIIFMT",        "ISF_Kernel_ATLFASTIIFMT")
 addAlgorithm("ISF_Config.ISF_MainConfig.getKernel_ATLFASTIIF_PileUp",   "ISF_Kernel_ATLFASTIIF_PileUp")

Simulation/ISF/ISF_Config/python/ISF_MainConfig.py

@@ -418,6 +418,25 @@ def getKernel_ATLFASTIIMT(name="ISF_Kernel_ATLFASTIIMT", **kwargs):
     simFlags.SimulationFlavour = "ATLFASTII"
     return getKernel_GenericSimulatorMT(name, **kwargs)
 
+
+############## Simulator: ATLFASTII_QS ###############
+def getKernel_ATLFASTII_QS(name="ISF_Kernel_ATLFASTII_QS", **kwargs):
+    kwargs.setdefault("ParticleBroker"             , 'ISF_AFIIParticleBrokerSvc'                        )
+
+    kwargs.setdefault("BeamPipeSimulationSelectors", [ 'ISF_DefaultAFII_QS_Geant4Selector' ]            )
+    kwargs.setdefault("IDSimulationSelectors"      , [ 'ISF_DefaultAFII_QS_Geant4Selector' ]            )
+    kwargs.setdefault("CaloSimulationSelectors"    , [ 'ISF_MuonAFII_QS_Geant4Selector',
+                                                       'ISF_EtaGreater5ParticleKillerSimSelector',
+                                                       'ISF_DefaultLegacyAFIIFastCaloSimSelector' ] )
+    kwargs.setdefault("MSSimulationSelectors"      , [ 'ISF_DefaultAFII_QS_Geant4Selector' ]            )
+    kwargs.setdefault("CavernSimulationSelectors"  , [ 'ISF_DefaultParticleKillerSelector'  ]           )
+    kwargs.setdefault("InputConverter"             , 'ISF_LongLivedInputConverter'                      )
+    kwargs.setdefault("QuasiStablePatcher"         , 'ZeroLifetimePositioner'                           )
+    from G4AtlasApps.SimFlags import simFlags
+    simFlags.SimulationFlavour = "ATLFASTII_QS"
+    return getKernel_GenericSimulator(name, **kwargs)
+
+
 ############## Simulator: ATLFASTIIF ###############
 def getKernel_ATLFASTIIF(name="ISF_Kernel_ATLFASTIIF", **kwargs):
     kwargs.setdefault("BeamPipeSimulationSelectors" , [ 'ISF_DefaultParticleKillerSelector' ]       )

Simulation/ISF/ISF_Core/ISF_Services/python/ISF_ServicesConfig.py

@@ -106,7 +106,7 @@ def getGenericTruthService(name="ISF_TruthService", **kwargs):
     kwargs.setdefault('SkipIfNoChildren', True)
     kwargs.setdefault('SkipIfNoParentBarcode', True)
     kwargs.setdefault('ForceEndVtxInRegions', [])
-    long_lived_simulators = ['LongLived', 'longLived']
+    long_lived_simulators = ['LongLived', 'longLived', 'QS']
     from ISF_Config.ISF_jobProperties import ISF_Flags
     is_long_lived_simulation = any(x in ISF_Flags.Simulator() for x in long_lived_simulators) #FIXME this should be set in a nicer way.
     if is_long_lived_simulation:

Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfig.py

-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 """
 Tools configurations for ISF
@@ -58,3 +58,7 @@ def getPassBackGeant4SimSvc(name="ISF_PassBackGeant4SimSvc", **kwargs):
 def getAFIIGeant4SimSvc(name="ISF_AFIIGeant4SimSvc", **kwargs):
     kwargs.setdefault('SimulatorTool'       , 'ISF_AFIIGeant4Tool')
     return getPassBackGeant4SimSvc(name, **kwargs)
+
+def getAFII_QS_Geant4SimSvc(name="ISF_AFII_QS_Geant4SimSvc", **kwargs):
+    kwargs.setdefault('SimulatorTool'       , 'AFII_QS_Geant4Tool')
+    return getPassBackGeant4SimSvc(name, **kwargs)

Simulation/ISF/ISF_Geant4/ISF_Geant4Services/python/ISF_Geant4ServicesConfigDb.py

-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.CfgGetter import addService
 addService("ISF_Geant4Services.ISF_Geant4ServicesConfig.getGeant4SimSvc",          "ISF_Geant4SimSvc")
@@ -6,3 +6,4 @@ addService("ISF_Geant4Services.ISF_Geant4ServicesConfig.getFullGeant4SimSvc",
 addService("ISF_Geant4Services.ISF_Geant4ServicesConfig.getPassBackGeant4SimSvc",  "ISF_PassBackGeant4SimSvc")
 addService("ISF_Geant4Services.ISF_Geant4ServicesConfig.getAFIIGeant4SimSvc",      "ISF_AFIIGeant4SimSvc")
 addService("ISF_Geant4Services.ISF_Geant4ServicesConfig.getLongLivedGeant4SimSvc", "ISF_LongLivedGeant4SimSvc")
+addService("ISF_Geant4Services.ISF_Geant4ServicesConfig.getAFII_QS_Geant4SimSvc",  "ISF_AFII_QS_Geant4SimSvc")

Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfig.py

@@ -14,21 +14,7 @@ def getMCTruthUserActionTool(name='ISFMCTruthUserActionTool', **kwargs):
 ## -----------------------------------------------------------------------------
 ### Base Version
 def getPhysicsValidationUserActionTool(name="ISFG4PhysicsValidationUserActionTool", **kwargs):
-    kwargs.setdefault('ParticleBroker'     , 'ISF_ParticleBrokerSvc')
-    from ISF_Geant4Tools.ISF_Geant4ToolsConf import G4UA__iGeant4__PhysicsValidationUserActionTool
-    return G4UA__iGeant4__PhysicsValidationUserActionTool(name, **kwargs)
-### Specialized Versions
-def getG4OnlyPhysicsValidationUserActionTool(name="G4OnlyPhysicsValidationUserActionTool", **kwargs):
-    kwargs.setdefault('ParticleBroker'     , 'ISF_ParticleBrokerSvcNoOrdering')
-    return getPhysicsValidationUserActionTool(name, **kwargs)
-
-def getAFII_G4PhysicsValidationUserActionTool(name="AFII_G4PhysicsValidationUserActionTool", **kwargs):
-    kwargs.setdefault('ParticleBroker'     , 'ISF_AFIIParticleBrokerSvc')
-    return getPhysicsValidationUserActionTool(name, **kwargs)
-
-def getQuasiStableG4PhysicsValidationUserActionTool(name="QuasiStableG4PhysicsValidationUserActionTool", **kwargs):
-    kwargs.setdefault('ParticleBroker'     , 'ISF_LongLivedParticleBrokerSvc')
-    return getPhysicsValidationUserActionTool(name, **kwargs)
+    return CfgMgr.G4UA__iGeant4__PhysicsValidationUserActionTool(name, **kwargs)
 
 ## -----------------------------------------------------------------------------
 ### Base Version
@@ -111,4 +97,8 @@ def getLongLivedGeant4Tool(name="ISF_LongLivedGeant4Tool", **kwargs):
     kwargs.setdefault('InputConverter', 'ISF_LongLivedInputConverter')
     return getFullGeant4Tool(name, **kwargs)
 
+def getAFII_QS_Geant4Tool(name='AFII_QS_Geant4Tool', **kwargs):
+    kwargs.setdefault('InputConverter', 'ISF_LongLivedInputConverter')
+    return getAFII_Geant4Tool(name, **kwargs)
+
 ## -----------------------------------------------------------------------------

Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/python/ISF_Geant4ToolsConfigDb.py

-# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 
 from AthenaCommon.CfgGetter import addTool
 
 addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getMCTruthUserActionTool"              , "ISFMCTruthUserActionTool")
 
 addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getPhysicsValidationUserActionTool"              , "ISFG4PhysicsValidationUserActionTool")
-addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getG4OnlyPhysicsValidationUserActionTool"        , "G4OnlyPhysicsValidationUserActionTool")
-addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getAFII_G4PhysicsValidationUserActionTool"       , "AFII_G4PhysicsValidationUserActionTool")
-addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getQuasiStableG4PhysicsValidationUserActionTool" , "QuasiStableG4PhysicsValidationUserActionTool")
 
 addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getTrackProcessorUserActionTool"              , "ISFG4TrackProcessorUserActionTool")
 addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getFullG4TrackProcessorUserActionTool"        , "FullG4TrackProcessorUserActionTool")
@@ -19,3 +16,4 @@ addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getFullGeant4Tool",           "IS
 addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getLongLivedGeant4Tool",      "ISF_LongLivedGeant4Tool")
 addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getPassBackGeant4Tool",       "ISF_PassBackGeant4Tool")
 addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getAFIIGeant4Tool",           "ISF_AFIIGeant4Tool")
+addTool("ISF_Geant4Tools.ISF_Geant4ToolsConfig.getAFII_QS_Geant4Tool",       "AFII_QS_Geant4Tool")

Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 
@@ -14,7 +14,6 @@
 #include "ISF_Event/ISFParticle.h"
 #include "ISF_Event/ParticleClipboard.h"
 
-#include "ISF_Interfaces/IParticleBroker.h"
 #include "ISF_Interfaces/IParticleHelper.h"
 
 // ISF Geant4 includes
@@ -114,27 +113,11 @@ namespace G4UA{
 
     void PhysicsValidationUserAction::BeginOfRunAction(const G4Run*)
     {
-      
-      if (m_config.particleBroker.retrieve().isFailure()) {
-	ATH_MSG_FATAL("Could not retrieve ISF Particle Broker: " << m_config.particleBroker);
-	return;
-      }
-      
-      if (m_config.particleHelper.retrieve().isFailure()) {
-	ATH_MSG_FATAL("Could not retrieve " << m_config.particleHelper->name());
-	return;
-      }
-      
+
       if (m_config.geoIDSvc.retrieve().isFailure()) {
 	ATH_MSG_FATAL("Could not retrieve ISF GeoID Svc: " << m_config.geoIDSvc);
 	return;
       }
-      
-      if (m_config.UASvc.retrieve().isFailure()) {
-	ATH_MSG_FATAL("Could not retrieve UserActionSvc "<<m_config.UASvc);
-	return;
-      }
-
 
       m_geoIDSvcQuick = &(*m_config.geoIDSvc);
 
@@ -471,68 +454,61 @@ namespace G4UA{
       if ( nextGeoID == geoID) {
 	ATH_MSG_DEBUG("track stays inside "<<geoID);
       } else {
-	ATH_MSG_DEBUG("track moves from "<<geoID<<" to "<<nextGeoID);
-	
-	// Don't save if doing a zero step ?
-	//if (aStep->GetTrack()->GetTrackLength() == 0.) {
-	if (aStep->GetStepLength() == 0.) {
-	  return;
-	}
-	
-	// don't change geometry assignment for validation ntuple
-	m_geoID = geoID;
-	
-	//4ParticleDefinition* particleDefinition = track->GetDefinition();
-	
-	const G4ThreeVector g4pos = track->GetPosition();
-	//const double gTime = track->GetGlobalTime();
-	const HepGeom::Point3D<double> position(g4pos.x(),g4pos.y(),g4pos.z());
-	
-	G4ThreeVector g4mom = track->GetMomentum();
-	const HepGeom::Vector3D<double> momentum(g4mom.x(),g4mom.y(),g4mom.z());
-	
-	//double mass    = particleDefinition->GetPDGMass();
-	//double charge  = particleDefinition->GetPDGCharge();
-	//int    pdgID   = particleDefinition->GetPDGEncoding();
-	
-	if (m_config.particleBroker) {
-	  
-	  // *AS* why ask stackSvc for current(), shouldn't better the TransportTool keep track?
-	  bool dead=false;
-	  if (track->GetTrackStatus()==fStopAndKill) {
-	    dead=true;
-	  }
-	  
-	  if (!dead) {
-	    
-	    // track info
-	    //VTrackInformation * trackInfo= static_cast<VTrackInformation*>(track->GetUserInformation());
-	    m_scEnd = 0;
-	    m_dt = track->GetLocalTime();
-	    
-	    m_pth = track->GetVertexMomentumDirection().theta();
-	    m_pph = track->GetVertexMomentumDirection().phi();
-	    m_p   = track->GetVertexKineticEnergy();
-	    m_eloss = track->GetKineticEnergy()-m_p;
-	    
-	    m_thIn= track->GetVertexPosition().theta();
-	    m_phIn= track->GetVertexPosition().phi();
-	    m_dIn=  track->GetVertexPosition().mag();
-	    
-	    m_thEnd=postStep->GetPosition().theta();
-	    m_phEnd=postStep->GetPosition().phi();
-	    m_dEnd=postStep->GetPosition().mag();
-	    
-	    m_particles->Fill();
-	    m_X0 = 0.;
-	    m_L0 = 0.;
-	    m_wZ = 0.;
-	    m_radloss = 0.;
-	    m_ionloss = 0.;
-	    m_wzOaTr= 0.;
-	  }
-	  m_X0=0.;
-	}
+        ATH_MSG_DEBUG("track moves from "<<geoID<<" to "<<nextGeoID);
+
+        // Don't save if doing a zero step ?
+        //if (aStep->GetTrack()->GetTrackLength() == 0.) {
+        if (aStep->GetStepLength() == 0.) {
+          return;
+        }
+
+        // don't change geometry assignment for validation ntuple
+        m_geoID = geoID;
+
+        //4ParticleDefinition* particleDefinition = track->GetDefinition();
+
+        const G4ThreeVector g4pos = track->GetPosition();
+        //const double gTime = track->GetGlobalTime();
+        const HepGeom::Point3D<double> position(g4pos.x(),g4pos.y(),g4pos.z());
+
+        G4ThreeVector g4mom = track->GetMomentum();
+        const HepGeom::Vector3D<double> momentum(g4mom.x(),g4mom.y(),g4mom.z());
+
+        bool dead=false;
+        if (track->GetTrackStatus()==fStopAndKill) {
+          dead=true;
+        }
+
+        if (!dead) {
+
+          // track info
+          //VTrackInformation * trackInfo= static_cast<VTrackInformation*>(track->GetUserInformation());
+          m_scEnd = 0;
+          m_dt = track->GetLocalTime();
+
+          m_pth = track->GetVertexMomentumDirection().theta();
+          m_pph = track->GetVertexMomentumDirection().phi();
+          m_p   = track->GetVertexKineticEnergy();
+          m_eloss = track->GetKineticEnergy()-m_p;
+
+          m_thIn= track->GetVertexPosition().theta();
+          m_phIn= track->GetVertexPosition().phi();
+          m_dIn=  track->GetVertexPosition().mag();
+
+          m_thEnd=postStep->GetPosition().theta();
+          m_phEnd=postStep->GetPosition().phi();
+          m_dEnd=postStep->GetPosition().mag();
+
+          m_particles->Fill();
+          m_X0 = 0.;
+          m_L0 = 0.;
+          m_wZ = 0.;
+          m_radloss = 0.;
+          m_ionloss = 0.;
+          m_wzOaTr= 0.;
+        }
+        m_X0=0.;
+
       }
       
     }

Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserAction.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ISF_GEANT4TOOLS_PHYSICSVALIDATIONUSERACTION_H
@@ -7,10 +7,6 @@
 
 #include "AthenaBaseComps/AthAlgTool.h"
 
-#include "G4AtlasInterfaces/IUserActionSvc.h"
-
-#include "ISF_Interfaces/IParticleBroker.h"
-#include "ISF_Interfaces/IParticleHelper.h"
 #include "ISF_Interfaces/IGeoIDSvc.h"
 
 #include "GaudiKernel/ToolHandle.h"
@@ -26,11 +22,6 @@
 // ROOT forward declarations
 class TTree;
 
-namespace ISF {
-  class IParticleHelper;
-  class IParticleBroker;
-}
-
 #include "G4UserEventAction.hh"
 #include "G4UserRunAction.hh"
 #include "G4UserSteppingAction.hh"
@@ -47,27 +38,21 @@ namespace G4UA{
       struct Config
       {
         MSG::Level verboseLevel=MSG::INFO;
-	bool validationOutput = true;
-	std::string validationStream="ISFG4SimKernel";
-	ServiceHandle<ITHistSvc> thistSvc=ServiceHandle<ITHistSvc>("THistSvc", "PhysicsValidationUserAction");
-	ServiceHandle<ISF::IParticleBroker>  particleBroker=
-	  ServiceHandle<ISF::IParticleBroker>("ISF::ParticleBroker/ISF_ParticleStackService", "PhysicsValidationUserAction");
-	ToolHandle<ISF::IParticleHelper>     particleHelper=
-	  ToolHandle<ISF::IParticleHelper>("ISF::ParticleHelper/ISF_ParticleHelper");
-	ServiceHandle<ISF::IGeoIDSvc>        geoIDSvc=
-	  ServiceHandle<ISF::IGeoIDSvc>("ISF::GeoIDSvc/ISF_GeoIDSvc", "PhysicsValidationUserAction");  
-	
-	ServiceHandle<G4UA::IUserActionSvc>  UASvc=
-	  ServiceHandle<G4UA::IUserActionSvc>("G4UA::UserActionService","PhysicsValidationUserAction");
-	double idR=1150.-1.e-5;
-	double idZ=3490.;
-	double caloRmean=0.5*(40.+4250.);
-	double caloZmean=0.5*(3490.+6740.);
-	double muonRmean=0.5*(60.+30000.);
-	double muonZmean=0.5*(6740.+30000.);
-	double cavernRmean=300000.0;
-	double cavernZmean=300000.0;
-	
+        bool validationOutput = true;
+        std::string validationStream="ISFG4SimKernel";
+        ServiceHandle<ITHistSvc> thistSvc=ServiceHandle<ITHistSvc>("THistSvc", "PhysicsValidationUserAction");
+        ServiceHandle<ISF::IGeoIDSvc>        geoIDSvc=
+          ServiceHandle<ISF::IGeoIDSvc>("ISF::GeoIDSvc/ISF_GeoIDSvc", "PhysicsValidationUserAction");
+
+        double idR=1150.-1.e-5;
+        double idZ=3490.;
+        double caloRmean=0.5*(40.+4250.);
+        double caloZmean=0.5*(3490.+6740.);
+        double muonRmean=0.5*(60.+30000.);
+        double muonZmean=0.5*(6740.+30000.);
+        double cavernRmean=300000.0;
+        double cavernZmean=300000.0;
+
       };
 
       PhysicsValidationUserAction(const Config& config);

Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserActionTool.cxx

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
-#include "CxxUtils/make_unique.h"
 #include "PhysicsValidationUserActionTool.h"
 
 namespace G4UA
@@ -17,19 +16,16 @@ namespace G4UA
                                     const IInterface* parent)
       : UserActionToolBase<PhysicsValidationUserAction>(type, name, parent)
     {
-      declareProperty( "ValidationOutput",
-		       m_config.validationOutput,
-		       "If turned on, write out a ROOT tree.");
+      declareProperty("ValidationOutput",
+                      m_config.validationOutput,
+                      "If turned on, write out a ROOT tree.");
       declareProperty("ValidationStreamName",
-		      m_config.validationStream,
-		      "Name of the output stream" );
+                      m_config.validationStream,
+                      "Name of the output stream");
       declareProperty("THistService",
-		      m_config.thistSvc,
-		      "The THistSvc" );
-      declareProperty("ParticleBroker", m_config.particleBroker, "ISF Particle Broker Svc");
-      declareProperty("ParticleHelper", m_config.particleHelper, "ISF Particle Helper"    );
+                      m_config.thistSvc,
+                      "The THistSvc");
       declareProperty("GeoIDSvc"      , m_config.geoIDSvc      , "ISF GeoID Svc"          );
-      declareProperty("UserActionSvc",m_config.UASvc);
       declareProperty("ID_Rmax",m_config.idR);
       declareProperty("ID_Zmax",m_config.idZ);
       declareProperty("CaloRmean",m_config.caloRmean);

Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/PhysicsValidationUserActionTool.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ISF_GEANT4TOOLS_G4UA__PHYSICSVALIATIONUSERACTIONTOOL_H

Simulation/ISF/ISF_Geant4/ISF_Geant4Tools/src/TrackProcessorUserActionPassBack.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef ISF_GEANT4TOOLS_TRACKPROCESSORUSERACTIONPASSBACK_H
@@ -11,6 +11,7 @@
 #include "GaudiKernel/ServiceHandle.h"
 
 #include "ISF_Interfaces/IGeoIDSvc.h"
+#include "ISF_Interfaces/IParticleBroker.h"
 
 #include <string>
 
@@ -21,7 +22,6 @@ class G4LogicalVolume;
 
 namespace ISF {
   class ISFParticle;
-  class IParticleBroker;
   class ITruthBinding;
 }
 

Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfig.py

@@ -38,6 +38,10 @@ def getDefaultLongLivedGeant4Selector(name="ISF_DefaultLongLivedGeant4Selector",
     kwargs.setdefault("Simulator"   , 'ISF_LongLivedGeant4SimSvc')
     return getDefaultGeant4Selector(name, **kwargs )
 
+def getDefaultAFII_QS_Geant4Selector(name="ISF_DefaultAFII_QS_Geant4Selector", **kwargs):
+    kwargs.setdefault("Simulator"   , 'ISF_AFII_QS_Geant4SimSvc')
+    return getDefaultGeant4Selector(name, **kwargs )
+
 def getFullGeant4Selector(name="ISF_FullGeant4Selector", **kwargs):
     kwargs.setdefault("Simulator"   , 'ISF_FullGeant4SimSvc')
     kwargs.setdefault('SimulationFlavor', SimulationFlavor.Geant4)
@@ -151,6 +155,10 @@ def getMuonAFIIGeant4Selector(name="ISF_MuonAFIIGeant4Selector", **kwargs):
     kwargs.setdefault('SimulationFlavor', SimulationFlavor.Geant4)
     return getMuonGeant4Selector(name, **kwargs)
 
+def getMuonAFII_QS_Geant4Selector(name="ISF_MuonAFII_QS_Geant4Selector", **kwargs):
+    kwargs.setdefault('Simulator'       , 'ISF_AFII_QS_Geant4SimSvc')
+    return getMuonGeant4Selector(name, **kwargs)
+
 def getMuonFatrasSelector(name="ISF_MuonFatrasSelector", **kwargs):
     kwargs.setdefault('Simulator'       , 'ISF_FatrasSimSvc')
     kwargs.setdefault('SimulationFlavor', SimulationFlavor.Fatras)

Simulation/ISF/ISF_SimulationSelectors/python/ISF_SimulationSelectorsConfigDb.py

@@ -10,6 +10,7 @@ addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getElectronGeant4
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getNeutralGeant4Selector"                , "ISF_NeutralGeant4Selector"               )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getMuonGeant4Selector"                   , "ISF_MuonGeant4Selector"                  )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getMuonAFIIGeant4Selector"               , "ISF_MuonAFIIGeant4Selector"              )
+addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getMuonAFII_QS_Geant4Selector"           , "ISF_MuonAFII_QS_Geant4Selector"          )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getMuonFatrasSelector"                   , "ISF_MuonFatrasSelector"                  )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getMuonFatrasPileupSelector"             , "ISF_MuonFatrasPileupSelector"            )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getPhotonConeFatrasSelector"             , "ISF_PhotonConeFatrasSelector"            )
@@ -45,6 +46,7 @@ addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getPileupParticle
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getDefaultGeant4Selector"                , "ISF_DefaultGeant4Selector"               )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getDefaultAFIIGeant4Selector"            , "ISF_DefaultAFIIGeant4Selector"           )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getDefaultLongLivedGeant4Selector"       , "ISF_DefaultLongLivedGeant4Selector"      )
+addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getDefaultAFII_QS_Geant4Selector"        , "ISF_DefaultAFII_QS_Geant4Selector"       )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getFullGeant4Selector"                   , "ISF_FullGeant4Selector"                  )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getPassBackGeant4Selector"               , "ISF_PassBackGeant4Selector"              )
 addTool("ISF_SimulationSelectors.ISF_SimulationSelectorsConfig.getFatrasPileupSelector"                 , "ISF_FatrasPileupSelector"                )