[subexp-daq] NURDLIB: - how to check which version is installed and how to update to the most recent version

Hans Toshihide Törnqvist hans.tornqvist at chalmers.se
Mon Jan 8 11:38:23 CET 2024 

Dear Günter,

Aha, it looks like Håkan's instructions could be misinterpreted, what 
you are seeing is expected behaviour :)

'make clean' will clean the build directory, which it does with 'rm -rf 
build_...'.

'make' without additional arguments builds nurdlib which is what you 
want now.

Cheers,
Hans

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

More information about the subexp-daq mailing list