feat: Lepton PID #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

c-dilks wants to merge 44 commits into main from lepton-pid-redux

CODEOWNERS

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,11 +6,14 @@ @@
     # @RichCap                     Richard Capobianco
     # @rtysonCLAS12                Richard Tyson
     # @Gregtom3                    Gregory Matousek
+    # @MarianaT27                  Mariana Tenorio Pita
+    # @tbhayward                   Timothy Hayward
     #################################################################################
     * @c-dilks
     src/iguana/algorithms/clas12/CalorimeterLinker/* @c-dilks
     src/iguana/algorithms/clas12/EventBuilderFilter/* @c-dilks
+    src/iguana/algorithms/clas12/LeptonIDFilter/* @MarianaT27
     src/iguana/algorithms/clas12/MatchParticleProximity/* @c-dilks
     src/iguana/algorithms/clas12/PhotonGBTFilter/* @Gregtom3
     src/iguana/algorithms/clas12/SectorFinder/* @rtysonCLAS12
@@ Expand Down @@

examples/meson.build

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     # install config files
-    example_config_files_prefix = project_etcdir / 'examples'
+    example_config_files_prefix = project_etc_dir / 'examples'
     install_subdir('config' / 'examples', install_dir: example_config_files_prefix, strip_directory: true)
     # compiled examples
@@ Expand Down @@

meson.build

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -9,6 +9,7 @@ project(
  
        'cpp_std': 'c++17',

        'buildtype': 'release',

        'libdir': 'lib',

        'datadir': 'share',

        'licensedir': 'share/licenses/iguana',

        'pkgconfig.relocatable': 'true',

        'force_fallback_for': ['rcdb'],

    @@ -20,6 +21,14 @@ project_description = 'Implementation Guardian of Analysis Algorithms'
  
    add_languages('fortran', native: false, required: get_option('bind_fortran'))

    use_chameleon = get_option('bind_fortran')

    # check built-in build options

    if get_option('libdir') != 'lib'

      warning('build option "libdir" = "' + get_option('libdir') + '", which is not "lib"; if you experience any issues, please report them')

    endif

    if get_option('datadir') != 'share'

      error('build option "datadir" must be "share", but it is set to "' + get_option('datadir') + '"')

    endif

    # warn that macOS is no longer tested

    if host_machine.system() == 'darwin'

      warning('''host machine system is darwin:

    @@ -70,6 +79,7 @@ ROOT_dep = dependency(
  
        'ROOT::RIO',

        'ROOT::ROOTDataFrame',

        'ROOT::ROOTVecOps',

        'ROOT::TMVA',

        'ROOT::TreePlayer',

      ],

    )

    @@ -159,7 +169,8 @@ hipo_dep_dataframes_found = hipo_dep.get_variable(
  
    project_inc = include_directories('src')

    project_libs = []

    project_deps = declare_dependency(dependencies: dep_list)

    project_etcdir = get_option('sysconfdir') / meson.project_name()

    project_etc_dir = get_option('sysconfdir') / meson.project_name()

    project_data_dir = get_option('datadir') / meson.project_name()

    project_test_env = environment()

    project_pythondir = 'python'

    @@ -195,9 +206,14 @@ project_test_env.prepend(
  
    )

    # set preprocessor macros

    add_project_arguments('-DIGUANA_ETCDIR="' + get_option('prefix') / project_etcdir + '"', language: [ 'cpp' ])

    add_project_arguments(

      '-D IGUANA_PREFIX="' + get_option('prefix') + '"',

      '-D IGUANA_ETCDIR="' + project_etc_dir + '"',

      '-D IGUANA_DATADIR="' + project_data_dir + '"',

      language: ['cpp'],

    )

    if ROOT_dep.found()

      add_project_arguments('-DIGUANA_ROOT_FOUND', language: [ 'cpp' ]) # currently only used for Validator plot styles

      add_project_arguments('-D IGUANA_ROOT_FOUND', language: [ 'cpp' ]) # currently only used for Validator plot styles

    endif

    # start chameleon

    @@ -251,7 +267,7 @@ if get_option('z_install_envfile')
  
          'libdir':            get_option('libdir'),

          'includedir':        get_option('includedir'),

          'bindir':            get_option('bindir'),

          'etcdir':            project_etcdir,

          'etcdir':            project_etc_dir,

          'pythondir':         project_pythondir,

          'dep_pkgconfigdirs': ':'.join(dep_pkgconfig_dirs),

          'dep_libdirs':       ':'.join(dep_lib_dirs),

meson/lsan.supp

Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		leak:libCling.so
		leak:TMVA::DataSetFactory::BuildDynamicDataSet

src/iguana/algorithms/Algorithm.cc

-Original file line number
+Diff line change
@@ Expand Up / @@ -116,6 +116,19 @@ namespace iguana { @@
       ///////////////////////////////////////////////////////////////////////////////
+      YAML::Node Algorithm::GetOptionNode(YAMLReader::node_path_t node_path) const
+      {
+        node_path.push_front(m_class_name);
+        auto node = m_yaml_config->GetNode(node_path);
+        if(!node.has_value()) {
+          m_log->Error("Algorithm::GetOptionNode failed to find node");
+          throw std::runtime_error("config file parsing issue");
+        }
+        return node.value();
+      }
+      ///////////////////////////////////////////////////////////////////////////////
       void Algorithm::SetName(std::string_view name)
       {
         Object::SetName(name);
@@ Expand Down Expand Up / @@ -153,6 +166,17 @@ namespace iguana { @@
       ///////////////////////////////////////////////////////////////////////////////
+      std::string Algorithm::GetDataFile(std::string const& name)
+      {
+        if(!m_datafile_reader) {
+          m_datafile_reader = std::make_unique<DataFileReader>(ConfigFileReader::ConvertAlgoNameToConfigDir(m_class_name), "data|" + m_name);
+          m_datafile_reader->SetLogLevel(m_log->GetLevel());
+        }
+        return m_datafile_reader->FindFile(name);
+      }
+      ///////////////////////////////////////////////////////////////////////////////
       void Algorithm::ParseYAMLConfig()
       {
@@ Expand Down @@

src/iguana/algorithms/Algorithm.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,10 +8,11 @@ @@
     #include "AlgorithmBoilerplate.h"
     #include "iguana/bankdefs/BankDefs.h"
+    #include "iguana/services/DataFileReader.h"
     #include "iguana/services/Deprecated.h"
+    #include "iguana/services/GlobalParam.h"
     #include "iguana/services/RCDBReader.h"
     #include "iguana/services/YAMLReader.h"
-    #include <iguana/services/GlobalParam.h>
     namespace iguana {
@@ Expand Down Expand Up / @@ -167,6 +168,11 @@ namespace iguana { @@
           template <typename OPTION_TYPE>
           std::set<OPTION_TYPE> GetOptionSet(YAMLReader::node_path_t node_path = {}) const;
+          /// Get the `YAML::Node` for an option
+          /// @param node_path the `YAML::Node` identifier path to search
+          /// @returns the `YAML::Node`
+          YAML::Node GetOptionNode(YAMLReader::node_path_t node_path) const;
           /// Set the name of this algorithm
           /// @param name the new name
           void SetName(std::string_view name);
@@ Expand All / @@ -189,6 +195,11 @@ namespace iguana { @@
           /// @param name the directory name
           void SetConfigDirectory(std::string const& name);
+          /// Get the full path to a data file, such as a machine-learning model
+          /// @param name the name of the file; if found in the user's current working directory (`./`), that will be the file that is used;
+          /// otherwise the _installed_ file (in `$IGUANA/share/`) will be used by default
+          std::string GetDataFile(std::string const& name);
           /// Get the index of a bank in a `hipo::banklist`; throws an exception if the bank is not found
           /// @param banks the list of banks this algorithm will use
           /// @param bank_name the name of the bank
@@ Expand Down Expand Up / @@ -347,6 +358,9 @@ namespace iguana { @@
           /// Data structure to hold configuration options set by `Algorithm::SetOption`
           std::unordered_map<std::string, option_t> m_option_cache;
+          /// Data file reader
+          std::unique_ptr<DataFileReader> m_datafile_reader;
       };
       //////////////////////////////////////////////////////////////////////////////
@@ Expand Down @@

src/iguana/algorithms/TypeDefs.h

-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ namespace iguana { @@
         /// PDG codes
         enum PDG {
           electron     = 11,
+          positron     = -11,
           photon       = 22,
           proton       = 2212,
           antiproton   = -2212,
@@ Expand All / @@ -56,6 +57,7 @@ namespace iguana { @@
         /// Particle names
         const std::unordered_map<PDG, std::string> name{
           { electron, "electron" },
+          { positron, "positron" },
           { photon, "photon" },
           { proton, "proton" },
           { antiproton, "antiproton" },
@@ Expand All / @@ -70,6 +72,7 @@ namespace iguana { @@
         /// Particle titles
         const std::unordered_map<PDG, std::string> title{
           { electron, "e^{-}" },
+          { positron, "e^{+}" },
           { photon, "#gamma" },
           { proton, "p" },
           { antiproton, "#bar{p}" },
@@ Expand All / @@ -84,6 +87,7 @@ namespace iguana { @@
         /// Particle mass in GeV
         const std::unordered_map<PDG, double> mass{
           { electron, 0.000511 },
+          { positron, 0.000511 },
           { photon, 0.0 },
           { proton, 0.938272 },
           { antiproton, 0.938272 },
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Lepton PID #414

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

feat: Lepton PID #414

Are you sure you want to change the base?

Uh oh!

feat: Lepton PID #414

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!