diff --git a/StandardConfig/production/ILDReconstruction.py b/StandardConfig/production/ILDReconstruction.py index 161e7ba1..bf909c88 100644 --- a/StandardConfig/production/ILDReconstruction.py +++ b/StandardConfig/production/ILDReconstruction.py @@ -168,6 +168,38 @@ action="store_true", ) +parser.add_argument( + "--VXDBarrelDigitiserResolutionU", + action="store", + default=["0.003"], + help="Resolution in U direction for VXD Barrel digitisation. Only used for FCC models", + nargs="+", +) + +parser.add_argument( + "--VXDBarrelDigitiserResolutionV", + action="store", + default=["0.003"], + help="Resolution in V direction for VXD Barrel digitisation. Only used for FCC models", + nargs="+", +) + +parser.add_argument( + "--VXDEndcapDigitiserResolutionU", + action="store", + default=["0.003"], + help="Resolution in U direction for VXD Endcap digitisation. Only used for FCC models", + nargs="+", +) + +parser.add_argument( + "--VXDEndcapDigitiserResolutionV", + action="store", + default=["0.003"], + help="Resolution in V direction for VXD Endcap digitisation. Only used for FCC models", + nargs="+", +) + def get_compact_file_path(detector_model: str): """returns the compact file path to a specified detector model starting with the path stored in the 'K4GEO' environment variable""" @@ -245,6 +277,10 @@ def get_cms_energy_config( "cms_energy_config": cms_energy_config, "using_particle_gun": reco_args.usingParticleGun, "track_merging": reco_args.trackMerge, + "VXDBarrelDigitiserResolutionU": reco_args.VXDBarrelDigitiserResolutionU, + "VXDBarrelDigitiserResolutionV": reco_args.VXDBarrelDigitiserResolutionV, + "VXDEndcapDigitiserResolutionU": reco_args.VXDEndcapDigitiserResolutionU, + "VXDEndcapDigitiserResolutionV": reco_args.VXDEndcapDigitiserResolutionV, }, ) diff --git a/StandardConfig/production/Tracking/TrackingDigi_FCCeeMDI.py b/StandardConfig/production/Tracking/TrackingDigi_FCCeeMDI.py index 5403ff64..f39ab4db 100644 --- a/StandardConfig/production/Tracking/TrackingDigi_FCCeeMDI.py +++ b/StandardConfig/production/Tracking/TrackingDigi_FCCeeMDI.py @@ -10,11 +10,11 @@ VertexBarrelDigitiser.ProcessorType = "DDPlanarDigiProcessor" VertexBarrelDigitiser.Parameters = { "IsStrip": ["false"], - "ResolutionU": ["0.003", "0.003", "0.003", "0.003", "0.003", "0.003"], - "ResolutionV": ["0.003", "0.003", "0.003", "0.003", "0.003", "0.003"], + "ResolutionU": [str(x) for x in VXDBarrelDigitiserResolutionU], + "ResolutionV": [str(x) for x in VXDBarrelDigitiserResolutionV], "SimTrackHitCollectionName": ["VertexBarrelCollection"], "SimTrkHitRelCollection": ["VertexBarrelTrackerHitRelations"], - "SubDetectorName": ["VertexBarrel"], + "SubDetectorName": ["Vertex"], "TrackerHitCollectionName": ["VertexBarrelTrackerHits"], } @@ -22,11 +22,11 @@ VertexEndcapDigitiser.ProcessorType = "DDPlanarDigiProcessor" VertexEndcapDigitiser.Parameters = { "IsStrip": ["false"], - "ResolutionU": ["0.003", "0.003", "0.003", "0.003", "0.003", "0.003"], - "ResolutionV": ["0.003", "0.003", "0.003", "0.003", "0.003", "0.003"], + "ResolutionU": [str(x) for x in VXDEndcapDigitiserResolutionU], + "ResolutionV": [str(x) for x in VXDEndcapDigitiserResolutionV], "SimTrackHitCollectionName": ["VertexEndcapCollection"], "SimTrkHitRelCollection": ["VertexEndcapTrackerHitRelations"], - "SubDetectorName": ["VertexEndcap"], + "SubDetectorName": ["Vertex"], "TrackerHitCollectionName": ["VertexEndcapTrackerHits"], } diff --git a/StandardConfig/production/Tracking/TrackingReco_FCCeeMDI.py b/StandardConfig/production/Tracking/TrackingReco_FCCeeMDI.py index 80ee6faf..e94b9891 100644 --- a/StandardConfig/production/Tracking/TrackingReco_FCCeeMDI.py +++ b/StandardConfig/production/Tracking/TrackingReco_FCCeeMDI.py @@ -3,7 +3,7 @@ from Configurables import MarlinProcessorWrapper from py_utils import encode_CT_steps_dict_to_legacy_list -CT_MAX_DIST = "0.03" # RANDOM VALUE COPYIED FROM CLDRECO +CT_MAX_DIST = "0.05" # COPYIED FROM CLDRECO, valid for vertex detector with first layer close to IP (like in CLD_o2) MCPartColName = ["MCParticle"] # MCParticleCollectionName VertexBarrelHitCollectionNames = ["VertexBarrelTrackerHits"] VertexEndcapHitCollectionNames = ["VertexEndcapTrackerHits"] @@ -35,7 +35,9 @@ "TrackIsCurlerOmega": ["0.001"], "TrackStartsInnerDist": ["25"], "TrackSystemName": ["DDKalTest"], + "VXDHitCollection": ["VertexBarrelTrackerHits"], "VXDHitCollection": VertexBarrelHitCollectionNames, + "VXDDetectorName": ["Vertex"], "VXDDetectorName": ["VertexBarrel"], "pickUpSiHits": ["false"], } @@ -76,8 +78,8 @@ MyConformalTracking.ProcessorType = "ConformalTrackingV2" conformal_tracking_steps_config = { # Based on CLD's Reconstruction in CLDConfig - "VertexBarrel": { - "collections": VertexBarrelHitCollectionNames, + "Vertex": { + "collections": ["VertexBarrelTrackerHits"], "params": { "MaxCellAngle": 0.01, "MaxCellAngleRZ": 0.01, @@ -90,8 +92,8 @@ "flags": ["HighPTFit", "VertexToTracker"], "functions": ["CombineCollections", "BuildNewTracks"], }, - "VertexEncap": { - "collections": VertexEndcapHitCollectionNames, + "Vertex": { + "collections": ["VertexEndcapTrackerHits"], "params": { "MaxCellAngle": 0.01, "MaxCellAngleRZ": 0.01, @@ -122,20 +124,20 @@ "flags": ["HighPTFit", "VertexToTracker", "RadialSearch"], "functions": ["CombineCollections", "BuildNewTracks"], }, - # "LowerCellAngle2": { - # "collections": "", - # "params": { - # "MaxCellAngle": 0.1, - # "MaxCellAngleRZ": 0.1, - # "Chi2Cut": 2000, - # "MinClustersOnTrack": 4, - # "MaxDistance": CT_MAX_DIST, - # "SlopeZRange": 10.0, - # "HighPTCut": 10.0, - # }, - # "flags": ["HighPTFit", "VertexToTracker", "RadialSearch"], - # "functions": ["BuildNewTracks","SortTracks"], - # }, + "LowerCellAngle2": { + "collections": [""], + "params": { + "MaxCellAngle": 0.1, + "MaxCellAngleRZ": 0.1, + "Chi2Cut": 2000, + "MinClustersOnTrack": 4, + "MaxDistance": CT_MAX_DIST, + "SlopeZRange": 10.0, + "HighPTCut": 10.0, + }, + "flags": ["HighPTFit", "VertexToTracker", "RadialSearch"], + "functions": ["BuildNewTracks", "SortTracks"], + }, "Tracker": { "collections": ["InnerTrackerBarrelHits", "InnerTrackerEndcapHits"], "params": {