Merge pull request #250 from JeffersonLab/aaust_b1pi_updates

b1pi_test updates for jana2

Author: aaust

b1pi_test/b1pi_cron.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-hosts="ifarm1901 sandd1 ifarm9"
+hosts="halld-cron-2024 ifarm2401"
 date_token=`date +%F`
 date_file=/volatile/halld/$USER/b1pi_date.txt
 rm -fv $date_file
@@ -31,6 +31,7 @@ while [ $nprocs -ne 0 ]
     sleep 300
 done
 /group/halld/Software/hd_utilities/b1pi_test/b1pi_message.sh
-source /group/halld/Software/build_scripts/gluex_env_jlab.sh
+HALLD_VERSIONS=/group/halld/www/halldweb/html/halld_versions
+source /group/halld/Software/build_scripts/gluex_env_jlab.sh $HALLD_VERSIONS/version.xml
 /group/halld/Software/time-history-plots/plots/b1pi_test/b1pi_history_data.sh $date_token >> /group/halld/time_history_data/b1pi_test.txt
 exit

b1pi_test/b1pi_cron_one.sh

@@ -11,10 +11,12 @@ export BMS_OSNAME=`/group/halld/Software/build_scripts/osrelease.pl`
 export BUILD_DIR=/volatile/halld/gluex/nightly/$TODAYS_DATE/$BMS_OSNAME
 export B1PI_TEST_DIR=/group/halld/Software/hd_utilities/b1pi_test
 export BUILD_SCRIPTS=/group/halld/Software/build_scripts
+export SEED=123
 
 # Setup environment based on sim-recon build we're using 
 source $BUILD_SCRIPTS/gluex_env_boot_jlab.sh
 gxenv $BUILD_DIR/version_${TODAYS_DATE}.xml
+#gxenv $HALLD_VERSIONS/version_5.21.1.xml
 export JANA_CALIB_CONTEXT="variation=mc"
 
 # do the test
@@ -23,7 +25,7 @@ export RUN_DIR=/volatile/halld/$USER/b1pi/$TODAYS_DATE/$BMS_OSNAME/$RUN
 rm -rfv $RUN_DIR
 mkdir -pv $RUN_DIR
 cd $RUN_DIR
-$B1PI_TEST_DIR/b1pi_test.sh -4 -n $nevents -r $RUN
+$B1PI_TEST_DIR/b1pi_test.sh -4 -n $nevents -r $RUN -t 8
 echo \#count events
 echo \#count b1_pi.hddm `./hddm_counter.pl b1_pi.hddm physicsEvent`
 echo \#count hdgeant.hddm `./hddm_counter.pl hdgeant.hddm physicsEvent`
@@ -41,7 +43,7 @@ export RUN_DIR=/volatile/halld/$USER/b1pi/$TODAYS_DATE/$BMS_OSNAME/$RUN
 rm -rfv $RUN_DIR
 mkdir -pv $RUN_DIR
 cd $RUN_DIR
-$B1PI_TEST_DIR/b1pi_test.sh -n $nevents -r $RUN -4
+$B1PI_TEST_DIR/b1pi_test.sh -n $nevents -r $RUN -4 -t 8
 echo \#count events
 echo \#count b1_pi.hddm `./hddm_counter.pl b1_pi.hddm physicsEvent`
 echo \#count hdgeant.hddm `./hddm_counter.pl hdgeant.hddm physicsEvent`

b1pi_test/b1pi_test.sh

@@ -141,17 +141,17 @@ echo $command
 $command
 
 echo "Running mcsmear ..."
-command="mcsmear -PJANA:BATCH_MODE=1 -PTHREAD_TIMEOUT=500 hdgeant.hddm"
+command="mcsmear -Pjana:warmup_timeout=1000 -Pjana:timeout=1000 hdgeant.hddm"
 echo $command
 $command
 
 echo "Running hd_root with danarest ..."
-command="hd_root -PJANA:BATCH_MODE=1 --nthreads=$NTHREADS -PTHREAD_TIMEOUT=500 -PPLUGINS=danarest hdgeant_smeared.hddm"
+command="hd_root -PNTHREADS=$NTHREADS -Pjana:warmup_timeout=1000 -Pjana:timeout=1000 -PPLUGINS=danarest hdgeant_smeared.hddm"
 echo $command
 $command
 
 echo "Running hd_root with b1pi_hists & monitoring_hists ..."
-command="hd_root -PJANA:BATCH_MODE=1 --nthreads=$NTHREADS -PTHREAD_TIMEOUT=500 -PPLUGINS=b1pi_hists,monitoring_hists dana_rest.hddm"
+command="hd_root -PNTHREADS=$NTHREADS -Pjana:warmup_timeout=1000 -Pjana:timeout=1000 -PPLUGINS=b1pi_hists,monitoring_hists dana_rest.hddm"
 echo $command
 $command