<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="Generator" content="Microsoft Exchange Server">
<!-- converted from text --><style><!-- .EmailQuote { margin-left: 1pt; padding-left: 4pt; border-left: #800000 2px solid; } --></style>
</head>
<body>
<meta content="text/html; charset=UTF-8">
<style type="text/css" style="">
<!--
p
{margin-top:0;
margin-bottom:0}
-->
</style>
<div dir="ltr">
<div id="x_divtagdefaultwrapper" dir="ltr" style="font-size:14pt; color:#000000; font-family:Calibri,Helvetica,sans-serif">
<p>Dear Hans,</p>
<p><br>
</p>
<p>I copied the directory of our existing DAQ system:</p>
<p>> cp -r old_daq new_daq<br>
</p>
<p><br>
</p>
<p>Then deleted the NURDLIB folder, downloaded the new one and switched to the mcal_daq_merge branch using</p>
<p>> <span>git checkout mcal_daq_merge</span></p>
<p><br>
</p>
<p>Then I connected to the RIO and tried to compile in the folder of the new NURDLIB. This is the result:</p>
<p></p>
<div>RIO4-MCAL-2 mbsdaq > make clean<br>
Could not figure out RFX1 firmware (8-xdigit number), skipping.<br>
TRIDI_FW=d374466d<br>
VULOM4_FW=d96ffc88<br>
RFX1_FW=<br>
rm -rf build_cc_ppc-linux_4.2.2_debug</div>
<p></p>
<p><br>
</p>
<p>No further message and a new folder <span>build_cc_ppc-linux_4.2.2_debug is not created.</span></p>
<p><span><br>
</span></p>
<p><span>When checking the Makefile, I noticed that in the old NURDLIB folder there is no /gmake, instead there is a file make.mk which probably does the same job.</span></p>
<p><span><br>
</span></p>
<p><span>Probably there are some adjustment that I need to make, so that the new NURDLIB version can compile on our system. But I don't know where to look at, unfortunately.</span></p>
<p><span><br>
</span></p>
<p><span>Could you give us advice?<br>
</span></p>
<p><span><br>
</span></p>
<p><span><br>
</span></p>
<p><span><br>
</span></p>
<p><span><br>
</span></p>
<p><span>Best greetings</span></p>
<p><span>Günter<br>
</span></p>
<p><span><br>
</span></p>
<p><span><br>
</span></p>
<p><span><br>
</span></p>
<p><br>
</p>
<br>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="x_divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>Von:</b> subexp-daq <subexp-daq-bounces@lists.chalmers.se> im Auftrag von Hċkan T Johansson <f96hajo@chalmers.se><br>
<b>Gesendet:</b> Sonntag, 7. Januar 2024 21:48:21<br>
<b>An:</b> Discuss use of Nurdlib, TRLO II, drasi and UCESB.<br>
<b>Betreff:</b> Re: [subexp-daq] NURDLIB: - how to check which version is installed and how to update to the most recent version</font>
<div> </div>
</div>
</div>
<font size="2"><span style="font-size:10pt;">
<div class="PlainText"><br>
Dear Günter,<br>
<br>
I would very much suggest to do the 'update' in a copy of the directory <br>
tree that you are using, such that it is very easy to go back. (Or go <br>
between the systems.)<br>
<br>
For the update, something along the lines:<br>
<br>
git fetch origin # or instead of 'origin' the shorthand you have for the<br>
# remote repo<br>
<br>
git log --all --decorate --graph --oneline --color # just to see where<br>
# you are, and where you would go<br>
<br>
git checkout mcal_daq_merge # if that fails, try origin/mcal_daq_merge<br>
<br>
<br>
You would want to run the git commands etc on the PC, but compilations of <br>
code that runs on the RIO needs to be done on the RIO.<br>
<br>
A 'make clean' is probbaly a healthy start.<br>
<br>
But first - please make sure to work in copied directory tree.<br>
<br>
Cheers,<br>
Hċkan<br>
<br>
<br>
<br>
On Sun, 7 Jan 2024, Weber, Guenter Dr. wrote:<br>
<br>
> <br>
> Dear Hans,<br>
> <br>
> <br>
> thank you very much and have a happy new year!<br>
> <br>
> <br>
> Could you give me instructions on how to update NURDLIB in an already<br>
> existing DAQ system?<br>
> <br>
> <br>
> Would it be enough to replace the old files in the NURDLIB folder with the<br>
> most recent ones and then somewhere type in "make"? And is compilation to be<br>
> executed within the RIO system or on the server?<br>
> <br>
> <br>
> <br>
> <br>
> Best greetings from Jena<br>
> <br>
> Günter<br>
> <br>
> <br>
> <br>
> <br>
> ____________________________________________________________________________<br>
> Von: Hans Toshihide Törnqvist <hans.tornqvist@chalmers.se><br>
> Gesendet: Sonntag, 7. Januar 2024 20:33:55<br>
> An: Weber, Guenter Dr.; Discuss use of Nurdlib, TRLO II, drasi and UCESB.<br>
> Betreff: Re: AW: [subexp-daq] NURDLIB: - how to check which version is<br>
> installed and how to update to the most recent version <br>
> Dear Günter,<br>
> <br>
> I took a shot at merging the 'mcal_daq' branch that you have been using<br>
> with the 'master' branch, you can find that merge in the branch<br>
> 'mcal_daq_merge'.<br>
> <br>
> That version passes my soft tests, but they are weak compared to a real<br>
> running DAQ :) So please give it a try and let me know how it goes.<br>
> <br>
> Best regards,<br>
> <br>
> Hans<br>
> <br>
> On 2023-12-22 19:32, Weber, Guenter Dr. wrote:<br>
> > Dear Hans,<br>
> ><br>
> ><br>
> > the command<br>
> ><br>
> ><br>
> > > git remote -v<br>
> ><br>
> ><br>
> > resulted in the following output:<br>
> ><br>
> ><br>
> > bloeher bloeher@140.181.60.97:/u/bloeher/git-bare/nurdlib-jena.git (fetch)<br>
> > bloeher bloeher@140.181.60.97:/u/bloeher/git-bare/nurdlib-jena.git (push)<br>
> > maxs1 <br>
> > atpnbg011:/LynxOS/mbsusr/mbsdaq/mbsrun/rio4/2021_mcalstruck/nurdlib<br>
> > (fetch)<br>
> > maxs1 <br>
> > atpnbg011:/LynxOS/mbsusr/mbsdaq/mbsrun/rio4/2021_mcalstruck/nurdlib<br>
> (push)<br>
> > origin /u/htoernqv/repos/nurdlib.git/ (fetch)<br>
> > origin /u/htoernqv/repos/nurdlib.git/ (push)<br>
> ><br>
> > I added the new git repository and executed the push command as<br>
> > explained in your e-mail. Looks like everything worked out fine.<br>
> ><br>
> ><br>
> ><br>
> ><br>
> > Best greetings<br>
> ><br>
> > Günter<br>
> ><br>
> ><br>
> ><br>
> > ------------------------------------------------------------------------<br>
> > *Von:* Hans Toshihide Törnqvist <hans.tornqvist@chalmers.se><br>
> > *Gesendet:* Freitag, 22. Dezember 2023 18:25:05<br>
> > *An:* Discuss use of Nurdlib, TRLO II, drasi and UCESB.; Weber, Guenter<br>
> Dr.<br>
> > *Betreff:* Re: [subexp-daq] NURDLIB: - how to check which version is<br>
> > installed and how to update to the most recent version<br>
> > Dear Günter,<br>
> ><br>
> > On 2023-12-22 17:55, Weber, Guenter Dr. wrote:<br>
> >> Dear Hakan,<br>
> >><br>
> >> thank you very much for the reply.<br>
> >><br>
> >> On my system the output of the command is as follows:<br>
> >><br>
> >> git describe --all --always --dirty --long<br>
> >> -> heads/mcal_daq-0-gb2bc721<br>
> >><br>
> >> How shall I interpret this output?<br>
> ><br>
> > It looks like your repository has the branch 'mcal_daq' active, and part<br>
> > of the checksum is b2bc721.<br>
> ><br>
> > The very good news is that it doesn't say "-dirty" at the end, which<br>
> > means that there are no uncommitted changes, yet :)<br>
> ><br>
> >> I guess I should compare it to something I can find under<br>
> >> <a href="https://gitlab.com/chalmers-subexp">https://gitlab.com/chalmers-subexp</a> <<a href="https://gitlab.com/chalmers-subexp">https://gitlab.com/chalmers-subexp</a>><br>
> > <<a href=""></a>https://gitlab.com/chalmers-subexp <<a href="https://gitlab.com/chalmers-subexp">https://gitlab.com/chalmers-subexp</a>>><br>
> ><br>
> > It seems like the branch/commit are not in any of the "official"<br>
> > repositories, I had a look. However, I did find 'mcal_daq' branches in<br>
> > some private repositories at GSI by Bastii, but I cannot find the<br>
> > b2bc721 commit. I also cannot find several of the commit messages.<br>
> ><br>
> > The safest way forward would be if you could push your version of<br>
> > nurdlib to gitlab. It looks like you are currently a member of the<br>
> > project, so try:<br>
> ><br>
> > > git remote -v<br>
> ><br>
> > If the gitlab repo is not listed there, do:<br>
> ><br>
> > > git remote add gitlab git@gitlab.com:chalmers-subexp/nurdlib.git<br>
> ><br>
> > Then:<br>
> ><br>
> > > git push gitlab mcal_daq<br>
> ><br>
> > I can then pull that and see how to get that into the main branch. Once<br>
> > that's done, I will ask you to try the new version to make sure it still<br>
> > runs correctly. And of course if there are problems with the above<br>
> > commands, let us know.<br>
> ><br>
> > Best regards,<br>
> ><br>
> > Hans<br>
> ><br>
> >> But there I only can access the following projects:<br>
> >><br>
> >> - drasi<br>
> >> - egmwsort<br>
> >> - ucesb<br>
> >><br>
> >> Best greetings<br>
> >> Günter<br>
> >><br>
> >><br>
> >> ------------------------------------------------------------------------<br>
> >> *Von:* subexp-daq <subexp-daq-bounces@lists.chalmers.se> im Auftrag von<br>
> >> Hċkan T Johansson <f96hajo@chalmers.se><br>
> >> *Gesendet:* Freitag, 22. Dezember 2023 17:48:46<br>
> >> *An:* Discuss use of Nurdlib, TRLO II, drasi and UCESB.<br>
> >> *Betreff:* Re: [subexp-daq] NURDLIB: - how to check which version is<br>
> >> installed and how to update to the most recent version<br>
> >><br>
> >> Dear Günter,<br>
> >><br>
> >> On Fri, 22 Dec 2023, Weber, Guenter Dr. wrote:<br>
> >><br>
> >>><br>
> >>> Dear all,<br>
> >>><br>
> >>><br>
> >>> I would like to know how ...<br>
> >>><br>
> >>><br>
> >>> 1) I can check which version of NURDLIB is installed on my system.<br>
> >><br>
> >> Please somewhere under the nurdlib/ directory, run:<br>
> >><br>
> >> git describe --all --always --dirty --long<br>
> >><br>
> >>> 2) I can update to the most recent 'official' version.<br>
> >><br>
> >> cd <directory-where-the-new-copy-should-be-under><br>
> >><br>
> >> git clone git@gitlab.com:chalmers-subexp/nurdlib.git<br>
> >><br>
> >> Then:<br>
> >><br>
> >> cd nurdlib<br>
> >><br>
> >> For that git clone to work, you'll first have to set up ssh keys with<br>
> >> gitlab. That would be useful also in order to upload code. See:<br>
> >><br>
> >> <a href="https://docs.gitlab.com/ee/user/ssh.html">https://docs.gitlab.com/ee/user/ssh.html</a><br>
> > <<a href="https://docs.gitlab.com/ee/user/ssh.html">https://docs.gitlab.com/ee/user/ssh.html</a>><br>
> >> <<a href=""></a>https://docs.gitlab.com/ee/user/ssh.html<br>
> > <<a href="https://docs.gitlab.com/ee/user/ssh.html">https://docs.gitlab.com/ee/user/ssh.html</a>>><br>
> >><br>
> >> and please *do* use a passphrase for the ssh key.<br>
> >><br>
> >> Cheers,<br>
> >> Hċkan<br>
> >><br>
> >><br>
> >>><br>
> >>><br>
> >>> Thank you very much!<br>
> >>><br>
> >>><br>
> >>><br>
> >>> Best greetings<br>
> >>><br>
> >>> Günter<br>
> >>><br>
> >>><br>
> >>><br>
> >>><br>
> >><br>
> <br>
></div>
</span></font>
</body>
</html>