Skip to content
Snippets Groups Projects

split track containers and persistency (versioning)

Merged Maarten Van Veghel requested to merge mveghel-calov1persistencyfix into master
Compare and Show latest version
1 file
+ 0
19
Compare changes
  • Side-by-side
  • Inline
@@ -13,8 +13,6 @@ Define the necessary reconstruction chain to go from Ttracks to particles
"""
from RecoConf.protoparticles import make_charged_protoparticles
from RecoConf.rich_reconstruction import make_rich_pids, default_rich_reco_options
from RecoConf.calorimeter_reconstruction import make_calo
from RecoConf.hlt2_global_reco import convert_tracks_to_v3_from_v1
from RecoConf.reconstruction_objects import reconstruction
from RecoConf.hlt2_tracking import kill_clones, make_TrackBestTrackCreator_tracks
@@ -23,7 +21,6 @@ from PyConf.Algorithms import (TrackListRefiner, TrackSelectionToContainer)
from PyConf.Tools import (ParticleVertexFitter, TrackRungeKuttaExtrapolator,
TrackStateProvider, TrackInterpolator)
from PyConf import configurable
from PyConf.packing import persisted_location
import Functors as F
@@ -96,21 +93,6 @@ def make_good_ttracks(global_reco=reconstruction,
return fitted_filtered_tracks["Best"]
# Calo PIDs from T tracks
def make_ttrack_calo_pids(ttracks, pvs):
tracks_v3, trackrels = convert_tracks_to_v3_from_v1(
ttracks["v1"], track_types=["Ttrack"])
calo_pids = make_calo(
tracks_v3,
pvs,
trackrels=trackrels,
chargedpid_types={
"calo": ["Ttrack"],
"brem": [None]
})
return calo_pids
# RICH PIDs from T tracks
def make_ttrack_rich_pids(ttracks):
return make_rich_pids(
@@ -122,7 +104,6 @@ def make_ttrack_rich_pids(ttracks):
@configurable
def make_ttrack_reco(global_reco, make_ttracks):
good_ttracks = make_ttracks()
pvs = global_reco["PVs"]
rich_pids = make_ttrack_rich_pids(good_ttracks)
# TODO calo reco was configured wrong (to be added appropriately)
Loading