[v311] resync to upstream 311: this fixes "./CODEGEN/generateAndCompa…

…re.sh gg_tt --mad"

This was previously failing as
output madevent CODEGEN_mad_gg_tt --vector_size=16 --me_exporter=standalone_cudacpp
Traceback (most recent call last):
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/extended_cmd.py", line 1544, in onecmd
    return self.onecmd_orig(line, **opt)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/extended_cmd.py", line 1493, in onecmd_orig
    return func(arg, **opt)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/master_interface.py", line 281, in do_import
    self.cmd.do_import(self, *args, **opts)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/madgraph_interface.py", line 5694, in do_import
    self.import_command_file(args[1])
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/extended_cmd.py", line 1692, in import_command_file
    self.exec_cmd(line, precmd=True)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/extended_cmd.py", line 1573, in exec_cmd
    stop = Cmd.onecmd_orig(current_interface, line, **opt)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/extended_cmd.py", line 1493, in onecmd_orig
    return func(arg, **opt)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/master_interface.py", line 299, in do_output
    self.cmd.do_output(self, line, *args, **opts)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/madgraph_interface.py", line 8253, in do_output
    self.finalize(nojpeg, flaglist=flaglist)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/interface/madgraph_interface.py", line 8621, in finalize
    self._me_curr_exporter.convert_model(self._curr_model,
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/PLUGIN/CUDACPP_SA_OUTPUT/output.py", line 177, in convert_model
    return super().convert_model(model, wanted_lorentz, wanted_coupling)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/iolibs/export_cpp.py", line 2583, in convert_model
    model_builder.write_files()
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/madgraph/iolibs/export_cpp.py", line 128, in write_files
    self.write_aloha_routines()
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/PLUGIN/CUDACPP_SA_OUTPUT/model_handling.py", line 832, in write_aloha_routin
es
    h_rout, cc_rout = abstracthelas.write(output_dir=None, language=self.aloha_writer, mode='no_include')
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/aloha/create_aloha.py", line 97, in write
    text = writer.write(mode=mode, **opt)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/aloha/aloha_writers.py", line 1827, in write
    cc_text = WriteALOHA.write(self, **opt)
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/aloha/aloha_writers.py", line 244, in write
    core_text = self.define_expression()
  File "/data/avalassi/GPU2020/MG5aMC/3.1.1_lo_vectorization/PLUGIN/CUDACPP_SA_OUTPUT/model_handling.py", line 457, in define_expression
    out.write('    %(declnamedenom)s = %(pre_coup)s%(coup)s%(post_coup)s / ( %(denom)s )\n' % mydict) # AV
KeyError: 'denom'

epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/model_handling.py

@@ -454,7 +454,11 @@ def define_expression(self):
                 if not aloha.complex_mass:
                     # This affects 'denom = COUP' in HelAmps_sm.cc
                     if self.routine.denominator:
-                        out.write('    %(declnamedenom)s = %(pre_coup)s%(coup)s%(post_coup)s / ( %(denom)s )\n' % mydict) # AV
+                        if self.routine.denominator == "1":
+                            out.write('    %(declnamedenom)s = %(pre_coup)s%(coup)s%(post_coup)s\n' % mydict) # AV
+                        else:
+                            mydict['denom'] = self.routine.denominator
+                            out.write('    %(declnamedenom)s = %(pre_coup)s%(coup)s%(post_coup)s / ( %(denom)s )\n' % mydict) # AV
                     else:
                         out.write('    %(declnamedenom)s = %(pre_coup)s%(coup)s%(post_coup)s / ( ( P%(i)s[0] * P%(i)s[0] ) - ( P%(i)s[1] * P%(i)s[1] ) - ( P%(i)s[2] * P%(i)s[2] ) - ( P%(i)s[3] * P%(i)s[3] ) - M%(i)s * ( M%(i)s - cI * W%(i)s ) );\n' % mydict) # AV
                 else: