Skip to content

Draft: Squashed and rebased version of TRD2D changes.

Dominik Smith requested to merge d.smith/cbmroot:Trd2dUpdateRebase into master

A squashed version of !1179 (closed) which solves the rebase conflicts which arise from conflicting changes to CbmTaskUnpack since the introduction of cbm::algo::Unpack in !1176 (merged)

@p.-a.loizeau @a.bercuci It might make sense to continue from here.

I checked that the squashed version reproduces the unpacker output of the original version.

Description of original MR for reference:

The fixes address several problems/requests of the community wrt the reconstruction of data, unpacking and reconstruction. They include:

  • implementation of channel masking (CbmTrdParFasp) and the propagation of such info to the level of reconstruction.
  • absorption of FASP and CROB mapping in the ASIC parameters (recently asked by @d.smith) (CbmTrdParModAsic/CbmTrdParSetAsic) and preparation for streamlining the handling of TRD parameters (https://redmine.cbm.gsi.de/issues/2853)
  • fixing the local reconstruction in case of full TS reco (asked by the Much group : https://indico.gsi.de/event/17736/contributions/71965/attachments/43809/61561/2023_3005.pdf S3)
  • updates in the R/W of FASP parameters (CbmTrdParSetAsic)
  • online monitoring of mask/working channels (CbmTrdUnpackFaspMonitor)
  • extend documentation for the ASIC param class (CbmTrdParAsic.h)

Depends on CbmSoft/cbmroot_parameter!130 (merged)

Squashed commit message for reference:

add masking for silent FEE channels at the level of ASIC parameter definition. Details include:

  • global access to the masking status (CbmTrdModuleAbstract)
  • implementation of channel masking (CbmTrdParFasp)
  • updates in the R/W of FASP parameters (CbmTrdParSetAsic)
  • documentation for the ASIC param class (bmTrdParAsic.h)
  • online monitoring of mask/working channels (CbmTrdUnpackFaspMonitor)

Other changes:

  • remove FASP to Module geo mapping. Moved internally to the generation of ASIC pars. This is to propagate the correct mapping for all levels of data processing (unpack, monitor, reco, tracking)
  • modify histo naming, explicit variable naming
  • add support for channel masking in reconstruction. Only available for TRD2D
  • remove support for channel masking in module base class
  • align to the new signature of FindClusters. No modification to the algorithm
  • add support for channel mask and processing over full TS
  • add support for full TS reconstruction in TRD2D
  • remove external mapping correction of FASP to pad wrt default distribution
  • split CbmTrdParSetAsic class in two. One for module wise (CbmTrdParModAsic) and the proper set related. Add also CROB id to the param file
  • add module ASIC parameters
  • finalize absorbtion of CROB mapping in the setup parameters
  • update parameter version to match the cbmroot_parameter data base
  • update cbm:algo copy of the unpack TRD2D to the new ascii parameters format
  • add channel mask support for simulations
  • re-introduce the equipment map, add channel mask info to internal parameters
  • Updated CbmTaskUnpack.cxx and Unpack.cxx as precursor for rebase.
Edited by Dominik Smith

Merge request reports