Merge lp:~maddevelopers/mg5amcnlo/gluino_fix into lp:~madteam/mg5amcnlo/trunk

[Olivier Mattelaer]

just fixing the lorentz invariance for the gluino at rest.

[lp:~maddevelopers/mg5amcnlo/gluino_fix]

206. By mattelaer-olivier on 2012-02-18

wrong fix in cc routine

[Olivier Mattelaer (olivier-mattelaer)]

Just to confirm that all acceptance test are passing (but one which is due to a configuration problem that I will solve directly in 1.4.3)

Cheers,

Olivier

[Johan Alwall (johan-alwall)]

Great! Then I'll approve.

Johan

review: Approve

=== modified file 'Template/Source/make_opts'
--- Template/Source/make_opts	2011-11-18 17:35:49 +0000
+++ Template/Source/make_opts	2012-02-18 00:34:18 +0000
@@ -8,7 +8,7 @@
 
 # Set FC unless it's defined by an environment variable
 ifeq ($(origin FC),default)
-  FC=gfortran
+  FC=g77
 endif
 
 # Options: dynamic, lhapdf

=== modified file 'aloha/template_files/aloha_functions.f'
--- aloha/template_files/aloha_functions.f	2010-09-28 10:05:41 +0000
+++ aloha/template_files/aloha_functions.f	2012-02-18 00:34:18 +0000
@@ -219,8 +219,8 @@
 
             sqm(0) = dsqrt(abs(fmass)) ! possibility of negative fermion masses
             sqm(1) = sign(sqm(0),fmass) ! possibility of negative fermion masses
-            ip = -((1+nh)/2)
-            im =  (1-nh)/2
+            ip = -((1-nh)/2) * nhel
+            im =  (1+nh)/2* nhel
 
             fo(1) = im     * sqm(im)
             fo(2) = ip*nsf * sqm(im)

=== modified file 'aloha/template_files/oxxxxx.cc'
--- aloha/template_files/oxxxxx.cc	2010-07-26 04:28:51 +0000
+++ aloha/template_files/oxxxxx.cc	2012-02-18 00:34:18 +0000
@@ -14,8 +14,8 @@
     if (pp == 0.000){
       sqm[0] = pow(abs(fmass),0.5);
       sqm[1] = Sgn(sqm[0],fmass); 
-      ip = -((1+nh)/2);
-      im = (1-nh)/2;
+      ip = -((1-nh)/2) * nhel ;
+      im = (1+nh)/2 * nhel;
       fo[0] = im *sqm[im];
       fo[1] = ip*nsf*sqm[im];
       fo[2] = im*nsf*sqm[-ip];
@@ -27,8 +27,8 @@
       sf[1] = double(1+nsf-(1-nsf)*nh)*0.5;
       omega[0] = pow(p[0]+pp,0.5);
       omega[1] = fmass/omega[0];
-      ip = (1+nh)/2;
-      im = (1-nh)/2;
+      ip = (1+nh)/2 ;
+      im = (1-nh)/2 ;
       sfomeg[0] = sf[0]*omega[ip];
       sfomeg[1] = sf[1]*omega[im];
       pp3 = max(pp+p[3],0.00);

=== modified file 'aloha/template_files/wavefunctions.py'
--- aloha/template_files/wavefunctions.py	2011-01-07 23:13:28 +0000
+++ aloha/template_files/wavefunctions.py	2012-02-18 00:34:18 +0000
@@ -94,8 +94,8 @@
         pp = min(p[0],sqrt(p[1]**2 + p[2]**2 + p[3]**2 ))
         if (pp == 0.): 
             sqm = sqrt(abs(fmass)) 
-            ip = -((1+nh)/2) 
-            im = (1-nh)/2 
+            ip = -((1-nh)/2) * nhel
+            im = (1+nh)/2 * nhel
 
             fo[0] = im*sqm
             fo[1] = ip*nsf*sqm

=== modified file 'tests/parallel_tests/compare_with_old_mg5_version.py'
--- tests/parallel_tests/compare_with_old_mg5_version.py	2011-11-28 20:34:18 +0000
+++ tests/parallel_tests/compare_with_old_mg5_version.py	2012-02-18 00:34:18 +0000
@@ -461,6 +461,23 @@
                              model = "sm",
                              energy = 1000,
                              filename = "sm_22.log")   
+            
+    def test_mg5_sm_13(self):
+        """Test a semi-complete list of sm 1->3 processes"""
+        # Create a list of processes to check automatically
+        my_proc_list = me_comparator.create_proc_list_enhanced(
+                          init_part_list = ['t','t~','ta+','ta-'], 
+                          final_part_list_1 = ['b','b~','vt','vt~'],
+                          final_part_list_2 = ['u', 'u~', 'd', 'd~', 'c','c~', 'e+', 've', 'e-', 've~','mu-','vm'], 
+                          initial=1, final_1=1, final_2=2, charge_conservation=True)
+        
+        
+        # Store list of non-zero processes and results in file
+        self.compare_processes(my_proc_list,
+                             orders = {'QED':4, 'QCD':4},
+                             model = "sm",
+                             energy = 1000,
+                             filename = "sm_13.log")   
 
     def test_mg5_sm_23_p1(self):
         """Test a semi-complete list of sm 2->3 processes"""
@@ -588,6 +605,25 @@
                              energy = 2000,
                              filename = "mssm_22.log")   
 
+    def test_mg5_mssm_13(self):
+        """Test a semi-complete list of mssm 1->3 processes"""
+        # Create a list of processes to check automatically
+        my_proc_list = me_comparator.create_proc_list_enhanced(
+                          init_part_list = ['t1','t1~','t2', 't2~','b2','b2~'], 
+                          final_part_list_1 = ['b1','b1~','b2','b2~','n1','n2'],
+                          final_part_list_2 = ['u', 'u~', 'd', 'd~', 'c','c~', 'b', 'b~', 't','t~'], 
+                          initial=1, final_1=1, final_2=2, charge_conservation=False)
+        my_proc_list += ['t2 > b1 d~ u', 't2 > b2 d~ u', 't1 > b1 d~ u', 't1 > b2 d~ u',
+                        't2~ > b1~ d u~', 't2~ > b2~ d u~', 't1~ > b1~ d u~', 't1~ > b2~ d u~']
+        print len(my_proc_list)
+        # Store list of non-zero processes and results in file
+        self.compare_processes(my_proc_list,
+                             orders = {'QED':4, 'QCD':4},
+                             model = "mssm",
+                             energy = 2000,
+                             filename = "mssm_13_%s.log") 
+
+
     def test_mg5_mssm_23_p1(self):
         """Test a semi-complete list of mssm 2->3 processes"""
         # Create a list of processes to check automatically