Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Summer 2023 updates #516

Merged
merged 7 commits into from
Apr 12, 2023
Merged

Summer 2023 updates #516

merged 7 commits into from
Apr 12, 2023

Conversation

jml985
Copy link
Contributor

@jml985 jml985 commented Mar 29, 2023

No description provided.

nigmatkulov and others added 2 commits March 24, 2023 17:23
@nigmatkulov @plexoos @zsweger
Create PWGTools area (star-bnl#340)
cef7e84 
The commit will create a new directory that should be excluded from the
compilation process. At the first iteration it should be cross checked
(if compilation will pass the CI/CD). Also before merging Zachary Sweger
should confirm that the subdirectories contain the latest versions of
the Glauber codes.

---------

Co-authored-by: Grigory Nigmatkulov <nigmaktulov@gmail.com>
Co-authored-by: Dmitri Smirnov <dmixsmi@gmail.com>
Co-authored-by: Zachary Sweger <zsweger@berkeley.edu>
@jml985
Summer 2023 updates
9b7ca12
@genevb genevb removed their request for review March 30, 2023 13:59
@jml985
Copy link
Contributor Author

jml985 commented Mar 30, 2023

I don't have any idea what the update "adding PWGTools" was for or meant. It doesn't actually have any effect or bearing on what I'm doing which is trying add in changes from StRoot/RTS. I did just add one more change to the file StRoot/RTS/src/DAQ_TPC23/itpc23.h. In order to do this I needed to fetch and merge to my local directory, which had no effect considering I have only StRoot/RTS enabled for download. It did allow me to push it to my local github/main however.

@plexoos
Copy link
Member

plexoos commented Mar 31, 2023

The compilation is failing with this error:

#10 136.6 g++ -m64 -fPIC -pipe -Wall -Woverloaded-virtual -std=c++0x -Wno-long-long -pthread -Wno-deprecated-declarations -O2 -g -falign-loops -falign-jumps -falign-functions -Dsl79_gcc485 -D_LARGEFILE64_SOURCE -DNEW_DAQ_READER -DRTS_PROJECT_STAR -DTPXREADER -DRTS_LITTLE_ENDIAN -DEVP_VERSION="\"EVP_VERSION=2.0\"" -DNEW_DAQ_READER -I. -IStRoot/RTS/include -IStRoot/RTS/trg/include -IStRoot/RTS/include/TPC -IStRoot/RTS/src/SFS -IStRoot/RTS/src -IStRoot/RTS/src/EVP_READER -I. -IStRoot -I.sl79_gcc485/include -I/opt/software/linux-scientific7-x86_64/gcc-4.8.5/root-5.34.38-l3v6vso6qgojm4l2ctwjojs6trbt4hpn/include -c .sl79_gcc485/OBJ/StRoot/RTS/src/DAQ_TPC23/itpc23.cxx -o .sl79_gcc485/OBJ/StRoot/RTS/src/DAQ_TPC23/itpc23.o
#10 136.6 .sl79_gcc485/OBJ/StRoot/RTS/src/DAQ_TPC23/itpc23.cxx:37:45: error: no 'void itpc23::set_rdo(int, int)' member function declared in class 'itpc23'
#10 136.6  inline void itpc23::set_rdo(int sec, int rdo)
#10 136.6                                              ^
#10 136.6 cons: *** [.sl79_gcc485/OBJ/StRoot/RTS/src/DAQ_TPC23/itpc23.o] Error 1
#10 136.6 cons: errors constructing .sl79_gcc485/OBJ/StRoot/RTS/src/DAQ_TPC23/itpc23.o

@jml985 are you going to look into this?

@jml985
Copy link
Contributor Author

jml985 commented Apr 3, 2023

Sorry I had tried to fix some problems I thought Tonko had introduced, but they were actually due to my own mess... I've updated with tonko's changes and will see if they pass the CI

plexoos
plexoos approved these changes Apr 4, 2023
View reviewed changes
Copy link
Member

@plexoos plexoos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The code compiles now

@starsdong
Copy link
Member

Dmitri, let us merge this PR into main (do we need to update and sync with the main first?) Thanks

@plexoos
Copy link
Member

plexoos commented Apr 12, 2023

Dmitri, let us merge this PR into main (do we need to update and sync with the main first?) Thanks

There are no reported conflicts, should be able to merge as is

@plexoos plexoos merged commit 3a0f650 into star-bnl:main Apr 12, 2023
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@plexoos plexoos plexoos approved these changes

@akioogawa akioogawa Awaiting requested review from akioogawa akioogawa is a code owner

@tonko-lj tonko-lj Awaiting requested review from tonko-lj tonko-lj is a code owner

@klendathu2k klendathu2k Awaiting requested review from klendathu2k

@fisyak fisyak Awaiting requested review from fisyak

@nigmatkulov nigmatkulov Awaiting requested review from nigmatkulov nigmatkulov is a code owner

@zsweger zsweger Awaiting requested review from zsweger zsweger is a code owner

@marrbnl marrbnl Awaiting requested review from marrbnl marrbnl is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jml985 @plexoos @starsdong @nigmatkulov