Closed baltzell closed 1 year ago
The one in the development is outdated, On the branch iss540_iss731, it has the right definition of banks. Here is the current definition of the matching banks https://github.com/JeffersonLab/clas12-offline-software/blob/iss540_iss731/etc/bankdefs/hipo4/mc.json#L104-L133
As the TruthMatching is not fully functional yet, it probably can be removed from the development branch for pass2. Let me know, if you want the current bank definitions in iss540_iss731 to be modified as well.
Even if the matching is not fully functional, I think if the bank format can be finalized and in the pass2 release (and pull in your latest functionality, and delete the old branch) that would be worthwhile.
Regarding the "tid", I would definitely keep it the exact same variable name as what it links to in MC::Particle, which sounds like is "tid".
Or, looks like you switch to row index instead of tid, which is also probably fine. Maybe just put in a PR?
Ok @baltzell , then if I understood you correctly, I will create a pull request without changing anything.
I gave it a look, and that branch is so old that is has a lot merge/rebase conflicts with development. I think the easiest and best thing to do would be to make a new branch off development and manually pull in the changes to the small number of files relevant to MC matching. Looks like it should only be a couple JSON files and a couple Java files?
Ok, I have some questions/clarifications:
There are three files that are different between the development and the iss540_iss731,
-- I know that TruthMatch.java should be completely replaced by the one in iss540_iss731, -- In mc.json there is a bank MC::User which has the same "item" : 5, as the bank "MC::GenMatch", I don't remember if "MC::User" is still being used? somehow I though it was decided to not use it, but if it will be used, then I can shift Truth Match bank "item"s by one. -- About EvioDataEventHandler.java, as gemc produces hipo files directly, in the new branch I will not touch this file, and will change only MC::User and TruthMatch.java
If you agree with this, I can do those changes.
Yes, I'd propose to completely discard the changes to EvioDataEventHandler.java and make a new branch with just the JSON and TruthMatch.java changes.
Ok, pushed the iss1081_TruthMatchPR to remote. if it passes the checks, will create a PR.
closed by #1085
Shall we simplify and cleanup the naming conventions used here:
https://github.com/JeffersonLab/clas12-offline-software/blob/abb98af76b877786a48698be9a03f9b89fb9adba/etc/bankdefs/hipo4/mc.json#L113-L126
If so, we should do it for the pass2 release. I'll propose: