Skip to content
Snippets Groups Projects
Commit 7284efe8 authored by Simon Viel's avatar Simon Viel Committed by Graeme Stewart
Browse files

Consistently import AppMgr modules for all SLHC layouts (InDetSLHC_Example-00-01-97)

        * Consistently import AppMgr modules for all SLHC layouts
        * Should have no impact on the output
        * Tagging as InDetSLHC_Example-00-01-97

2016-04-25 Simon Viel
        * Can run digitization + reconstruction with AthenaMP at mu = 0
        * Does not work yet with mu > 0  (but works without AthenaMP)
        * Same as InDetSLHC_Example-00-01-95-01
        * Tagging as InDetSLHC_Example-00-01-96
parent 1bf25e52
No related merge requests found
Showing
with 109 additions and 38 deletions
......@@ -59,9 +59,12 @@ class SLHC_Setup :
else:
print 'SLHC_Setup: Geometry coming fully from database'
# Alignments have to disabled for Pixels
pixelTool = svcMgr.GeoModelSvc.DetectorTools['PixelDetectorTool']
pixelTool.Alignable = False
# Alignments have to be disabled for Pixels, but only if they are included
try:
pixelTool = svcMgr.GeoModelSvc.DetectorTools['PixelDetectorTool']
pixelTool.Alignable = False
except IndexError:
print " SLHC_Setup.py: Warning: Cannot turn off pixel alignment (perhaps because pixels are not included?)"
def search_file(self,filename, search_path):
......
......@@ -33,6 +33,9 @@ class SLHC_Setup :
# constructor requires the SLHC_Flags
def __init__(self):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaCommon.AppMgr import ToolSvc as toolSvc
# Only use local text file and dictionary if SLHC_Version set
if (SLHC_Flags.SLHC_Version() and not (SLHC_Flags.SLHC_Version() == 'None')) :
......@@ -55,7 +58,6 @@ class SLHC_Setup :
database_full_path_name = database_file_path+'/'+database_file
# Pass text file name to GeometryDBSvc
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
if not hasattr(svcMgr,'InDetGeometryDBSvc'):
from GeometryDBSvc.GeometryDBSvcConf import GeometryDBSvc
svcMgr+=GeometryDBSvc("InDetGeometryDBSvc")
......@@ -90,9 +92,6 @@ class SLHC_Setup :
os.environ[envName]=fileName
print "ENV ",envName," ",fileName
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaCommon.AppMgr import ToolSvc as toolSvc
print "******************************************************************************************"
print "PixelGeoModel - import module and design tools"
# Service used to build module geometry
......
......@@ -5,7 +5,7 @@
"""
__author__ = "A. Salzburger"
__version__= "$Revision: 739838 $"
__version__= "$Revision: 745350 $"
__doc__ = "SLHC_PathSetting"
__all__ = [ "SLHC_PathSetting" ]
......@@ -33,6 +33,9 @@ class SLHC_Setup :
# constructor requires the SLHC_Flags
def __init__(self):
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaCommon.AppMgr import ToolSvc as toolSvc
# Only use local text file and dictionary if SLHC_Version set
if (SLHC_Flags.SLHC_Version() and not (SLHC_Flags.SLHC_Version() == 'None')) :
......@@ -55,7 +58,6 @@ class SLHC_Setup :
database_full_path_name = database_file_path+'/'+database_file
# Pass text file name to GeometryDBSvc
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
if not hasattr(svcMgr,'InDetGeometryDBSvc'):
from GeometryDBSvc.GeometryDBSvcConf import GeometryDBSvc
svcMgr+=GeometryDBSvc("InDetGeometryDBSvc")
......@@ -90,9 +92,6 @@ class SLHC_Setup :
os.environ[envName]=fileName
print "ENV ",envName," ",fileName
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from AthenaCommon.AppMgr import ToolSvc as toolSvc
print "******************************************************************************************"
print "PixelGeoModel - import module and design tools"
# Service used to build module geometry
......
......@@ -6,6 +6,8 @@
from InDetSLHC_Example.SLHC_Setup_Alpine import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
......
......@@ -6,6 +6,8 @@
from InDetSLHC_Example.SLHC_Setup_Alpine_VF import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
......
......@@ -6,8 +6,9 @@
from InDetSLHC_Example.SLHC_Setup_ExtBrl_32 import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
from AthenaCommon.AppMgr import ServiceMgr
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
from AthenaCommon.DetFlags import DetFlags
......@@ -42,6 +43,8 @@ if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsDeltaSize = True
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsL01hit = True
ToolSvc.InDetSpSeedsMakerSLHC.NsigmaClusSizeZcut = 4.0
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsPixHole = False
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsSctHole = False
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.usePixelClusterCleanUp = True
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.usePixelClusterCleanUpSizePhicutsB = True
......@@ -53,3 +56,5 @@ if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsDeltaSize = True
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsL01hit = True
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.NsigmaClusSizeZcut = 4.0
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsPixHole = False
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsSctHole = False
......@@ -6,8 +6,9 @@
from InDetSLHC_Example.SLHC_Setup_ExtBrl_4 import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
from AthenaCommon.AppMgr import ServiceMgr
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
from AthenaCommon.DetFlags import DetFlags
......@@ -42,6 +43,8 @@ if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsDeltaSize = True
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsL01hit = True
ToolSvc.InDetSpSeedsMakerSLHC.NsigmaClusSizeZcut = 4.0
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsPixHole = False
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsSctHole = False
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.usePixelClusterCleanUp = True
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.usePixelClusterCleanUpSizePhicutsB = True
......@@ -53,4 +56,5 @@ if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsDeltaSize = True
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsL01hit = True
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.NsigmaClusSizeZcut = 4.0
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsPixHole = False
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsSctHole = False
......@@ -6,8 +6,9 @@
from InDetSLHC_Example.SLHC_Setup_ExtBrl_4_25x100 import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
from AthenaCommon.AppMgr import ServiceMgr
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
from AthenaCommon.DetFlags import DetFlags
......@@ -42,6 +43,8 @@ if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsDeltaSize = True
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsL01hit = True
ToolSvc.InDetSpSeedsMakerSLHC.NsigmaClusSizeZcut = 4.0
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsPixHole = False
ToolSvc.InDetSpSeedsMakerSLHC.useITKseedCutsSctHole = False
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.usePixelClusterCleanUp = True
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.usePixelClusterCleanUpSizePhicutsB = True
......@@ -53,4 +56,5 @@ if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsDeltaSize = True
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsL01hit = True
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.NsigmaClusSizeZcut = 4.0
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsPixHole = False
ToolSvc.InDetSpSeedsMakerVeryForwardSLHCTracks.useITKseedCutsSctHole = False
......@@ -6,6 +6,8 @@
from InDetSLHC_Example.SLHC_Setup_IExtBrl_4 import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
......
......@@ -6,6 +6,8 @@
from InDetSLHC_Example.SLHC_Setup_InclBrl_4 import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
......
......@@ -6,6 +6,8 @@
from InDetSLHC_Example.SLHC_Setup_InclBrl_4_25x100 import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
......
#--------------------------------------------------------------
# SLHC setup
#--------------------------------------------------------------
# set the path variables consistently
from InDetSLHC_Example.SLHC_Setup_LoI import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
......
#--------------------------------------------------------------
# SLHC setup
#--------------------------------------------------------------
# set the path variables consistently
from InDetSLHC_Example.SLHC_Setup_LoI_ECRing import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
......
#--------------------------------------------------------------
# SLHC setup
#--------------------------------------------------------------
# set the path variables consistently
from InDetSLHC_Example.SLHC_Setup_LoI_VF import SLHC_Setup
SLHC_Setup = SLHC_Setup()
from AthenaCommon.AppMgr import ServiceMgr
if rec.OutputFileNameForRecoStep() == 'RAWtoESD' or rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
ServiceMgr.PixelOfflineCalibSvc.HDCFromCOOL = False
......
......@@ -3,6 +3,9 @@ DetFlags.ID_setOn()
DetFlags.TRT_setOff()
DetFlags.detdescr.TRT_setOff()
DetFlags.makeRIO.TRT_setOff()
DetFlags.BCM_setOff()
DetFlags.detdescr.BCM_setOff()
DetFlags.makeRIO.BCM_setOff()
DetFlags.DBM_setOff()
DetFlags.detdescr.DBM_setOff()
DetFlags.makeRIO.DBM_setOff()
......
......@@ -12,6 +12,8 @@ rec.doTrigger=False # Otherwise, you will get "Py:TriggerMenu.menu.GenerateMenu
from AthenaCommon.DetFlags import DetFlags
DetFlags.BField_setOn()
DetFlags.pileup.all_setOff()
from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
TrkDetFlags.SLHC_Geometry=True
......@@ -48,21 +50,30 @@ InDetFlags.doSGDeletion=False # This should be False.
InDetFlags.doPixelClusterSplitting=False # This should be False.
InDetFlags.doLowBetaFinder=False # This should be False.
if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
InDetFlags.writeRDOs=True
InDetFlags.doSLHCVeryForward=True
# InDetFlags.doStandardPlots=True
# InDetFlags.doPrintConfigurables = True
if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
InDetFlags.writeRDOs = True
InDetFlags.doSLHCVeryForward = True
InDetFlags.doPseudoTracking = True
# if rec.OutputFileNameForRecoStep() == 'ESDtoAOD':
# InDetFlags.doNewTracking=False
# InDetFlags.doVertexFinding=False
# InDetFlags.doPRDFormation=False
# InDetFlags.doParticleCreation=False
# InDetFlags.disableInDetReco.set_Value_and_Lock(False)
# InDetFlags.disableInDetReco=False
# InDetFlags.doStatistics=False
# InDetFlags.disableTracking=False
# InDetFlags.doForwardTracks=False
# InDetFlags.doSGDeletion=True
# InDetFlags.doPrintConfigurables.set_Value_and_Lock(True)
if rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
rec.doDPD = True
from InDetPrepRawDataToxAOD.InDetDxAODJobProperties import InDetDxAODFlags
InDetDxAODFlags.DumpUnassociatedHits = False
InDetDxAODFlags.DumpPixelInfo = True
InDetDxAODFlags.DumpPixelRdoInfo = True
InDetDxAODFlags.DumpSctInfo = True
InDetDxAODFlags.DumpSctRdoInfo = True
include("InDetSLHC_Example/preInclude.SLHC.NoTRT_NoDBM.Reco.py")
include("InDetSLHC_Example/preInclude.SLHC.NoTRT_NoBCM_NoDBM.Reco.py")
DetFlags.all_setOff()
DetFlags.dcs.all_setOn()
DetFlags.detdescr.all_setOn()
DetFlags.TRT_setOff()
DetFlags.BCM_setOff()
DetFlags.DBM_setOff()
DetFlags.BField_setOn()
include("InDetSLHC_Example/preInclude.SLHC.py")
include("InDetSLHC_Example/preInclude.NoTRT_NoDBM.py")
include("InDetSLHC_Example/preInclude.NoTRT_NoBCM_NoDBM.py")
### Temporally disabled to avoid a crash or an ERROR message (start) ###
### Checked with devval rel_6 as of 2014-12-07
......@@ -12,6 +12,8 @@ rec.doTrigger=False # Otherwise, you will get "Py:TriggerMenu.menu.GenerateMenu
from AthenaCommon.DetFlags import DetFlags
DetFlags.BField_setOn()
DetFlags.pileup.all_setOff()
from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
TrkDetFlags.SLHC_Geometry=True
......@@ -48,21 +50,30 @@ InDetFlags.doSGDeletion=False # This should be False.
InDetFlags.doPixelClusterSplitting=False # This should be False.
InDetFlags.doLowBetaFinder=False # This should be False.
if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
InDetFlags.writeRDOs=True
InDetFlags.doSLHCVeryForward=True
# InDetFlags.doStandardPlots=True
# InDetFlags.doPrintConfigurables = True
if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
InDetFlags.writeRDOs = True
InDetFlags.doSLHCVeryForward = True
InDetFlags.doPseudoTracking = True
# if rec.OutputFileNameForRecoStep() == 'ESDtoAOD':
# InDetFlags.doNewTracking=False
# InDetFlags.doVertexFinding=False
# InDetFlags.doPRDFormation=False
# InDetFlags.doParticleCreation=False
# InDetFlags.disableInDetReco.set_Value_and_Lock(False)
# InDetFlags.disableInDetReco=False
# InDetFlags.doStatistics=False
# InDetFlags.disableTracking=False
# InDetFlags.doForwardTracks=False
# InDetFlags.doSGDeletion=True
# InDetFlags.doPrintConfigurables.set_Value_and_Lock(True)
if rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
rec.doDPD = True
from InDetPrepRawDataToxAOD.InDetDxAODJobProperties import InDetDxAODFlags
InDetDxAODFlags.DumpUnassociatedHits = False
InDetDxAODFlags.DumpPixelInfo = True
InDetDxAODFlags.DumpPixelRdoInfo = True
InDetDxAODFlags.DumpSctInfo = True
InDetDxAODFlags.DumpSctRdoInfo = True
......@@ -7,10 +7,12 @@ rec.doJetMissingETTag=False
rec.doMuonCombined=False
rec.doEgamma=False
## Magnet is on
# Magnet is on
from AthenaCommon.DetFlags import DetFlags
DetFlags.BField_setOn()
DetFlags.pileup.all_setOff()
from TrkDetDescrSvc.TrkDetDescrJobProperties import TrkDetFlags
TrkDetFlags.SLHC_Geometry=True
......@@ -47,21 +49,30 @@ InDetFlags.doSGDeletion=False # This should be False.
InDetFlags.doPixelClusterSplitting=False # This should be False.
InDetFlags.doLowBetaFinder=False # This should be False.
if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
InDetFlags.writeRDOs=True
InDetFlags.doSLHCVeryForward=True
# InDetFlags.doStandardPlots=True
# InDetFlags.doPrintConfigurables = True
if rec.OutputFileNameForRecoStep() == 'RAWtoESD':
InDetFlags.writeRDOs = True
InDetFlags.doSLHCVeryForward = True
InDetFlags.doPseudoTracking = True
# if rec.OutputFileNameForRecoStep() == 'ESDtoAOD':
# InDetFlags.doNewTracking=False
# InDetFlags.doVertexFinding=False
# InDetFlags.doPRDFormation=False
# InDetFlags.doParticleCreation=False
# InDetFlags.disableInDetReco.set_Value_and_Lock(False)
# InDetFlags.disableInDetReco=False
# InDetFlags.doStatistics=False
# InDetFlags.disableTracking=False
# InDetFlags.doForwardTracks=False
# InDetFlags.doSGDeletion=True
# InDetFlags.doPrintConfigurables.set_Value_and_Lock(True)
if rec.OutputFileNameForRecoStep() == 'ESDtoDPD':
rec.doDPD = True
from InDetPrepRawDataToxAOD.InDetDxAODJobProperties import InDetDxAODFlags
InDetDxAODFlags.DumpUnassociatedHits = False
InDetDxAODFlags.DumpPixelInfo = True
InDetDxAODFlags.DumpPixelRdoInfo = True
InDetDxAODFlags.DumpSctInfo = True
InDetDxAODFlags.DumpSctRdoInfo = True
#--------------------------------------------------------------
# SLHC setup
#--------------------------------------------------------------
# set the path variables consistently
from InDetSLHC_Example.SLHC_Setup_LoI import SLHC_Setup_XMLReader
SLHC_Setup_XMLReader = SLHC_Setup_XMLReader()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment