Pass at a set of more modern libraries that at least allow this branc…

…h to build.
DUNE · Aug 19, 2022 · bfba425 · bfba425
1 parent 4212060
commit bfba425
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 52 deletions.
diff --git a/Makefile b/Makefile
@@ -16,48 +16,59 @@ LDLIBS += -L$(LIBXML2_FQ_DIR)/lib -lxml2
 LDLIBS += -L$(HDF5_LIB) -lhdf5_cpp
 LDLIBS += -L$(PYTHIA6) -lPythia6
 LDLIBS += -L$(ROOTSYS)/lib -lGeom -lEGPythia6
-LDLIBS += -L$(GENIE)/lib \
-                                        -lGAlgorithm \
-                                        -lGBaryonResonance \
-                                        -lGBase \
-                                        -lGBodekYang \
-                                        -lGCharm \
-                                        -lGCoh \
-                                        -lGCrossSections \
-                                        -lGDecay \
-                                        -lGDfrc \
-                                        -lGDIS \
-                                        -lGElas \
-                                        -lGElFF \
-                                        -lGEVGCore \
-                                        -lGEVGDrivers \
-                                        -lGEVGModules \
-                                        -lGFluxDrivers \
-                                        -lGFragmentation \
-                                        -lGGeo \
-                                        -lGGiBUU \
-                                        -lGHadronTransp \
-                                        -lGHEP \
-                                        -lGInteraction \
-                                        -lGLlewellynSmith \
-                                        -lGMEC \
-                                        -lGReinSehgal \
-                                        -lGSingleKaon \
-                                        -lGMessenger \
-                                        -lGMuELoss \
-                                        -lGNtuple \
-                                        -lGNuclear \
-                                        -lGNuE \
-                                        -lGNuGamma \
-                                        -lGNumerical \
-                                        -lGPDF \
-                                        -lGPDG \
-                                        -lGQEL \
-                                        -lGQPM \
-                                        -lGRegistry \
-                                        -lGRES \
-                                        -lGUtils \
-                                        -lGReWeight
+LDLIBS += -L$(GSL_LIB) -lgsl -lgslcblas
+LDLIBS += -L$(GENIE_LIB) \
+-lGFwAlg \
+-lGFwEG \
+-lGFwGHEP \
+-lGFwInt \
+-lGFwMsg \
+-lGFwNtp \
+-lGFwNum \
+-lGFwParDat \
+-lGFwReg \
+-lGFwUtl \
+-lGPhAMNGEG \
+-lGPhAMNGXS \
+-lGPhBDMEG \
+-lGPhBDMXS \
+-lGPhChmXS \
+-lGPhCmn \
+-lGPhCohEG \
+-lGPhCohXS \
+-lGPhDcy \
+-lGPhDeEx \
+-lGPhDfrcEG \
+-lGPhDfrcXS \
+-lGPhDISEG \
+-lGPhDISXS \
+-lGPhGlwResEG \
+-lGPhGlwResXS \
+-lGPhHadnz \
+-lGPhHadTransp \
+-lGPhIBDEG \
+-lGPhIBDXS \
+-lGPhMEL \
+-lGPhMNucEG \
+-lGPhMNucXS \
+-lGPhNDcy \
+-lGPhNNBarOsc \
+-lGPhNuclSt \
+-lGPhNuElEG \
+-lGPhNuElXS \
+-lGPhPDF \
+-lGPhQELEG \
+-lGPhQELXS \
+-lGPhResEG \
+-lGPhResXS \
+-lGPhStrEG \
+-lGPhStrXS \
+-lGPhXSIg \
+-lGRwClc \
+-lGRwFwk \
+-lGRwIO \
+-lGTlFlx \
+-lGTlGeo \
 
 #LDLIBS += -L$(NUSYST)/build/Linux/lib -lsystematicstools_utility -lsystematicstools_interpreters -lsystematicstools_interface -lsystematicstools_systproviders
 #LDLIBS += -L$(NUSYST)/build/nusystematics/artless -lnusystematics_systproviders

diff --git a/ndcaf_setup.sh b/ndcaf_setup.sh
@@ -1,17 +1,17 @@
 source /cvmfs/dune.opensciencegrid.org/products/dune/setup_dune.sh
-setup duneanaobj v02_01_00 -q e20:prof
 setup cmake v3_9_0
-setup gcc v6_4_0
+setup gcc v9_3_0
 setup pycurl
 setup ifdhc
-setup dk2nugenie   v01_06_01f -q debug:e15
+setup dk2nugenie   v01_08_00n -q debug:e20
 setup genie_xsec   v2_12_10   -q DefaultPlusValenciaMEC
 setup genie_phyopt v2_12_10   -q dkcharmtau
-setup geant4 v4_10_3_p01b -q e15:debug
+setup geant4 v4_10_6_p01c -q e20:debug
 setup jobsub_client
 setup eigen v3_3_5
-setup hdf5 v1_10_2a -q e15
-setup fhiclcpp v4_06_08 -q debug:e15
+setup duneanaobj v02_01_00 -q e20:prof
+setup hdf5 v1_10_5a -q e20
+setup fhiclcpp v4_12_02 -q debug:e20
 
 # edep-sim needs to know where a certain GEANT .cmake file is...
 G4_cmake_file=`find ${GEANT4_FQ_DIR}/lib64 -name 'Geant4Config.cmake'`

diff --git a/src/CAF.h b/src/CAF.h
@@ -3,7 +3,7 @@
 
 #include "TFile.h"
 #include "TTree.h"
-#include "Ntuple/NtpMCEventRecord.h"
+#include "Framework/Ntuple/NtpMCEventRecord.h"
 #include "duneanaobj/StandardRecord/StandardRecord.h"
 #include "duneanaobj/StandardRecord/SRGlobal.h"
 

diff --git a/src/truth/FillTruth.cxx b/src/truth/FillTruth.cxx
@@ -13,9 +13,9 @@
 #include "TTree.h"
 
 // GENIE
-#include "EVGCore/EventRecord.h"
-#include "Ntuple/NtpMCEventRecord.h"
-#include "GHEP/GHepParticle.h"
+#include "Framework/EventGen/EventRecord.h"
+#include "Framework/Ntuple/NtpMCEventRecord.h"
+#include "Framework/GHEP/GHepParticle.h"
 
 // Standard Record format
 #include "duneanaobj/StandardRecord/StandardRecord.h"