Merge pull request #327 from JeffersonLab/ana1921pass0

Ana1921pass0

build.sh

@@ -6,6 +6,7 @@
         -DPython3_EXECUTABLE=$(which python3) \
         -DCMAKE_BUILD_TYPE=RelWithDbInfo \
         -DCMAKE_CXX_COMPILER=$(which g++) -DCMAKE_C_COMPILER=$(which gcc) \
+        -DHPSMC_ENABLE_ROOT=ON \
         -DHPSMC_ENABLE_EGS5=ON \
         -DHPSMC_ENABLE_MADGRAPH=ON \
         -DHPSMC_ENABLE_STDHEP=ON \
@@ -14,4 +15,4 @@
         -DHPSMC_ENABLE_HPSJAVA=ON \
         -DHPSMC_ENABLE_CONDITIONS=OFF
     make install
-)
+)

examples/hpstr/job.json

@@ -3,7 +3,7 @@
         "recon": "kalSimpTuple_cfg.py",
         "ana": "anaVtxTuple_cfg.py"
     },
-    "run_mode": 0,
+    "is_data": 0,
     "nevents": 50,
     "year": 2021,
     "input_files": {

examples/tritrig_beam/job.json

@@ -9,7 +9,7 @@
         "readout": "/org/hps/steering/readout/PhysicsRun2019TrigMultiSingles.lcsim",
         "recon": "/org/hps/steering/recon/PhysicsRun2019MCRecon.lcsim"
     },
-    "run_mode": 0,
+    "is_data": 0,
     "config_files": {
         "recon": "recoTuple_cfg.py",
         "ana": "anaVtxTuple_cfg.py"
@@ -27,4 +27,4 @@
     "seed": 10399312,
     "output_dir": "output",
     "job_id": 1
-  }
+  }

prod/jlab/ana1921pass0/.hpsmc

@@ -1,5 +1,14 @@
+[HPSTR]
+hpstr_install_dir = /work/hallb/hps/bravo/sw/hpstr/install
+hpstr_base = /work/hallb/hps/bravo/sw/hpstr
+
+[EvioToLcio]
+hps_java_bin_jar = /u/group/hps/hps_soft/hps-java/hps-distribution-5.1-bin.jar
+java_args = -Xmx3g -XX:+UseSerialGC
+
 [Job]
 dry_run = False
-enable_file_chaining = False
 check_output_files = False
+enable_copy_output_files = False
+enable_file_chaining = True
 delete_rundir = False

prod/jlab/ana1921pass0/ana1921pass0.md

@@ -1,5 +1,17 @@
-Data conversion -- evio to lcio  {#datacnv}
+Data conversion/reco -- evio to lcio  {#ana1921pass0}
 ===============================
 
-This is the configuration used for pass0 of the 2019 and 2021 data
+This is the job configuration used for pass0 of the 2019 and 2021 data.
+hps2021goldRuns.csv and hps2019goldRuns.csv are from the [run spreadsheets](https://wiki.jlab.org/hps-run/index.php/The_HPS_Run_Wiki).
+build2021filenames.py and build2019filenames.py read these csv files and produce a txt file with full path to each file selected via glob.
 
+The configuration for all the jobs to be submitted is generated via mkjobs.sh, which
+utilizes the .tmpl files as a template for all the jobs.
+
+The configuration for the jobs to be run are in jobs2019.json and jobs2021.json, where for
+instance you can find the output location for the files, the hps-java steering file, etc.
+These files are in a human readable format.
+
+The jobs are submitted to the swif2 system at jlab via run_swif2.sh
+The specfic location of the installations used are configured in .hpsmc
+hpstr release that will be installed is v1.0.0

prod/jlab/ana1921pass0/job2019.json.tmpl

@@ -1,19 +1,21 @@
 {
     {% set splitPath = input_files['data'][0].split('/') %}
     {% set run_number = splitPath[6].split('_')[1]|int %}
+    {% set partition = splitPath[7].split('.')[2]|int %}
     {% set detector = 'HPS_PhysicsRun2019_Pass2' %}
     "input_files": {
         "{{input_files['data'][0]}}": "data_events.evio"
     },
     "output_files": {
-        "data_events.slcio": "data_events.slcio",
-        "data_events.root": "data_events.root"
+        "data_events.slcio": "{{splitPath[6]}}_{{splitPath[7].split('.')[2]}}.slcio",
+        "data_events.root": "{{splitPath[6]}}_{{splitPath[7].split('.')[2]}}.root"
     },
-    "output_dir": "output/{{detector}}",
+    "output_dir": "/cache/hallb/hps/physrun2019/production/pass0/{{splitPath[6]}}",
+    "is_data": 1,
     "detector": "{{detector}}",
     "run_number": {{run_number}},
     "steering_files": {
-        "recon": "/org/hps/steering/recon/PhysicsRun2021_pass0_recon_evio.lcsim"
+        "recon": "/org/hps/steering/recon/PhysicsRun2019_pass0_recon_evio.lcsim"
     },
     "config_files": {
         "recon": "recoTuple_cfg.py"

prod/jlab/ana1921pass0/job2021.json.tmpl

@@ -10,14 +10,15 @@
         "{{input_files['data'][0]}}": "data_events.evio"
     },
     "output_files": {
-        "data_events.slcio": "data_events.slcio",
-        "data_events.root": "data_events.root"
+        "data_events.slcio": "{{splitPath[6]}}_{{splitPath[7].split('.')[2]}}.slcio",
+        "data_events.root": "{{splitPath[6]}}_{{splitPath[7].split('.')[2]}}.root"
     },
-    "output_dir": "output/{{detector}}",
+    "output_dir": "/cache/hallb/hps/physrun2021/production/pass0/{{splitPath[6]}}",
     "detector": "{{detector}}",
+    "is_data": 1,
     "run_number": {{run_number}},
     "steering_files": {
-        "recon": "/org/hps/steering/recon/PhysicsRun2021_pass0_recon_evio.lcsim"
+        "recon": "/org/hps/steering/recon/PhysicsRun2019_pass0_recon_evio.lcsim"
     },
     "config_files": {
         "recon": "recoTuple_cfg.py"