ANN for muon selection

Your version is still oudatet. You have to rebase. Please try the "Rebase" buuton on !110 (merged).

added 61 commits

528283a4...294b3ce2 - 51 commits from branch computing:master
693a8b88 - Update analysis/PWGDIL/dimuon/CMakeLists.txt
f44fd730 - Update analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
ab0ce062 - Update analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
0e582ab9 - Update analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
7a99823d - Update analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
ac1d1f1d - Update macro/analysis/much/ANN.C
940989e4 - Update macro/much/run_ana.C
025b1c92 - Update macro/much/batch_run_bg.sh
3e68eb16 - Update macro/much/batch_run_sgn.sh
eefcbd3b - Add ANN=-1 for analysis input

Compare with previous version

added 19 commits

eefcbd3b...45cf6444 - 9 commits from branch computing:master
5afb4eec - Update analysis/PWGDIL/dimuon/CMakeLists.txt
2329f103 - Update analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
cbd4d584 - Update analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
93a5f17e - Update analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
8a3b48e8 - Update analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
1c69d70e - Update macro/analysis/much/ANN.C
97239d52 - Update macro/much/run_ana.C
5e3c9cab - Update macro/much/batch_run_bg.sh
cab09e91 - Update macro/much/batch_run_sgn.sh
365938b1 - Add ANN=-1 for analysis input

Compare with previous version

added 1 commit

bee28cc3 - Apply clang format

Compare with previous version

assigned to @p.-a.loizeau

Dear Anna,

It seems the changes lead to segmentation faults in the following two tests: "much_analysis" and "dimuon_analysis_sis100_muon_lmvm".

Could it be that we forgot some files and/or parameters?

Hi. Me not, but git: the macro/dimuon/CMakeLists.txt has to be copied also

added 1 commit

27cfff97 - Add missing much ana parameter in other CMakeList

Compare with previous version

The failing test are due to the missing parameter files. I now merged the parameter repository. Please fix the file external/InstallParameter.cmake

by defining the correct repository version.

Correct the line

set(PARAMETER_VERSION ece66cc34c11c668dbf43a91edc4073cb9f963c1)

to

set(PARAMETER_VERSION 3cdf7badf1aeb68efbcc7134a9735e772baead15)

After the change please rebase again your MR and commit.

added 1 commit

4c7cf0dd - Change external/InstallParameter.cmake

Compare with previous version

approved this merge request

unapproved this merge request

added 72 commits

da70099e - Update analysis/PWGDIL/dimuon/CMakeLists.txt
7d71ede6 - Update analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
3b22d7e9 - Update analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
37b44f43 - Update analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
211a8563 - Update analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
4ee140d0 - Update macro/analysis/much/ANN.C
380a356c - Update macro/much/run_ana.C
06f7afe1 - Update macro/much/batch_run_bg.sh
aae86365 - Update macro/much/batch_run_sgn.sh
67039de2 - Add ANN=-1 for analysis input
5ef7cc1c - Fix build for ubuntu 18.04 and gcc 7.5.0
408c8b21 - Format fixed code
4a787bb9 - Introduce CbmBeamGenerator
672c00d3 - Add dEdx field to StsTrack, add dEdx calculation method to CbmStsTrackFinder
0d2d755e - Update in the EB time-reconstruction of the rectangular pads
e2d7250a - add additional comment
feaee887 - Force new column (format)
3d1b7a1a - apply format file correctly
ea7ad25b - restore format
b76af303 - try to apply correct clang-format with version 8.0 this time
21766f77 - Move parameters from the source code into the header file
b2d47517 - apply clang-format
4d94ad7f - adding declaration in the source file and updating namespace calls for proper coding conventions
44e9511c - apply clang-format
5d0d533b - add AT->KFPF interface
f27f37a0 - make 100% reproducing original KFPF
dccf5d16 - add PV from reco to CbmKFPF
017e2105 - add macro
7768777a - fix bug with PV find mode
e0cfc833 - clang formating
5fe8d59f - unformat CmakeLists.txt to avoid bug
1cd874ce - add macro test, fix macro
768b19f1 - fix typo in output file name
7aaed2d3 - fix macro test, return PV find mode default
64f2d67a - apply clang for macro
5f45d916 - Catch case of ions and cherenkov photons not present in the standard...
c28a4548 - Fix spadic 2.2 channel mapping in asic coordinates
0d04a3e0 - Second iteration of mapping fix
9c43ea4f - Improve performance by initializing the channel vector in the header
d65d8633 - Fix format checker
e67fa245 - Remove unnecessary distinction between Apple and Linux
bfd4f0a1 - Add new CI stage
8d70672d - Remove obsolete single trd unpack macro
82b6b645 - TrdRawMessage add GetTime return function to get the time in ns
c46da572 - TrdParManager add some helpers to unify parameter handling
2fa4354c - Update default geo tag and use new raw message time getter
45838c64 - Some upgrades for the TRD unpacker task
fc84e1b6 - Update TRD parameter loading for mCbm
e49eb575 - Fix naming Id
ffb8ff03 - Update downloaded parameter version
d115e0bf - Add safety in case of inactive trd in CbmSetup
1d825ad3 - Make arguments to Lambda function for the sorting of clusters constant. Refs #1808 @30min.
69f2d464 - qa directory for common qa tools
5b1a183c - L1: changes due to changed branch naming
e66c7ce5 - Increase version counter for CbmEventGenerator. Refs #1814 @30min.
eb7b4a1c - do not register CbmQaCanvas in the global list of canvases
e12e9489 - install AnalysisTree/include
6c7af3a6 - Add custom streamer for CbmPsdDigi (#1814)
5b7c13f6 - segfault fix in CbmSTSDigitizeQA
0a64fb1b - Implement reflectivity for RICH in Geant4
d9e0e873 - replace install FILES with DIRECTORY
625b2fbf - Remove unecessary include statements
b4b1b54d - changed the event building limit to good values of mRICH as requested in Issue #1827
4a21d754 - qa task for MUCH transport level
c8a0e6e5 - Add linear history check to CI for merge requests. Refs #1852
44b08775 - Update STS offsets and noisy channels for mCBM 2020
69ca256b - Add TRD v20a geometry, refs #1851
a62fc359 - CbmMuchTransportQa: Added pie charts to display particle ratios.
d734f580 - Apply clang format
24a8b876 - Add missing much ana parameter in other CMakeList
4208e1a8 - Change external/InstallParameter.cmake
70d04875 - Merge branch 'dimuon' of https://git.cbm.gsi.de/a.senger/cbmroot into dimuon

Compare with previous version

Dear Anna,

Unfortunately your last attempt created a merge commit which brings in a loop and this fails the linearity check.

To solve it, could you please try the following in order to do a clean rebase:

git clone https://git.cbm.gsi.de/a.senger/cbmroot.git dimuon_rebase
cd dimuon_rebase
git checkout dimuon
./scripts/connect_upstream_repo.sh https://git.cbm.gsi.de/computing/cbmroot
git reset --hard HEAD~1
git fetch upstream
git rebase upstream/master

At this point you will get a message about a conflict. I checked and we can solve it the following way:

nano external/InstallParameter.cmake

=> there will be a block at beginning of file:

<<<<<<< HEAD
set(PARAMETER_VERSION dada295251416c29e42223609a97eff8bf72141b)
=======
set(PARAMETER_VERSION 3cdf7badf1aeb68efbcc7134a9735e772baead15)
>>>>>>> Change external/InstallParameter.cmake

=> Keep only set(PARAMETER_VERSION 3cdf7badf1aeb68efbcc7134a9735e772baead15)
=> Then go on with:

git add external/InstallParameter.cmake
git rebase --continue
git status

=> Should show

On branch dimuon
Your branch and 'origin/dimuon' have diverged,
and have 27 and 85 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

nothing to commit, working tree clean

Finally overwrite the remote version:

git push --force

added 27 commits

70d04875...4f3cbefd - 14 commits from branch computing:master
d6bb3282 - Update analysis/PWGDIL/dimuon/CMakeLists.txt
c78a2c3b - Update analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.h
be63183a - Update analysis/PWGDIL/dimuon/CbmAnaMuonCandidate.cxx
87b0a572 - Update analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
d9ddf5f1 - Update analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.cxx
bd7a7d62 - Update macro/analysis/much/ANN.C
24bb56e2 - Update macro/much/run_ana.C
aa1052db - Update macro/much/batch_run_bg.sh
0f891117 - Update macro/much/batch_run_sgn.sh
42a29990 - Add ANN=-1 for analysis input
99e60ce1 - Apply clang format
604bb284 - Add missing much ana parameter in other CMakeList
6cfc974f - Change external/InstallParameter.cmake

Compare with previous version

approved this merge request

merged

ANN for muon selection

Merge request reports

Activity