switch eb tests to gemc 5.0

baltzell · baltzell · commit 2c32f01ace94 · 2022-05-15T16:10:33.000-04:00
diff --git a/validation/advanced-tests/run-eb-tests.sh b/validation/advanced-tests/run-eb-tests.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 webDir=http://clasweb.jlab.org/clas12offline/distribution/coatjava/validation_files/eb
-webVersion=4.4.0-fid-r11
+webVersion=5.0-fid-r11
 webDir=$webDir/$webVersion
 
 # coatjava must already be built at ../../coatjava/
@@ -124,31 +124,28 @@ then
     fi
 
     # download test files, if necessary:
-    rm -f ${webFileStub}.evio
-    wget -N --no-check-certificate $webDir/${webFileStub}.evio.gz
+    wget -N --no-check-certificate $webDir/${webFileStub}.hipo
     if [ $? != 0 ] ; then echo "wget validation files failure" ; exit 1 ; fi
-    gunzip -f ${webFileStub}.evio.gz
 
-    rm -f ${webFileStub}.hipo
-    rm -f out_${webFileStub}.hipo
-
-    # convert to hipo:
-    $COAT/bin/evio2hipo -s $gemcSolenoidDefault -o ${webFileStub}.hipo ${webFileStub}.evio
+    # update the schema dictionary:
+    rm -f up_${webFileStub}.hipo
+    ../../coatjava/bin/hipo-utils -update -d ../../coatjava/etc/bankdefs/hipo4/ -o up_${webFileStub}.hipo ${webFileStub}.hipo
 
     # run reconstruction:
+    rm -f out_${webFileStub}.hipo
     if [ $useClara -eq 0 ]
     then
         GEOMDBVAR=$geoDbVariation
         export GEOMDBVAR
-        ../../coatjava/bin/recon-util -i ${webFileStub}.hipo -o out_${webFileStub}.hipo -c 2
+        ../../coatjava/bin/recon-util -i up_${webFileStub}.hipo -o out_${webFileStub}.hipo -c 2
     else
         echo "set inputDir $PWD/" > cook.clara
         echo "set outputDir $PWD/" >> cook.clara
         echo "set threads 7" >> cook.clara
         echo "set javaMemory 2" >> cook.clara
         echo "set session s_cook" >> cook.clara
         echo "set description d_cook" >> cook.clara
-        ls ${webFileStub}.hipo > files.list
+        ls up_${webFileStub}.hipo > files.list
         echo "set fileList $PWD/files.list" >> cook.clara
         echo "run local" >> cook.clara
         echo "exit" >> cook.clara
diff --git a/validation/advanced-tests/src/eb/scripts/.gitignore b/validation/advanced-tests/src/eb/scripts/.gitignore
@@ -1,2 +1,3 @@
 *.txt
 *.gz
+*.hipo
diff --git a/validation/advanced-tests/src/eb/scripts/gemc-all.sh b/validation/advanced-tests/src/eb/scripts/gemc-all.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-gemc=${DIR}/gemc.csh
+gemc=${DIR}/gemc.sh
 list=${DIR}/list.txt
 
 for xx in `awk '{print$1}' $list`
diff --git a/validation/advanced-tests/src/eb/scripts/gemc.csh b/validation/advanced-tests/src/eb/scripts/gemc.csh
diff --git a/validation/advanced-tests/src/eb/scripts/gemc.sh b/validation/advanced-tests/src/eb/scripts/gemc.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+if ! [ -e "$1.txt" ]
+then
+    echo Missing input file:  $1.txt
+    exit
+fi
+if [ -e "$1.evio" ] || [ -e "$1.hipo" ]
+then
+    echo Output file already exists:  ${1}.evio/hipo
+    exit
+fi
+
+run=11
+nEvents=100
+gcard=$GEMC/../config/clas12-default.gcard 
+
+gemc \
+    $gcard \
+    -INPUT_GEN_FILE="LUND, $1.txt" \
+    -OUTPUT="hipo, $1.hipo" \
+    -RUNNO=$run \
+    -USE_GUI=0 \
+    -N=$nEvents
+
