Skip to content

Fix compilation and linking issues #7

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

Merged
mwinn2 merged 3 commits into from
Dec 9, 2019
Merged

Fix compilation and linking issues #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4882715
Fix compilation and linking issues
aphecetche Dec 1, 2019
d495f76
Merge branch 'movedigittobase' into movedigittobase-fix
mwinn2 Dec 4, 2019
0a9f6b1
Merge branch 'movedigittobase' into movedigittobase-fix
mwinn2 Dec 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions Detectors/MUON/MCH/Base/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,14 @@
# submit itself to any jurisdiction.

o2_add_library(MCHBase
SOURCES
SOURCES
src/ClusterBlock.cxx
src/Digit.cxx
src/DigitBlock.cxx
src/Mapping.cxx
src/PreClusterBlock.cxx
src/TrackBlock.cxx
PUBLIC_LINK_LIBRARIES ROOT::Core FairRoot::Base FairMQ::FairMQ O2::MCHBase)
PUBLIC_LINK_LIBRARIES ROOT::Core FairRoot::Base FairMQ::FairMQ)

o2_target_root_dictionary(MCHBase
HEADERS include/MCHBase/ClusterBlock.h
include/MCHBase/Digit.h
include/MCHBase/DigitBlock.h
include/MCHBase/Mapping.h
include/MCHBase/PreClusterBlock.h
include/MCHBase/TrackBlock.h
)
HEADERS include/MCHBase/Digit.h)
2 changes: 1 addition & 1 deletion Detectors/MUON/MCH/Base/src/Digit.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
namespace o2::mch
{


bool closeEnough(double x, double y, double eps = 1E-6)
{
return std::fabs(x - y) <= eps * std::max(1.0, std::max(std::fabs(x), std::fabs(y)));
}

ClassImp(Digit);
Digit::Digit(double time, int detid, int pad, unsigned long adc)
: mTime(time), mDetID(detid), mPadID(pad), mADC(adc)
{
Expand Down