Skip to content
Snippets Groups Projects
Commit 61cf41a7 authored by Gerhard Raven's avatar Gerhard Raven
Browse files

cleanup deprecated code

parent f812503d
No related branches found
No related tags found
1 merge request!2166use RawBank::View as input instead of RawEvent
Pipeline #6617726 passed
......@@ -29,7 +29,6 @@ from RecoConf.hlt1_tracking import (
make_reco_pvs,
make_PatPV3DFuture_pvs,
make_RetinaClusters,
_rawevent_to_rawbank,
get_global_measurement_provider,
)
......@@ -72,10 +71,8 @@ def make_my_sequence():
my_mask = [sensor in [99]
for sensor in range(208)] # sensor 99 is chosen arbitrarily
bankType = "VPRetinaCluster"
vpClustering = VeloRetinaClusterTrackingSIMDFull(
RawBanks=_rawevent_to_rawbank(
default_raw_banks(bankType), bankType),
RawBanks=default_raw_banks("VPRetinaCluster"),
SensorMasks=tuple(my_mask),
MaxScatterSeeding=0.1,
MaxScatterForwarding=0.1,
......
......@@ -17,7 +17,6 @@ from RecoConf.hlt1_tracking import (
make_PatPV3DFuture_pvs,
make_RetinaClusters,
get_global_measurement_provider,
_rawevent_to_rawbank,
)
from PyConf.application import default_raw_banks
......@@ -71,8 +70,7 @@ def make_my_sequence():
]
vpClustering = VeloRetinaClusterTrackingSIMDFull(
RawBanks=_rawevent_to_rawbank(
default_raw_banks("VPRetinaCluster"), "VPRetinaCluster"),
RawBanks=default_raw_banks("VPRetinaCluster"),
SensorMasks=tuple(my_SensorMask),
MaxScatterSeeding=0.1,
MaxScatterForwarding=0.1,
......
......@@ -40,7 +40,6 @@ from PyConf.Algorithms import (
PatPV3DFuture,
PrStorePrUTHitsEmptyProducer,
PrStoreUTHitEmptyProducer,
LHCb__UnpackRawEvent,
)
from PyConf.Tools import (
......@@ -60,34 +59,6 @@ log = logging.getLogger(__name__)
from RecoConf.core_algorithms import make_unique_id_generator
def _rawevent_to_rawbank(dh, tp):
if dh.type == "LHCb::RawEvent":
print("FIXME: fix input to return RawBanks instead of RawEvent")
def output_transform(Output):
return {"RawBankLocations": [Output]}
dh = LHCb__UnpackRawEvent(
RawEventLocation=dh,
output_transform=output_transform,
BankTypes=[tp]).Output
return dh
@configurable
def default_ft_decoding_version(value=4):
raise DeprecationWarning(
"Function default_ft_decoding_version has to be imported from the RecoConf.decoders module."
)
@configurable
def require_gec(make_raw=default_raw_banks, cut=-1, **kwargs):
raise DeprecationWarning(
"Function require_gec has to be imported from the RecoConf.event_filters module."
)
@configurable
def make_VeloClusterTrackingSIMD(algorithm=VeloClusterTrackingSIMD,
make_raw=default_raw_banks,
......@@ -117,7 +88,7 @@ def make_VeloClusterTrackingSIMD(algorithm=VeloClusterTrackingSIMD,
my_SensorMasks = [j in masked_sensors for j in range(208)
] # 208 = LHCb::Pr::Velo::VPInfos::NSensors
return algorithm(
RawBanks=_rawevent_to_rawbank(make_raw(bank_type), bank_type),
RawBanks=make_raw(bank_type),
SensorMasks=tuple(my_SensorMasks),
MaxScatterSeeding=MaxScatterSeeding,
MaxScatterForwarding=MaxScatterForwarding,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment