Adding default reconstruction options file (tracking and clustering).

.gitlab-ci.yml

@@ -48,8 +48,8 @@ common:detector:
     - print_env.sh
 
 include:
-  #- local: 'benchmarks/dis/config.yml'
-  #- local: 'benchmarks/dvmp/config.yml'
+  - local: 'benchmarks/dis/config.yml'
+  - local: 'benchmarks/dvmp/config.yml'
   - local: 'benchmarks/dvcs/config.yml'
 
 summary:

benchmarks/dis/README.md

 # DIS Benchmarks
 
-## Compiling Pythia
+## Compiling Pythia example
 
 ```
 g++ src/pythia_dis.cc -o pythia_dis  \

benchmarks/dis/analysis/dis.h

-#ifndef DVMP_H
-#define DVMP_H
-
-#include <util.h>
-
-#include <algorithm>
-#include <cmath>
-#include <exception>
-#include <fmt/core.h>
-#include <limits>
-#include <string>
-#include <vector>
-
-#include <Math/Vector4D.h>
-
-// Additional utility functions for DVMP benchmarks. Where useful, these can be
-// promoted to the top-level util library
-namespace util {
-
-  //The functions below were copied from dvmp.h
-
-
-  // ADD EXTRA DIS UTILTIY FUNCTIONS HERE
-
-  //=========================================================================================================
-
-} // namespace util
-
-#endif

benchmarks/dis/analysis/dis_electrons.cxx

-#include "dis.h"
-#include "plot.h"
+#include "common_bench/benchmark.h"
+#include "common_bench/mt.h"
+#include "common_bench/util.h"
 
-#include <common_bench/benchmark.h>
-#include <common_bench/mt.h>
-#include <common_bench/util.h>
-
-#include "ROOT/RDataFrame.hxx"
 #include <cmath>
-#include <fmt/color.h>
-#include <fmt/core.h>
 #include <fstream>
 #include <iostream>
-#include <nlohmann/json.hpp>
 #include <string>
 #include <vector>
-#include <eicd/ReconstructedParticleData.h>
+#include <algorithm>
+#include <utility>
+
+#include "ROOT/RDataFrame.hxx"
 #include <TH1D.h>
 #include <TFitResult.h>
 #include <TRandom3.h>
-#include <algorithm>
-#include <utility>
 
+#include "fmt/color.h"
+#include "fmt/core.h"
+
+#include "nlohmann/json.hpp"
+#include "eicd/ReconstructedParticleData.h"
 
 // Get a vector of 4-momenta from the reconstructed data.
 inline auto momenta_from_reconstruction(const std::vector<eic::ReconstructedParticleData>& parts)

benchmarks/dis/config.yml

@@ -10,8 +10,9 @@ dis:process:
   needs: ["common:detector", "dis:generate"]
   timeout: 2 hour
   script:
-    - compile_analyses.py dis
-    - ./benchmarks/dis/dis.sh --config barrel --ebeam 18 --pbeam 275
+    - echo "Temporarily disabling!!!"
+      #- compile_analyses.py dis
+      #- ./benchmarks/dis/dis.sh --config barrel --ebeam 18 --pbeam 275
   retry:
     max: 2
     when:

benchmarks/dis/dis.sh

@@ -85,13 +85,13 @@ echo "Running the digitization and reconstruction"
 export JUGGLER_SIM_FILE=${SIM_FILE}
 export JUGGLER_REC_FILE=${REC_FILE}
 xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-  gaudirun.py options/tracker_reconstruction.py 
+  gaudirun.py options/reconstruction.py 
 ## on-error, first retry running juggler again as there is still a random
 ## crash we need to address FIXME
 if [ "$?" -ne "0" ] ; then
   echo "Juggler crashed, retrying..."
   xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-    gaudirun.py options/tracker_reconstruction.py \
+    gaudirun.py options/reconstruction.py \
     2>&1 > ${REC_LOG}
   if [ "$?" -ne "0" ] ; then
     echo "ERROR running juggler, both attempts failed"

benchmarks/dvcs/dvcs.sh

@@ -39,7 +39,7 @@ fi
 
 # Need to figure out how to pass file name to juggler from the commandline
 xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-  gaudirun.py options/tracker_reconstruction.py
+  gaudirun.py options/reconstruction.py
 if [[ "$?" -ne "0" ]] ; then
   echo "ERROR running juggler"
   exit 1

benchmarks/dvmp/dvmp.sh

@@ -85,14 +85,14 @@ echo "Running the digitization and reconstruction"
 export JUGGLER_SIM_FILE=${SIM_FILE}
 export JUGGLER_REC_FILE=${REC_FILE}
 xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-  gaudirun.py options/tracker_reconstruction.py \
+  gaudirun.py options/reconstruction.py \
   2>&1 > ${REC_LOG}
 ## on-error, first retry running juggler again as there is still a random
 ## crash we need to address FIXME
 if [ "$?" -ne "0" ] ; then
   echo "Juggler crashed, retrying..."
   xenv -x ${JUGGLER_INSTALL_PREFIX}/Juggler.xenv \
-    gaudirun.py options/tracker_reconstruction.py \
+    gaudirun.py options/reconstruction.py \
     2>&1 > ${REC_LOG}
   if [ "$?" -ne "0" ] ; then
     echo "ERROR running juggler, both attempts failed"