Norbert Herrmann authored 3 years ago and Pierre-Alain Loizeau committed 3 years ago

Apply clang-format. uncomment TofSimpClusterizer constructor

  - cbmroot/reco/L1/L1Algo/L1BaseStationInfo.h:
    > a prototype of user-friendly interface to L1Station and other geometry inputs to L1Algo (experimental)
    > added setters and getters for L1Station data fields
    > added calculation of hidden L1Station properties
    > added Print() method
  - cbmroot/reco/L1/L1Algo/L1Parameters.h:
    > add new compile time constants: kMaxNFieldApproxCoefficients, kStationBits, kThreadBits, kTripletBits,
      kMaxNstations, kMaxNthreads, kMaxNtriplets
    > add new runtime "constants": fMaxDoubletsPerSinglet, fMaxTripletPerDoublets
    > add Print() method
  - cbmroot/reco/L1/L1Algo/L1Algo.h:
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/reco/L1/L1Algo/L1Algo.cxx:
    > add L1Parameters::Print() call from L1Algo::Init()
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/reco/L1/L1Algo/L1CATrackFinder.cxx:
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/reco/L1/L1Algo/L1TrackFitter.cxx:
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/reco/L1/L1Algo/L1Field.h:
    > magic constant '21' changed to L1Parameters::kMaxNFieldApproxCoefficients (compile time)
  - cmbroot/reco/L1/CbmL1.h:
    > add a L1Paramters class field (currently ptr to address in the heap) to CbmL1
    > add getter for the L1Parameters class field to CbmL1
  - cbmroot/reco/L1/CbmL1.cxx:
    > add transfer of the L1Parameters data from CbmL1 to L1Algo
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/macro/run/run_reco.C:
    > add example of L1Algo runtime constants modification

L1Parameters.h: new file ; L1BaseStationInfo.h: getters and setters added; L1Station.h: minor modifications; L1Field.h: magic constant '21' changed to the constexpr parameter L1Parameters::kN_FS_COEFFS

  - cbmroot/reco/L1/L1Algo/L1BaseStationInfo.h:
    > a prototype of user-friendly interface to L1Station and other geometry inputs to L1Algo (experimental)
    > added setters and getters for L1Station data fields
    > added calculation of hidden L1Station properties
    > added Print() method
  - cbmroot/reco/L1/L1Algo/L1Parameters.h:
    > add new compile time constants: kMaxNFieldApproxCoefficients, kStationBits, kThreadBits, kTripletBits,
      kMaxNstations, kMaxNthreads, kMaxNtriplets
    > add new runtime "constants": fMaxDoubletsPerSinglet, fMaxTripletPerDoublets
    > add Print() method
  - cbmroot/reco/L1/L1Algo/L1Algo.h:
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/reco/L1/L1Algo/L1Algo.cxx:
    > add L1Parameters::Print() call from L1Algo::Init()
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/reco/L1/L1Algo/L1CATrackFinder.cxx:
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/reco/L1/L1Algo/L1TrackFitter.cxx:
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/reco/L1/L1Algo/L1Field.h:
    > magic constant '21' changed to L1Parameters::kMaxNFieldApproxCoefficients (compile time)
  - cmbroot/reco/L1/CbmL1.h:
    > add a L1Paramters class field (currently ptr to address in the heap) to CbmL1
    > add getter for the L1Parameters class field to CbmL1
  - cbmroot/reco/L1/CbmL1.cxx:
    > add transfer of the L1Parameters data from CbmL1 to L1Algo
    > modifications according to the constants transfer to the L1Parameters class (example: fkMaxNthreads ==> L1Parameters::kMaxNthreads)
  - cbmroot/macro/run/run_reco.C:
    > add example of L1Algo runtime constants modification

L1Parameters.h: new file ; L1BaseStationInfo.h: getters and setters added; L1Station.h: minor modifications; L1Field.h: magic constant '21' changed to the constexpr parameter L1Parameters::kN_FS_COEFFS

pipe_v16e_1e is the shifted pipe_v16b_1e by creation of node.
pipe_v20b_1m is the shifted pipe_v20a_1m
sts_v20a is the shifted sts_v19a geometry
much_v20c_sis100_1m_lmvm is shifted lmvm verison of v20a
much_v20c_sis100_1m_jpsi is shifted version of v20a
trd_v20c_1(e,h,m_ is the shifted trd_v20b_1(e,h,m)
tof_v20c_1(e,h,m) is the shifted tof_v20b_1(e,h.m)
psd_v20c is the shifted psd_v20a

Geometries without macros are manually shifted by editing of their TFile.

Updates external repos tags
For geometry, parameter and input repos.
Updated tags in switch_defaults.sh.
run_tra_(file|beam).C now positions the target dependent on the setup file chosen.

Updates README.md file in macro/geometry directory.

Adds standard tra, digi, and reco ctest for origin redefinition
and DEC21 candidate geometries for the electron and hadron setups.

Allows a non standard install directory for cbmroot.

Updates the geometry repository tags.

- For PAPa I simply removed myself, such that now for the time being only Adrian is entered.
- For the TRD directories I added @a.bercuci hopefully in the near future also a dedicated person from the 1D part can be added again here.

Use std::string instead of TString to format log output.

Mehulkumar Shiroya authored 3 years ago and Florian Uhlig committed 3 years ago

There are four sts beampipe macros to include to use them along with the new
sts geometries

beampipe_v21a: Old beampipe, can only be used with sts geometry version: sts_v21[a].

beampipe_v21b: New beampipe. It has 40mm diameter upstream side and 104mm diameter (including cylindrical part) downstream side.
This beampipe can be used with the sts geometry version: sts_v21[b, d, f, h].

beampipe_v21c: New beampipe. It has 55mm diameter upstream side and 104mm diameter(including cylindrical part) downstream side.
This beampipe can be used with the sts geometry version: sts_v21[c].

beampipe_v21d: New beampipe. It has 40mm diameter upstream side and 104 diameter(including cylindrical part) downstream side.
This beampipe can be used with the sts geometry having a target position at -44 cm. which means it can only be used with the
sts geometry vesrion: sts_v21[e, g, i].

Volker Friese authored 3 years ago and Florian Uhlig committed 3 years ago

Correct CbmDaq to provide the proper MC event list. Prevent tree access modes kRepeat and kRandom for the time being.