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

[Johan Alwall]

- Fixed long-standing problem that Bogdan pointed out with mixed QED/QCD orders.
- Some fixes to run_card and launch command.

[Olivier Mattelaer (olivier-mattelaer)]

Could you comment on your modification on the launch command.
I don't see the point of those modifications, is there a reason for this change, or this is only for the beauty of it?

review: Approve

[Johan Alwall (johan-alwall)]

Hello Olivier,

Sorry, I thought it was obvious. With static variables, if you run
launch several times with running pythia (and pgs), the pythia_card
(and pgs_card) are added on but never removed, so you get multiple
questions if you want to edit the pythia_card.dat.

Johan

=== modified file 'Template/Cards/run_card.dat'
--- Template/Cards/run_card.dat	2011-04-19 00:55:55 +0000
+++ Template/Cards/run_card.dat	2011-05-10 22:47:53 +0000
@@ -157,6 +157,11 @@
  0   = mmnl    ! min invariant mass for all letpons (l+- and vl) 
  1d5 = mmnlmax ! max invariant mass for all letpons (l+- and vl) 
 #*********************************************************************
+# Minimum and maximum pt for 4-momenta sum of leptons                *
+#*********************************************************************
+ 0   = ptllmin  ! Minimum pt for 4-momenta sum of leptons(l and vl)
+ 1d5 = ptllmax  ! Maximum pt for 4-momenta sum of leptons(l and vl)
+#*********************************************************************
 # Inclusive cuts                                                     *
 #*********************************************************************
  0  = xptj ! minimum pt for at least one jet  
 
=== modified file 'Template/Cards/run_card_default.dat'
--- Template/Cards/run_card_default.dat	2011-03-02 18:01:07 +0000
+++ Template/Cards/run_card_default.dat	2011-05-10 22:47:53 +0000
@@ -70,6 +70,11 @@
 # BW cutoff (M+/-bwcutoff*Gamma)
 #**********************************
   15  = bwcutoff
+#**********************************************************
+# Apply pt/E/eta/dr/mij cuts on decay products or not
+# (note that etmiss/ptll/ptheavy/sorted cuts always apply)
+#**********************************************************
+   F  = cut_decays
 #*******************                                                 
 # Standard Cuts
 #*******************                                                 
@@ -152,6 +157,11 @@
  0   = mmnl    ! min invariant mass for all letpons (l+- and vl) 
  1d5 = mmnlmax ! max invariant mass for all letpons (l+- and vl) 
 #*********************************************************************
+# Minimum and maximum pt for 4-momenta sum of leptons                *
+#*********************************************************************
+ 0   = ptllmin  ! Minimum pt for 4-momenta sum of leptons(l and vl)
+ 1d5 = ptllmax  ! Maximum pt for 4-momenta sum of leptons(l and vl)
+#*********************************************************************
 # Inclusive cuts                                                     *
 #*********************************************************************
  0  = xptj ! minimum pt for at least one jet  
 
=== modified file 'Template/SubProcesses/cluster.f'
--- Template/SubProcesses/cluster.f	2011-04-14 02:31:58 +0000
+++ Template/SubProcesses/cluster.f	2011-05-10 22:47:53 +0000
@@ -498,6 +498,7 @@
       include 'nexternal.inc'
       include 'cluster.inc'
       include 'message.inc'
+      include 'maxconfigs.inc'
       real*8 p(0:3,nexternal), pcmsp(0:3), p1(0:3)
       real*8 pi(0:3), nr(0:3), pz(0:3)
       integer i, j, k, n, idi, idj, idij, icgs(0:n_max_cg)
@@ -505,6 +506,9 @@
       double precision nn2,ct,st
       double precision minpt2ij,pt2ij(n_max_cl),zij(n_max_cl)
 
+      integer mapconfig(0:lmaxconfigs), this_config
+      common/to_mconfigs/mapconfig, this_config
+
       integer nbw,ibwlist(nexternal)
       logical isbw(n_max_cl)
       data isbw/n_max_cl*.false./
@@ -632,13 +636,13 @@
             write(*,*)'winner ',n,': ',idacl(n,1),'&',idacl(n,2),
      &           ' -> ',minpt2ij,', z = ',zcl(n)
          endif
-c     Reset igscl with new mother
+c     Reset igraphs with new mother
          if (.not.findmt(imocl(n),igraphs,nbw,ibwlist)) then
             write(*,*) 'cluster.f: Error. Invalid combination.' 
             return
          endif
          if (btest(mlevel,4)) then
-            write(*,*)'diagrams: ',(igraphs(k),k=1,igraphs(0))
+            write(*,*)'graphs: ',(igraphs(k),k=1,igraphs(0))
          endif
          if (iwin.lt.3) then
 c     is clustering
@@ -739,6 +743,15 @@
               write(*,*) 'Last vertex is ',imap(1,2),imap(2,2),imap(3,2)
               write(*,*) '            -> ',pt2ijcl(n+1),sqrt(pt2ijcl(n+1))
             endif
+c     If present channel among graphs, use only this channel
+c     This is important when we have mixed QED-QCD
+            do i=1,igraphs(0)
+               if (igraphs(i).eq.this_config) then
+                  igraphs(0)=1
+                  igraphs(1)=this_config
+                  exit
+               endif
+            enddo
 c            if(pt2ijcl(n).gt. pt2ijcl(n+1))then
 c              pt2ijcl(n+1)=pt2ijcl(n)
 c              if (btest(mlevel,3)) then
 
=== modified file 'Template/SubProcesses/reweight.f'
--- Template/SubProcesses/reweight.f	2011-04-21 15:56:29 +0000
+++ Template/SubProcesses/reweight.f	2011-05-10 22:47:53 +0000
@@ -412,8 +412,10 @@
       if (btest(mlevel,1)) then
         write(*,*)'setclscales: identified tree {'
         do i=1,nexternal-2
-          write(*,*)'  ',i,': ',idacl(i,1),'&',idacl(i,2),
-     &       ' -> ',imocl(i),', ptij = ',dsqrt(pt2ijcl(i)) 
+          write(*,*)'  ',i,': ',idacl(i,1),'(',ipdgcl(idacl(i,1),igraphs(1)),')',
+     $       '&',idacl(i,2),'(',ipdgcl(idacl(i,2),igraphs(1)),')',
+     $       ' -> ',imocl(i),', ptij = ',dsqrt(pt2ijcl(i)),
+     $       '(',ipdgcl(imocl(i),igraphs(1)),')'
         enddo
         write(*,*)'  graphs (',igraphs(0),'):',(igraphs(i),i=1,igraphs(0))
         write(*,*)'}'
 
=== modified file 'UpdateNotes.txt'
--- UpdateNotes.txt	2011-05-08 22:57:35 +0000
+++ UpdateNotes.txt	2011-05-10 22:47:53 +0000
@@ -1,8 +1,13 @@
 Update notes for MadGraph 5 (in reverse time order)
 
-1.2.2 (09/05/11)  OM: fix ALOHA symmetries creating not gauge invariant result for scalar octet
-
-1.2.1 (08/05/11)  OM: reduce the quantity of RAM use by matrix.f
+1.2.3 (11/05/11): JA: Fixed problem with scale choice in processes with mixed 
+                      QED/QCD orders, e.g. p p > t t~ QED=2
+		  JA: Added the ptllmin/max options in the default run_card.dat
+
+1.2.2 (09/05/11): OM: fix ALOHA symmetries creating not gauge invariant result 
+                      for scalar octet
+
+1.2.1 (08/05/11): OM: reduce the quantity of RAM use by matrix.f
       	          OM: support speed of psyco if this python module is installed
                   OM: fix a minor bug in the model parsing
                   OM: add the check of valid model.pkl also for v4 model
 
=== modified file 'madgraph/VERSION'
--- madgraph/VERSION	2011-05-08 22:57:35 +0000
+++ madgraph/VERSION	2011-05-10 22:47:53 +0000
@@ -1,2 +1,2 @@
-version = 1.2.2
-date = 2011-05-08
+version = 1.2.3
+date = 2011-05-11
 
=== modified file 'madgraph/interface/launch_ext_program.py'
--- madgraph/interface/launch_ext_program.py	2011-05-03 19:17:59 +0000
+++ madgraph/interface/launch_ext_program.py	2011-05-10 22:47:53 +0000
@@ -36,7 +36,6 @@
     program_dir = ''
     executable = ''  # path from program_dir
     
-    cards = [] # files can be modified (path from self.card_dir)
     force = False
     
     def __init__(self, running_dir, card_dir='', timeout=None,
@@ -51,6 +50,7 @@
         for key,value in options.items():
             setattr(self, key, value)
             
+        self.cards = [] # files can be modified (path from self.card_dir)
             
     def run(self):
         """ execute the main code """
@@ -147,12 +147,12 @@
 class SALauncher(ExtLauncher):
     """ A class to launch a simple Standalone test """
     
-    cards = ['param_card.dat']
-
     def __init__(self, running_dir, timeout, **options):
         """ initialize the StandAlone Version"""
         
         ExtLauncher.__init__(self, running_dir, './Cards', timeout, **options)
+        self.cards = ['param_card.dat']
+
     
     def launch_program(self):
         """launch the main program"""
@@ -170,8 +170,6 @@
 class MELauncher(ExtLauncher):
     """A class to launch MadEvent run"""
     
-    cards = ['param_card.dat', 'run_card.dat']
-
     def __init__(self, running_dir, timeout, unit='pb', **option):
         """ initialize the StandAlone Version"""
         
@@ -182,6 +180,7 @@
         assert hasattr(self, 'name')
         self.unit = unit
         
+        self.cards = ['param_card.dat', 'run_card.dat']
         # Check for pythia-pgs directory
         if os.path.isdir(os.path.join(MG5DIR,'pythia-pgs')):
             self.pythia = os.path.join(MG5DIR,'pythia-pgs')
@@ -305,20 +304,16 @@
 class Pythia8Launcher(ExtLauncher):
     """A class to launch Pythia8 run"""
     
-    cards = []
-
     def __init__(self, running_dir, timeout, **option):
         """ initialize launching Pythia 8"""
 
         running_dir = os.path.join(running_dir, 'examples')
         ExtLauncher.__init__(self, running_dir, '.', timeout, **option)
-
-    
-    def prepare_run(self):
-        """ ask for pythia-pgs/delphes run """
-
         self.cards = []
-        
+    
+    def prepare_run(self):
+        """ ask for pythia-pgs/delphes run """
+
         # Find all main_model_process.cc files
         date_file_list = []
         for file in glob.glob(os.path.join(self.running_dir,'main_*_*.cc')):