From 22e46524f80139cc92fcf2c892d36729e8e80d3c Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Wed, 18 Dec 2024 11:49:00 +0100 Subject: [PATCH 01/22] Use VTXDigitizer from k4RecTracker instead of Marlin digitizer for vertex detector and tracking system --- CLDConfig/Tracking/ConformalTracking.py | 35 ++++-- CLDConfig/Tracking/TrackingDigi.py | 158 ++++++++++++------------ 2 files changed, 104 insertions(+), 89 deletions(-) diff --git a/CLDConfig/Tracking/ConformalTracking.py b/CLDConfig/Tracking/ConformalTracking.py index b712f7a..19531d7 100644 --- a/CLDConfig/Tracking/ConformalTracking.py +++ b/CLDConfig/Tracking/ConformalTracking.py @@ -16,8 +16,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from Gaudi.Configuration import WARNING +from Gaudi.Configuration import INFO, WARNING, DEBUG from Configurables import MarlinProcessorWrapper +from Configurables import ToolSvc, Lcio2EDM4hepTool, EDM4hep2LcioTool # geoservice comes from the `global_vars` of the SequenceLoader @@ -38,24 +39,24 @@ "MCParticleCollectionName": ["MCParticle"], "MaxHitInvertedFit": ["0"], "MinClustersOnTrackAfterFit": ["3"], - "RelationsNames": ["VXDTrackerHitRelations", "VXDEndcapTrackerHitRelations", "InnerTrackerBarrelHitsRelations", "OuterTrackerBarrelHitsRelations", "InnerTrackerEndcapHitsRelations", "OuterTrackerEndcapHitsRelations"], + "RelationsNames": ["VTXTrackerBarrelHitsRelations", "VTXTrackerEndcapHitsRelations", "InnerTrackerBarrelHitsRelations", "OuterTrackerBarrelHitsRelations", "InnerTrackerEndcapHitsRelations", "OuterTrackerEndcapHitsRelations"], "RetryTooManyTracks": ["false"], "SiTrackCollectionName": ["SiTracksCT"], "SortTreeResults": ["true"], "Steps": [ - "[VXDBarrel]", - "@Collections", ":", "VXDTrackerHits", + "[VTXTrackerBarrel]", + "@Collections", ":", "VTXTrackerBarrelHits", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", "@Functions", ":", "CombineCollections,", "BuildNewTracks", - "[VXDEncap]", - "@Collections", ":", "VXDEndcapTrackerHits", + "[VTXTrackerEndcap]", + "@Collections", ":", "VTXTrackerEndcapHits", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", "@Functions", ":", "CombineCollections,", "ExtendTracks", "[LowerCellAngle1]", - "@Collections", ":", "VXDTrackerHits,", "VXDEndcapTrackerHits", + "@Collections", ":", "VTXTrackerBarrelHits,", "VTXTrackerEndcapHits", "@Parameters", ":", "MaxCellAngle", ":", "0.05;", "MaxCellAngleRZ", ":", "0.05;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "CombineCollections,", "BuildNewTracks", @@ -65,21 +66,35 @@ "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "BuildNewTracks,", "SortTracks", "[Tracker]", - "@Collections", ":", "ITrackerHits,", "OTrackerHits,", "ITrackerEndcapHits,", "OTrackerEndcapHits", + "@Collections", ":", "InnerTrackerBarrelHits,", "OuterTrackerBarrelHits,", "InnerTrackerEndcapHits,", "OuterTrackerEndcapHits", "@Parameters", ":", "MaxCellAngle", ":", "0.1;", "MaxCellAngleRZ", ":", "0.1;", "Chi2Cut", ":", "2000;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "1.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "CombineCollections,", "ExtendTracks", "[Displaced]", - "@Collections", ":", "VXDTrackerHits,", "VXDEndcapTrackerHits,", "ITrackerHits,", "OTrackerHits,", "ITrackerEndcapHits,", "OTrackerEndcapHits", + "@Collections", ":", "VTXTrackerBarrelHits,", "VTXTrackerEndcapHits,", "InnerTrackerBarrelHits,", "OuterTrackerBarrelHits,", "InnerTrackerEndcapHits,", "OuterTrackerEndcapHits", "@Parameters", ":", "MaxCellAngle", ":", "0.1;", "MaxCellAngleRZ", ":", "0.1;", "Chi2Cut", ":", "1000;", "MinClustersOnTrack", ":", "5;", "MaxDistance", ":", "0.015;", "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "OnlyZSchi2cut,", "RadialSearch", "@Functions", ":", "CombineCollections,", "BuildNewTracks" ], "ThetaRange": ["0.05"], "TooManyTracks": ["100000"], - "TrackerHitCollectionNames": ["VXDTrackerHits", "VXDEndcapTrackerHits", "ITrackerHits", "OTrackerHits", "ITrackerEndcapHits", "OTrackerEndcapHits"], + "TrackerHitCollectionNames": ["VTXTrackerBarrelHits", "VTXTrackerEndcapHits", "InnerTrackerBarrelHits", "OuterTrackerBarrelHits", "InnerTrackerEndcapHits", "OuterTrackerEndcapHits"], "trackPurity": ["0.7"] } +# EDM4hep to LCIO converter +edmConvTool = EDM4hep2LcioTool("EDM4hep2lcio") +edmConvTool.convertAll = False +# Next Step : do the conversion only for new collections +edmConvTool.collNameMapping = { + "VTXTrackerBarrelHits": "VTXTrackerBarrelHits", + "VTXTrackerEndcapHits": "VTXTrackerEndcapHits", + "InnerTrackerBarrelHits": "InnerTrackerBarrelHits", + "OuterTrackerBarrelHits": "OuterTrackerBarrelHits", + "InnerTrackerEndcapHits": "InnerTrackerEndcapHits", + "OuterTrackerEndcapHits": "OuterTrackerEndcapHits" +} +edmConvTool.OutputLevel = WARNING +MyConformalTracking.EDM4hep2LcioTool = edmConvTool ClonesAndSplitTracksFinder = MarlinProcessorWrapper("ClonesAndSplitTracksFinder") ClonesAndSplitTracksFinder.OutputLevel = WARNING diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 5d352ea..1de2950 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -17,92 +17,92 @@ # limitations under the License. # from Gaudi.Configuration import WARNING -from Configurables import MarlinProcessorWrapper +from Configurables import VTXdigitizer -VXDBarrelDigitiser = MarlinProcessorWrapper("VXDBarrelDigitiser") -VXDBarrelDigitiser.OutputLevel = WARNING -VXDBarrelDigitiser.ProcessorType = "DDPlanarDigiProcessor" -VXDBarrelDigitiser.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"], - "SimTrackHitCollectionName": ["VertexBarrelCollection"], - "SimTrkHitRelCollection": ["VXDTrackerHitRelations"], - "SubDetectorName": ["Vertex"], - "TrackerHitCollectionName": ["VXDTrackerHits"] - } +VTXBarrelDigitizer = VTXdigitizer("VTXBarrelDigitizer", + inputSimHits = "VertexBarrelCollection", + outputDigiHits = "VTXTrackerBarrelHits", + outputSimDigiAssociation = "VTXTrackerBarrelHitsRelations", + detectorName = "Vertex", + readoutName = "VertexBarrelCollection", + xResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], + yResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], + tResolution = [1000,1000,1000,1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) -VXDEndcapDigitiser = MarlinProcessorWrapper("VXDEndcapDigitiser") -VXDEndcapDigitiser.OutputLevel = WARNING -VXDEndcapDigitiser.ProcessorType = "DDPlanarDigiProcessor" -VXDEndcapDigitiser.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"], - "SimTrackHitCollectionName": ["VertexEndcapCollection"], - "SimTrkHitRelCollection": ["VXDEndcapTrackerHitRelations"], - "SubDetectorName": ["Vertex"], - "TrackerHitCollectionName": ["VXDEndcapTrackerHits"] - } +VTXEndcapDigitizer = VTXdigitizer("VTXEndcapDigitizer", + inputSimHits = "VertexEndcapCollection", + outputDigiHits = "VTXTrackerEndcapHits", + outputSimDigiAssociation = "VTXTrackerEndcapHitsRelations", + detectorName = "Vertex", + readoutName = "VertexEndcapCollection", + xResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], + yResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], + tResolution = [1000,1000,1000,1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) -InnerPlanarDigiProcessor = MarlinProcessorWrapper("InnerPlanarDigiProcessor") -InnerPlanarDigiProcessor.OutputLevel = WARNING -InnerPlanarDigiProcessor.ProcessorType = "DDPlanarDigiProcessor" -InnerPlanarDigiProcessor.Parameters = { - "IsStrip": ["false"], - "ResolutionU": ["0.007"], - "ResolutionV": ["0.09"], - "SimTrackHitCollectionName": ["InnerTrackerBarrelCollection"], - "SimTrkHitRelCollection": ["InnerTrackerBarrelHitsRelations"], - "SubDetectorName": ["InnerTrackers"], - "TrackerHitCollectionName": ["ITrackerHits"] - } +InnerTrackerBarrelDigitizer = VTXdigitizer("InnerTrackerBarrelDigitizer", + inputSimHits = "InnerTrackerBarrelCollection", + outputDigiHits = "InnerTrackerBarrelHits", + outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", + detectorName = "InnerTrackers", + readoutName = "InnerTrackerBarrelCollection", + xResolution = [0.007, 0.007, 0.007], + yResolution = [0.09, 0.09, 0.09], + tResolution = [1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) -InnerEndcapPlanarDigiProcessor = MarlinProcessorWrapper("InnerEndcapPlanarDigiProcessor") -InnerEndcapPlanarDigiProcessor.OutputLevel = WARNING -InnerEndcapPlanarDigiProcessor.ProcessorType = "DDPlanarDigiProcessor" -InnerEndcapPlanarDigiProcessor.Parameters = { - "IsStrip": ["false"], - "ResolutionU": ["0.005", "0.007", "0.007", "0.007", "0.007", "0.007", "0.007"], - "ResolutionV": ["0.005", "0.09", "0.09", "0.09", "0.09", "0.09", "0.09"], - "SimTrackHitCollectionName": ["InnerTrackerEndcapCollection"], - "SimTrkHitRelCollection": ["InnerTrackerEndcapHitsRelations"], - "SubDetectorName": ["InnerTrackers"], - "TrackerHitCollectionName": ["ITrackerEndcapHits"] - } +InnerTrackerEndcapDigitizer = VTXdigitizer("InnerTrackerEndcapDigitizer", + inputSimHits = "InnerTrackerEndcapCollection", + outputDigiHits = "InnerTrackerEndcapHits", + outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", + detectorName = "InnerTrackers", + readoutName = "InnerTrackerEndcapCollection", + xResolution = [0.005, 0.007, 0.007, 0.007, 0.007, 0.007, 0.007], + yResolution = [0.005, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09], + tResolution = [1000,1000,1000,1000,1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) -OuterPlanarDigiProcessor = MarlinProcessorWrapper("OuterPlanarDigiProcessor") -OuterPlanarDigiProcessor.OutputLevel = WARNING -OuterPlanarDigiProcessor.ProcessorType = "DDPlanarDigiProcessor" -OuterPlanarDigiProcessor.Parameters = { - "IsStrip": ["false"], - "ResolutionU": ["0.007", "0.007", "0.007"], - "ResolutionV": ["0.09", "0.09", "0.09"], - "SimTrackHitCollectionName": ["OuterTrackerBarrelCollection"], - "SimTrkHitRelCollection": ["OuterTrackerBarrelHitsRelations"], - "SubDetectorName": ["OuterTrackers"], - "TrackerHitCollectionName": ["OTrackerHits"] - } +OuterTrackerBarrelDigitizer = VTXdigitizer("OuterTrackerBarrelDigitizer", + inputSimHits = "OuterTrackerBarrelCollection", + outputDigiHits = "OuterTrackerBarrelHits", + outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", + detectorName = "OuterTrackers", + readoutName = "OuterTrackerBarrelCollection", + xResolution = [0.007, 0.007, 0.007], + yResolution = [0.09, 0.09, 0.09], + tResolution = [1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) -OuterEndcapPlanarDigiProcessor = MarlinProcessorWrapper("OuterEndcapPlanarDigiProcessor") -OuterEndcapPlanarDigiProcessor.OutputLevel = WARNING -OuterEndcapPlanarDigiProcessor.ProcessorType = "DDPlanarDigiProcessor" -OuterEndcapPlanarDigiProcessor.Parameters = { - "IsStrip": ["false"], - "ResolutionU": ["0.007", "0.007", "0.007", "0.007", "0.007"], - "ResolutionV": ["0.09", "0.09", "0.09", "0.09", "0.09"], - "SimTrackHitCollectionName": ["OuterTrackerEndcapCollection"], - "SimTrkHitRelCollection": ["OuterTrackerEndcapHitsRelations"], - "SubDetectorName": ["OuterTrackers"], - "TrackerHitCollectionName": ["OTrackerEndcapHits"] - } +OuterTrackerEndcapDigitizer = VTXdigitizer("OuterTrackerEndcapDigitizer", + inputSimHits = "OuterTrackerEndcapCollection", + outputDigiHits = "OuterTrackerEndcapHits", + outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", + detectorName = "OuterTrackers", + readoutName = "OuterTrackerEndcapCollection", + xResolution = [0.007, 0.007, 0.007, 0.007], + yResolution = [0.09, 0.09, 0.09, 0.09], + tResolution = [1000,1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) TrackingDigiSequence = [ - VXDBarrelDigitiser, - VXDEndcapDigitiser, - InnerPlanarDigiProcessor, - InnerEndcapPlanarDigiProcessor, - OuterPlanarDigiProcessor, - OuterEndcapPlanarDigiProcessor, + VTXBarrelDigitizer, + VTXEndcapDigitizer, + InnerTrackerBarrelDigitizer, + InnerTrackerEndcapDigitizer, + OuterTrackerBarrelDigitizer, + OuterTrackerEndcapDigitizer ] From 8d8f4a920c915f0aac412b078c56a938ec8e3b71 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Wed, 15 Jan 2025 17:41:54 +0100 Subject: [PATCH 02/22] Adapt CLDConfiguration to use VTXDigiDetailed instead of VTXDigi for digitization of vertex and tracker detector --- CLDConfig/Tracking/TrackingDigi.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 1de2950..78dc4b2 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -17,10 +17,10 @@ # limitations under the License. # from Gaudi.Configuration import WARNING -from Configurables import VTXdigitizer +from Configurables import VTXdigitizerDetailed -VTXBarrelDigitizer = VTXdigitizer("VTXBarrelDigitizer", +VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", inputSimHits = "VertexBarrelCollection", outputDigiHits = "VTXTrackerBarrelHits", outputSimDigiAssociation = "VTXTrackerBarrelHitsRelations", @@ -33,7 +33,7 @@ OutputLevel = WARNING ) -VTXEndcapDigitizer = VTXdigitizer("VTXEndcapDigitizer", +VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", inputSimHits = "VertexEndcapCollection", outputDigiHits = "VTXTrackerEndcapHits", outputSimDigiAssociation = "VTXTrackerEndcapHitsRelations", @@ -46,7 +46,7 @@ OutputLevel = WARNING ) -InnerTrackerBarrelDigitizer = VTXdigitizer("InnerTrackerBarrelDigitizer", +InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", inputSimHits = "InnerTrackerBarrelCollection", outputDigiHits = "InnerTrackerBarrelHits", outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", @@ -59,7 +59,7 @@ OutputLevel = WARNING ) -InnerTrackerEndcapDigitizer = VTXdigitizer("InnerTrackerEndcapDigitizer", +InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", inputSimHits = "InnerTrackerEndcapCollection", outputDigiHits = "InnerTrackerEndcapHits", outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", @@ -72,7 +72,7 @@ OutputLevel = WARNING ) -OuterTrackerBarrelDigitizer = VTXdigitizer("OuterTrackerBarrelDigitizer", +OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", inputSimHits = "OuterTrackerBarrelCollection", outputDigiHits = "OuterTrackerBarrelHits", outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", @@ -85,7 +85,7 @@ OutputLevel = WARNING ) -OuterTrackerEndcapDigitizer = VTXdigitizer("OuterTrackerEndcapDigitizer", +OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", inputSimHits = "OuterTrackerEndcapCollection", outputDigiHits = "OuterTrackerEndcapHits", outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", From 89f4279b6c8dd7ece565eda2aea23c2758ae208a Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Tue, 28 Jan 2025 16:43:39 +0100 Subject: [PATCH 03/22] Add LocalNormalVectorDir parameterization and precise DetectorName with Barrel/Endcap --- CLDConfig/Tracking/TrackingDigi.py | 139 +++++++++++++++-------------- 1 file changed, 72 insertions(+), 67 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 78dc4b2..e60119b 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -19,84 +19,89 @@ from Gaudi.Configuration import WARNING from Configurables import VTXdigitizerDetailed - VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", - inputSimHits = "VertexBarrelCollection", - outputDigiHits = "VTXTrackerBarrelHits", - outputSimDigiAssociation = "VTXTrackerBarrelHitsRelations", - detectorName = "Vertex", - readoutName = "VertexBarrelCollection", - xResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], - yResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], - tResolution = [1000,1000,1000,1000,1000,1000], - forceHitsOntoSurface = False, - OutputLevel = WARNING - ) + inputSimHits = "VertexBarrelCollection", + outputDigiHits = "VTXTrackerBarrelHits", + outputSimDigiAssociation = "VTXTrackerBarrelHitsRelations", + detectorName = "VertexBarrel", + readoutName = "VertexBarrelCollection", + LocalNormalVectorDir = "x", + xResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], + yResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], + tResolution = [1000,1000,1000,1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", - inputSimHits = "VertexEndcapCollection", - outputDigiHits = "VTXTrackerEndcapHits", - outputSimDigiAssociation = "VTXTrackerEndcapHitsRelations", - detectorName = "Vertex", - readoutName = "VertexEndcapCollection", - xResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], - yResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], - tResolution = [1000,1000,1000,1000,1000,1000], - forceHitsOntoSurface = False, - OutputLevel = WARNING - ) + inputSimHits = "VertexEndcapCollection", + outputDigiHits = "VTXTrackerEndcapHits", + outputSimDigiAssociation = "VTXTrackerEndcapHitsRelations", + detectorName = "VertexEndcap", + readoutName = "VertexEndcapCollection", + LocalNormalVectorDir = "y", + xResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], + yResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], + tResolution = [1000,1000,1000,1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", - inputSimHits = "InnerTrackerBarrelCollection", - outputDigiHits = "InnerTrackerBarrelHits", - outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", - detectorName = "InnerTrackers", - readoutName = "InnerTrackerBarrelCollection", - xResolution = [0.007, 0.007, 0.007], - yResolution = [0.09, 0.09, 0.09], - tResolution = [1000,1000,1000], - forceHitsOntoSurface = False, - OutputLevel = WARNING - ) + inputSimHits = "InnerTrackerBarrelCollection", + outputDigiHits = "InnerTrackerBarrelHits", + outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", + detectorName = "InnerTrackerBarrel", + readoutName = "InnerTrackerBarrelCollection", + LocalNormalVectorDir = "z", + xResolution = [0.007, 0.007, 0.007], + yResolution = [0.09, 0.09, 0.09], + tResolution = [1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", - inputSimHits = "InnerTrackerEndcapCollection", - outputDigiHits = "InnerTrackerEndcapHits", - outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", - detectorName = "InnerTrackers", - readoutName = "InnerTrackerEndcapCollection", - xResolution = [0.005, 0.007, 0.007, 0.007, 0.007, 0.007, 0.007], - yResolution = [0.005, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09], - tResolution = [1000,1000,1000,1000,1000,1000,1000], - forceHitsOntoSurface = False, - OutputLevel = WARNING - ) + inputSimHits = "InnerTrackerEndcapCollection", + outputDigiHits = "InnerTrackerEndcapHits", + outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", + detectorName = "InnerTrackerEndcap", + readoutName = "InnerTrackerEndcapCollection", + LocalNormalVectorDir = "z", + xResolution = [0.005, 0.007, 0.007, 0.007, 0.007, 0.007, 0.007], + yResolution = [0.005, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09], + tResolution = [1000,1000,1000,1000,1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", - inputSimHits = "OuterTrackerBarrelCollection", - outputDigiHits = "OuterTrackerBarrelHits", - outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", - detectorName = "OuterTrackers", - readoutName = "OuterTrackerBarrelCollection", - xResolution = [0.007, 0.007, 0.007], - yResolution = [0.09, 0.09, 0.09], - tResolution = [1000,1000,1000], - forceHitsOntoSurface = False, - OutputLevel = WARNING - ) + inputSimHits = "OuterTrackerBarrelCollection", + outputDigiHits = "OuterTrackerBarrelHits", + outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", + detectorName = "OuterTrackerBarrel", + readoutName = "OuterTrackerBarrelCollection", + LocalNormalVectorDir = "z", + xResolution = [0.007, 0.007, 0.007], + yResolution = [0.09, 0.09, 0.09], + tResolution = [1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", - inputSimHits = "OuterTrackerEndcapCollection", - outputDigiHits = "OuterTrackerEndcapHits", - outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", - detectorName = "OuterTrackers", - readoutName = "OuterTrackerEndcapCollection", - xResolution = [0.007, 0.007, 0.007, 0.007], - yResolution = [0.09, 0.09, 0.09, 0.09], - tResolution = [1000,1000,1000,1000], - forceHitsOntoSurface = False, - OutputLevel = WARNING - ) + inputSimHits = "OuterTrackerEndcapCollection", + outputDigiHits = "OuterTrackerEndcapHits", + outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", + detectorName = "OuterTrackerEndcap", + readoutName = "OuterTrackerEndcapCollection", + LocalNormalVectorDir = "z", + xResolution = [0.007, 0.007, 0.007, 0.007], + yResolution = [0.09, 0.09, 0.09, 0.09], + tResolution = [1000,1000,1000,1000], + forceHitsOntoSurface = False, + OutputLevel = WARNING + ) TrackingDigiSequence = [ VTXBarrelDigitizer, From 28b11843e853ba72cb2619ca6cc79970c9a5c215 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Mon, 10 Feb 2025 14:43:09 +0100 Subject: [PATCH 04/22] Update TrackingDigi to use new VtxDigiDetailed digitizer within k4RecTracker --- CLDConfig/Tracking/TrackingDigi.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index e60119b..03dbe7a 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -26,8 +26,6 @@ detectorName = "VertexBarrel", readoutName = "VertexBarrelCollection", LocalNormalVectorDir = "x", - xResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], - yResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], tResolution = [1000,1000,1000,1000,1000,1000], forceHitsOntoSurface = False, OutputLevel = WARNING @@ -40,8 +38,6 @@ detectorName = "VertexEndcap", readoutName = "VertexEndcapCollection", LocalNormalVectorDir = "y", - xResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], - yResolution = [0.003, 0.003, 0.003, 0.003, 0.003, 0.003], tResolution = [1000,1000,1000,1000,1000,1000], forceHitsOntoSurface = False, OutputLevel = WARNING @@ -54,8 +50,6 @@ detectorName = "InnerTrackerBarrel", readoutName = "InnerTrackerBarrelCollection", LocalNormalVectorDir = "z", - xResolution = [0.007, 0.007, 0.007], - yResolution = [0.09, 0.09, 0.09], tResolution = [1000,1000,1000], forceHitsOntoSurface = False, OutputLevel = WARNING @@ -68,8 +62,6 @@ detectorName = "InnerTrackerEndcap", readoutName = "InnerTrackerEndcapCollection", LocalNormalVectorDir = "z", - xResolution = [0.005, 0.007, 0.007, 0.007, 0.007, 0.007, 0.007], - yResolution = [0.005, 0.09, 0.09, 0.09, 0.09, 0.09, 0.09], tResolution = [1000,1000,1000,1000,1000,1000,1000], forceHitsOntoSurface = False, OutputLevel = WARNING @@ -82,8 +74,6 @@ detectorName = "OuterTrackerBarrel", readoutName = "OuterTrackerBarrelCollection", LocalNormalVectorDir = "z", - xResolution = [0.007, 0.007, 0.007], - yResolution = [0.09, 0.09, 0.09], tResolution = [1000,1000,1000], forceHitsOntoSurface = False, OutputLevel = WARNING @@ -96,8 +86,6 @@ detectorName = "OuterTrackerEndcap", readoutName = "OuterTrackerEndcapCollection", LocalNormalVectorDir = "z", - xResolution = [0.007, 0.007, 0.007, 0.007], - yResolution = [0.09, 0.09, 0.09, 0.09], tResolution = [1000,1000,1000,1000], forceHitsOntoSurface = False, OutputLevel = WARNING From 00849792dec2170710bd14b079ee3f6976cfba6a Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Mon, 10 Feb 2025 19:46:40 +0100 Subject: [PATCH 05/22] Add Debug Histograms in digitizer output --- CLDConfig/Tracking/TrackingDigi.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 03dbe7a..50bc4bf 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -28,7 +28,9 @@ LocalNormalVectorDir = "x", tResolution = [1000,1000,1000,1000,1000,1000], forceHitsOntoSurface = False, - OutputLevel = WARNING + OutputLevel = WARNING, + DebugHistos = True, + DebugFileName = "Debug_VTXBarrelDigitizer.root" ) VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", @@ -40,7 +42,9 @@ LocalNormalVectorDir = "y", tResolution = [1000,1000,1000,1000,1000,1000], forceHitsOntoSurface = False, - OutputLevel = WARNING + OutputLevel = WARNING, + DebugHistos = True, + DebugFileName = "Debug_VTXEndcapDigitizer.root" ) InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", @@ -52,7 +56,9 @@ LocalNormalVectorDir = "z", tResolution = [1000,1000,1000], forceHitsOntoSurface = False, - OutputLevel = WARNING + OutputLevel = WARNING, + DebugHistos = True, + DebugFileName = "Debug_InnerTrackerBarrelDigitizer.root" ) InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", @@ -64,7 +70,9 @@ LocalNormalVectorDir = "z", tResolution = [1000,1000,1000,1000,1000,1000,1000], forceHitsOntoSurface = False, - OutputLevel = WARNING + OutputLevel = WARNING, + DebugHistos = True, + DebugFileName = "Debug_InnerTrackerEndcapDigitizer.root" ) OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", @@ -76,7 +84,9 @@ LocalNormalVectorDir = "z", tResolution = [1000,1000,1000], forceHitsOntoSurface = False, - OutputLevel = WARNING + OutputLevel = WARNING, + DebugHistos = True, + DebugFileName = "Debug_OuterTrackerBarrelDigitizer.root" ) OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", @@ -88,7 +98,9 @@ LocalNormalVectorDir = "z", tResolution = [1000,1000,1000,1000], forceHitsOntoSurface = False, - OutputLevel = WARNING + OutputLevel = WARNING, + DebugHistos = True, + DebugFileName = "Debug_OuterTrackerEndcapDigitizer.root" ) TrackingDigiSequence = [ From 027418f51c560e89daa7cdfe74936e4eea87ab05 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Wed, 12 Feb 2025 17:51:36 +0100 Subject: [PATCH 06/22] Update name of the LCIO version of TrackerHitPlaneCollection --- CLDConfig/Tracking/ConformalTracking.py | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/CLDConfig/Tracking/ConformalTracking.py b/CLDConfig/Tracking/ConformalTracking.py index 19531d7..708f80e 100644 --- a/CLDConfig/Tracking/ConformalTracking.py +++ b/CLDConfig/Tracking/ConformalTracking.py @@ -46,17 +46,17 @@ "Steps": [ "[VTXTrackerBarrel]", - "@Collections", ":", "VTXTrackerBarrelHits", + "@Collections", ":", "VTXTrackerBarrelHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", "@Functions", ":", "CombineCollections,", "BuildNewTracks", "[VTXTrackerEndcap]", - "@Collections", ":", "VTXTrackerEndcapHits", + "@Collections", ":", "VTXTrackerEndcapHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", "@Functions", ":", "CombineCollections,", "ExtendTracks", "[LowerCellAngle1]", - "@Collections", ":", "VTXTrackerBarrelHits,", "VTXTrackerEndcapHits", + "@Collections", ":", "VTXTrackerBarrelHitsLCIO,", "VTXTrackerEndcapHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.05;", "MaxCellAngleRZ", ":", "0.05;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "CombineCollections,", "BuildNewTracks", @@ -66,32 +66,32 @@ "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "BuildNewTracks,", "SortTracks", "[Tracker]", - "@Collections", ":", "InnerTrackerBarrelHits,", "OuterTrackerBarrelHits,", "InnerTrackerEndcapHits,", "OuterTrackerEndcapHits", + "@Collections", ":", "InnerTrackerBarrelHitsLCIO,", "OuterTrackerBarrelHitsLCIO,", "InnerTrackerEndcapHitsLCIO,", "OuterTrackerEndcapHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.1;", "MaxCellAngleRZ", ":", "0.1;", "Chi2Cut", ":", "2000;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "1.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "CombineCollections,", "ExtendTracks", "[Displaced]", - "@Collections", ":", "VTXTrackerBarrelHits,", "VTXTrackerEndcapHits,", "InnerTrackerBarrelHits,", "OuterTrackerBarrelHits,", "InnerTrackerEndcapHits,", "OuterTrackerEndcapHits", + "@Collections", ":", "VTXTrackerBarrelHitsLCIO,", "VTXTrackerEndcapHitsLCIO,", "InnerTrackerBarrelHitsLCIO,", "OuterTrackerBarrelHitsLCIO,", "InnerTrackerEndcapHitsLCIO,", "OuterTrackerEndcapHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.1;", "MaxCellAngleRZ", ":", "0.1;", "Chi2Cut", ":", "1000;", "MinClustersOnTrack", ":", "5;", "MaxDistance", ":", "0.015;", "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "OnlyZSchi2cut,", "RadialSearch", "@Functions", ":", "CombineCollections,", "BuildNewTracks" ], "ThetaRange": ["0.05"], "TooManyTracks": ["100000"], - "TrackerHitCollectionNames": ["VTXTrackerBarrelHits", "VTXTrackerEndcapHits", "InnerTrackerBarrelHits", "OuterTrackerBarrelHits", "InnerTrackerEndcapHits", "OuterTrackerEndcapHits"], + "TrackerHitCollectionNames": ["VTXTrackerBarrelHitsLCIO", "VTXTrackerEndcapHitsLCIO", "InnerTrackerBarrelHitsLCIO", "OuterTrackerBarrelHitsLCIO", "InnerTrackerEndcapHitsLCIO", "OuterTrackerEndcapHitsLCIO"], "trackPurity": ["0.7"] } # EDM4hep to LCIO converter -edmConvTool = EDM4hep2LcioTool("EDM4hep2lcio") +edmConvTool = EDM4hep2LcioTool("EDM4hep2Lcio") edmConvTool.convertAll = False # Next Step : do the conversion only for new collections edmConvTool.collNameMapping = { - "VTXTrackerBarrelHits": "VTXTrackerBarrelHits", - "VTXTrackerEndcapHits": "VTXTrackerEndcapHits", - "InnerTrackerBarrelHits": "InnerTrackerBarrelHits", - "OuterTrackerBarrelHits": "OuterTrackerBarrelHits", - "InnerTrackerEndcapHits": "InnerTrackerEndcapHits", - "OuterTrackerEndcapHits": "OuterTrackerEndcapHits" + "VTXTrackerBarrelHits": "VTXTrackerBarrelHitsLCIO", + "VTXTrackerEndcapHits": "VTXTrackerEndcapHitsLCIO", + "InnerTrackerBarrelHits": "InnerTrackerBarrelHitsLCIO", + "OuterTrackerBarrelHits": "OuterTrackerBarrelHitsLCIO", + "InnerTrackerEndcapHits": "InnerTrackerEndcapHitsLCIO", + "OuterTrackerEndcapHits": "OuterTrackerEndcapHitsLCIO" } edmConvTool.OutputLevel = WARNING MyConformalTracking.EDM4hep2LcioTool = edmConvTool From 7ad55fffcbd08185cddadb60d3c2f06509118db3 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Wed, 12 Feb 2025 17:52:43 +0100 Subject: [PATCH 07/22] Set time resolution to 0 for now --- CLDConfig/Tracking/TrackingDigi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 50bc4bf..00be3dc 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -26,7 +26,7 @@ detectorName = "VertexBarrel", readoutName = "VertexBarrelCollection", LocalNormalVectorDir = "x", - tResolution = [1000,1000,1000,1000,1000,1000], + tResolution = [0.,0.,0.,0.,0.,0.], forceHitsOntoSurface = False, OutputLevel = WARNING, DebugHistos = True, @@ -40,7 +40,7 @@ detectorName = "VertexEndcap", readoutName = "VertexEndcapCollection", LocalNormalVectorDir = "y", - tResolution = [1000,1000,1000,1000,1000,1000], + tResolution = [0.,0.,0.,0.,0.,0.], forceHitsOntoSurface = False, OutputLevel = WARNING, DebugHistos = True, @@ -54,7 +54,7 @@ detectorName = "InnerTrackerBarrel", readoutName = "InnerTrackerBarrelCollection", LocalNormalVectorDir = "z", - tResolution = [1000,1000,1000], + tResolution = [0.,0.,0.], forceHitsOntoSurface = False, OutputLevel = WARNING, DebugHistos = True, @@ -68,7 +68,7 @@ detectorName = "InnerTrackerEndcap", readoutName = "InnerTrackerEndcapCollection", LocalNormalVectorDir = "z", - tResolution = [1000,1000,1000,1000,1000,1000,1000], + tResolution = [0.,0.,0.,0.,0.,0.,0.], forceHitsOntoSurface = False, OutputLevel = WARNING, DebugHistos = True, @@ -82,7 +82,7 @@ detectorName = "OuterTrackerBarrel", readoutName = "OuterTrackerBarrelCollection", LocalNormalVectorDir = "z", - tResolution = [1000,1000,1000], + tResolution = [0.,0.,0.], forceHitsOntoSurface = False, OutputLevel = WARNING, DebugHistos = True, @@ -96,7 +96,7 @@ detectorName = "OuterTrackerEndcap", readoutName = "OuterTrackerEndcapCollection", LocalNormalVectorDir = "z", - tResolution = [1000,1000,1000,1000], + tResolution = [0.,0.,0.,0.], forceHitsOntoSurface = False, OutputLevel = WARNING, DebugHistos = True, From cdeebcf15f86f884cd9cbdf4317150dec41732e7 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Thu, 13 Feb 2025 15:35:55 +0100 Subject: [PATCH 08/22] Change the Collections and relations names for consistency with reconstruction and next steps --- CLDConfig/Tracking/ConformalTracking.py | 32 +++++++++++++++---------- CLDConfig/Tracking/TrackingDigi.py | 16 ++++++------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/CLDConfig/Tracking/ConformalTracking.py b/CLDConfig/Tracking/ConformalTracking.py index 708f80e..35e0c23 100644 --- a/CLDConfig/Tracking/ConformalTracking.py +++ b/CLDConfig/Tracking/ConformalTracking.py @@ -39,24 +39,24 @@ "MCParticleCollectionName": ["MCParticle"], "MaxHitInvertedFit": ["0"], "MinClustersOnTrackAfterFit": ["3"], - "RelationsNames": ["VTXTrackerBarrelHitsRelations", "VTXTrackerEndcapHitsRelations", "InnerTrackerBarrelHitsRelations", "OuterTrackerBarrelHitsRelations", "InnerTrackerEndcapHitsRelations", "OuterTrackerEndcapHitsRelations"], + "RelationsNames": ["VXDTrackerHitRelations", "VXDEndcapTrackerHitRelations", "InnerTrackerBarrelHitsRelations", "OuterTrackerBarrelHitsRelations", "InnerTrackerEndcapHitsRelations", "OuterTrackerEndcapHitsRelations"], "RetryTooManyTracks": ["false"], "SiTrackCollectionName": ["SiTracksCT"], "SortTreeResults": ["true"], "Steps": [ "[VTXTrackerBarrel]", - "@Collections", ":", "VTXTrackerBarrelHitsLCIO", + "@Collections", ":", "VXDTrackerHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", "@Functions", ":", "CombineCollections,", "BuildNewTracks", "[VTXTrackerEndcap]", - "@Collections", ":", "VTXTrackerEndcapHitsLCIO", + "@Collections", ":", "VXDEndcapTrackerHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", "@Functions", ":", "CombineCollections,", "ExtendTracks", "[LowerCellAngle1]", - "@Collections", ":", "VTXTrackerBarrelHitsLCIO,", "VTXTrackerEndcapHitsLCIO", + "@Collections", ":", "VXDTrackerHitsLCIO,", "VXDEndcapTrackerHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.05;", "MaxCellAngleRZ", ":", "0.05;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "CombineCollections,", "BuildNewTracks", @@ -66,19 +66,19 @@ "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "BuildNewTracks,", "SortTracks", "[Tracker]", - "@Collections", ":", "InnerTrackerBarrelHitsLCIO,", "OuterTrackerBarrelHitsLCIO,", "InnerTrackerEndcapHitsLCIO,", "OuterTrackerEndcapHitsLCIO", + "@Collections", ":", "ITrackerHitsLCIO,", "OTrackerHitsLCIO,", "ITrackerEndcapHitsLCIO,", "OTrackerEndcapHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.1;", "MaxCellAngleRZ", ":", "0.1;", "Chi2Cut", ":", "2000;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "1.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "CombineCollections,", "ExtendTracks", "[Displaced]", - "@Collections", ":", "VTXTrackerBarrelHitsLCIO,", "VTXTrackerEndcapHitsLCIO,", "InnerTrackerBarrelHitsLCIO,", "OuterTrackerBarrelHitsLCIO,", "InnerTrackerEndcapHitsLCIO,", "OuterTrackerEndcapHitsLCIO", + "@Collections", ":", "VXDTrackerHitsLCIO,", "VXDEndcapTrackerHitsLCIO,", "ITrackerHitsLCIO,", "OTrackerHitsLCIO,", "ITrackerEndcapHitsLCIO,", "OTrackerEndcapHitsLCIO", "@Parameters", ":", "MaxCellAngle", ":", "0.1;", "MaxCellAngleRZ", ":", "0.1;", "Chi2Cut", ":", "1000;", "MinClustersOnTrack", ":", "5;", "MaxDistance", ":", "0.015;", "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "OnlyZSchi2cut,", "RadialSearch", "@Functions", ":", "CombineCollections,", "BuildNewTracks" ], "ThetaRange": ["0.05"], "TooManyTracks": ["100000"], - "TrackerHitCollectionNames": ["VTXTrackerBarrelHitsLCIO", "VTXTrackerEndcapHitsLCIO", "InnerTrackerBarrelHitsLCIO", "OuterTrackerBarrelHitsLCIO", "InnerTrackerEndcapHitsLCIO", "OuterTrackerEndcapHitsLCIO"], + "TrackerHitCollectionNames": ["VXDTrackerHitsLCIO", "VXDEndcapTrackerHitsLCIO", "ITrackerHitsLCIO", "OTrackerHitsLCIO", "ITrackerEndcapHitsLCIO", "OTrackerEndcapHitsLCIO"], "trackPurity": ["0.7"] } # EDM4hep to LCIO converter @@ -86,12 +86,18 @@ edmConvTool.convertAll = False # Next Step : do the conversion only for new collections edmConvTool.collNameMapping = { - "VTXTrackerBarrelHits": "VTXTrackerBarrelHitsLCIO", - "VTXTrackerEndcapHits": "VTXTrackerEndcapHitsLCIO", - "InnerTrackerBarrelHits": "InnerTrackerBarrelHitsLCIO", - "OuterTrackerBarrelHits": "OuterTrackerBarrelHitsLCIO", - "InnerTrackerEndcapHits": "InnerTrackerEndcapHitsLCIO", - "OuterTrackerEndcapHits": "OuterTrackerEndcapHitsLCIO" + "VXDTrackerHits": "VXDTrackerHitsLCIO", + "VXDEndcapTrackerHits": "VXDEndcapTrackerHitsLCIO", + "ITrackerHits": "ITrackerHitsLCIO", + "OTrackerHits": "OTrackerHitsLCIO", + "ITrackerEndcapHits": "ITrackerEndcapHitsLCIO", + "OTrackerEndcapHits": "OTrackerEndcapHitsLCIO", +# "VXDTrackerHitRelations": "VXDTrackerHitRelations", +# "VXDEndcapTrackerHitRelations": "VXDEndcapTrackerHitRelations", +# "InnerTrackerBarrelHitsRelations": "InnerTrackerBarrelHitsRelations", +# "OuterTrackerBarrelHitsRelations": "OuterTrackerBarrelHitsRelations", +# "InnerTrackerEndcapHitsRelations": "InnerTrackerEndcapHitsRelations", +# "OuterTrackerEndcapHitsRelations": "OuterTrackerEndcapHitsRelations" } edmConvTool.OutputLevel = WARNING MyConformalTracking.EDM4hep2LcioTool = edmConvTool diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 00be3dc..87ad474 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -21,8 +21,8 @@ VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", inputSimHits = "VertexBarrelCollection", - outputDigiHits = "VTXTrackerBarrelHits", - outputSimDigiAssociation = "VTXTrackerBarrelHitsRelations", + outputDigiHits = "VXDTrackerHits", + outputSimDigiAssociation = "VXDTrackerHitRelations", detectorName = "VertexBarrel", readoutName = "VertexBarrelCollection", LocalNormalVectorDir = "x", @@ -35,8 +35,8 @@ VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", inputSimHits = "VertexEndcapCollection", - outputDigiHits = "VTXTrackerEndcapHits", - outputSimDigiAssociation = "VTXTrackerEndcapHitsRelations", + outputDigiHits = "VXDEndcapTrackerHits", + outputSimDigiAssociation = "VXDEndcapTrackerHitRelations", detectorName = "VertexEndcap", readoutName = "VertexEndcapCollection", LocalNormalVectorDir = "y", @@ -49,7 +49,7 @@ InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", inputSimHits = "InnerTrackerBarrelCollection", - outputDigiHits = "InnerTrackerBarrelHits", + outputDigiHits = "ITrackerHits", outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", detectorName = "InnerTrackerBarrel", readoutName = "InnerTrackerBarrelCollection", @@ -63,7 +63,7 @@ InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", inputSimHits = "InnerTrackerEndcapCollection", - outputDigiHits = "InnerTrackerEndcapHits", + outputDigiHits = "ITrackerEndcapHits", outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", detectorName = "InnerTrackerEndcap", readoutName = "InnerTrackerEndcapCollection", @@ -77,7 +77,7 @@ OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", inputSimHits = "OuterTrackerBarrelCollection", - outputDigiHits = "OuterTrackerBarrelHits", + outputDigiHits = "OTrackerHits", outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", detectorName = "OuterTrackerBarrel", readoutName = "OuterTrackerBarrelCollection", @@ -91,7 +91,7 @@ OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", inputSimHits = "OuterTrackerEndcapCollection", - outputDigiHits = "OuterTrackerEndcapHits", + outputDigiHits = "OTrackerEndcapHits", outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", detectorName = "OuterTrackerEndcap", readoutName = "OuterTrackerEndcapCollection", From a126d26228b5ee1c3ef02eb25a891838a9a01d6e Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Thu, 13 Feb 2025 16:02:48 +0100 Subject: [PATCH 09/22] Change the names of the collections to discriminate between EDM4Hep Collections and LCIO ones with LCIO collection names being consistent with the steps after digitization --- CLDConfig/Tracking/ConformalTracking.py | 36 ++++++++++++------------- CLDConfig/Tracking/TrackingDigi.py | 24 ++++++++--------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/CLDConfig/Tracking/ConformalTracking.py b/CLDConfig/Tracking/ConformalTracking.py index 35e0c23..e65b45c 100644 --- a/CLDConfig/Tracking/ConformalTracking.py +++ b/CLDConfig/Tracking/ConformalTracking.py @@ -46,17 +46,17 @@ "Steps": [ "[VTXTrackerBarrel]", - "@Collections", ":", "VXDTrackerHitsLCIO", + "@Collections", ":", "VXDTrackerHits", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", "@Functions", ":", "CombineCollections,", "BuildNewTracks", "[VTXTrackerEndcap]", - "@Collections", ":", "VXDEndcapTrackerHitsLCIO", + "@Collections", ":", "VXDEndcapTrackerHits", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", "@Functions", ":", "CombineCollections,", "ExtendTracks", "[LowerCellAngle1]", - "@Collections", ":", "VXDTrackerHitsLCIO,", "VXDEndcapTrackerHitsLCIO", + "@Collections", ":", "VXDTrackerHits,", "VXDEndcapTrackerHits", "@Parameters", ":", "MaxCellAngle", ":", "0.05;", "MaxCellAngleRZ", ":", "0.05;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "CombineCollections,", "BuildNewTracks", @@ -66,19 +66,19 @@ "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "BuildNewTracks,", "SortTracks", "[Tracker]", - "@Collections", ":", "ITrackerHitsLCIO,", "OTrackerHitsLCIO,", "ITrackerEndcapHitsLCIO,", "OTrackerEndcapHitsLCIO", + "@Collections", ":", "ITrackerHits,", "OTrackerHits,", "ITrackerEndcapHits,", "OTrackerEndcapHits", "@Parameters", ":", "MaxCellAngle", ":", "0.1;", "MaxCellAngleRZ", ":", "0.1;", "Chi2Cut", ":", "2000;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "1.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker,", "RadialSearch", "@Functions", ":", "CombineCollections,", "ExtendTracks", "[Displaced]", - "@Collections", ":", "VXDTrackerHitsLCIO,", "VXDEndcapTrackerHitsLCIO,", "ITrackerHitsLCIO,", "OTrackerHitsLCIO,", "ITrackerEndcapHitsLCIO,", "OTrackerEndcapHitsLCIO", + "@Collections", ":", "VXDTrackerHits,", "VXDEndcapTrackerHits,", "ITrackerHits,", "OTrackerHits,", "ITrackerEndcapHits,", "OTrackerEndcapHits", "@Parameters", ":", "MaxCellAngle", ":", "0.1;", "MaxCellAngleRZ", ":", "0.1;", "Chi2Cut", ":", "1000;", "MinClustersOnTrack", ":", "5;", "MaxDistance", ":", "0.015;", "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "OnlyZSchi2cut,", "RadialSearch", "@Functions", ":", "CombineCollections,", "BuildNewTracks" ], "ThetaRange": ["0.05"], "TooManyTracks": ["100000"], - "TrackerHitCollectionNames": ["VXDTrackerHitsLCIO", "VXDEndcapTrackerHitsLCIO", "ITrackerHitsLCIO", "OTrackerHitsLCIO", "ITrackerEndcapHitsLCIO", "OTrackerEndcapHitsLCIO"], + "TrackerHitCollectionNames": ["VXDTrackerHits", "VXDEndcapTrackerHits", "ITrackerHits", "OTrackerHits", "ITrackerEndcapHits", "OTrackerEndcapHits"], "trackPurity": ["0.7"] } # EDM4hep to LCIO converter @@ -86,18 +86,18 @@ edmConvTool.convertAll = False # Next Step : do the conversion only for new collections edmConvTool.collNameMapping = { - "VXDTrackerHits": "VXDTrackerHitsLCIO", - "VXDEndcapTrackerHits": "VXDEndcapTrackerHitsLCIO", - "ITrackerHits": "ITrackerHitsLCIO", - "OTrackerHits": "OTrackerHitsLCIO", - "ITrackerEndcapHits": "ITrackerEndcapHitsLCIO", - "OTrackerEndcapHits": "OTrackerEndcapHitsLCIO", -# "VXDTrackerHitRelations": "VXDTrackerHitRelations", -# "VXDEndcapTrackerHitRelations": "VXDEndcapTrackerHitRelations", -# "InnerTrackerBarrelHitsRelations": "InnerTrackerBarrelHitsRelations", -# "OuterTrackerBarrelHitsRelations": "OuterTrackerBarrelHitsRelations", -# "InnerTrackerEndcapHitsRelations": "InnerTrackerEndcapHitsRelations", -# "OuterTrackerEndcapHitsRelations": "OuterTrackerEndcapHitsRelations" + "VXDTrackerHitsEDM4HEP": "VXDTrackerHits", + "VXDEndcapTrackerHitsEDM4HEP": "VXDEndcapTrackerHits", + "ITrackerHitsEDM4HEP": "ITrackerHits", + "OTrackerHitsEDM4HEP": "OTrackerHits", + "ITrackerEndcapHitsEDM4HEP": "ITrackerEndcapHits", + "OTrackerEndcapHitsEDM4HEP": "OTrackerEndcapHits", + "VXDTrackerHitRelationsEDM4HEP": "VXDTrackerHitRelations", + "VXDEndcapTrackerHitRelationsEDM4HEP": "VXDEndcapTrackerHitRelations", + "InnerTrackerBarrelHitsRelationsEDM4HEP": "InnerTrackerBarrelHitsRelations", + "OuterTrackerBarrelHitsRelationsEDM4HEP": "OuterTrackerBarrelHitsRelations", + "InnerTrackerEndcapHitsRelationsEDM4HEP": "InnerTrackerEndcapHitsRelations", + "OuterTrackerEndcapHitsRelationsEDM4HEP": "OuterTrackerEndcapHitsRelations" } edmConvTool.OutputLevel = WARNING MyConformalTracking.EDM4hep2LcioTool = edmConvTool diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 87ad474..9c3d952 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -21,8 +21,8 @@ VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", inputSimHits = "VertexBarrelCollection", - outputDigiHits = "VXDTrackerHits", - outputSimDigiAssociation = "VXDTrackerHitRelations", + outputDigiHits = "VXDTrackerHitsEDM4HEP", + outputSimDigiAssociation = "VXDTrackerHitRelationsEDM4HEP", detectorName = "VertexBarrel", readoutName = "VertexBarrelCollection", LocalNormalVectorDir = "x", @@ -35,8 +35,8 @@ VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", inputSimHits = "VertexEndcapCollection", - outputDigiHits = "VXDEndcapTrackerHits", - outputSimDigiAssociation = "VXDEndcapTrackerHitRelations", + outputDigiHits = "VXDEndcapTrackerHitsEDM4HEP", + outputSimDigiAssociation = "VXDEndcapTrackerHitRelationsEDM4HEP", detectorName = "VertexEndcap", readoutName = "VertexEndcapCollection", LocalNormalVectorDir = "y", @@ -49,8 +49,8 @@ InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", inputSimHits = "InnerTrackerBarrelCollection", - outputDigiHits = "ITrackerHits", - outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", + outputDigiHits = "ITrackerHitsEDM4HEP", + outputSimDigiAssociation = "InnerTrackerBarrelHitsRelationsEDM4HEP", detectorName = "InnerTrackerBarrel", readoutName = "InnerTrackerBarrelCollection", LocalNormalVectorDir = "z", @@ -63,8 +63,8 @@ InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", inputSimHits = "InnerTrackerEndcapCollection", - outputDigiHits = "ITrackerEndcapHits", - outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", + outputDigiHits = "ITrackerEndcapHitsEDM4HEP", + outputSimDigiAssociation = "InnerTrackerEndcapHitsRelationsEDM4HEP", detectorName = "InnerTrackerEndcap", readoutName = "InnerTrackerEndcapCollection", LocalNormalVectorDir = "z", @@ -77,8 +77,8 @@ OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", inputSimHits = "OuterTrackerBarrelCollection", - outputDigiHits = "OTrackerHits", - outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", + outputDigiHits = "OTrackerHitsEDM4HEP", + outputSimDigiAssociation = "OuterTrackerBarrelHitsRelationsEDM4HEP", detectorName = "OuterTrackerBarrel", readoutName = "OuterTrackerBarrelCollection", LocalNormalVectorDir = "z", @@ -91,8 +91,8 @@ OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", inputSimHits = "OuterTrackerEndcapCollection", - outputDigiHits = "OTrackerEndcapHits", - outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", + outputDigiHits = "OTrackerEndcapHitsEDM4HEP", + outputSimDigiAssociation = "OuterTrackerEndcapHitsRelationsEDM4HEP", detectorName = "OuterTrackerEndcap", readoutName = "OuterTrackerEndcapCollection", LocalNormalVectorDir = "z", From 302874896753f3b95f776f6cb857710c6bf3dda9 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Mon, 17 Feb 2025 10:43:42 +0100 Subject: [PATCH 10/22] Set correct names for collections and collection converter --- CLDConfig/Tracking/ConformalTracking.py | 28 ++++++++++++------------- CLDConfig/Tracking/TrackingDigi.py | 24 ++++++++++----------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CLDConfig/Tracking/ConformalTracking.py b/CLDConfig/Tracking/ConformalTracking.py index e65b45c..ff0a8a5 100644 --- a/CLDConfig/Tracking/ConformalTracking.py +++ b/CLDConfig/Tracking/ConformalTracking.py @@ -83,23 +83,23 @@ } # EDM4hep to LCIO converter edmConvTool = EDM4hep2LcioTool("EDM4hep2Lcio") -edmConvTool.convertAll = False +#edmConvTool.convertAll = True # Next Step : do the conversion only for new collections edmConvTool.collNameMapping = { - "VXDTrackerHitsEDM4HEP": "VXDTrackerHits", - "VXDEndcapTrackerHitsEDM4HEP": "VXDEndcapTrackerHits", - "ITrackerHitsEDM4HEP": "ITrackerHits", - "OTrackerHitsEDM4HEP": "OTrackerHits", - "ITrackerEndcapHitsEDM4HEP": "ITrackerEndcapHits", - "OTrackerEndcapHitsEDM4HEP": "OTrackerEndcapHits", - "VXDTrackerHitRelationsEDM4HEP": "VXDTrackerHitRelations", - "VXDEndcapTrackerHitRelationsEDM4HEP": "VXDEndcapTrackerHitRelations", - "InnerTrackerBarrelHitsRelationsEDM4HEP": "InnerTrackerBarrelHitsRelations", - "OuterTrackerBarrelHitsRelationsEDM4HEP": "OuterTrackerBarrelHitsRelations", - "InnerTrackerEndcapHitsRelationsEDM4HEP": "InnerTrackerEndcapHitsRelations", - "OuterTrackerEndcapHitsRelationsEDM4HEP": "OuterTrackerEndcapHitsRelations" + "VXDTrackerHits": "VXDTrackerHits", + "VXDEndcapTrackerHits": "VXDEndcapTrackerHits", + "ITrackerHits": "ITrackerHits", + "OTrackerHits": "OTrackerHits", + "ITrackerEndcapHits": "ITrackerEndcapHits", + "OTrackerEndcapHits": "OTrackerEndcapHits", + "VXDTrackerHitRelations": "VXDTrackerHitRelations", + "VXDEndcapTrackerHitRelations": "VXDEndcapTrackerHitRelations", + "InnerTrackerBarrelHitsRelations": "InnerTrackerBarrelHitsRelations", + "OuterTrackerBarrelHitsRelations": "OuterTrackerBarrelHitsRelations", + "InnerTrackerEndcapHitsRelations": "InnerTrackerEndcapHitsRelations", + "OuterTrackerEndcapHitsRelations": "OuterTrackerEndcapHitsRelations" } -edmConvTool.OutputLevel = WARNING +edmConvTool.OutputLevel = DEBUG MyConformalTracking.EDM4hep2LcioTool = edmConvTool ClonesAndSplitTracksFinder = MarlinProcessorWrapper("ClonesAndSplitTracksFinder") diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 9c3d952..87ad474 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -21,8 +21,8 @@ VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", inputSimHits = "VertexBarrelCollection", - outputDigiHits = "VXDTrackerHitsEDM4HEP", - outputSimDigiAssociation = "VXDTrackerHitRelationsEDM4HEP", + outputDigiHits = "VXDTrackerHits", + outputSimDigiAssociation = "VXDTrackerHitRelations", detectorName = "VertexBarrel", readoutName = "VertexBarrelCollection", LocalNormalVectorDir = "x", @@ -35,8 +35,8 @@ VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", inputSimHits = "VertexEndcapCollection", - outputDigiHits = "VXDEndcapTrackerHitsEDM4HEP", - outputSimDigiAssociation = "VXDEndcapTrackerHitRelationsEDM4HEP", + outputDigiHits = "VXDEndcapTrackerHits", + outputSimDigiAssociation = "VXDEndcapTrackerHitRelations", detectorName = "VertexEndcap", readoutName = "VertexEndcapCollection", LocalNormalVectorDir = "y", @@ -49,8 +49,8 @@ InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", inputSimHits = "InnerTrackerBarrelCollection", - outputDigiHits = "ITrackerHitsEDM4HEP", - outputSimDigiAssociation = "InnerTrackerBarrelHitsRelationsEDM4HEP", + outputDigiHits = "ITrackerHits", + outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", detectorName = "InnerTrackerBarrel", readoutName = "InnerTrackerBarrelCollection", LocalNormalVectorDir = "z", @@ -63,8 +63,8 @@ InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", inputSimHits = "InnerTrackerEndcapCollection", - outputDigiHits = "ITrackerEndcapHitsEDM4HEP", - outputSimDigiAssociation = "InnerTrackerEndcapHitsRelationsEDM4HEP", + outputDigiHits = "ITrackerEndcapHits", + outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", detectorName = "InnerTrackerEndcap", readoutName = "InnerTrackerEndcapCollection", LocalNormalVectorDir = "z", @@ -77,8 +77,8 @@ OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", inputSimHits = "OuterTrackerBarrelCollection", - outputDigiHits = "OTrackerHitsEDM4HEP", - outputSimDigiAssociation = "OuterTrackerBarrelHitsRelationsEDM4HEP", + outputDigiHits = "OTrackerHits", + outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", detectorName = "OuterTrackerBarrel", readoutName = "OuterTrackerBarrelCollection", LocalNormalVectorDir = "z", @@ -91,8 +91,8 @@ OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", inputSimHits = "OuterTrackerEndcapCollection", - outputDigiHits = "OTrackerEndcapHitsEDM4HEP", - outputSimDigiAssociation = "OuterTrackerEndcapHitsRelationsEDM4HEP", + outputDigiHits = "OTrackerEndcapHits", + outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", detectorName = "OuterTrackerEndcap", readoutName = "OuterTrackerEndcapCollection", LocalNormalVectorDir = "z", From 0d7e8c4cfe7e978b8aa0fdbc10584e1e626fcf42 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Tue, 25 Mar 2025 11:31:59 +0100 Subject: [PATCH 11/22] Debug --- CLDConfig/Tracking/ConformalTracking.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CLDConfig/Tracking/ConformalTracking.py b/CLDConfig/Tracking/ConformalTracking.py index ff0a8a5..abceafe 100644 --- a/CLDConfig/Tracking/ConformalTracking.py +++ b/CLDConfig/Tracking/ConformalTracking.py @@ -83,7 +83,7 @@ } # EDM4hep to LCIO converter edmConvTool = EDM4hep2LcioTool("EDM4hep2Lcio") -#edmConvTool.convertAll = True +edmConvTool.convertAll = False # Next Step : do the conversion only for new collections edmConvTool.collNameMapping = { "VXDTrackerHits": "VXDTrackerHits", @@ -99,7 +99,7 @@ "InnerTrackerEndcapHitsRelations": "InnerTrackerEndcapHitsRelations", "OuterTrackerEndcapHitsRelations": "OuterTrackerEndcapHitsRelations" } -edmConvTool.OutputLevel = DEBUG +edmConvTool.OutputLevel = WARNING MyConformalTracking.EDM4hep2LcioTool = edmConvTool ClonesAndSplitTracksFinder = MarlinProcessorWrapper("ClonesAndSplitTracksFinder") From 2d83c680a545c73518ad5da181c97f885eb7fc69 Mon Sep 17 00:00:00 2001 From: Adrien Sabard Date: Thu, 17 Apr 2025 13:45:27 +0200 Subject: [PATCH 12/22] True Works vs False Issue CollNameMapping --- CLDConfig/Tracking/ConformalTracking.py | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/CLDConfig/Tracking/ConformalTracking.py b/CLDConfig/Tracking/ConformalTracking.py index abceafe..adcf1cf 100644 --- a/CLDConfig/Tracking/ConformalTracking.py +++ b/CLDConfig/Tracking/ConformalTracking.py @@ -83,22 +83,22 @@ } # EDM4hep to LCIO converter edmConvTool = EDM4hep2LcioTool("EDM4hep2Lcio") -edmConvTool.convertAll = False +edmConvTool.convertAll = True # Next Step : do the conversion only for new collections -edmConvTool.collNameMapping = { - "VXDTrackerHits": "VXDTrackerHits", - "VXDEndcapTrackerHits": "VXDEndcapTrackerHits", - "ITrackerHits": "ITrackerHits", - "OTrackerHits": "OTrackerHits", - "ITrackerEndcapHits": "ITrackerEndcapHits", - "OTrackerEndcapHits": "OTrackerEndcapHits", - "VXDTrackerHitRelations": "VXDTrackerHitRelations", - "VXDEndcapTrackerHitRelations": "VXDEndcapTrackerHitRelations", - "InnerTrackerBarrelHitsRelations": "InnerTrackerBarrelHitsRelations", - "OuterTrackerBarrelHitsRelations": "OuterTrackerBarrelHitsRelations", - "InnerTrackerEndcapHitsRelations": "InnerTrackerEndcapHitsRelations", - "OuterTrackerEndcapHitsRelations": "OuterTrackerEndcapHitsRelations" -} +#edmConvTool.collNameMapping = { +# "VXDTrackerHits": "VXDTrackerHits", +# "VXDEndcapTrackerHits": "VXDEndcapTrackerHits", +# "ITrackerHits": "ITrackerHits", +# "OTrackerHits": "OTrackerHits", +# "ITrackerEndcapHits": "ITrackerEndcapHits", +# "OTrackerEndcapHits": "OTrackerEndcapHits", +# "VXDTrackerHitRelations": "VXDTrackerHitRelations", +# "VXDEndcapTrackerHitRelations": "VXDEndcapTrackerHitRelations", +# "InnerTrackerBarrelHitsRelations": "InnerTrackerBarrelHitsRelations", +# "OuterTrackerBarrelHitsRelations": "OuterTrackerBarrelHitsRelations", +# "InnerTrackerEndcapHitsRelations": "InnerTrackerEndcapHitsRelations", +# "OuterTrackerEndcapHitsRelations": "OuterTrackerEndcapHitsRelations" +#} edmConvTool.OutputLevel = WARNING MyConformalTracking.EDM4hep2LcioTool = edmConvTool From 1292fede1212cba84e75da9a30f492ec95d751ed Mon Sep 17 00:00:00 2001 From: Adrien Sabard Date: Tue, 29 Apr 2025 00:14:40 +0200 Subject: [PATCH 13/22] thresh config --- CLDConfig/Tracking/TrackingDigi.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 87ad474..bc3de6d 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from Gaudi.Configuration import WARNING +from Gaudi.Configuration import WARNING, DEBUG, INFO from Configurables import VTXdigitizerDetailed VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", @@ -27,8 +27,10 @@ readoutName = "VertexBarrelCollection", LocalNormalVectorDir = "x", tResolution = [0.,0.,0.,0.,0.,0.], + Threshold = 3000.0, + ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = WARNING, + OutputLevel = INFO, DebugHistos = True, DebugFileName = "Debug_VTXBarrelDigitizer.root" ) @@ -41,8 +43,10 @@ readoutName = "VertexEndcapCollection", LocalNormalVectorDir = "y", tResolution = [0.,0.,0.,0.,0.,0.], + Threshold = 3000.0, + ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = WARNING, + OutputLevel = INFO, DebugHistos = True, DebugFileName = "Debug_VTXEndcapDigitizer.root" ) @@ -55,8 +59,10 @@ readoutName = "InnerTrackerBarrelCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.], + Threshold = 3000.0, + ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = WARNING, + OutputLevel = INFO, DebugHistos = True, DebugFileName = "Debug_InnerTrackerBarrelDigitizer.root" ) @@ -69,8 +75,10 @@ readoutName = "InnerTrackerEndcapCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.,0.,0.,0.,0.], + Threshold = 3000.0, + ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = WARNING, + OutputLevel = INFO, DebugHistos = True, DebugFileName = "Debug_InnerTrackerEndcapDigitizer.root" ) @@ -83,8 +91,10 @@ readoutName = "OuterTrackerBarrelCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.], + Threshold = 3000.0, + ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = WARNING, + OutputLevel = INFO, DebugHistos = True, DebugFileName = "Debug_OuterTrackerBarrelDigitizer.root" ) @@ -97,8 +107,10 @@ readoutName = "OuterTrackerEndcapCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.,0.], + Threshold = 3000.0, + ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = WARNING, + OutputLevel = INFO, DebugHistos = True, DebugFileName = "Debug_OuterTrackerEndcapDigitizer.root" ) From a83a88e77601a631633e6fbdb775b49b4742da41 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Wed, 25 Jun 2025 17:36:11 +0200 Subject: [PATCH 14/22] Use DEBUG for Tracking Digi --- CLDConfig/Tracking/TrackingDigi.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index bc3de6d..b9ee734 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -30,7 +30,7 @@ Threshold = 3000.0, ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = INFO, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_VTXBarrelDigitizer.root" ) @@ -46,7 +46,7 @@ Threshold = 3000.0, ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = INFO, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_VTXEndcapDigitizer.root" ) @@ -62,7 +62,7 @@ Threshold = 3000.0, ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = INFO, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_InnerTrackerBarrelDigitizer.root" ) @@ -78,7 +78,7 @@ Threshold = 3000.0, ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = INFO, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_InnerTrackerEndcapDigitizer.root" ) @@ -94,7 +94,7 @@ Threshold = 3000.0, ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = INFO, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_OuterTrackerBarrelDigitizer.root" ) @@ -110,7 +110,7 @@ Threshold = 3000.0, ThresholdSmearing = 35.0, forceHitsOntoSurface = False, - OutputLevel = INFO, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_OuterTrackerEndcapDigitizer.root" ) From 47d3156ba804e1ff52a424f2c841f7ff2c152aa2 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Wed, 16 Jul 2025 17:48:01 +0200 Subject: [PATCH 15/22] Set threshold to 0 and remove debug plots and debug logs --- CLDConfig/Tracking/TrackingDigi.py | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index b9ee734..b4c1cea 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -27,11 +27,11 @@ readoutName = "VertexBarrelCollection", LocalNormalVectorDir = "x", tResolution = [0.,0.,0.,0.,0.,0.], - Threshold = 3000.0, - ThresholdSmearing = 35.0, + Threshold = 0.0, #3000.0, + ThresholdSmearing = 0.0, #35.0, forceHitsOntoSurface = False, - OutputLevel = DEBUG, - DebugHistos = True, + OutputLevel = WARNING, + DebugHistos = False, DebugFileName = "Debug_VTXBarrelDigitizer.root" ) @@ -43,11 +43,11 @@ readoutName = "VertexEndcapCollection", LocalNormalVectorDir = "y", tResolution = [0.,0.,0.,0.,0.,0.], - Threshold = 3000.0, - ThresholdSmearing = 35.0, + Threshold = 0.0, #3000.0, + ThresholdSmearing = 0.0, #35.0, forceHitsOntoSurface = False, - OutputLevel = DEBUG, - DebugHistos = True, + OutputLevel = WARNING, + DebugHistos = False, DebugFileName = "Debug_VTXEndcapDigitizer.root" ) @@ -59,11 +59,11 @@ readoutName = "InnerTrackerBarrelCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.], - Threshold = 3000.0, - ThresholdSmearing = 35.0, + Threshold = 0.0, #3000.0, + ThresholdSmearing = 0.0, #35.0, forceHitsOntoSurface = False, - OutputLevel = DEBUG, - DebugHistos = True, + OutputLevel = WARNING, + DebugHistos = False, DebugFileName = "Debug_InnerTrackerBarrelDigitizer.root" ) @@ -75,11 +75,11 @@ readoutName = "InnerTrackerEndcapCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.,0.,0.,0.,0.], - Threshold = 3000.0, - ThresholdSmearing = 35.0, + Threshold = 0.0, #3000.0, + ThresholdSmearing = 0.0, #35.0, forceHitsOntoSurface = False, - OutputLevel = DEBUG, - DebugHistos = True, + OutputLevel = WARNING, + DebugHistos = False, DebugFileName = "Debug_InnerTrackerEndcapDigitizer.root" ) @@ -91,11 +91,11 @@ readoutName = "OuterTrackerBarrelCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.], - Threshold = 3000.0, - ThresholdSmearing = 35.0, + Threshold = 0.0, #3000.0, + ThresholdSmearing = 0.0, #35.0, forceHitsOntoSurface = False, - OutputLevel = DEBUG, - DebugHistos = True, + OutputLevel = WARNING, + DebugHistos = False, DebugFileName = "Debug_OuterTrackerBarrelDigitizer.root" ) @@ -107,11 +107,11 @@ readoutName = "OuterTrackerEndcapCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.,0.], - Threshold = 3000.0, - ThresholdSmearing = 35.0, + Threshold = 0.0, #3000.0, + ThresholdSmearing = 0.0, #35.0, forceHitsOntoSurface = False, - OutputLevel = DEBUG, - DebugHistos = True, + OutputLevel = WARNING, + DebugHistos = False, DebugFileName = "Debug_OuterTrackerEndcapDigitizer.root" ) From f623817ab5f0edc3aa24d9738a448cc05e4db9f1 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Thu, 24 Jul 2025 13:46:31 +0200 Subject: [PATCH 16/22] Remove forceHitOntoSurface and use Debug plots --- CLDConfig/Tracking/TrackingDigi.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index b4c1cea..40499eb 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -29,9 +29,8 @@ tResolution = [0.,0.,0.,0.,0.,0.], Threshold = 0.0, #3000.0, ThresholdSmearing = 0.0, #35.0, - forceHitsOntoSurface = False, OutputLevel = WARNING, - DebugHistos = False, + DebugHistos = True, DebugFileName = "Debug_VTXBarrelDigitizer.root" ) @@ -45,9 +44,8 @@ tResolution = [0.,0.,0.,0.,0.,0.], Threshold = 0.0, #3000.0, ThresholdSmearing = 0.0, #35.0, - forceHitsOntoSurface = False, OutputLevel = WARNING, - DebugHistos = False, + DebugHistos = True, DebugFileName = "Debug_VTXEndcapDigitizer.root" ) @@ -61,9 +59,8 @@ tResolution = [0.,0.,0.], Threshold = 0.0, #3000.0, ThresholdSmearing = 0.0, #35.0, - forceHitsOntoSurface = False, OutputLevel = WARNING, - DebugHistos = False, + DebugHistos = True, DebugFileName = "Debug_InnerTrackerBarrelDigitizer.root" ) @@ -77,9 +74,8 @@ tResolution = [0.,0.,0.,0.,0.,0.,0.], Threshold = 0.0, #3000.0, ThresholdSmearing = 0.0, #35.0, - forceHitsOntoSurface = False, OutputLevel = WARNING, - DebugHistos = False, + DebugHistos = True, DebugFileName = "Debug_InnerTrackerEndcapDigitizer.root" ) @@ -93,9 +89,8 @@ tResolution = [0.,0.,0.], Threshold = 0.0, #3000.0, ThresholdSmearing = 0.0, #35.0, - forceHitsOntoSurface = False, OutputLevel = WARNING, - DebugHistos = False, + DebugHistos = True, DebugFileName = "Debug_OuterTrackerBarrelDigitizer.root" ) @@ -109,9 +104,8 @@ tResolution = [0.,0.,0.,0.], Threshold = 0.0, #3000.0, ThresholdSmearing = 0.0, #35.0, - forceHitsOntoSurface = False, OutputLevel = WARNING, - DebugHistos = False, + DebugHistos = True, DebugFileName = "Debug_OuterTrackerEndcapDigitizer.root" ) From 8f9dc129b8187458af6b5ec64aa97184cc284328 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Thu, 4 Sep 2025 18:03:05 +0200 Subject: [PATCH 17/22] Remove readoutName option that is now automatically taken from inputSimHits --- CLDConfig/Tracking/TrackingDigi.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 40499eb..2e04e3b 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -24,7 +24,6 @@ outputDigiHits = "VXDTrackerHits", outputSimDigiAssociation = "VXDTrackerHitRelations", detectorName = "VertexBarrel", - readoutName = "VertexBarrelCollection", LocalNormalVectorDir = "x", tResolution = [0.,0.,0.,0.,0.,0.], Threshold = 0.0, #3000.0, @@ -39,7 +38,6 @@ outputDigiHits = "VXDEndcapTrackerHits", outputSimDigiAssociation = "VXDEndcapTrackerHitRelations", detectorName = "VertexEndcap", - readoutName = "VertexEndcapCollection", LocalNormalVectorDir = "y", tResolution = [0.,0.,0.,0.,0.,0.], Threshold = 0.0, #3000.0, @@ -54,7 +52,6 @@ outputDigiHits = "ITrackerHits", outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", detectorName = "InnerTrackerBarrel", - readoutName = "InnerTrackerBarrelCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.], Threshold = 0.0, #3000.0, @@ -69,7 +66,6 @@ outputDigiHits = "ITrackerEndcapHits", outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", detectorName = "InnerTrackerEndcap", - readoutName = "InnerTrackerEndcapCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.,0.,0.,0.,0.], Threshold = 0.0, #3000.0, @@ -84,7 +80,6 @@ outputDigiHits = "OTrackerHits", outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", detectorName = "OuterTrackerBarrel", - readoutName = "OuterTrackerBarrelCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.], Threshold = 0.0, #3000.0, @@ -99,7 +94,6 @@ outputDigiHits = "OTrackerEndcapHits", outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", detectorName = "OuterTrackerEndcap", - readoutName = "OuterTrackerEndcapCollection", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.,0.], Threshold = 0.0, #3000.0, From 591886410331dda7cde4c189e4d8e994baf2cc06 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Tue, 30 Sep 2025 16:53:21 +0200 Subject: [PATCH 18/22] Update with gaudi::Functional detailed digitizer --- CLDConfig/Tracking/TrackingDigi.py | 72 +++++++++++++++--------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 2e04e3b..5d64dfc 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -20,85 +20,85 @@ from Configurables import VTXdigitizerDetailed VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", - inputSimHits = "VertexBarrelCollection", - outputDigiHits = "VXDTrackerHits", - outputSimDigiAssociation = "VXDTrackerHitRelations", + inputSimHits = ["VertexBarrelCollection"], + outputDigiHits = ["VXDTrackerHits"], + outputSimDigiAssociation = ["VXDTrackerHitRelations"], detectorName = "VertexBarrel", LocalNormalVectorDir = "x", tResolution = [0.,0.,0.,0.,0.,0.], - Threshold = 0.0, #3000.0, - ThresholdSmearing = 0.0, #35.0, - OutputLevel = WARNING, + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_VTXBarrelDigitizer.root" ) VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", - inputSimHits = "VertexEndcapCollection", - outputDigiHits = "VXDEndcapTrackerHits", - outputSimDigiAssociation = "VXDEndcapTrackerHitRelations", + inputSimHits = ["VertexEndcapCollection"], + outputDigiHits = ["VXDEndcapTrackerHits"], + outputSimDigiAssociation = ["VXDEndcapTrackerHitRelations"], detectorName = "VertexEndcap", LocalNormalVectorDir = "y", tResolution = [0.,0.,0.,0.,0.,0.], - Threshold = 0.0, #3000.0, - ThresholdSmearing = 0.0, #35.0, - OutputLevel = WARNING, + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_VTXEndcapDigitizer.root" ) InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", - inputSimHits = "InnerTrackerBarrelCollection", - outputDigiHits = "ITrackerHits", - outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", + inputSimHits = ["InnerTrackerBarrelCollection"], + outputDigiHits = ["ITrackerHits"], + outputSimDigiAssociation = ["InnerTrackerBarrelHitsRelations"], detectorName = "InnerTrackerBarrel", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.], - Threshold = 0.0, #3000.0, - ThresholdSmearing = 0.0, #35.0, - OutputLevel = WARNING, + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_InnerTrackerBarrelDigitizer.root" ) InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", - inputSimHits = "InnerTrackerEndcapCollection", - outputDigiHits = "ITrackerEndcapHits", - outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", + inputSimHits = ["InnerTrackerEndcapCollection"], + outputDigiHits = ["ITrackerEndcapHits"], + outputSimDigiAssociation = ["InnerTrackerEndcapHitsRelations"], detectorName = "InnerTrackerEndcap", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.,0.,0.,0.,0.], - Threshold = 0.0, #3000.0, - ThresholdSmearing = 0.0, #35.0, - OutputLevel = WARNING, + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_InnerTrackerEndcapDigitizer.root" ) OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", - inputSimHits = "OuterTrackerBarrelCollection", - outputDigiHits = "OTrackerHits", - outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", + inputSimHits = ["OuterTrackerBarrelCollection"], + outputDigiHits = ["OTrackerHits"], + outputSimDigiAssociation = ["OuterTrackerBarrelHitsRelations"], detectorName = "OuterTrackerBarrel", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.], - Threshold = 0.0, #3000.0, - ThresholdSmearing = 0.0, #35.0, - OutputLevel = WARNING, + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_OuterTrackerBarrelDigitizer.root" ) OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", - inputSimHits = "OuterTrackerEndcapCollection", - outputDigiHits = "OTrackerEndcapHits", - outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", + inputSimHits = ["OuterTrackerEndcapCollection"], + outputDigiHits = ["OTrackerEndcapHits"], + outputSimDigiAssociation = ["OuterTrackerEndcapHitsRelations"], detectorName = "OuterTrackerEndcap", LocalNormalVectorDir = "z", tResolution = [0.,0.,0.,0.], - Threshold = 0.0, #3000.0, - ThresholdSmearing = 0.0, #35.0, - OutputLevel = WARNING, + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = DEBUG, DebugHistos = True, DebugFileName = "Debug_OuterTrackerEndcapDigitizer.root" ) From caf9104aa6b590806abe58c27deaef69bade5451 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Tue, 25 Nov 2025 13:48:26 +0100 Subject: [PATCH 19/22] Update Digitizer config with parametrized pixels and KeyValue instead of KeyValues --- CLDConfig/Tracking/TrackingDigi.py | 54 +++++++++++++++++------------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 5d64dfc..43a9b2f 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -20,11 +20,12 @@ from Configurables import VTXdigitizerDetailed VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", - inputSimHits = ["VertexBarrelCollection"], - outputDigiHits = ["VXDTrackerHits"], - outputSimDigiAssociation = ["VXDTrackerHitRelations"], + inputSimHits = "VertexBarrelCollection", + outputDigiHits = "VXDTrackerHits", + outputSimDigiAssociation = "VXDTrackerHitRelations", detectorName = "VertexBarrel", - LocalNormalVectorDir = "x", + PixSizePhi = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm + PixSizeTheta = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm tResolution = [0.,0.,0.,0.,0.,0.], Threshold = 100.0, ThresholdSmearing = 20.0, @@ -34,11 +35,12 @@ ) VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", - inputSimHits = ["VertexEndcapCollection"], - outputDigiHits = ["VXDEndcapTrackerHits"], - outputSimDigiAssociation = ["VXDEndcapTrackerHitRelations"], + inputSimHits = "VertexEndcapCollection", + outputDigiHits = "VXDEndcapTrackerHits", + outputSimDigiAssociation = "VXDEndcapTrackerHitRelations", detectorName = "VertexEndcap", - LocalNormalVectorDir = "y", + PixSizePhi = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm + PixSizeTheta = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm tResolution = [0.,0.,0.,0.,0.,0.], Threshold = 100.0, ThresholdSmearing = 20.0, @@ -48,11 +50,12 @@ ) InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", - inputSimHits = ["InnerTrackerBarrelCollection"], - outputDigiHits = ["ITrackerHits"], - outputSimDigiAssociation = ["InnerTrackerBarrelHitsRelations"], + inputSimHits = "InnerTrackerBarrelCollection", + outputDigiHits = "ITrackerHits", + outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", detectorName = "InnerTrackerBarrel", - LocalNormalVectorDir = "z", + PixSizePhi = [0.050, 0.050, 0.050], # in mm + PixSizeTheta = [0.300, 0.300, 0.300], # in mm tResolution = [0.,0.,0.], Threshold = 100.0, ThresholdSmearing = 20.0, @@ -62,11 +65,12 @@ ) InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", - inputSimHits = ["InnerTrackerEndcapCollection"], - outputDigiHits = ["ITrackerEndcapHits"], - outputSimDigiAssociation = ["InnerTrackerEndcapHitsRelations"], + inputSimHits = "InnerTrackerEndcapCollection", + outputDigiHits = "ITrackerEndcapHits", + outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", detectorName = "InnerTrackerEndcap", - LocalNormalVectorDir = "z", + PixSizePhi = [0.020, 0.050, 0.050, 0.050, 0.050, 0.050,0.050], # in mm + PixSizeTheta = [0.020, 0.300, 0.300, 0.300, 0.300, 0.300, 0.300], # in mm tResolution = [0.,0.,0.,0.,0.,0.,0.], Threshold = 100.0, ThresholdSmearing = 20.0, @@ -76,11 +80,12 @@ ) OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", - inputSimHits = ["OuterTrackerBarrelCollection"], - outputDigiHits = ["OTrackerHits"], - outputSimDigiAssociation = ["OuterTrackerBarrelHitsRelations"], + inputSimHits = "OuterTrackerBarrelCollection", + outputDigiHits = "OTrackerHits", + outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", detectorName = "OuterTrackerBarrel", - LocalNormalVectorDir = "z", + PixSizePhi = [0.050, 0.050, 0.050], # in mm + PixSizeTheta = [0.300, 0.300, 0.300], # in mm tResolution = [0.,0.,0.], Threshold = 100.0, ThresholdSmearing = 20.0, @@ -90,11 +95,12 @@ ) OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", - inputSimHits = ["OuterTrackerEndcapCollection"], - outputDigiHits = ["OTrackerEndcapHits"], - outputSimDigiAssociation = ["OuterTrackerEndcapHitsRelations"], + inputSimHits = "OuterTrackerEndcapCollection", + outputDigiHits = "OTrackerEndcapHits", + outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", detectorName = "OuterTrackerEndcap", - LocalNormalVectorDir = "z", + PixSizePhi = [0.050, 0.050, 0.050, 0.050], # in mm + PixSizeTheta = [0.300, 0.300, 0.300, 0.300], # in mm tResolution = [0.,0.,0.,0.], Threshold = 100.0, ThresholdSmearing = 20.0, From 97b418c1a8da04e06067f7fe38d12ebfbd795c58 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Wed, 18 Feb 2026 15:01:18 +0100 Subject: [PATCH 20/22] Use Detailed Tracker Digitizer as option --- CLDConfig/CLDReconstruction.py | 6 +- CLDConfig/Tracking/ConformalTracking.py | 26 +--- CLDConfig/Tracking/TrackingDigi.py | 173 ++++++++++----------- CLDConfig/Tracking/TrackingDigiDetailed.py | 119 ++++++++++++++ 4 files changed, 211 insertions(+), 113 deletions(-) create mode 100644 CLDConfig/Tracking/TrackingDigiDetailed.py diff --git a/CLDConfig/CLDReconstruction.py b/CLDConfig/CLDReconstruction.py index f932131..225b18d 100644 --- a/CLDConfig/CLDReconstruction.py +++ b/CLDConfig/CLDReconstruction.py @@ -35,6 +35,7 @@ parser_group.add_argument("--enableLCFIJet", action="store_true", help="Enable LCFIPlus jet clustering parts", default=False) parser_group.add_argument("--cms", action="store", help="Choose a Centre-of-Mass energy", default=240, choices=(91, 160, 240, 365), type=int) parser_group.add_argument("--compactFile", help="Compact detector file to use", type=str, default=os.environ["K4GEO"] + "/FCCee/CLD/compact/CLD_o2_v07/CLD_o2_v07.xml") +parser_group.add_argument("--detailedDigitization", action="store_true", default=False, help="Use detailed digitization for the tracker (k4Rectracker/VTXdigiDetailed), instead of parametric digitization") tracking_group = parser_group.add_mutually_exclusive_group() tracking_group.add_argument("--conformalTracking", action="store_true", default=True, help="Use conformal tracking pattern recognition") tracking_group.add_argument("--truthTracking", action="store_true", default=False, help="Cheat tracking pattern recognition") @@ -115,7 +116,10 @@ algList.append(MyAIDAProcessor) sequenceLoader.load("Overlay/Overlay") # tracker hit digitisation -sequenceLoader.load("Tracking/TrackingDigi") +if reco_args.detailedDigitization: + sequenceLoader.load("Tracking/TrackingDigiDetailed") +else: + sequenceLoader.load("Tracking/TrackingDigi") # tracking if reco_args.truthTracking: diff --git a/CLDConfig/Tracking/ConformalTracking.py b/CLDConfig/Tracking/ConformalTracking.py index adcf1cf..695f5fc 100644 --- a/CLDConfig/Tracking/ConformalTracking.py +++ b/CLDConfig/Tracking/ConformalTracking.py @@ -81,26 +81,12 @@ "TrackerHitCollectionNames": ["VXDTrackerHits", "VXDEndcapTrackerHits", "ITrackerHits", "OTrackerHits", "ITrackerEndcapHits", "OTrackerEndcapHits"], "trackPurity": ["0.7"] } -# EDM4hep to LCIO converter -edmConvTool = EDM4hep2LcioTool("EDM4hep2Lcio") -edmConvTool.convertAll = True -# Next Step : do the conversion only for new collections -#edmConvTool.collNameMapping = { -# "VXDTrackerHits": "VXDTrackerHits", -# "VXDEndcapTrackerHits": "VXDEndcapTrackerHits", -# "ITrackerHits": "ITrackerHits", -# "OTrackerHits": "OTrackerHits", -# "ITrackerEndcapHits": "ITrackerEndcapHits", -# "OTrackerEndcapHits": "OTrackerEndcapHits", -# "VXDTrackerHitRelations": "VXDTrackerHitRelations", -# "VXDEndcapTrackerHitRelations": "VXDEndcapTrackerHitRelations", -# "InnerTrackerBarrelHitsRelations": "InnerTrackerBarrelHitsRelations", -# "OuterTrackerBarrelHitsRelations": "OuterTrackerBarrelHitsRelations", -# "InnerTrackerEndcapHitsRelations": "InnerTrackerEndcapHitsRelations", -# "OuterTrackerEndcapHitsRelations": "OuterTrackerEndcapHitsRelations" -#} -edmConvTool.OutputLevel = WARNING -MyConformalTracking.EDM4hep2LcioTool = edmConvTool +# EDM4hep to LCIO converter (only needed for the Detailed Digitization which produces EDM4hep output) +if reco_args.detailedDigitization: + edmConvTool = EDM4hep2LcioTool("EDM4hep2Lcio") + edmConvTool.convertAll = True + edmConvTool.OutputLevel = WARNING + MyConformalTracking.EDM4hep2LcioTool = edmConvTool ClonesAndSplitTracksFinder = MarlinProcessorWrapper("ClonesAndSplitTracksFinder") ClonesAndSplitTracksFinder.OutputLevel = WARNING diff --git a/CLDConfig/Tracking/TrackingDigi.py b/CLDConfig/Tracking/TrackingDigi.py index 43a9b2f..5d352ea 100644 --- a/CLDConfig/Tracking/TrackingDigi.py +++ b/CLDConfig/Tracking/TrackingDigi.py @@ -16,104 +16,93 @@ # See the License for the specific language governing permissions and # limitations under the License. # -from Gaudi.Configuration import WARNING, DEBUG, INFO -from Configurables import VTXdigitizerDetailed +from Gaudi.Configuration import WARNING +from Configurables import MarlinProcessorWrapper -VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", - inputSimHits = "VertexBarrelCollection", - outputDigiHits = "VXDTrackerHits", - outputSimDigiAssociation = "VXDTrackerHitRelations", - detectorName = "VertexBarrel", - PixSizePhi = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm - PixSizeTheta = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm - tResolution = [0.,0.,0.,0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, - OutputLevel = DEBUG, - DebugHistos = True, - DebugFileName = "Debug_VTXBarrelDigitizer.root" - ) -VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", - inputSimHits = "VertexEndcapCollection", - outputDigiHits = "VXDEndcapTrackerHits", - outputSimDigiAssociation = "VXDEndcapTrackerHitRelations", - detectorName = "VertexEndcap", - PixSizePhi = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm - PixSizeTheta = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm - tResolution = [0.,0.,0.,0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, - OutputLevel = DEBUG, - DebugHistos = True, - DebugFileName = "Debug_VTXEndcapDigitizer.root" - ) +VXDBarrelDigitiser = MarlinProcessorWrapper("VXDBarrelDigitiser") +VXDBarrelDigitiser.OutputLevel = WARNING +VXDBarrelDigitiser.ProcessorType = "DDPlanarDigiProcessor" +VXDBarrelDigitiser.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"], + "SimTrackHitCollectionName": ["VertexBarrelCollection"], + "SimTrkHitRelCollection": ["VXDTrackerHitRelations"], + "SubDetectorName": ["Vertex"], + "TrackerHitCollectionName": ["VXDTrackerHits"] + } -InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", - inputSimHits = "InnerTrackerBarrelCollection", - outputDigiHits = "ITrackerHits", - outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", - detectorName = "InnerTrackerBarrel", - PixSizePhi = [0.050, 0.050, 0.050], # in mm - PixSizeTheta = [0.300, 0.300, 0.300], # in mm - tResolution = [0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, - OutputLevel = DEBUG, - DebugHistos = True, - DebugFileName = "Debug_InnerTrackerBarrelDigitizer.root" - ) +VXDEndcapDigitiser = MarlinProcessorWrapper("VXDEndcapDigitiser") +VXDEndcapDigitiser.OutputLevel = WARNING +VXDEndcapDigitiser.ProcessorType = "DDPlanarDigiProcessor" +VXDEndcapDigitiser.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"], + "SimTrackHitCollectionName": ["VertexEndcapCollection"], + "SimTrkHitRelCollection": ["VXDEndcapTrackerHitRelations"], + "SubDetectorName": ["Vertex"], + "TrackerHitCollectionName": ["VXDEndcapTrackerHits"] + } -InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", - inputSimHits = "InnerTrackerEndcapCollection", - outputDigiHits = "ITrackerEndcapHits", - outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", - detectorName = "InnerTrackerEndcap", - PixSizePhi = [0.020, 0.050, 0.050, 0.050, 0.050, 0.050,0.050], # in mm - PixSizeTheta = [0.020, 0.300, 0.300, 0.300, 0.300, 0.300, 0.300], # in mm - tResolution = [0.,0.,0.,0.,0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, - OutputLevel = DEBUG, - DebugHistos = True, - DebugFileName = "Debug_InnerTrackerEndcapDigitizer.root" - ) +InnerPlanarDigiProcessor = MarlinProcessorWrapper("InnerPlanarDigiProcessor") +InnerPlanarDigiProcessor.OutputLevel = WARNING +InnerPlanarDigiProcessor.ProcessorType = "DDPlanarDigiProcessor" +InnerPlanarDigiProcessor.Parameters = { + "IsStrip": ["false"], + "ResolutionU": ["0.007"], + "ResolutionV": ["0.09"], + "SimTrackHitCollectionName": ["InnerTrackerBarrelCollection"], + "SimTrkHitRelCollection": ["InnerTrackerBarrelHitsRelations"], + "SubDetectorName": ["InnerTrackers"], + "TrackerHitCollectionName": ["ITrackerHits"] + } -OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", - inputSimHits = "OuterTrackerBarrelCollection", - outputDigiHits = "OTrackerHits", - outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", - detectorName = "OuterTrackerBarrel", - PixSizePhi = [0.050, 0.050, 0.050], # in mm - PixSizeTheta = [0.300, 0.300, 0.300], # in mm - tResolution = [0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, - OutputLevel = DEBUG, - DebugHistos = True, - DebugFileName = "Debug_OuterTrackerBarrelDigitizer.root" - ) +InnerEndcapPlanarDigiProcessor = MarlinProcessorWrapper("InnerEndcapPlanarDigiProcessor") +InnerEndcapPlanarDigiProcessor.OutputLevel = WARNING +InnerEndcapPlanarDigiProcessor.ProcessorType = "DDPlanarDigiProcessor" +InnerEndcapPlanarDigiProcessor.Parameters = { + "IsStrip": ["false"], + "ResolutionU": ["0.005", "0.007", "0.007", "0.007", "0.007", "0.007", "0.007"], + "ResolutionV": ["0.005", "0.09", "0.09", "0.09", "0.09", "0.09", "0.09"], + "SimTrackHitCollectionName": ["InnerTrackerEndcapCollection"], + "SimTrkHitRelCollection": ["InnerTrackerEndcapHitsRelations"], + "SubDetectorName": ["InnerTrackers"], + "TrackerHitCollectionName": ["ITrackerEndcapHits"] + } -OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", - inputSimHits = "OuterTrackerEndcapCollection", - outputDigiHits = "OTrackerEndcapHits", - outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", - detectorName = "OuterTrackerEndcap", - PixSizePhi = [0.050, 0.050, 0.050, 0.050], # in mm - PixSizeTheta = [0.300, 0.300, 0.300, 0.300], # in mm - tResolution = [0.,0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, - OutputLevel = DEBUG, - DebugHistos = True, - DebugFileName = "Debug_OuterTrackerEndcapDigitizer.root" - ) +OuterPlanarDigiProcessor = MarlinProcessorWrapper("OuterPlanarDigiProcessor") +OuterPlanarDigiProcessor.OutputLevel = WARNING +OuterPlanarDigiProcessor.ProcessorType = "DDPlanarDigiProcessor" +OuterPlanarDigiProcessor.Parameters = { + "IsStrip": ["false"], + "ResolutionU": ["0.007", "0.007", "0.007"], + "ResolutionV": ["0.09", "0.09", "0.09"], + "SimTrackHitCollectionName": ["OuterTrackerBarrelCollection"], + "SimTrkHitRelCollection": ["OuterTrackerBarrelHitsRelations"], + "SubDetectorName": ["OuterTrackers"], + "TrackerHitCollectionName": ["OTrackerHits"] + } + +OuterEndcapPlanarDigiProcessor = MarlinProcessorWrapper("OuterEndcapPlanarDigiProcessor") +OuterEndcapPlanarDigiProcessor.OutputLevel = WARNING +OuterEndcapPlanarDigiProcessor.ProcessorType = "DDPlanarDigiProcessor" +OuterEndcapPlanarDigiProcessor.Parameters = { + "IsStrip": ["false"], + "ResolutionU": ["0.007", "0.007", "0.007", "0.007", "0.007"], + "ResolutionV": ["0.09", "0.09", "0.09", "0.09", "0.09"], + "SimTrackHitCollectionName": ["OuterTrackerEndcapCollection"], + "SimTrkHitRelCollection": ["OuterTrackerEndcapHitsRelations"], + "SubDetectorName": ["OuterTrackers"], + "TrackerHitCollectionName": ["OTrackerEndcapHits"] + } TrackingDigiSequence = [ - VTXBarrelDigitizer, - VTXEndcapDigitizer, - InnerTrackerBarrelDigitizer, - InnerTrackerEndcapDigitizer, - OuterTrackerBarrelDigitizer, - OuterTrackerEndcapDigitizer + VXDBarrelDigitiser, + VXDEndcapDigitiser, + InnerPlanarDigiProcessor, + InnerEndcapPlanarDigiProcessor, + OuterPlanarDigiProcessor, + OuterEndcapPlanarDigiProcessor, ] diff --git a/CLDConfig/Tracking/TrackingDigiDetailed.py b/CLDConfig/Tracking/TrackingDigiDetailed.py new file mode 100644 index 0000000..d803ee4 --- /dev/null +++ b/CLDConfig/Tracking/TrackingDigiDetailed.py @@ -0,0 +1,119 @@ +# +# Copyright (c) 2014-2024 Key4hep-Project. +# +# This file is part of Key4hep. +# See https://key4hep.github.io/key4hep-doc/ for further info. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +from Gaudi.Configuration import WARNING, DEBUG, INFO +from Configurables import VTXdigitizerDetailed + +VTXBarrelDigitizer = VTXdigitizerDetailed("VTXBarrelDigitizer", + inputSimHits = "VertexBarrelCollection", + outputDigiHits = "VXDTrackerHits", + outputSimDigiAssociation = "VXDTrackerHitRelations", + detectorName = "VertexBarrel", + PixSizePhi = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm + PixSizeTheta = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm + tResolution = [0.,0.,0.,0.,0.,0.], + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = WARNING, + DebugHistos = False, + DebugFileName = "Debug_VTXBarrelDigitizer.root" + ) + +VTXEndcapDigitizer = VTXdigitizerDetailed("VTXEndcapDigitizer", + inputSimHits = "VertexEndcapCollection", + outputDigiHits = "VXDEndcapTrackerHits", + outputSimDigiAssociation = "VXDEndcapTrackerHitRelations", + detectorName = "VertexEndcap", + PixSizePhi = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm + PixSizeTheta = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm + tResolution = [0.,0.,0.,0.,0.,0.], + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = WARNING, + DebugHistos = False, + DebugFileName = "Debug_VTXEndcapDigitizer.root" + ) + +InnerTrackerBarrelDigitizer = VTXdigitizerDetailed("InnerTrackerBarrelDigitizer", + inputSimHits = "InnerTrackerBarrelCollection", + outputDigiHits = "ITrackerHits", + outputSimDigiAssociation = "InnerTrackerBarrelHitsRelations", + detectorName = "InnerTrackerBarrel", + PixSizePhi = [0.050, 0.050, 0.050], # in mm + PixSizeTheta = [0.300, 0.300, 0.300], # in mm + tResolution = [0.,0.,0.], + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = WARNING, + DebugHistos = False, + DebugFileName = "Debug_InnerTrackerBarrelDigitizer.root" + ) + +InnerTrackerEndcapDigitizer = VTXdigitizerDetailed("InnerTrackerEndcapDigitizer", + inputSimHits = "InnerTrackerEndcapCollection", + outputDigiHits = "ITrackerEndcapHits", + outputSimDigiAssociation = "InnerTrackerEndcapHitsRelations", + detectorName = "InnerTrackerEndcap", + PixSizePhi = [0.020, 0.050, 0.050, 0.050, 0.050, 0.050,0.050], # in mm + PixSizeTheta = [0.020, 0.300, 0.300, 0.300, 0.300, 0.300, 0.300], # in mm + tResolution = [0.,0.,0.,0.,0.,0.,0.], + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = WARNING, + DebugHistos = False, + DebugFileName = "Debug_InnerTrackerEndcapDigitizer.root" + ) + +OuterTrackerBarrelDigitizer = VTXdigitizerDetailed("OuterTrackerBarrelDigitizer", + inputSimHits = "OuterTrackerBarrelCollection", + outputDigiHits = "OTrackerHits", + outputSimDigiAssociation = "OuterTrackerBarrelHitsRelations", + detectorName = "OuterTrackerBarrel", + PixSizePhi = [0.050, 0.050, 0.050], # in mm + PixSizeTheta = [0.300, 0.300, 0.300], # in mm + tResolution = [0.,0.,0.], + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = WARNING, + DebugHistos = False, + DebugFileName = "Debug_OuterTrackerBarrelDigitizer.root" + ) + +OuterTrackerEndcapDigitizer = VTXdigitizerDetailed("OuterTrackerEndcapDigitizer", + inputSimHits = "OuterTrackerEndcapCollection", + outputDigiHits = "OTrackerEndcapHits", + outputSimDigiAssociation = "OuterTrackerEndcapHitsRelations", + detectorName = "OuterTrackerEndcap", + PixSizePhi = [0.050, 0.050, 0.050, 0.050], # in mm + PixSizeTheta = [0.300, 0.300, 0.300, 0.300], # in mm + tResolution = [0.,0.,0.,0.], + Threshold = 100.0, + ThresholdSmearing = 20.0, + OutputLevel = WARNING, + DebugHistos = False, + DebugFileName = "Debug_OuterTrackerEndcapDigitizer.root" + ) + +TrackingDigiDetailedSequence = [ + VTXBarrelDigitizer, + VTXEndcapDigitizer, + InnerTrackerBarrelDigitizer, + InnerTrackerEndcapDigitizer, + OuterTrackerBarrelDigitizer, + OuterTrackerEndcapDigitizer +] \ No newline at end of file From afc193cafb298d05dbf079e7b0bb50a9e9aa8c3e Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Wed, 18 Feb 2026 15:26:33 +0100 Subject: [PATCH 21/22] Restore steps names in Conformaltracking --- CLDConfig/Tracking/ConformalTracking.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CLDConfig/Tracking/ConformalTracking.py b/CLDConfig/Tracking/ConformalTracking.py index 695f5fc..15fa8d6 100644 --- a/CLDConfig/Tracking/ConformalTracking.py +++ b/CLDConfig/Tracking/ConformalTracking.py @@ -45,12 +45,12 @@ "SortTreeResults": ["true"], "Steps": [ - "[VTXTrackerBarrel]", + "[VXDBarrel]", "@Collections", ":", "VXDTrackerHits", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", "@Functions", ":", "CombineCollections,", "BuildNewTracks", - "[VTXTrackerEndcap]", + "[VXDEncap]", "@Collections", ":", "VXDEndcapTrackerHits", "@Parameters", ":", "MaxCellAngle", ":", "0.01;", "MaxCellAngleRZ", ":", "0.01;", "Chi2Cut", ":", "100;", "MinClustersOnTrack", ":", "4;", "MaxDistance", ":", CT_MAX_DIST, "SlopeZRange:", "10.0;", "HighPTCut:", "10.0;", "@Flags", ":", "HighPTFit,", "VertexToTracker", From ec1988248a9c2a95e0b81291358d6a7e8faf1400 Mon Sep 17 00:00:00 2001 From: jessy-daniel Date: Wed, 18 Feb 2026 15:47:17 +0100 Subject: [PATCH 22/22] Run precommit to correct format --- CLDConfig/Tracking/TrackingDigiDetailed.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CLDConfig/Tracking/TrackingDigiDetailed.py b/CLDConfig/Tracking/TrackingDigiDetailed.py index d803ee4..7c3e097 100644 --- a/CLDConfig/Tracking/TrackingDigiDetailed.py +++ b/CLDConfig/Tracking/TrackingDigiDetailed.py @@ -28,7 +28,7 @@ PixSizeTheta = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm tResolution = [0.,0.,0.,0.,0.,0.], Threshold = 100.0, - ThresholdSmearing = 20.0, + ThresholdSmearing = 20.0, OutputLevel = WARNING, DebugHistos = False, DebugFileName = "Debug_VTXBarrelDigitizer.root" @@ -42,8 +42,8 @@ PixSizePhi = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm PixSizeTheta = [0.020, 0.020, 0.020, 0.020, 0.020, 0.020], # in mm tResolution = [0.,0.,0.,0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, + Threshold = 100.0, + ThresholdSmearing = 20.0, OutputLevel = WARNING, DebugHistos = False, DebugFileName = "Debug_VTXEndcapDigitizer.root" @@ -57,8 +57,8 @@ PixSizePhi = [0.050, 0.050, 0.050], # in mm PixSizeTheta = [0.300, 0.300, 0.300], # in mm tResolution = [0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, + Threshold = 100.0, + ThresholdSmearing = 20.0, OutputLevel = WARNING, DebugHistos = False, DebugFileName = "Debug_InnerTrackerBarrelDigitizer.root" @@ -72,8 +72,8 @@ PixSizePhi = [0.020, 0.050, 0.050, 0.050, 0.050, 0.050,0.050], # in mm PixSizeTheta = [0.020, 0.300, 0.300, 0.300, 0.300, 0.300, 0.300], # in mm tResolution = [0.,0.,0.,0.,0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, + Threshold = 100.0, + ThresholdSmearing = 20.0, OutputLevel = WARNING, DebugHistos = False, DebugFileName = "Debug_InnerTrackerEndcapDigitizer.root" @@ -87,8 +87,8 @@ PixSizePhi = [0.050, 0.050, 0.050], # in mm PixSizeTheta = [0.300, 0.300, 0.300], # in mm tResolution = [0.,0.,0.], - Threshold = 100.0, - ThresholdSmearing = 20.0, + Threshold = 100.0, + ThresholdSmearing = 20.0, OutputLevel = WARNING, DebugHistos = False, DebugFileName = "Debug_OuterTrackerBarrelDigitizer.root" @@ -103,7 +103,7 @@ PixSizeTheta = [0.300, 0.300, 0.300, 0.300], # in mm tResolution = [0.,0.,0.,0.], Threshold = 100.0, - ThresholdSmearing = 20.0, + ThresholdSmearing = 20.0, OutputLevel = WARNING, DebugHistos = False, DebugFileName = "Debug_OuterTrackerEndcapDigitizer.root" @@ -116,4 +116,4 @@ InnerTrackerEndcapDigitizer, OuterTrackerBarrelDigitizer, OuterTrackerEndcapDigitizer -] \ No newline at end of file +]