Merge lp:~maddevelopers/mg5amcnlo/2.7.3_rwgtnlo2lo into lp:~maddevelopers/mg5amcnlo/3.4.0

[Olivier Mattelaer]

another branch that can be usefull to (partly?) include. To investigate

[Olivier Mattelaer (olivier-mattelaer)]

I guess the interest here is quite weak.

The implementation is not perfect (no test for example) and some part of the code shuld be refactorised.
So I will reject this. If the request is done again, it should be possible to re-implement this quite quickly anyway.

review: Disapprove

Unmerged revisions

326. By olivier-mattelaer on 2020-05-27

adding support for True_LO mode for NLO reweighting

=== modified file 'madgraph/interface/amcatnlo_run_interface.py'
--- madgraph/interface/amcatnlo_run_interface.py	2021-12-03 15:50:41 +0000
+++ madgraph/interface/amcatnlo_run_interface.py	2022-01-04 10:04:18 +0000
@@ -1385,7 +1385,15 @@
         else:
             self.allowed_reweight = [ 'OFF', 'ON', 'NLO', 'NLO_TREE','LO']
             return self.allowed_reweight     
-    
+
+    def check_value_reweight(self, value):
+
+        if value in self.get_allowed('reweight'):
+            return True
+        elif value.upper() == 'TRUE_LO':
+            return 'TRUE_LO'
+            
+        
     def set_default_reweight(self):
         """initialise the switch for reweight"""
         
@@ -1409,7 +1417,10 @@
                     "set store_rwgt_info T"]
         elif value == 'NLO_TREE':
             return ["edit reweight_card --replace_line='change mode' --before_line='launch' change mode NLO_tree",
-                    "set store_rwgt_info T"]            
+                    "set store_rwgt_info T"]
+        elif value == 'TRUE_LO':
+            return ["edit reweight_card --replace_line='change mode' --before_line='launch' change mode True_LO",
+                    "set store_rwgt_info T"]
         return []
             
 #

=== modified file 'madgraph/interface/reweight_interface.py'
--- madgraph/interface/reweight_interface.py	2021-12-03 15:40:10 +0000
+++ madgraph/interface/reweight_interface.py	2022-01-04 10:04:18 +0000
@@ -112,7 +112,7 @@
         self.seed = None
         self.output_type = "default"
         self.helicity_reweighting = True
-        self.rwgt_mode = '' # can be LO, NLO, NLO_tree, '' is default 
+        self.rwgt_mode = '' # can be LO, NLO, NLO_tree, True_LO, '' is default 
         self.has_nlo = False
         self.rwgt_dir = None
         self.exitted = False # Flag to know if do_quit was already called.
@@ -462,7 +462,9 @@
         elif self.rwgt_mode == 'LO+NLO':
             return ['_lo', '_nlo']
         elif self.rwgt_mode == 'NLO_tree':
-            return ['_tree']        
+            return ['_tree']
+        elif self.rwgt_mode == 'True_LO':
+            return ['_Tlo']
         elif not self.rwgt_mode and self.has_nlo :
             return ['_nlo']
         else:
@@ -1056,6 +1058,7 @@
         bjx = []
         wgt_tree = [] # reweight for loop-improved type
         wgt_virt  = [] #reweight b+v together
+        wgt_tlo = [] # reweight at LO accuracy
         base_wgt = []
         gs=[]
         qcdpower = []
@@ -1068,6 +1071,7 @@
             all_ctype = [w.type for w in cevent.wgts]
             if '_nlo' in type_nlo and any(c in all_ctype for c in [2,14,15]):
                 need_V =True
+                    
             
             w_orig = self.calculate_matrix_element(cevent, 0)
             w_new =  self.calculate_matrix_element(cevent, 1)
@@ -1111,6 +1115,12 @@
                                c_wgt.pwgt[2] * ratio_T]
                     wgt_tree.append(new_wgt)
                     
+                if '_Tlo' in type_nlo: #return real LO accuracy weight
+                    if c_wgt.type == 2:
+                        new_wgt = list(c_wgt.pwgt[:3])
+                    else:
+                        new_wgt = [0, 0, 0]
+                    wgt_tlo.append(new_wgt)
                 base_wgt.append(c_wgt.pwgt[:3])
         
         
@@ -1150,6 +1160,11 @@
             w_new =  self.calculate_matrix_element(event, 1)            
             final_weight['_lo'] = w_new/w_orig*event.wgt
             
+        if '_Tlo' in type_nlo:
+            out, partial = self.combine_wgt_local(scales2, pdg, bjx, wgt_tlo, gs, qcdpower, self.pdf)
+            avg = [1] * len(partial)
+            final_weight['_Tlo'] = out/orig_wgt*event.wgt
+                
             
         if self.output_type != 'default' and len(type_nlo)==1 and '_lo' not in type_nlo:
             to_write = [partial[i]/ref_wgts[i]*partial_check[i]
@@ -1160,10 +1175,14 @@
                         c_wgt.ref_wgt = to_write.pop(0)
                         if '_tree' in type_nlo:
                             c_wgt.pwgt = wgt_tree.pop(0)
+                        elif '_Tlo' in type_nlo:
+                            c_wgt.pwgt = wgt_tlo.pop(0)
                         else:
                             c_wgt.pwgt = wgt_virt.pop(0)
             assert not to_write
             assert not wgt_tree
+            assert not wgt_tlo
+            assert not wgt_virt
         return final_weight 
 
 
@@ -1697,7 +1716,7 @@
         # 5. create the virtual for NLO reweighting  ---------------------------
         if second and 'virtual_path' in self.dedicated_path:
             files.ln(self.dedicated_path['virtual_path'], path_me, name=data['paths'][1])
-        elif has_nlo and 'NLO' in self.rwgt_mode:
+        elif has_nlo and 'NLO' in self.rwgt_mode and self.rwgt_mode != 'NLO_tree':
             self.create_standalone_virt_directory(data, second)
             
             if False:#not second:
@@ -1723,22 +1742,23 @@
                 except:
                     misc.compile(['OLP_static'], cwd=pjoin(path_me, data['paths'][1],'SubProcesses'),
                              nb_core=1)
-        elif has_nlo and not second and self.rwgt_mode == ['NLO_tree']:
+        elif has_nlo and not second and self.rwgt_mode in ['NLO_tree','True_LO']:
             # We do not have any virtual reweighting to do but we still have to
             #combine the weights.
             #Idea:create a fake directory.
-            start = time.time()
-            commandline='import model loop_sm;generate g g > e+ ve [virt=QCD]'
-            # deactivate golem since it creates troubles
-            old_options = dict(mgcmd.options)
-            mgcmd.options['golem'] = None             
-            commandline = commandline.replace('add process', 'generate',1)
-            logger.info(commandline)
-            mgcmd.exec_cmd(commandline, precmd=True)
-            commandline = 'output standalone_rw %s --prefix=int -f' % pjoin(path_me, data['paths'][1])
-            mgcmd.exec_cmd(commandline, precmd=True)    
-            #put back golem to original value
-            mgcmd.options['golem'] = old_options['golem']
+            if False:
+                start = time.time()
+                commandline='import model loop_sm;generate g g > e+ ve [virt=QCD]'
+                # deactivate golem since it creates troubles
+                old_options = dict(mgcmd.options)
+                mgcmd.options['golem'] = None             
+                commandline = commandline.replace('add process', 'generate',1)
+                logger.info(commandline)
+                mgcmd.exec_cmd(commandline, precmd=True)
+                commandline = 'output standalone_rw %s --prefix=int -f' % pjoin(path_me, data['paths'][1])
+                mgcmd.exec_cmd(commandline, precmd=True)    
+                #put back golem to original value
+                mgcmd.options['golem'] = old_options['golem']
             # update make_opts
             if not mgcmd.options['lhapdf']:
                 raise Exception("NLO_tree reweighting requires LHAPDF to work correctly")

=== modified file 'madgraph/various/misc.py'
--- madgraph/various/misc.py	2021-12-03 15:40:10 +0000
+++ madgraph/various/misc.py	2022-01-04 10:04:18 +0000
@@ -2112,6 +2112,15 @@
         use_lhapdf=False
         return False
     else:
+<<<<<<< TREE
+=======
+        if sys.platform != "darwin":
+            if os.environ.has_key('LD_LIBRARY_PATH'):
+                os.environ['LD_LIBRARY_PATH'] = lhapdf_libdir
+            else:
+                os.environ['LD_LIBRARY_PATH'] = '%s:%s' %(lhapdf_libdir,os.environ['LD_LIBRARY_PATH'])
+        
+>>>>>>> MERGE-SOURCE
         try:
             candidates=[dirname for dirname in os.listdir(lhapdf_libdir) \
                             if os.path.isdir(os.path.join(lhapdf_libdir,dirname))]