pull the necessary updates from main branch

README.md

@@ -2,10 +2,11 @@
 
 [![PAD](https://img.shields.io/static/v1?style=plastic&label=Recasting&message=PublicAnalysisDatabase&color=blue)](http://madanalysis.irmp.ucl.ac.be/wiki/PublicAnalysisDatabase)
 [![TUTO](https://img.shields.io/static/v1?style=plastic&label=Tutorials&message=@HomePage&color=red)](https://madanalysis.irmp.ucl.ac.be/wiki/tutorials)
+[![Talks](https://img.shields.io/static/v1?style=plastic&label=Talks&message=@HomePage&color=red)](http://madanalysis.irmp.ucl.ac.be/wiki/Talks)
 [![FAQ](https://img.shields.io/static/v1?style=plastic&label=FAQ&message=NormalMode&color=orange)](http://madanalysis.irmp.ucl.ac.be/wiki/FAQNormalMode)
 
-![Python v3.8](https://img.shields.io/badge/python-3670A0?style=plastic&logo=python&logoColor=ffdd54&label=3.6|3.7|3.8&color=brightgreen)
-![C++](https://img.shields.io/badge/c++-%2300599C.svg?style=plastic&logo=c%2B%2B&logoColor=white&label=98|11)
+![Python v3.8](https://img.shields.io/badge/python-3670A0?style=plastic&logo=python&logoColor=ffdd54&label=3.8&color=brightgreen)
+![C++](https://img.shields.io/badge/c++-%2300599C.svg?style=plastic&logo=c%2B%2B&logoColor=white&label=11)
 ## Outline
  - [What is MadAnalysis 5?](#what-is-madanalysis-5)
  - [Requirements](#requirements)
@@ -14,6 +15,7 @@
  - [Description of the package](#description-of-the-package)
  - [Very first steps with MadAnalysis 5](#very-first-steps-with-madanalysis-5)
  - [Troubleshootings and bug reports](#troubleshootings-and-bug-reports)
+ - [Supported third party software](#supported-third-party-software)
  - [Authors](#authors)
  - [Our famous last words](#our-famous-last-words)
  - [Credits](#credits)
@@ -44,7 +46,7 @@ More details can be found on the [MadAnalysis 5 website](https://madanalysis.irm
 
 MadAnalysis 5 requires several external libraries in order to properly run:
 
- - Python 3.6 or a more recent version that can be downloaded from [this website](http://www.python.org/)
+ - Python 3.8 or a more recent version that can be downloaded from [this website](http://www.python.org/)
  In order to check the installed version of Python on a system, it is
  sufficient to issue in a shell `$ python --version`.
 
@@ -225,6 +227,16 @@ suggested to create a report on [GitHub Issues](https://github.com/MadAnalysis/m
 In this way, you also participate to the improvement of MadAnalysis 5 and the
 authors thank you for this.
 
+### Supported third party software
+
+In the following you can find supported third party software that can be used within MadAnalysis 5.
+The [latest release](https://github.com/MadAnalysis/madanalysis5/releases) of MadAnalysis 5 has been tested with enlisted versions.
+
+- [FastJet](http://fastjet.fr) v3.3.3
+- [Delphes](https://github.com/delphes/delphes) v3.4.3
+- [ROOT](https://root.cern) v6.04.08
+- [pyhf](https://github.com/scikit-hep/pyhf) v0.6.3
+
 ### Authors
 
 MadAnalysis 5 is openly developed by the core dev team consisting of:

bin/ma5

@@ -41,9 +41,8 @@ if sys.version_info[0] != 3 or sys.version_info[1] <= 6:
 try:
  import six
 except:
- sys.exit('The python "six" module is not found on your system and it is required for MadAnalysis 5 for ' +\
- 'a question of Python 2/3 compatibility. Please install it with the following command:\n' +\
- 'pip install six') 
+ sys.exit('The python "six" module is not found on your system. ' +\
+ 'Please install it with the following command:\npython -m pip install six')
 
 # Getting the parent directory (ma5 root dir) of the script real path (bin)
 import os
@@ -67,8 +66,8 @@ sys.path.insert(0, servicedir)
 
 # Release version
 # Do not touch it !!!!! 
-version = "1.10.0"
-date = "2022/01/12"
+version = "1.10.1"
+date = "2022/01/15"
 
 # Loading the MadAnalysis session
 import madanalysis.core.launcher

madanalysis/UpdateNotes.txt

@@ -1,5 +1,12 @@
 Update notes for MadAnalysis 5 (in reverse time order)
 
+
+133 1.10.1 (2021/12/15) ma5team: - Minimum python version requirement has been increased to 3.8.
+ - Minimum GCC compiler requirement has been increased to `std=c++11` compatible.
+ - Update in expert mode structure, several new functionalities like filter
+ functions, region dependent reweigthing, ability to input command line options.
+ For details [see PR input](#link-PR-here).
+
 132 1.9 (2021/12/13) ma5team: - Adding support for LLP (also in the SFS) [2112.05163].
  - Particle propagation module [2112.05163].
  - PYHF/simplified likelihood interface.

madanalysis/interpreter/cmd_install.py

@@ -106,7 +106,7 @@ def UpdatePaths():
  UpdatePaths()
  if not main.CheckConfig():
  return False
-  return resu
+ return resu
  elif ResuActi == 0 and has_release and not pad:
  self.logger.warning("A previous " + release +' installation has been found. Skipping...')
  self.logger.warning('To update ;' + release + ', please remove first the tools/' + release + 'delphes directory')

madanalysis/misc/run_recast.py

@@ -1907,7 +1907,7 @@ def get_CLs(**kwargs):
  iteration_limit += 1
  elif isinstance(CLs, dict):
  if isnan(CLs["CLs_obs"]) or any([isnan(x) for x in CLs["CLs_exp"]]):
- arargumentsgs["stats"] = "q"
+ arguments["stats"] = "q"
  arguments["bounds"][model.config.poi_index] = (
  arguments["bounds"][model.config.poi_index][0]-5,
  arguments["bounds"][model.config.poi_index][1]

madanalysis/system/detect_zlib.py

@@ -44,7 +44,10 @@ def __init__(self,archi_info, user_info, session_info, debug):
  self.name = 'Zlib'
  self.mandatory = False
  self.force = False
-
+
+ self.search_libs = []
+ self.search_incs = []
+
  self.logger = logging.getLogger('MA5')
 
  # NAme of the header
@@ -55,9 +58,6 @@ def __init__(self,archi_info, user_info, session_info, debug):
  if self.archi_info.isMac:
  self.libnames.extend(['libz.dylib'])
 
- self.search_libs = self.libnames
- self.search_incs = ['zlib.h']
-
  #specific options
  self.header_files = []
  self.library_files = []
@@ -96,9 +96,10 @@ def FillHeaders(self):
  # Filling container with standard include paths
  DetectZlib.AddIfValid('/usr/include',self.search_incs)
  DetectZlib.AddIfValid('/usr/local/include',self.search_incs)
- DetectZlib.AddIfValid('/usr/local/opt/zlib/include',self.search_incs)
  DetectZlib.AddIfValid('/local/include',self.search_incs)
  DetectZlib.AddIfValid('/opt/local/include',self.search_incs)
+ DetectZlib.AddIfValid('/usr/local/opt/zlib/lib',self.search_incs)
+ DetectZlib.AddIfValid('/usr/local/opt/zlib/include/',self.search_incs)
  for path in self.session_info.gcc_header_search_path:
  DetectZlib.AddIfValid(path,self.search_libs)
 
@@ -130,7 +131,6 @@ def FillLibraries(self):
 
  # Filling container with standard library paths
  DetectZlib.AddIfValid('/usr/lib*',self.search_libs)
- DetectZlib.AddIfValid('/usr/local/opt/zlib/lib',self.search_libs)
  DetectZlib.AddIfValid('/usr/local/lib*',self.search_libs)
  DetectZlib.AddIfValid('/local/lib*',self.search_libs)
  DetectZlib.AddIfValid('/opt/local/lib*',self.search_libs)

tools/SampleAnalyzer/Commons/Base/Configuration.cpp

@@ -40,8 +40,8 @@ using namespace MA5;
 // Initializing static data members
 // -----------------------------------------------------------------------------
 // DO NOT TOUCH THESE LINES
-const std::string Configuration::sampleanalyzer_version_ = "1.10.0";
-const std::string Configuration::sampleanalyzer_date_ = "2022/01/12";
+const std::string Configuration::sampleanalyzer_version_ = "1.10.1";
+const std::string Configuration::sampleanalyzer_date_ = "2022/01/15";
 // DO NOT TOUCH THESE LINES
 
 // -----------------------------------------------------------------------------
@@ -51,13 +51,11 @@ void Configuration::PrintSyntax()
 {
  INFO << endmsg;
  INFO << "Syntax : SampleAnalyzer [option] <filelist>" << endmsg;
- INFO << " with <filelist> = txt file containing all sample file names"
- << endmsg;
+ INFO << " with <filelist> = txt file containing all sample file names" << endmsg;
  INFO << " with [option] = " << endmsg;
- INFO << " --check_event : check the compliance of the event file"
- << endmsg;
- INFO << " --no_event_weight : the event weights are not used"
- << endmsg;
+ INFO << " --check_event : check the compliance of the event file" << endmsg;
+ INFO << " --no_event_weight : the event weights are not used" << endmsg;
+ INFO << " --ma5_version : returns the version of this release" << endmsg;
  INFO << " Any aditional option for the analyzer can be given with the following syntax:" << endmsg;
  INFO << " --<opt_name>=<val>" << endmsg;
  INFO << endmsg;
@@ -147,14 +145,14 @@ MAbool Configuration::Initialize(MAint32 &argc, MAchar *argv[])
  // version
  else if (argument.find("--ma5_version=")==0) DecodeMA5version(argument);
 
- // other = comman line options
+ // other = command line options
  else
  {
  std::string arg = argv[i];
  MAuint32 loc = arg.find("=");
  if (loc == 0 || loc > arg.length())
  {
- ERROR << "option '" << argument << "' is unknown !!!" << endmsg;
+ ERROR << "option '" << argument << "' unknown." << endmsg;
  PrintSyntax();
  return false;
  }

tools/SampleAnalyzer/Commons/DataFormat/RecTrackFormat.h

@@ -75,7 +75,6 @@ class RecTrackFormat : public RecParticleFormat
  MAfloat64 etaOuter_; /// eta @ first layer of calo
  MAfloat64 phiOuter_; /// phi @ first layer of calo
  std::vector<IsolationConeType> isolCones_; // isolation cones
- // MCParticleFormat* mc_; @JACK causes seg fault already exists in RecParticleFormat
 
  // -------------------------------------------------------------
  // method members
@@ -140,11 +139,6 @@ class RecTrackFormat : public RecParticleFormat
  virtual void SetCharge(MAint32 charge)
  { if (charge>0) charge_=true; else charge_=false; }
 
- /// Accessor to charge
- //@JACK: already exist in recparticlebase
- // const MCParticleFormat* mc() const
- // {return mc_;}
-
  /// giving a new isolation cone entry
  IsolationConeType* GetNewIsolCone()
  {