Improve handling of external hepmc input (#78)

* Fix deuteron charge, add Helium3

* Improve handling of external hepmc data

Author: njacazio

examples/aod/createO2tables.C

@@ -67,9 +67,12 @@ int createO2tables(const char* inputFile = "delphes.root",
     return 0;
   }
 
-  TDatabasePDG::Instance()->AddParticle("deuteron", "deuteron", 1.8756134, kTRUE, 0.0, 1, "Nucleus", 1000010020);
+  TDatabasePDG::Instance()->AddParticle("deuteron", "deuteron", 1.8756134, kTRUE, 0.0, 3, "Nucleus", 1000010020);
   TDatabasePDG::Instance()->AddAntiParticle("anti-deuteron", -1000010020);
 
+  TDatabasePDG::Instance()->AddParticle("helium3", "helium3", 2.80839160743, kTRUE, 0.0, 6, "Nucleus", 1000020030);
+  TDatabasePDG::Instance()->AddAntiParticle("anti-helium3", -1000020030);
+
   if (do_vertexing) {
     o2::base::GeometryManager::loadGeometry();
     o2::base::Propagator::initFieldFromGRP("o2sim_grp.root");

examples/scripts/createO2tables.py

@@ -8,6 +8,7 @@
 import os
 import shutil
 import time
+import glob
 import random
 from datetime import datetime
 from common import bcolors, msg, fatal_msg, verbose_msg, run_in_parallel, set_verbose_mode, get_default_parser, warning_msg
@@ -158,7 +159,28 @@ def check_duplicate(option_name):
                           "as it will be automatically set")
         for i in ["--output", "-o", "--nevents", "-n"]:
             check_duplicate(i)
-        msg("Using custom generator", custom_gen)
+        if "INPUT_FILES" in custom_gen:
+            input_hepmc_files = custom_gen.replace("INPUT_FILES",
+                                                   "").strip().split(" ")
+            input_hepmc_file_list = []
+            for i in input_hepmc_files:
+                input_hepmc_file_list += glob.glob(os.path.normpath(i))
+
+            if len(input_hepmc_file_list) >= nruns:
+                input_hepmc_file_list = input_hepmc_file_list[0:nruns]
+            else:
+                nruns = len(input_hepmc_file_list)
+
+            if len(input_hepmc_file_list) <= 0:
+                fatal_msg("Did not find any input file matching to the request:",
+                          custom_gen)
+            custom_gen = f"INPUT_FILES "+" ".join(input_hepmc_file_list)
+            msg("Using", len(input_hepmc_file_list),
+                "input HepMC file" +
+                ("" if len(input_hepmc_file_list) == 1 else "s"),
+                input_hepmc_file_list)
+        else:
+            msg("Using custom generator", custom_gen)
 
     # Printing configuration
     msg(" --- running createO2tables.py", color=bcolors.HEADER)
@@ -297,10 +319,7 @@ def copy_and_link(file_name):
                 if "INPUT_FILES" in custom_gen:
                     input_hepmc_file = custom_gen.replace("INPUT_FILES",
                                                           "").strip().split(" ")
-                    if run_number < len(input_hepmc_file):
-                        input_hepmc_file = input_hepmc_file[run_number]
-                    else:
-                        return
+                    input_hepmc_file = input_hepmc_file[run_number]
                     write_to_runner(f"ln -s {input_hepmc_file}"
                                     f" {hepmc_file} \n")
                 else:

examples/scripts/default_configfile.ini

@@ -71,7 +71,7 @@ generators = $O2DPG_ROOT/MC/config/common/pythia8/generator/pythia8_KrKr.cfg
 generators = $DELPHESO2_ROOT/examples/pythia8/pythia8_XeXe.cfg
 
 [INPUT_HEPMC] # AOD creation from input HEPMC files
-custom_gen = INPUT_FILES /tmp/AnalysisResults_1.hepmc /tmp/AnalysisResults_2.hepmc
+custom_gen = INPUT_FILES /tmp/AnalysisResults_*.hepmc
 
 [GUN]
 custom_gen = rpythia8-gun --pdg 421 --px 1. --py 0. --pz 0. --xProd 0. --yProd 0. --zProd 0. --config $DELPHESO2_ROOT/examples/pythia8/decays/force_hadronic_D.cfg --decay