Merge lp:~ma5dev/madanalysis5/ma5_pyhf into lp:~ma5dev/madanalysis5/v1.9_beta

[Jack Y. Araz]

installation of PADForSFS bind to FastJet

this commit has been pushed on top of latest commit on v1.9_beta

revno: 143
committer: Benjamin Fuks <email address hidden>
branch nick: v1.9_beta
timestamp: Tue 2021-01-12 10:29:05 +0100
message:
  Bug fix with the mg5 interface

[lp:~ma5dev/madanalysis5/ma5_pyhf]

148. By Jack Y. Araz on 2021-02-17

mg5 integration for PADForSFS

[Benjamin Fuks (fuks)]

Hi Jack,

Can you please change this behaviour:
+ # If FastJet is installed, install PADForSFS
+ if self.main.archi_info.has_fastjet and install_padforsfs:
+ self.logger.info('Installing PAD for SFS')
+ if not installer.Execute('padforsfs'):
+ self.logger.error('Impossible to install PAD For SFS.')
+ return False

If fastjet is not installed, then the code should propose the user to "install fastjet and then install the PADForSFS". Can you please implement that change? Thanks in advance. I will merge the code when done. The MG5 thingie looks good.

Cheers,

Benj

review: Needs Fixing

[Jack Y. Araz (jackaraz)]

Hi Benjamin

By suggestion do you mean ask the user if they want to install FJ or not? Or just like a warning? Are we allowed to interact with the user through Mg5 interface? If so I'll do that accordingly.

Cheers
Jack

> Hi Jack,
>
> Can you please change this behaviour:
> + # If FastJet is installed, install PADForSFS
> + if self.main.archi_info.has_fastjet and install_padforsfs:
> + self.logger.info('Installing PAD for SFS')
> + if not installer.Execute('padforsfs'):
> + self.logger.error('Impossible to install PAD For SFS.')
> + return False
>
> If fastjet is not installed, then the code should propose the user to "install
> fastjet and then install the PADForSFS". Can you please implement that change?
> Thanks in advance. I will merge the code when done. The MG5 thingie looks
> good.
>
> Cheers,
>
> Benj

[lp:~ma5dev/madanalysis5/ma5_pyhf]

149. By Jack Y. Araz on 2021-02-18

fastjet installation requirement before PADForSFS installation

[Jack Y. Araz (jackaraz)]

Hi Benjamin

pad4sfs will ask for fastjet installation from now on.

cheers
jack

review: Needs Resubmitting

[lp:~ma5dev/madanalysis5/ma5_pyhf]

150. By Benjamin Fuks on 2021-02-19

Small typo fixes

=== modified file 'madanalysis/install/install_pad.py'
--- madanalysis/install/install_pad.py	2021-02-09 21:05:56 +0000
+++ madanalysis/install/install_pad.py	2021-02-19 16:32:46 +0000
@@ -169,7 +169,8 @@
         if self.padname in ['PAD', 'PADForSFS']:
             json_struct_name = [x for x in self.files.keys() if 'json' in x]
             if len(json_struct_name) == 1:
-                logging.getLogger('MA5').debug(" ** Getting the list of pyhf-compatible analyses in " + self.downloaddir+"/"+json_struct_name[0])
+                logging.getLogger('MA5').debug(" ** Getting the list of pyhf-compatible analyses in " +\
+                                               self.downloaddir+"/"+json_struct_name[0])
                 json_input = open(os.path.join(self.downloaddir,json_struct_name[0]));
                 for line in json_input:
                     if len(line.strip())==0 or line.strip().startswith('#'):
@@ -216,11 +217,15 @@
                     logging.getLogger('MA5').debug('  --> Creating a skeleton analysis for ' + new_analysis)
                     TheCommand = ['./newAnalyzer.py', new_analysis, new_analysis]
                     logging.getLogger('MA5').debug('  -->  ' + ' '.join(TheCommand))
-                    ok, out= ShellCommand.ExecuteWithLog(TheCommand,logname,self.installdir+'/Build/SampleAnalyzer',silent=False)
+                    ok, out= ShellCommand.ExecuteWithLog(TheCommand,logname,
+                                                         self.installdir+'/Build/SampleAnalyzer',
+                                                         silent=False)
                     if not ok:
                         return False
                 ## Making space for the new files
-                for onefile in ['Build/SampleAnalyzer/User/Analyzer/'+new_analysis+'.cpp', 'Build/SampleAnalyzer/User/Analyzer/'+new_analysis+'.h', 'Build/Main/main.bak']:
+                for onefile in ['Build/SampleAnalyzer/User/Analyzer/'+new_analysis+'.cpp', 
+                                'Build/SampleAnalyzer/User/Analyzer/'+new_analysis+'.h', 
+                                'Build/Main/main.bak']:
                     TheCommand = ['rm', '-f', os.path.join(self.installdir,onefile)]
                     logging.getLogger('MA5').debug('  -->  ' + ' '.join(TheCommand))
                     ok= ShellCommand.Execute(TheCommand,self.main.archi_info.ma5dir+'/tools')
 
=== modified file 'madanalysis/interpreter/cmd_install.py'
--- madanalysis/interpreter/cmd_install.py	2021-02-09 23:40:40 +0000
+++ madanalysis/interpreter/cmd_install.py	2021-02-19 16:32:46 +0000
@@ -22,13 +22,11 @@
 ################################################################################
 
 
-from __future__ import absolute_import
+from __future__                             import absolute_import
 from madanalysis.interpreter.cmd_base       import CmdBase
 from madanalysis.install.install_manager    import InstallManager
 import logging, os
 
-import six.moves.urllib.request, six.moves.urllib.parse , six.moves.urllib.error
-
 class CmdInstall(CmdBase):
     """Command INSTALL"""
 
@@ -144,14 +142,48 @@
             if self.main.archi_info.has_fastjet:
                 padsfs_install_check = installer.Execute('PADForSFS')
             else:
-                self.logger.warning('PADForSFS can not be installed without FastJet.')
+                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
+                    padsfs_install_check = 'restart'
             if inst_delphes(self.main,installer,'delphes',True):
                 pad_install_check = installer.Execute('PAD')
             else:
-                self.logger.warning('Delphes is not installed (and will be installed). Then please exit MA5 and re-install the PAD')
+                self.logger.warning('Delphes is not installed (and will be installed). '+
+                                    'Then please exit MA5 and re-install the PAD')
+            if 'restart' in [pad_install_check, padsfs_install_check]:
+                return 'restart'
             return any([pad_install_check, padsfs_install_check])
         elif args[0]=='PADForSFS':
-            return installer.Execute('PADForSFS')
+            padsfs_install_check = False
+            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
+                    return 'restart'
+            return padsfs_install_check
         elif args[0]=='pyhf':
             return installer.Execute('pyhf')
         else:
 
=== modified file 'madanalysis/interpreter/ma5_interpreter.py'
--- madanalysis/interpreter/ma5_interpreter.py	2020-09-29 21:01:19 +0000
+++ madanalysis/interpreter/ma5_interpreter.py	2021-02-19 16:32:46 +0000
@@ -258,7 +258,7 @@
         # initialization
         install_delphes         = False
         install_delphesMA5tune  = False
-        user_info           = UserInfo()
+        user_info               = UserInfo()
 
         # A few useful methods
         def validate_bool_key(key):
@@ -327,8 +327,10 @@
                 install_delphes = validate_bool_key(key)
             elif key=='with-delphesMA5tune':
                 install_delphesMA5tune = validate_bool_key(key)
+            elif key in ['with-PADForSFS','with-padforsfs','PADForSFS']:
+                install_padforsfs = value
             else:
-                raise UNK_OPT('Unknown options for further_install')
+                raise UNK_OPT('Unknown options for further_install : '+str(key))
 
         # Muting the logger
         lvl = self.logger.getEffectiveLevel()
@@ -368,6 +370,13 @@
                 self.logger.error('Impossible to install fastjet.')
                 return False
 
+        # If FastJet is installed, install PADForSFS
+        if self.main.archi_info.has_fastjet and install_padforsfs:
+            self.logger.info('Installing PAD for SFS')
+            if not installer.Execute('padforsfs'):
+                self.logger.error('Impossible to install PAD For SFS.')
+                return False
+
         # Delphes installation
         if self.main.archi_info.has_root and user_info.delphes_veto and install_delphes:
             self.logger.warning('Delphes has been both vetoed and non-vetoed. Ignoring veto.')
 
=== modified file 'madanalysis/system/detect_pad.py'
--- madanalysis/system/detect_pad.py	2021-02-11 00:05:52 +0000
+++ madanalysis/system/detect_pad.py	2021-02-19 16:32:46 +0000
@@ -22,16 +22,11 @@
 ################################################################################
 
 
-from __future__ import absolute_import
-import logging
-import glob
-import os
-import sys
-import re
-import platform
-from shell_command  import ShellCommand
+from __future__                                 import absolute_import
+from shell_command                              import ShellCommand
 from madanalysis.enumeration.detect_status_type import DetectStatusType
 from madanalysis.system.config_checker          import ConfigChecker
+import logging, os
 
 
 class DetectPAD: