search

testdockerwcsim / XTriggerApplication

Other
2 stars 3 forks source link

Feature/triggers comparison #88

Closed federiconova closed 3 years ago

federiconova commented 3 years ago

add some functionalities to output triggers and compare outputs

tdealtry commented 3 years ago

There's still some conflicts on this PR. You can use the website GUI way to do things as Ben showed in the meeting, or you can do things from the command line with a 

git pull <remote_name> master

where remote_name is whatever your git remote -v output says for git@github.com:HKDAQ/TriggerApplication.git (or the https equivalent*). If you don't have such a line, you can add it (naming it upstream is one convention, but can name it whatever you like)

git remote add upstream git@github.com:HKDAQ/TriggerApplication.git

(or the https equivalent)

*https://github.com/HKDAQ/TriggerApplication.git

federiconova commented 3 years ago

There's still some conflicts on this PR. You can use the website GUI way to do things as Ben showed in the meeting, or you can do things from the command line with a

git pull <remote_name> master

where remote_name is whatever your git remote -v output says for git@github.com:HKDAQ/TriggerApplication.git (or the https equivalent*). If you don't have such a line, you can add it (naming it upstream is one convention, but can name it whatever you like)

git remote add upstream git@github.com:HKDAQ/TriggerApplication.git

(or the https equivalent)

*https://github.com/HKDAQ/TriggerApplication.git

I think I fixed it, but can you check if there are still conflicts?

tdealtry commented 3 years ago

@federiconova the build is failing. It looks like test_vertice.h has multiple copies of most of the new lines (e.g. the following appears on line 48 & line 169)

typedef unsigned short offset_t;
federiconova commented 3 years ago

@federiconova the build is failing. It looks like test_vertice.h has multiple copies of most of the new lines (e.g. the following appears on line 48 & line 169)

typedef unsigned short offset_t;

ah, good thanks, I removed them.

tdealtry commented 3 years ago

Build passed! Thanks @federiconova This is ready to go too @brichards64