hansenjo
commented
6 years ago If a rebase refuses to run because you have uncommited changes, just do "git stash" first. It saves all uncommited changes to the stash stack. After rebasing, restore your changes with "git stash pop".
CODA3 and CODA2 data format support
These changes address Feature 274 in Redmine. https://redmine.jlab.org/issues/274
Specifically, we can now read data files written with CODA 3. in addition to CODA 2.. The decoding of the initial part of the event buffer is different for these versions. This is explained in the Redmine link.
For testing of this code, I ran on some old data (CODA 2.) and compared to the results of the code in the master branch. I did the "all histogram bins identical" test for hundreds of histograms. For testing with CODA3. I used my FADC test stand and took data in different modes (9 and 10) and with different block levels (1, 20, and 100) and did a thorough debug. Looks like it works.
One issue. I normally do a "git rebase -i master" but git would not allow it because I had uncommitted changes. I don't want to commit those changes. Anyway, there's probably a workaround but for now I request that Ole do the rebase if necessary. I had based this on a pretty recent master branch and had merged.