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

[Johan Alwall]

- Fixed problem with user defined scales using setscales.f
- Fixed the error message in compile in misc.py
- Fix better error message if results.dat not found.

[Olivier Mattelaer (olivier-mattelaer)]

Hi Johan,

Is this shouldn't return an error? rather than this message?

Otherwise, yes you can merge.

Cheers,

Olivier
On 18-oct.-11, at 21:59, Johan Alwall wrote:

> + if not os.path.exists(path):
> + logger.error('Generation failed (no results.dat file
> found)')
> + return

[Johan Alwall (johan-alwall)]

Hello Olivier,

This is a typical follow-up error, and the real error is usually given above. It's not an error that should give an MG5_debug file for sure, and with too much text it makes it difficult to spot the real error written several lines above. So I think this is much less confusing.

I'll do the merge.

Thanks,
Johan

=== modified file 'Template/SubProcesses/reweight.f'
--- Template/SubProcesses/reweight.f	2011-10-05 03:10:17 +0000
+++ Template/SubProcesses/reweight.f	2011-10-19 03:01:20 +0000
@@ -758,12 +758,6 @@
       external alphas, isjetvx, getissud, pdg2pdf, xran1,  sudwgt
 
       rewgt=1.0d0
-
-      if((ickkw.gt.0.or..not.fixed_fac_scale.or..not.fixed_ren_scale)
-     $     .and..not.clustered)then
-        write(*,*)'Error: No clustering done when calling rewgt!'
-        stop
-      endif
       clustered=.false.
 
       if(ickkw.le.0) return

=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2011-10-12 16:09:26 +0000
+++ UpdateNotes.txt	2011-10-19 03:01:20 +0000
@@ -1,5 +1,10 @@
 Update notes for MadGraph 5 (in reverse time order)
 
+1.3.23 (19/10/11) JA: Allow user to set scales using setscales.f again 
+                      (this was broken in v. 1.3.18).
+                  JA: Ensure that the error message is displayed if the
+                     "make" command is not installed on the system.
+ 
 1.3.22 (12/10/11) JA: Fixed another bug (also introduced in 1.3.18), which 
                       could give the wrong ordering between the s-channel 
                       propagators for certain multiprocess cases (this

=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2011-10-12 16:09:26 +0000
+++ madgraph/VERSION	2011-10-19 03:01:20 +0000
@@ -1,2 +1,2 @@
-version = 1.3.22
-date = 2011-10-12
+version = 1.3.23
+date = 2011-10-19

=== modified file 'madgraph/interface/launch_ext_program.py'
--- madgraph/interface/launch_ext_program.py	2011-07-08 09:54:01 +0000
+++ madgraph/interface/launch_ext_program.py	2011-10-19 03:01:20 +0000
@@ -289,6 +289,9 @@
         # Display the cross-section to the screen
         path = os.path.join(self.running_dir, 'SubProcesses', '%s_results.dat' 
                                                                     % self.name) 
+        if not os.path.exists(path):
+            logger.error('Generation failed (no results.dat file found)')
+            return
         fsock = open(path)
         line = fsock.readline()
         cross, error = line.split()[0:2]

=== modified file 'madgraph/iolibs/misc.py'
--- madgraph/iolibs/misc.py	2011-07-08 09:54:01 +0000
+++ madgraph/iolibs/misc.py	2011-10-19 03:01:20 +0000
@@ -119,7 +119,7 @@
         else:
             error_text = "Impossible to compile %s directory\n" % cwd
             error_text += "Trying to launch make command returns:\n"
-            error_text += "    " + error + "\n"
+            error_text += "    " + str(error) + "\n"
             error_text += "In general this means that your computer is not able to compile."
             if sys.platform == "darwin":
                 error_text += "Note that MacOSX doesn\'t have gmake/gfortan install by default.\n"