Clean-up of unused function and improvements

Author: Qubitol

madmatrix/model_handling.py

@@ -846,7 +846,7 @@ def write_combined_cc(self, lor_names, offshell=None, sym=True, mode=''):
         # self.declaration.discard
         text.write(self.get_declaration_txt(add_i=False, combined=True))
         text.write(routine.getvalue())
-        text.write(self.get_foot_txt(combine=True))
+        text.write(self.get_foot_txt(combined=True))
 
         text = text.getvalue()
         return text
@@ -1897,13 +1897,6 @@ def edit_processConfig(self):
         ff.write(template % replace_dict)
         ff.close()
 
-    def generate_subprocess_directory_end(self, **opt):
-        """ opt contain all local variable of the fortran original function"""
-        #self.edit_coloramps() # AV new file (NB this is Sigma-specific, should not be a symlink to Subprocesses)
-        subproc_diagrams_for_config = opt['subproc_diagrams_for_config']
-        misc.sprint(len(subproc_diagrams_for_config))
-        self.edit_coloramps( subproc_diagrams_for_config)
-
     # AV - new method
     def edit_coloramps(self):
         """Generate coloramps.h"""
@@ -1970,17 +1963,6 @@ def edit_coloramps(self):
         ff.write(template % replace_dict)
         ff.close()
 
-    # AV - new method
-    def edit_testxxx(self):
-        """Generate testxxx.cc"""
-        ###misc.sprint('Entering OneProcessExporterMadMatrix.edit_testxxx')
-        template = open(pjoin(self.template_path,'madmatrix','testxxx.cc'),'r').read()
-        replace_dict = {}
-        replace_dict['model_name'] = self.model_name
-        ff = open(pjoin(self.path, '..', 'testxxx.cc'),'w')
-        ff.write(template % replace_dict)
-        ff.close()
-
     # AV - new method
     def edit_memorybuffers(self):
         """Generate MemoryBuffers.h"""
@@ -2046,14 +2028,15 @@ def get_color_matrix_lines(self, matrix_element):
             denom_string = '  static constexpr fptype2 colorDenom[ncolor] = { %s }; // 1-D array[%i]' \
                            % ( ', '.join(['%i' % denom for denom in color_denominators]), len(color_denominators) )
             matrix_strings = []
-            my_cs = color.ColorString()
             for index, denominator in enumerate(color_denominators):
                 # Then write the numerators for the matrix elements
                 num_list = matrix_element.get('color_matrix').get_line_numerators(index, denominator)
                 matrix_strings.append('{ %s }' % ', '.join(['%d' % i for i in num_list]))
             matrix_string = '  static constexpr fptype2 colorMatrix[ncolor][ncolor] = '
-            if len( matrix_strings ) > 1 : matrix_string += '{\n    ' + ',\n    '.join(matrix_strings) + ' };'
-            else: matrix_string += '{ ' + matrix_strings[0] + ' };'
+            if len( matrix_strings ) > 1:
+                matrix_string += '{\n    ' + ',\n    '.join(matrix_strings) + ' };'
+            else:
+                matrix_string += '{ ' + matrix_strings[0] + ' };'
             matrix_string += ' // 2-D array[%i][%i]' % ( len(color_denominators), len(color_denominators) )
             denom_comment = '\n  // The color denominators (initialize all array elements, with ncolor=%i)\n  // [NB do keep \'static\' for these constexpr arrays, see issue #283]\n' % len(color_denominators)
             matrix_comment = '\n  // The color matrix (initialize all array elements, with ncolor=%i)\n  // [NB do keep \'static\' for these constexpr arrays, see issue #283]\n' % len(color_denominators)
@@ -2359,7 +2342,7 @@ def super_get_matrix_element_calls(self, matrix_element, color_amplitudes, multi
         return res
 
     # AV - overload helas_call_writers.GPUFOHelasCallWriter method (improve formatting)
-    def get_matrix_element_calls(self, matrix_element, color_amplitudes, multi_channel_map=False):
+    def get_matrix_element_calls(self, matrix_element, color_amplitudes, multi_channel_map):
         """Return a list of strings, corresponding to the Helas calls for the matrix element"""
         res = self.super_get_matrix_element_calls(matrix_element, color_amplitudes, multi_channel_map)
         for i, item in enumerate(res):

madmatrix/output.py

@@ -130,13 +130,13 @@ def copy_template(self, model):
         super().copy_template(model)
 
     # AV - add debug printouts (in addition to the default one from OM's tutorial)
-    def generate_subprocess_directory(self, subproc_group, fortran_model, me=None):
+    def generate_subprocess_directory(self, matrix_element, cpp_helas_call_writer, proc_number=None):
         misc.sprint('Entering ProcessExporterMadMatrix.generate_subprocess_directory (create the directory)')
-        misc.sprint('  type(subproc_group)=%s'%type(subproc_group)) # e.g. madgraph.core.helas_objects.HelasMatrixElement
-        misc.sprint('  type(fortran_model)=%s'%type(fortran_model)) # e.g. madgraph.iolibs.helas_call_writers.GPUFOHelasCallWriter
-        misc.sprint('  type(me)=%s me=%s'%(type(me) if me is not None else None, me)) # e.g. int
+        misc.sprint('  type(matrix_element)=%s'%type(matrix_element)) # e.g. madgraph.core.helas_objects.HelasMatrixElement
+        misc.sprint('  type(cpp_helas_call_writer)=%s'%type(cpp_helas_call_writer)) # e.g. madgraph.iolibs.helas_call_writers.GPUFOHelasCallWriter
+        misc.sprint('  type(proc_number)=%s me=%s'%(type(proc_number) if proc_number is not None else None, proc_number)) # e.g. int
         misc.sprint("need to link", self.to_link_in_P)
-        out = super().generate_subprocess_directory(subproc_group, fortran_model, me)
+        out = super().generate_subprocess_directory(matrix_element, cpp_helas_call_writer, proc_number)
         return out
 
     # AV (default from OM's tutorial) - add a debug printout
@@ -146,55 +146,6 @@ def convert_model(self, model, wanted_lorentz=[], wanted_couplings=[]):
             del model.cudacpp_wanted_ordered_couplings
         return super().convert_model(model, wanted_lorentz, wanted_couplings)
 
-    # AV (default from OM's tutorial) - add a debug printout
-    def finalize(self, matrix_element, cmdhistory, MG5options, outputflag):
-        """Typically creating jpeg/HTML output/ compilation/...
-            cmdhistory is the list of command used so far.
-            MG5options are all the options of the main interface
-            outputflags is a list of options provided when doing the output command"""
-        ###misc.sprint('Entering ProcessExporterMadMatrix.finalize', self.in_madevent_mode, type(self))
-        if self.in_madevent_mode:
-            # Modify makefiles and symlinks to avoid doing
-            # make -f makefile -f cudacpp_overlay.mk to include the overlay
-            # and instead just use `make`, see #1052
-            subprocesses_dir = pjoin(self.dir_path, "SubProcesses")
-            files.cp(pjoin(subprocesses_dir, "makefile"), pjoin(subprocesses_dir, "makefile_original.mk"))
-            files.rm(pjoin(subprocesses_dir, "makefile"))
-            files.ln(pjoin(subprocesses_dir, "makefile_wrapper.mk"), subprocesses_dir, 'makefile')
-
-            patch_coupl_write = r"""set -euo pipefail
-# Get last fields from lines starting with WRITE(*,2)
-gcs=$(awk '$1=="WRITE(*,2)" {print $NF}' coupl_write.inc)
-
-for gc in $gcs; do
-  if grep -q "$gc(VECSIZE_MEMMAX)" coupl.inc; then
-    awk -v gc="$gc" '{
-      if ($1=="WRITE(*,2)" && $NF==gc) print $0"(1)";
-      else print
-    }' coupl_write.inc > coupl_write.inc.new
-    mv coupl_write.inc.new coupl_write.inc
-  fi
-done"""
-            try:
-                result = subprocess.run(
-                    ["bash", "-c", patch_coupl_write],
-                    cwd=pjoin(self.dir_path, "Source", "MODEL"),
-                    text=True,
-                    capture_output=True,
-                    check=True,  # raise CalledProcessError on non-zero exit
-                )
-                misc.sprint(result.returncode)
-            except subprocess.CalledProcessError as e:
-                logger.debug("####### \n stdout is \n %s", e.stdout)
-                logger.info("####### \n stderr is \n %s", e.stderr)
-                logger.info("return code is %s\n", e.returncode)
-                raise Exception("ERROR while patching coupl_write.inc") from e
-
-            # Additional patching (OM)
-            self.add_madevent_plugin_fct() # Added by OM
-        # do not call standard finalize since is this is already done...
-        #return super().finalize(matrix_element, cmdhistory, MG5options, outputflag)
-
     # AV (default from OM's tutorial) - overload settings and add a debug printout
     def modify_grouping(self, matrix_element):
         """allow to modify the grouping (if grouping is in place)
@@ -204,18 +155,3 @@ def modify_grouping(self, matrix_element):
         # Irrelevant here since group_mode=False so this function is never called
         misc.sprint('Entering ProcessExporterMadMatrix.modify_grouping')
         return False, matrix_element
-
-    # OM adding a new way to "patch" python file such that the launch command of MG5aMC is working
-    # this consist in a file plugin_interface.py
-    # which contains a series of functions and one dictionary variable TO_OVERWRITE
-    # that will be used to have temporary overwrite of all the key variable passed as string by their value.
-    # all variable that are file related should be called as madgraph.dir.file.variable
-    def add_madevent_plugin_fct(self):
-        """this consist in a file plugin_interface.py
-        which contains a series of functions and one dictionary variable TO_OVERWRITE
-        that will be used to have temporary overwrite of all the key variable passed as string by their value.
-        all variable that are file related should be called as madgraph.dir.file.variable
-        """
-        plugin_path = os.path.dirname(os.path.realpath( __file__ ))
-        files.cp(pjoin(plugin_path, 'launch_plugin.py'), pjoin(self.dir_path, 'bin', 'internal'))
-        files.ln(pjoin(self.dir_path, 'lib'),  pjoin(self.dir_path, 'SubProcesses'))