mCBM24 reconstruction (tsa input based)

added Analysis Parameters Reconstruction Tracking alignment mCBM labels

requested review from @p.-a.loizeau

assigned to @a.bercuci

changed the description

added 4 commits

7472f6ef...f616bff8 - 2 commits from branch computing:master
189b2088 - first try to put together the mCBM24 reconstruction
73c71ba5 - update check-timing task for differential analysis of detectors

Compare with previous version

added 1 commit

910bc26f - update licence header

Compare with previous version

added 1 commit

305663b4 - fix compilation

Compare with previous version

Dear @f.uhlig, @p.-a.loizeau,

you have been identified as code owner of at least one file which was changed with this merge request.

Please check the changes and approve them or request changes.

added CodeOwners label

resolved all threads

Will you also add an unpacking macro in this merge request? Then I would like to have these time offsets included (merge request for adding offset registration function in progress):

	if (runid >= 2700) //mCBM2024
	{
		trd1Dconfig->RegisterCriTimeOffset(20736, -36);
		trd1Dconfig->RegisterCriTimeOffset(20737, -37);
		trd1Dconfig->RegisterCriTimeOffset(20738, -65);
		trd1Dconfig->RegisterCriTimeOffset(20739, -52);
		trd1Dconfig->RegisterCriTimeOffset(20740, -50);
		trd1Dconfig->RegisterCriTimeOffset(20741, -49);
		
		//trd1Dconfig->RegisterCriTimeOffset(20992, 0); //no correlation
		trd1Dconfig->RegisterCriTimeOffset(20993, -50);
		trd1Dconfig->RegisterCriTimeOffset(20994, -57);
		trd1Dconfig->RegisterCriTimeOffset(20995, -52);
		trd1Dconfig->RegisterCriTimeOffset(20996, -52);
		trd1Dconfig->RegisterCriTimeOffset(20997, -53);
	}

mentioned in merge request !1751 (merged)

added 9 commits

305663b4...8b306b63 - 4 commits from branch computing:master
4cc92cf5 - first try to put together the mCBM24 reconstruction
cf91be72 - update check-timing task for differential analysis of detectors
e002b3d3 - update licence header
ec4029f9 - fix compilation
367fbf44 - add time offset calibration for each Elink for the TRD1D (mCBM24)

Compare with previous version

added 1 commit

4c5c01e9 - temporary store ToF parameters in the macro directory

Compare with previous version

added 1 commit

36e4519f - comment out explicit remove of the Rich local reconstruction (thx Martin)

Compare with previous version

I think macro/beamtime/mcbm2024/tof_v24a_mcbm.digibdf.par need to go in a merge request to the parameter repository (in the tof folder there) in order to allow simulations, or am I wrong?

added 29 commits

36e4519f...c77b5704 - 18 commits from branch computing:master
54a80f42 - 1 earlier commit
982d2a57 - update check-timing task for differential analysis of detectors
99ae7349 - update licence header
62f69aaf - fix compilation
657776a8 - add time offset calibration for each Elink for the TRD1D (mCBM24)
5c203e22 - temporary store ToF parameters in the macro directory
5d8836b1 - comment out explicit remove of the Rich local reconstruction (thx Martin)
8551f572 - update Reco task for the full mCBM24 gold setup
0b07e1a5 - temporary add working geometry for mCBM24 (using STS_v22f)
2d170b0f - needed for Rich address parsing
a6ae5054 - update time offset for TRD2D hits

Compare with previous version

added 1 commit

37fcfb71 - ToF calibration from...

Compare with previous version

added 1 commit

c3f0ffa9 - update tof params from SG (redmine #3245)

Compare with previous version

Is it correct that these scripts are made to analyze run 2812?

added 61 commits

c3f0ffa9...39c00e70 - 47 commits from branch computing:master
39c00e70...dc214c35 - 4 earlier commits
121dd50f - add time offset calibration for each Elink for the TRD1D (mCBM24)
eee6f648 - temporary store ToF parameters in the macro directory
2899dd7a - comment out explicit remove of the Rich local reconstruction (thx Martin)
2da6147c - update Reco task for the full mCBM24 gold setup
247d39eb - temporary add working geometry for mCBM24 (using STS_v22f)
40311c94 - needed for Rich address parsing
8707503d - update time offset for TRD2D hits
14e19a39 - ToF calibration from...
05ddf285 - update tof params from SG (redmine #3245)
0b3081a4 - fix format, clean-up commented-out code, finishes

Compare with previous version

added 1 commit

57c9daac - moving data files to PA repository

Compare with previous version

marked this merge request as ready

mentioned in commit a.bercuci/cbmroot_parameter@8d6b07f5

mentioned in merge request mcbm/cbmroot_parameter!8 (closed)

@a.bercuci I just saw that @d.emschermann pushed a new version of the digibdf file called tof_v24d_mcbm.digibdf.par to the mcbm version of the parameter repository. The new TOF geometry was also pushed to the mCBM version of the geometry repo.

So I think the tof_v24b_mcbm.digibdf.par that you have here (and which has different tracking station indices at lines 160-187) should either be put in the same place or just removed.
Probably somebody should also check whether tracking works fine with the new 24d version

Of interest to @se.gorbunov and @s.zharko

added 30 commits

57c9daac...86f8b7c1 - 14 commits from branch computing:master
86f8b7c1...5bbca139 - 6 earlier commits
b2cfbc9f - comment out explicit remove of the Rich local reconstruction (thx Martin)
5a18bbdc - update Reco task for the full mCBM24 gold setup
e6b8644a - temporary add working geometry for mCBM24 (using STS_v22f)
8ea1c1bc - needed for Rich address parsing
9aa4575a - update time offset for TRD2D hits
01a2ea00 - ToF calibration from...
318ca58a - update tof params from SG (redmine #3245)
da3f4fb1 - fix format, clean-up commented-out code, finishes
c9acb21d - moving data files to PA repository
143c6820 - remove prototype for detector view

Compare with previous version

added 1 commit

7b76b928 - move par file to the mCBM fork

Compare with previous version

mentioned in commit a.bercuci/cbmroot_parameter@5685f2a0

added 37 commits

7b76b928...e3a7301b - 20 commits from branch computing:master
e3a7301b...d0c4cc54 - 7 earlier commits
3daff613 - update Reco task for the full mCBM24 gold setup
3a0726a9 - temporary add working geometry for mCBM24 (using STS_v22f)
f0b05b75 - needed for Rich address parsing
4bdb97cb - update time offset for TRD2D hits
599ddeb2 - ToF calibration from...
044bee7b - update tof params from SG (redmine #3245)
6eb22472 - fix format, clean-up commented-out code, finishes
fb59c38f - moving data files to PA repository
527ae174 - remove prototype for detector view
cbf049a9 - move par file to the mCBM fork

Compare with previous version

resolved all threads

added 19 commits

cbf049a9...fef1eef4 - 2 commits from branch computing:master
fef1eef4...7e4f3f2b - 7 earlier commits
16972feb - update Reco task for the full mCBM24 gold setup
175fed7d - temporary add working geometry for mCBM24 (using STS_v22f)
7bdff896 - needed for Rich address parsing
7455b14c - update time offset for TRD2D hits
5beb17d7 - ToF calibration from...
5a499318 - update tof params from SG (redmine #3245)
ee6b7a31 - fix format, clean-up commented-out code, finishes
7b427790 - moving data files to PA repository
9ade6c46 - remove prototype for detector view
39d9f299 - move par file to the mCBM fork

Compare with previous version

approved this merge request

added 26 commits

39d9f299...19c6e54d - 9 commits from branch computing:master
19c6e54d...7b9ea4c6 - 7 earlier commits
1d4fc8e7 - update Reco task for the full mCBM24 gold setup
9198731e - temporary add working geometry for mCBM24 (using STS_v22f)
d072dcae - needed for Rich address parsing
a45948d6 - update time offset for TRD2D hits
9e34968a - ToF calibration from...
3f9cc3b4 - update tof params from SG (redmine #3245)
1cdcc4c9 - fix format, clean-up commented-out code, finishes
901a0da2 - moving data files to PA repository
968964c3 - remove prototype for detector view
96eb90e1 - move par file to the mCBM fork

Compare with previous version

The parfilesbasepathSts in run_unpack_tsa.C still points to the macro/beamtime/mcbm2022 directory for the runs taken in 2024, so the mStsPar.par file is never used. Should this be changed or is this intended?

resolved all threads

added 25 commits

96eb90e1...75a56441 - 7 commits from branch computing:master
75a56441...08ba3ce7 - 8 earlier commits
30bbcbf8 - temporary add working geometry for mCBM24 (using STS_v22f)
d2d3c2ab - needed for Rich address parsing
1565bc92 - update time offset for TRD2D hits
7531cd8f - ToF calibration from...
5d113e51 - update tof params from SG (redmine #3245)
ba7c76dd - fix format, clean-up commented-out code, finishes
7ff7e13d - moving data files to PA repository
f1fbff75 - remove prototype for detector view
819d91b4 - move par file to the mCBM fork
8f26cabb - update STS station definition for the new 000 sensor (SZ)

Compare with previous version

resolved all threads

added 1 commit

f904d699 - add distinction between rra and tsa files for STS reconstruction

Compare with previous version

resolved all threads

changed title from mCBM24 reconstruction to mCBM24 reconstruction (tsa input based)

changed the description

I think in the run_unpack_tsa.C macro the new mTofCriPar_2024_05_08.par file from MR 1808 has to be used for the 2024 data. See this comment from Pierre: !1808 (comment 43449)

marked this merge request as draft

@a.bercuci @p.-a.loizeau what is the status of this merge request? I would suggest to merge the part, which already works, and then apply further changes on top of it. We need this to study the tracking and alignment in the new data (at least to setup the reconstruction-qa chain).

added 17 commits

f904d699...8437458b - 7 earlier commits
d22de611 - Add cmake option to switch parameters and geometry to mcbm fork.
bbf6617e - [bugfix]: offline QA: ECbmRecoMode::Timeslice as a default for data processing...
1a3197eb - Offline QA updates:
9872ee98 - redo bugfix in order to apply in a separete merge request
a81c8776 - [CI/CD/QA] Fix-improve Weekly-SLURM-job-End-time Finder script for Virgo3
eea1f504 - bump parameter repository
00d9fe60 - Added missing cstdint includes.
d226b9cf - mRich: DenoiseCNN for mRICH using ONNX Runtime
91b701fc - [CI/CD/CDASH] Disable L1 cxx optimization for Profiling builds if gcc 10.2.1
57e2a313 - add geoemetry for NiNi setup (sts_v24c. rich_v24a, trd_v24e, tof_v24d)

Compare with previous version

added 36 commits

57e2a313...39253604 - 16 commits from branch computing:master
39253604...c0beb01b - 10 earlier commits
c3a25dbb - update time offset for TRD2D hits
1d40d51d - ToF calibration from...
326c0de3 - update tof params from SG (redmine #3245)
99339c42 - fix format, clean-up commented-out code, finishes
384f1cba - moving data files to PA repository
a7383d9d - remove prototype for detector view
9b17983f - move par file to the mCBM fork
b3a7d304 - update STS station definition for the new 000 sensor (SZ)
bfe11a5d - add distinction between rra and tsa files for STS reconstruction
96494232 - add geoemetry for NiNi setup (sts_v24c. rich_v24a, trd_v24e, tof_v24d)

Compare with previous version

added 1 commit

71e086b2 - default to reconstruct sts_v24b, explicit remove TRD2D from event reco

Compare with previous version

Trying to unpack *.tsa files from May results in a crash caused by some parameter file for the Trd1d, can you reproduce this? Trd1d was also not running in May? Disabling the unpack config for Trd1d resolves this, but unpacking should work without explicitly disabling. To reproduce:

root -l -b -q 'run_unpack_tsa.C("/lustre/cbm/prod/beamtime/2024/05/mcbm/3115/3115_node11_04_0023.tsa", 3115, "mcbm_beam_2024_05_08_nickel", 10)'

...
[INFO] CbmTrdUnpackConfig::Init() ---------------------------------
[INFO] CbmTrdUnpackConfig::InitOutput(TrdDigi)
[INFO] CbmTrdUnpackConfig::registerBranchToTree(TrdDigi)
[INFO] CbmTrdUnpackConfig::Init -
[INFO] CbmTrdUnpackConfig::chooseAlgo() - selected algo = CbmTrdUnpackAlgoR
-E- Could not open input file [...]/cbmroot/parameters/trd/trd_.asic.par
Fatal in <FairParAsciiFileIo::open>: Could not open input file
aborting

TRD1D was in. It should work. The setup info should be available and should produce the file name trd_v24e_mcbm.asic.par Check that you have this in the parameters/trd directory !

added 33 commits

71e086b2...4f075fca - 9 commits from branch computing:master
4f075fca...03c25813 - 14 earlier commits
c6679a3d - moving data files to PA repository
52d518f9 - remove prototype for detector view
9f6ce0dc - move par file to the mCBM fork
13a79f1f - update STS station definition for the new 000 sensor (SZ)
0b1ed4f3 - add distinction between rra and tsa files for STS reconstruction
4a3ab5b6 - add geoemetry for NiNi setup (sts_v24c. rich_v24a, trd_v24e, tof_v24d)
464557f9 - default to reconstruct sts_v24b, explicit remove TRD2D from event reco
b407ed70 - add TS support, add Track and Event filtering stubs
b1f36535 - add selection on individual Bmon sensors. Remove hard-codded setup from
ce46a1ba - add internal classes to dictionary. Expose them to users

Compare with previous version

added 1 commit

c857c46a - let geofile from a generic location (M Beyer)

Compare with previous version

added 1 commit

28e8e9d4 - rm data files which were added temorary

Compare with previous version

marked this merge request as ready

added 27 commits

b42c3023 - 1 commit from branch computing:master
b42c3023...1ddb1654 - 16 earlier commits
44c5d2ce - move par file to the mCBM fork
6d73214c - update STS station definition for the new 000 sensor (SZ)
69956c4c - add distinction between rra and tsa files for STS reconstruction
eecdf0e9 - add geoemetry for NiNi setup (sts_v24c. rich_v24a, trd_v24e, tof_v24d)
1097b45e - default to reconstruct sts_v24b, explicit remove TRD2D from event reco
b4f771d7 - add TS support, add Track and Event filtering stubs
91c4db50 - add selection on individual Bmon sensors. Remove hard-codded setup from
1b068069 - add internal classes to dictionary. Expose them to users
9765ee29 - let geofile from a generic location (M Beyer)
1cef9ea1 - rm data files which were added temorary

Compare with previous version

resolved all threads

added 31 commits

1cef9ea1...823c0976 - 4 commits from branch computing:master
823c0976...fee914a7 - 17 earlier commits
0803eeaf - update STS station definition for the new 000 sensor (SZ)
9a912f5b - add distinction between rra and tsa files for STS reconstruction
973fbc6a - add geoemetry for NiNi setup (sts_v24c. rich_v24a, trd_v24e, tof_v24d)
adc56328 - default to reconstruct sts_v24b, explicit remove TRD2D from event reco
0df5b88a - add TS support, add Track and Event filtering stubs
0d66a5fb - add selection on individual Bmon sensors. Remove hard-codded setup from
65e985c4 - add internal classes to dictionary. Expose them to users
ebb453f6 - let geofile from a generic location (M Beyer)
deb693d3 - rm data files which were added temorary
26229f40 - fix library; expose Filter classes to the user

Compare with previous version

I think before merging we will have to go through the commits to squash the commits adding and then removing the temporary files, so that they do not appear in the final history.

I would tend to not squash the complete MR on the other hand (which would be easier), as there are changes to at least three different places with different "goals/directions"

You are the master here. Do as you think is best

added 1 commit

c6714593 - switch qa to default mcbm2024 setup

Compare with previous version

added 1 commit

b36699cb - move warning message back to debug2

Compare with previous version

added 1 commit

899eb4bb - fix codding, more QA Event/Track filtering

Compare with previous version

mentioned in commit a.bercuci/cbmroot@dd07748e

added 45 commits

899eb4bb...562ced5d - 15 commits from branch computing:master
562ced5d...476f7e99 - 20 earlier commits
6e4a0e1e - add TS support, add Track and Event filtering stubs
ecbd5341 - add selection on individual Bmon sensors. Remove hard-codded setup from
ad91ba3b - add internal classes to dictionary. Expose them to users
85295826 - let geofile from a generic location (M Beyer)
03c61753 - rm data files which were added temorary
591ec4ba - fix library; expose Filter classes to the user
6e9aa24f - switch qa to default mcbm2024 setup
c21dc803 - move warning message back to debug2
8ae75a9d - fix codding, more QA Event/Track filtering
dd07748e - simplify the interface to Bmon filtering (suggested by PA...

Compare with previous version

added 1 commit

6b88610c - add public dependency for CbmSetup

Compare with previous version

added 1 commit

d20d16ab - Apply 1 suggestion(s) to 1 file(s)

Compare with previous version

resolved all threads

assigned to @p.-a.loizeau and unassigned @a.bercuci

approved this merge request

mentioned in commit p.-a.loizeau/cbmroot@0976bd1b

added 5 commits

040ee479 - update check-timing task for differential analysis of detectors + impr to macro
449fdacb - add time offset calibration for each Elink for the TRD1D (mCBM24)
0da35327 - update Reco QA task for the full mCBM24 gold setup + change default in macro
ab6033e2 - [RecoQa] add TS support, add Track and Event filtering stubs
0976bd1b - add selection on individual Bmon sensors + Fixes to 2024 mcbm_event_reco_L1

Compare with previous version

For reference and eventual revert before merging: tip before rebasing was d20d16ab

@a.bercuci I now rebased, split and squashed commits, reaching in the end 5 "topical" commits (could go down to 4 if going purely by files modified but I think it is ok as it is).
Comparing this to the previous tip shows that only the history is changed, not the changelist

Please have a look at the remaining commits content and let me know if you are ok with how they were gathered, if it is the case I will merge (either over the WE or on Monday morning)

@p.-a.loizeau thank you very much. I fully agree with your grouping. Please go on whenever you have time

merged

mCBM24 reconstruction (tsa input based)

Merged by Pierre-Alain Loizeau 1 year ago (Jun 16, 2024 12:32am UTC) 1 year ago

Activity

mCBM24 reconstruction (tsa input based)

Merge request reports

Merged by Pierre-Alain Loizeau 1 year ago (Jun 16, 2024 12:32am UTC) 1 year ago

Activity