Core update

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)
@@ -44,7 +45,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`.
 

bin/ma5

@@ -33,10 +33,10 @@ and call immediately the command line interface scripts"""
 
 # Checking if the correct release of Python is installed
 import sys
-if  (sys.version_info[0] == 2 and sys.version_info[1] < 7) or (sys.version_info[0] == 3 and sys.version_info[1] < 6):
+if  (sys.version_info[0] == 2 and sys.version_info[1] < 7) or (sys.version_info[0] == 3 and sys.version_info[1] < 8):
     sys.exit('Python release '+ sys.version + ' is detected.\n' + \
     'MadAnalysis 5 works only with python 2.7 ' + \
-    'or  python 3.6 and later.\n' + \
+    'or  python 3.8 and later.\n' + \
     'Please upgrade your version of python.')
 
 # Checking that the 'six' package is present
@@ -69,8 +69,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/build/makefile_writer.py

@@ -218,7 +218,7 @@ def Makefile(MakefileName,title,ProductName,ProductPath,isLibrary,cppfiles,hfile
 
         # - general
         cxxflags=[]
-        cxxflags.extend(['-Wall','-O3','-fPIC', '-I$(MA5_BASE)/tools/']) # general
+        cxxflags.extend(['-Wall','-std=c++11','-O3','-fPIC', '-I$(MA5_BASE)/tools/']) # general
         file.write('CXXFLAGS  = '+' '.join(cxxflags)+'\n')
         for item in moreIncludes:
             file.write('CXXFLAGS += '+' -I'+item+'\n')

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')
@@ -140,27 +140,26 @@ def UpdatePaths():
                 return True
         elif args[0]=='PAD':
             pad_install_check, padsfs_install_check = False, False
-            # PAD requires ma5 to be restarted; therefore we first install PADForSFS
+            # First check if PAD4SFS is installed
             if not self.main.session_info.has_padsfs:
-                if self.main.archi_info.has_fastjet:
-                    padsfs_install_check = installer.Execute('PADForSFS')
-                else:
-                    self.logger.warning("PADForSFS requires FastJet to be installed.")
-                    self.logger.info("Would you like to install FastJet? [Y/N]")
-                    while True:
-                        answer = input("Answer : ")
-                        if answer.lower() in ['y','n','yes','no']:
-                            break
-                        else:
-                            self.logger.warning("Please answer as \'y\', \'n\'")
-                    if answer.lower() in ['y','yes']:
-                        if not installer.Execute('fastjet'):
-                            return False
-                        if not installer.Execute('fastjet-contrib'):
-                            return False
-                        if not installer.Execute('PADForSFS'):
-                            return False
+                # check if FastJet is installed
+                if not self.main.archi_info.has_fastjet:
+                    answer = "y"
+                    if not self.main.forced:
+                        self.logger.warning("PADForSFS requires FastJet to be installed.")
+                        self.logger.info("Would you like to install FastJet? [Y/N]")
+                        while True:
+                            answer = input("Answer : ")
+                            if answer.lower() in ['y','n','yes','no', "yeap", "nope"]:
+                                break
+                    if answer.lower() in ['y','yes',"yeap"]:
+                        for package in ["fastjet", "fastjet-contrib", "PADForSFS"]:
+                            if not installer.Execute(package):
+                                return False
                         padsfs_install_check = 'restart'
+                else:
+                    padsfs_install_check = installer.Execute('PADForSFS')
+
             if inst_delphes(self.main,installer,'delphes',True):
                 pad_install_check = installer.Execute('PAD')
             else:
@@ -174,19 +173,18 @@ def UpdatePaths():
             if self.main.archi_info.has_fastjet:
                 padsfs_install_check = installer.Execute('PADForSFS')
             else:
-                self.logger.warning("PADForSFS requires FastJet to be installed.")
-                self.logger.info("Would you like to install FastJet? [Y/N]")
-                while True:
-                    answer = input("Answer : ")
-                    if answer.lower() in ['y','n','yes','no']:
-                        break
-                if answer.lower() in ['y','yes']:
-                    if not installer.Execute('fastjet'):
-                        return False
-                    if not installer.Execute('fastjet-contrib'):
-                        return False
-                    if not installer.Execute('PADForSFS'):
-                        return False
+                answer = "y"
+                if not self.main.forced:
+                    self.logger.warning("PADForSFS requires FastJet to be installed.")
+                    self.logger.info("Would you like to install FastJet? [Y/N]")
+                    while True:
+                        answer = input("Answer : ")
+                        if answer.lower() in ['y','n','yes','no', "yeap", "nope"]:
+                            break
+                if answer.lower() in ['y','yes',"yeap"]:
+                    for package in ["fastjet", "fastjet-contrib", "PADForSFS"]:
+                        if not installer.Execute(package):
+                            return False
                     return 'restart'
             return padsfs_install_check
         elif args[0]=='pyhf':