Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions StandardConfig/production/ILDReconstruction.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,38 @@
action="store_true",
)

parser.add_argument(
Comment thread
armin-ilg marked this conversation as resolved.
"--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"""
Expand Down Expand Up @@ -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,
},
)

Expand Down
12 changes: 6 additions & 6 deletions StandardConfig/production/Tracking/TrackingDigi_FCCeeMDI.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,23 @@
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],
Comment thread
armin-ilg marked this conversation as resolved.
"SimTrackHitCollectionName": ["VertexBarrelCollection"],
"SimTrkHitRelCollection": ["VertexBarrelTrackerHitRelations"],
"SubDetectorName": ["VertexBarrel"],
"SubDetectorName": ["Vertex"],
"TrackerHitCollectionName": ["VertexBarrelTrackerHits"],
}

VertexEndcapDigitiser = MarlinProcessorWrapper("VertexEndcapDigitiser")
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"],
}

Expand Down
40 changes: 21 additions & 19 deletions StandardConfig/production/Tracking/TrackingReco_FCCeeMDI.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -35,7 +35,9 @@
"TrackIsCurlerOmega": ["0.001"],
"TrackStartsInnerDist": ["25"],
"TrackSystemName": ["DDKalTest"],
"VXDHitCollection": ["VertexBarrelTrackerHits"],
"VXDHitCollection": VertexBarrelHitCollectionNames,
"VXDDetectorName": ["Vertex"],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't realized this before, but this has no effect as the next line overwrites the same property with "VertexBarrel" again.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, this must have been introduced somewhere along the way, I'll fix it.

"VXDDetectorName": ["VertexBarrel"],
"pickUpSiHits": ["false"],
}
Expand Down Expand Up @@ -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,
Expand All @@ -90,8 +92,8 @@
"flags": ["HighPTFit", "VertexToTracker"],
"functions": ["CombineCollections", "BuildNewTracks"],
},
"VertexEncap": {
"collections": VertexEndcapHitCollectionNames,
"Vertex": {
"collections": ["VertexEndcapTrackerHits"],
"params": {
"MaxCellAngle": 0.01,
"MaxCellAngleRZ": 0.01,
Expand Down Expand Up @@ -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"],
},
Comment thread
armin-ilg marked this conversation as resolved.
"Tracker": {
"collections": ["InnerTrackerBarrelHits", "InnerTrackerEndcapHits"],
"params": {
Expand Down
Loading