From ee3207ac7b3098ce7c36df02df519d0a3c7f782d Mon Sep 17 00:00:00 2001
From: Chris Pinkenburg <pinkenburg@bnl.gov>
Date: Tue, 11 Feb 2025 12:01:30 -0500
Subject: [PATCH 1/2] put ReadEICFiles back

---
 simulation/g4simulation/g4main/Makefile.am | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/simulation/g4simulation/g4main/Makefile.am b/simulation/g4simulation/g4main/Makefile.am
index 89bd61ba4c..513c658f24 100644
--- a/simulation/g4simulation/g4main/Makefile.am
+++ b/simulation/g4simulation/g4main/Makefile.am
@@ -37,6 +37,7 @@ libg4testbench_la_LDFLAGS = \
 libg4testbench_la_LIBADD = \
   libphg4hit.la \
   -lboost_filesystem \
+  -leicsmear \
   -lffamodules \
   -lfun4all \
   -lg4decayer \
@@ -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 \
@@ -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 \
@@ -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 \
@@ -209,9 +208,7 @@ pkginclude_HEADERS = \
   PHG4VtxPoint.h \
   PHG4VtxPointv1.h \
   PHG4VtxPointv2.h \
-  ReadEICFiles.h \
-  CosmicSpray.h \
-  EcoMug.h
+  ReadEICFiles.h
 
 ################################################
 # linking tests

From 5b334eb0767ed0ff0fc9a66fcb586245d94c123f Mon Sep 17 00:00:00 2001
From: Chris Pinkenburg <pinkenburg@bnl.gov>
Date: Tue, 11 Feb 2025 12:13:25 -0500
Subject: [PATCH 2/2] no special compiler flags for clang anymore

---
 simulation/g4simulation/g4main/configure.ac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/simulation/g4simulation/g4main/configure.ac b/simulation/g4simulation/g4main/configure.ac
index 307525a354..b5ca762db2 100644
--- a/simulation/g4simulation/g4main/configure.ac
+++ b/simulation/g4simulation/g4main/configure.ac
@@ -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)