Skip to content

Read readeic #3427

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

Open
pinkenburg wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Read readeic #3427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee3207a
put ReadEICFiles back
pinkenburg Feb 11, 2025
5b334eb
no special compiler flags for clang anymore
pinkenburg Feb 11, 2025
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
19 changes: 8 additions & 11 deletions simulation/g4simulation/g4main/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ libg4testbench_la_LDFLAGS = \
libg4testbench_la_LIBADD = \
libphg4hit.la \
-lboost_filesystem \
-leicsmear \
-lffamodules \
-lfun4all \
-lg4decayer \
Expand All @@ -49,11 +50,6 @@ libg4testbench_la_LIBADD = \
-lphhepmc \
-lphparameter

# I/O dictionaries have to exist for root5 and root6. For ROOT6 we need
# pcm files in addition. If someone can figure out how to make a list
# so this list of dictionaries is transformed into a list of pcm files
# following a simple naming convention, please change this accordingly and
# let me know
ROOTHITDICTS = \
EicEventHeader_Dict.cc \
EicEventHeaderv1_Dict.cc \
Expand Down Expand Up @@ -103,12 +99,13 @@ libphg4hit_la_SOURCES = \
PHG4VtxPointv2.cc

libg4testbench_la_SOURCES = \
CosmicSpray.cc \
Fun4AllMessenger.cc \
G4TBMagneticFieldSetup.cc \
G4TBFieldMessenger.cc \
Fun4AllDstPileupInputManager.cc \
Fun4AllDstPileupMerger.cc \
Fun4AllSingleDstPileupInputManager.cc \
G4TBMagneticFieldSetup.cc \
G4TBFieldMessenger.cc \
HepMCNodeReader.cc \
PHG4ConsistencyCheck.cc \
PHG4DisplayAction.cc \
Expand Down Expand Up @@ -149,13 +146,15 @@ libg4testbench_la_SOURCES = \
PHG4UIsession.cc \
PHG4Utils.cc \
PHG4VertexSelection.cc \
CosmicSpray.cc
ReadEICFiles.cc


##############################################
# please add new classes in alphabetical order

pkginclude_HEADERS = \
CosmicSpray.h \
EcoMug.h \
EicEventHeader.h \
Fun4AllDstPileupInputManager.h \
Fun4AllDstPileupMerger.h \
Expand Down Expand Up @@ -209,9 +208,7 @@ pkginclude_HEADERS = \
PHG4VtxPoint.h \
PHG4VtxPointv1.h \
PHG4VtxPointv2.h \
ReadEICFiles.h \
CosmicSpray.h \
EcoMug.h
ReadEICFiles.h

################################################
# linking tests
Expand Down
10 changes: 5 additions & 5 deletions simulation/g4simulation/g4main/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ CXXFLAGS="$CXXFLAGS -Wall -Werror -Wextra -Wshadow"

dnl AM_CONDITIONAL(GCC_GE_48, test `g++ -dumpversion | awk '{print $1>=4.8?"1":"0"}'` = 1)

case $CXX in
clang++)
CXXFLAGS="$CXXFLAGS -Wno-c11-extensions -Wno-deprecated-copy"
;;
esac
dnl case $CXX in
dnl clang++)
dnl CXXFLAGS="$CXXFLAGS -Wno-c11-extensions -Wno-deprecated-copy"
dnl ;;
dnl esac

CINTDEFS=" -noIncludePaths -inlineInputHeader "
AC_SUBST(CINTDEFS)
Expand Down