Separate hddm from halld_recon

Makefile_all

@@ -8,6 +8,7 @@ CERNLIB = ${ROOT_OF_ALL}/cernlib
 CLHEP_TOP = ${ROOT_OF_ALL}/clhep
 SIM-RECON = ${ROOT_OF_ALL}/sim-recon
 HDDS = ${ROOT_OF_ALL}/hdds
+HDDM = ${ROOT_OF_ALL}/hddm
 JANA = ${ROOT_OF_ALL}/jana
 ROOT = ${ROOT_OF_ALL}/root
 XERCES = ${ROOT_OF_ALL}/xerces-c
@@ -105,6 +106,14 @@ hdds_dir:
 hdds_make:
 	$(MAKE) -C${HDDS} -f${BUILD_SCRIPTS}/Makefile_hdds
 
+hddm_build: hddm_dir hddm_make
+
+hddm_dir:
+	test -d ${HDDM} || mkdir -pv ${HDDM}
+
+hddm_make:
+	$(MAKE) -C${HDDM} -f${BUILD_SCRIPTS}/Makefile_hddm
+
 sim-recon_build: sim-recon_dir sim-recon_make
 
 sim-recon_dir:

Makefile_evtgen

@@ -31,13 +31,17 @@ $(EVTGEN_HOME)/.patch_done: $(SOURCE_CODE_TARGET)
 	date > $@
 
 $(EVTGEN_HOME)/.configure: $(EVTGEN_HOME)/.patch_done
-	cd $(EVTGEN_HOME) ; ./configure --hepmcdir=$(HEPMCDIR) \
-	   --photosdir=$(PHOTOSDIR)
+	cd $(EVTGEN_HOME); mkdir -p $(EVTGEN_HOME)/build ; ./configure --prefix=$(EVTGEN_HOME)/build \
+	   --hepmcdir=$(HEPMCDIR) --photosdir=$(PHOTOSDIR)
 	date > $@
 
 $(EVTGEN_HOME)/.make_done: $(EVTGEN_HOME)/.configure
 	make -C $(EVTGEN_HOME)
 	date > $@
 
-$(EVTGEN_HOME)/evtgen_prereqs.xml: $(EVTGEN_HOME)/.make_done
+$(EVTGEN_HOME)/.install_done: $(EVTGEN_HOME)/.make_done
+	make -C $(EVTGEN_HOME) install
+	date > $@
+
+$(EVTGEN_HOME)/evtgen_prereqs.xml: $(EVTGEN_HOME)/.install_done
 	cd $(EVTGEN_HOME) ; $(BUILD_SCRIPTS)/version_prereqs.pl evtgen

Makefile_hddm

@@ -8,7 +8,7 @@ ifdef HDDM_VERSION
 else
  SOURCE_CODE_TARGET = $(HDDM_HOME)/.clone_done
  ifndef HDDM_URL
-  HDDM_URL=https://github.com/rjones30/HDDM
+  HDDM_URL=https://github.com/jeffersonlab/hddm
  endif
  HDDM_DIR = $(notdir $(HDDM_URL))
  ifndef HDDM_BRANCH
@@ -55,9 +55,11 @@ $(HDDM_HOME)/.cmake_done: $(SOURCE_CODE_TARGET)
 	    -DXercesC_LIBRARY=$(XERCESCROOT)/lib/libxerces-c.so \
 	    -DXercesC_INCLUDE_DIR=$(XERCES_INCLUDE) \
 	    -DXercesC_VERSION=$(XERCES_C_VERSION) -DCMAKE_INSTALL_PREFIX=.. ..
+	date > $@
 
 $(HDDM_HOME)/.make_install_done: $(HDDM_HOME)/.cmake_done
 	cd $(HDDM_HOME)/build; make install
+	date > $@
 
 $(HDDM_HOME)/hddm_prereqs_version.xml: $(HDDM_HOME)/.make_install_done
 	cd $(HDDM_HOME); $(BUILD_SCRIPTS)/version_prereqs.pl hddm

Makefile_hdgeant4

@@ -73,7 +73,7 @@ $(HDGEANT4_HOME)/.make_done: $(HDGEANT4_HOME)/.link_to_fixes_done
 	    then echo Geant4 setup not complete, sourcing geant4make.sh ; \
 	    . `find $(G4ROOT)/share/ -name geant4make.sh` ; \
 	fi ; \
-	make PYTHON_CONFIG=$(PYTHON_CONFIG) BOOST_PYTHON_LIB=$(PYTHON_BOOST) PYTHON_LIB_OPTION=$(PYTHON_LIB_OPTION) $(QTHOME_DEF) $(HDGEANT4_MAKE_OPTIONS)
+	make PYTHON_CONFIG=$(PYTHON_CONFIG) PYTHON_LIB_OPTION=$(PYTHON_LIB_OPTION) $(QTHOME_DEF) $(HDGEANT4_MAKE_OPTIONS)
 	date > $@
 
 $(HDGEANT4_HOME)/hdgeant4_prereqs_version.xml: $(HDGEANT4_HOME)/.make_done

gluex_env.csh

@@ -91,6 +91,12 @@ if ($?EVIOROOT) then
 endif
 # hdds
 setenv JANA_GEOMETRY_URL ccdb:///GEOMETRY/main_HDDS.xml
+# hddm
+if ($?HDDM_HOME) then
+    echo $PATH | grep $HDDM_HOME/bin > /dev/null
+    if ($status) setenv PATH $HDDM_HOME/bin:$PATH
+    setenv HDDM_DIR $HDDM_HOME
+endif
 # halld
 if ($?HALLD_HOME) then
     echo $PATH | grep $HALLD_HOME/$BMS_OSNAME/bin > /dev/null
@@ -120,6 +126,7 @@ endif
 if ($?DIRACXX_HOME) then
     echo $LD_LIBRARY_PATH | grep $DIRACXX_HOME > /dev/null
     if ($status) setenv LD_LIBRARY_PATH ${DIRACXX_HOME}/lib:${DIRACXX_HOME}:$LD_LIBRARY_PATH # covers both old and new Diracxx lib location
+    setenv DIRACXX_DIR $DIRACXX_HOME
 endif
 #
 # HDGeant4

gluex_env.sh

@@ -152,6 +152,15 @@ then
 fi
 # hdds
 export JANA_GEOMETRY_URL=ccdb:///GEOMETRY/main_HDDS.xml
+# hddm
+if [ -n "$HDDM_HOME" ]
+then
+    if [ `echo $PATH | grep -c $HDDM_HOME/bin` -eq 0 ]
+    then
+	export PATH=$HDDM_HOME/bin:$PATH
+	export HDDM_DIR=$HDDM_HOME
+    fi
+fi
 # sim-recon
 if [ -n "$HALLD_HOME" ]
 then
@@ -191,7 +200,9 @@ fi
 #
 if [ -n "$DIRACXX_HOME" ]; then
     if [ `echo $LD_LIBRARY_PATH | grep -c $DIRACXX_HOME` -eq 0 ]
-    then export LD_LIBRARY_PATH=$DIRACXX_HOME/lib:$DIRACXX_HOME:$LD_LIBRARY_PATH # covers both old and new Diracxx lib location
+    then
+	export LD_LIBRARY_PATH=$DIRACXX_HOME/lib:$DIRACXX_HOME:$LD_LIBRARY_PATH # covers both old and new Diracxx lib location
+	export DIRACXX_DIR=$DIRACXX_HOME
     fi
 fi
 #

gluex_env_jlab.csh

@@ -26,5 +26,6 @@ setenv JANA_CALIB_URL `$BUILD_SCRIPTS/calib_url_chooser.sh`
 setenv JANA_RESOURCE_DIR /group/halld/www/halldweb/html/resources
 # cmake on the cue
 if ( $BMS_OSNAME !~ *CentOS7.7* ) then
-    setenv PATH /apps/cmake/cmake-3.5.1/bin:$PATH
+    #setenv PATH /apps/cmake/cmake-3.5.1/bin:$PATH
+    setenv PATH /apps/bin:$PATH
 endif

gluex_env_jlab.sh

@@ -30,5 +30,6 @@ export JANA_RESOURCE_DIR=/group/halld/www/halldweb/html/resources
 # cmake on the cue
 if [[ $BMS_OSNAME != *CentOS7.7* ]]
     then
-    export PATH=/apps/cmake/cmake-3.5.1/bin:$PATH
+    #export PATH=/apps/cmake/cmake-3.5.1/bin:$PATH
+    export PATH=/apps/bin:$PATH
 fi

gluex_targets.mk

@@ -40,6 +40,9 @@ endif
 ifdef HDDS_HOME
     GLUEX_PASS2_TARGETS += hdds_build
 endif
+ifdef HDDM_HOME
+    GLUEX_PASS2_TARGETS += hddm_build
+endif
 ifdef AMPTOOLS_HOME
     GLUEX_PASS2_TARGETS += amptools_build
 endif

version_defs.pl

@@ -57,7 +57,7 @@
 	       photos => 'Photos-',
 	       evtgen => 'evtgen-',
 	       diracxx => 'Diracxx-',
-	       hddm => 'HDDM-',
+	       hddm => 'hddm-',
 	       halld_amp => 'halld_amp-');
 
 $unames = `uname -s`;
@@ -88,7 +88,7 @@
                lapack => '',
                hepmc => '',
                photos => '',
-               evtgen => '',
+               evtgen => '/build',
 	       diracxx => '',
 	       hddm => '',
 	       halld_amp => '');

version_prereqs.pl

@@ -35,7 +35,7 @@
 	    'xerces-c' => [],
 	    geant4 => [],
 	    ccdb => [],
-	    halld_recon => ['evio', 'cernlib', 'xerces-c', 'root', 'jana', 'hdds', 'ccdb', 'rcdb', 'sqlitecpp'],
+	    halld_recon => ['evio', 'cernlib', 'xerces-c', 'root', 'jana', 'hdds', 'hddm', 'ccdb', 'rcdb', 'sqlitecpp'],
 	    halld_sim => ['halld_recon'],
 	    amptools => ['root'],
 	    photos => ['hepmc'],

xml/packages.xml

@@ -53,4 +53,6 @@
 	 description="Amplitude analysis for GlueX"/>
 <package name="clhep" docName="clhep" homeVar="CLHEP_HOME"
 	 description="C++ mathematical library for HEP"/>
+<package name="hddm" docName="hddm" homeVar="HDDM_HOME"
+         description="efficient i/o library for self-describing structured scientific data"/>
 </packages>