From 25e87bdf9785416c41b82968e482569fbe56d763 Mon Sep 17 00:00:00 2001 From: sesen <sevda.esen@cern.ch> Date: Thu, 3 Mar 2022 12:00:03 +0100 Subject: [PATCH 1/9] replace HltPackedDataDecoder with HltPackedBufferDecoder in timing --- python/MooreTests/readTimingTable.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/MooreTests/readTimingTable.py b/python/MooreTests/readTimingTable.py index 4f8aab6c..42cf9d94 100644 --- a/python/MooreTests/readTimingTable.py +++ b/python/MooreTests/readTimingTable.py @@ -111,8 +111,8 @@ algGroups = { "CopyParticle2PVRelationsFromLinePersistenceLocations", "CopyParticlesWithPVRelations", "CopyProtoParticle2MCRelations", "CopySignalMCParticles", "ExecutionReportsWriter", - "HltDecReportsWriter", "HltPackedDataWriter", - "Hlt__RoutingBitsWriter", "Pack.*" + "HltDecReportsWriter", "HltPackedBufferWriter", + "Hlt__RoutingBitsWriter", "*Packer*" ]) ]) } -- GitLab From 9da1aa735864ee35c4469a48c2869eeddad95a6d Mon Sep 17 00:00:00 2001 From: sesen <sevda.esen@cern.ch> Date: Fri, 4 Mar 2022 17:20:17 +0100 Subject: [PATCH 2/9] fix timing table --- python/MooreTests/readTimingTable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/MooreTests/readTimingTable.py b/python/MooreTests/readTimingTable.py index 42cf9d94..3d9b1434 100644 --- a/python/MooreTests/readTimingTable.py +++ b/python/MooreTests/readTimingTable.py @@ -112,7 +112,7 @@ algGroups = { "CopyParticlesWithPVRelations", "CopyProtoParticle2MCRelations", "CopySignalMCParticles", "ExecutionReportsWriter", "HltDecReportsWriter", "HltPackedBufferWriter", - "Hlt__RoutingBitsWriter", "*Packer*" + "Hlt__RoutingBitsWriter", ".*Packer.*" ]) ]) } -- GitLab From 7af4d66018d9abdf4f23e8b92f3748db31c5d804 Mon Sep 17 00:00:00 2001 From: sesen <sevda.esen@cern.ch> Date: Tue, 8 Mar 2022 02:24:02 +0100 Subject: [PATCH 3/9] split persistency for timing plot --- python/MooreTests/readTimingTable.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/python/MooreTests/readTimingTable.py b/python/MooreTests/readTimingTable.py index 3d9b1434..9865f3b4 100644 --- a/python/MooreTests/readTimingTable.py +++ b/python/MooreTests/readTimingTable.py @@ -106,13 +106,19 @@ algGroups = { "JpsiMaker_ChicJpsiDiMuonLine", "make_chic2jpsimumu", "onia_prompt_pions", "^Charm.*", "^B2CC_.*" ]), - ("Persistence", [ + ("PersistenceCloning", [ "CopyLinePersistenceLocations", "CopyParticle2PVRelationsFromLinePersistenceLocations", "CopyParticlesWithPVRelations", "CopyProtoParticle2MCRelations", - "CopySignalMCParticles", "ExecutionReportsWriter", + "CopySignalMCParticles" + ]), + ("PersistenceWriting", [ + "ExecutionReportsWriter", "HltDecReportsWriter", "HltPackedBufferWriter", - "Hlt__RoutingBitsWriter", ".*Packer.*" + "Hlt__RoutingBitsWriter" + ]), + ("PersistencePacking", [ + ".*Pack.*" ]) ]) } -- GitLab From 6add84a500eced3ebe3509aa8ce2482086642278 Mon Sep 17 00:00:00 2001 From: sesen <sevda.esen@cern.ch> Date: Wed, 9 Mar 2022 21:12:37 +0100 Subject: [PATCH 4/9] update the algorithms for MuonPID in timing table due to name change --- python/MooreTests/readTimingTable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/MooreTests/readTimingTable.py b/python/MooreTests/readTimingTable.py index 9865f3b4..b8260ac4 100644 --- a/python/MooreTests/readTimingTable.py +++ b/python/MooreTests/readTimingTable.py @@ -85,7 +85,7 @@ algGroups = { "GraphClustering" ]), ("RICH", ["Rich.*"]), - ("Muon", ["MuonIDAlgLite", "MuonRawToHits"]), + ("Muon", ["Muon.*"]), ("Converters", [ ".*?[c,C]onverter.*", "TracksToSelection.*", "TrackSelectionToContainer", "fromPrSeedingTracksV1Tracks", -- GitLab From 5993fbfd132b75d73cb6ff55509562fc514147e9 Mon Sep 17 00:00:00 2001 From: sesen <sevda.esen@cern.ch> Date: Wed, 23 Mar 2022 15:37:51 +0100 Subject: [PATCH 5/9] better seperate packers from other algorithm in timing table --- python/MooreTests/readTimingTable.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/python/MooreTests/readTimingTable.py b/python/MooreTests/readTimingTable.py index b8260ac4..85891873 100644 --- a/python/MooreTests/readTimingTable.py +++ b/python/MooreTests/readTimingTable.py @@ -73,7 +73,7 @@ algGroups = { "CreateBestTrackContainer" ]), ("Calorimeter", [ - "Calo.*", "FutureEcalZSup", "FutureCellularAutomatonAlg", + "^(?!.*Packer).*Calo.*", "FutureEcalZSup", "FutureCellularAutomatonAlg", "InEcalFutureAcceptanceAlg", "FutureTrack2EcalEAlg", "FutureEcalPIDmuAlg", "FutureHcalZSup", "InHcalFutureAcceptanceAlg", "FutureTrack2HcalEAlg", @@ -84,8 +84,8 @@ algGroups = { "BremChi22IDFuture", "BremPIDeAlgFuture", "FutureClusChi22ID", "GraphClustering" ]), - ("RICH", ["Rich.*"]), - ("Muon", ["Muon.*"]), + ("RICH", ["^(?!.*Packer).*Rich.*"]), + ("Muon", ["^(?!.*Packer).*Muon.*"]), ("Converters", [ ".*?[c,C]onverter.*", "TracksToSelection.*", "TrackSelectionToContainer", "fromPrSeedingTracksV1Tracks", @@ -118,7 +118,7 @@ algGroups = { "Hlt__RoutingBitsWriter" ]), ("PersistencePacking", [ - ".*Pack.*" + ".*Packer.*" ]) ]) } -- GitLab From ea5fc3a46704f13dd17ea504ff4bf8aa12f1914c Mon Sep 17 00:00:00 2001 From: Gitlab CI <noreply@cern.ch> Date: Wed, 23 Mar 2022 14:50:27 +0000 Subject: [PATCH 6/9] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb-datapkg/PRConfig/-/jobs/20519509 --- python/MooreTests/readTimingTable.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/python/MooreTests/readTimingTable.py b/python/MooreTests/readTimingTable.py index 85891873..39f96fbc 100644 --- a/python/MooreTests/readTimingTable.py +++ b/python/MooreTests/readTimingTable.py @@ -73,9 +73,9 @@ algGroups = { "CreateBestTrackContainer" ]), ("Calorimeter", [ - "^(?!.*Packer).*Calo.*", "FutureEcalZSup", "FutureCellularAutomatonAlg", - "InEcalFutureAcceptanceAlg", "FutureTrack2EcalEAlg", - "FutureEcalPIDmuAlg", "FutureHcalZSup", + "^(?!.*Packer).*Calo.*", "FutureEcalZSup", + "FutureCellularAutomatonAlg", "InEcalFutureAcceptanceAlg", + "FutureTrack2EcalEAlg", "FutureEcalPIDmuAlg", "FutureHcalZSup", "InHcalFutureAcceptanceAlg", "FutureTrack2HcalEAlg", "FutureHcalPIDeAlg", "FutureHcalPIDmuAlg", "FuturePhotonMatchAlg", "ClassifyPhotonElectronAlg", "FutureElectronMatchAlg", @@ -113,13 +113,10 @@ algGroups = { "CopySignalMCParticles" ]), ("PersistenceWriting", [ - "ExecutionReportsWriter", - "HltDecReportsWriter", "HltPackedBufferWriter", - "Hlt__RoutingBitsWriter" + "ExecutionReportsWriter", "HltDecReportsWriter", + "HltPackedBufferWriter", "Hlt__RoutingBitsWriter" ]), - ("PersistencePacking", [ - ".*Packer.*" - ]) + ("PersistencePacking", [".*Packer.*"]) ]) } -- GitLab From d9fb83a45e93df8faf6cb7b8af66847d45fbc3b9 Mon Sep 17 00:00:00 2001 From: sesen <sevda.esen@cern.ch> Date: Mon, 28 Mar 2022 21:29:05 +0200 Subject: [PATCH 7/9] update timing table for persistency --- python/MooreTests/readTimingTable.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/MooreTests/readTimingTable.py b/python/MooreTests/readTimingTable.py index 39f96fbc..26e1519e 100644 --- a/python/MooreTests/readTimingTable.py +++ b/python/MooreTests/readTimingTable.py @@ -73,7 +73,7 @@ algGroups = { "CreateBestTrackContainer" ]), ("Calorimeter", [ - "^(?!.*Packer).*Calo.*", "FutureEcalZSup", + "^(?!.*Packer)Calo.*", "FutureEcalZSup", "FutureCellularAutomatonAlg", "InEcalFutureAcceptanceAlg", "FutureTrack2EcalEAlg", "FutureEcalPIDmuAlg", "FutureHcalZSup", "InHcalFutureAcceptanceAlg", "FutureTrack2HcalEAlg", @@ -85,7 +85,7 @@ algGroups = { "GraphClustering" ]), ("RICH", ["^(?!.*Packer).*Rich.*"]), - ("Muon", ["^(?!.*Packer).*Muon.*"]), + ("Muon", ["^(?!.*Packer)^(?!.*Converter).*Muon.*"]), ("Converters", [ ".*?[c,C]onverter.*", "TracksToSelection.*", "TrackSelectionToContainer", "fromPrSeedingTracksV1Tracks", @@ -116,7 +116,7 @@ algGroups = { "ExecutionReportsWriter", "HltDecReportsWriter", "HltPackedBufferWriter", "Hlt__RoutingBitsWriter" ]), - ("PersistencePacking", [".*Packer.*"]) + ("PersistencePacking", [".*Packer.*","PackMC.*"]) ]) } -- GitLab From 26e4a4b732294c69f20f03b8b1b7c16c99cb0f4e Mon Sep 17 00:00:00 2001 From: Gitlab CI <noreply@cern.ch> Date: Mon, 28 Mar 2022 19:29:23 +0000 Subject: [PATCH 8/9] Fixed formatting patch generated by https://gitlab.cern.ch/lhcb-datapkg/PRConfig/-/jobs/20649890 --- python/MooreTests/readTimingTable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/MooreTests/readTimingTable.py b/python/MooreTests/readTimingTable.py index 26e1519e..1004d7a1 100644 --- a/python/MooreTests/readTimingTable.py +++ b/python/MooreTests/readTimingTable.py @@ -116,7 +116,7 @@ algGroups = { "ExecutionReportsWriter", "HltDecReportsWriter", "HltPackedBufferWriter", "Hlt__RoutingBitsWriter" ]), - ("PersistencePacking", [".*Packer.*","PackMC.*"]) + ("PersistencePacking", [".*Packer.*", "PackMC.*"]) ]) } -- GitLab From f4fdfe4cfc85eb17af82a5b47c9b856e5c7e0717 Mon Sep 17 00:00:00 2001 From: sesen <sevda.esen@cern.ch> Date: Thu, 7 Apr 2022 12:33:56 +0200 Subject: [PATCH 9/9] make muon category to exclude lines --- python/MooreTests/readTimingTable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/MooreTests/readTimingTable.py b/python/MooreTests/readTimingTable.py index 1004d7a1..98434728 100644 --- a/python/MooreTests/readTimingTable.py +++ b/python/MooreTests/readTimingTable.py @@ -85,7 +85,7 @@ algGroups = { "GraphClustering" ]), ("RICH", ["^(?!.*Packer).*Rich.*"]), - ("Muon", ["^(?!.*Packer)^(?!.*Converter).*Muon.*"]), + ("Muon", ["^(?!.*Packer)^(?!.*Converter)^(?!.*Line).*Muon.*"]), ("Converters", [ ".*?[c,C]onverter.*", "TracksToSelection.*", "TrackSelectionToContainer", "fromPrSeedingTracksV1Tracks", -- GitLab