See ChangeLog

ChangeLog

+2019-11-01 Joany Manjarres <joany@cern.ch>
+	* tagging MC15JobOptions-01-01-83
+	* add 398566-645
+	* update cvs 346790-91 414005-18
+	* update JO 346729-30 346693-94 312662-751
+	* update MadGraphControl_SimplifiedModel_C1C1_WW_MadSpin.py
+
 2019-10-30 Joany Manjarres <joany@cern.ch>
 	* tagging MC15JobOptions-01-01-82
 	* update 412148-174

common/MadGraph/MadGraphControl_SimplifiedModel_C1C1_WW_MadSpin.py

@@ -14,7 +14,6 @@ madspindecays=False
 if "MadSpin" in runArgs.jobConfig[0] and dM<100.:
   madspindecays=True
 
-
 # Set Gen and Decay types 
 gentype = str(runArgs.jobConfig[0].split('_')[2])
 decaytype = str(runArgs.jobConfig[0].split('_')[3])
@@ -22,7 +21,7 @@ decaytype = str(runArgs.jobConfig[0].split('_')[3])
 # MadGraph options
 
 bwcutoff = 15
-extras['bwcutoff']=bwcutoff 
+extras['bwcutoff']=bwcutoff
 """
 xqcut = 15             # low matching scale, following DM group recommendations
 extras['ptj']=10       # low matching scale, following DM group recommendations #tried
@@ -90,7 +89,7 @@ set spinmode none
 
 %s
 
-# running the actual code                        
+# running the actual code
 launch"""%(bwcutoff,runArgs.randomSeed,msdecaystring))                    
   mscard.close()
   mergeproc+="LEPTONS,NEUTRINOS"
@@ -121,14 +120,37 @@ pythia.Commands += ["-24:onIfAny = -11 -12 -13 -14 -15 -16"] # switch on W->lnu
 
 evgenLog.info('Registered generation of ~chi1+/~chi1- production, decay via WW; grid point '+str(runArgs.runNumber)+' decoded into mass point ' + str(masses['1000024']) + ' ' + str(masses['1000022']))
 
-evgenConfig.contact = [ "marilea.reale@cern.ch", "primaver@cern.ch"]
+evgenConfig.contact = [ "francesco.giuseppe.gravili@cern.ch", "marilea.reale@cern.ch", "primaver@cern.ch"]
 evgenConfig.keywords += ['SUSY', 'gaugino', 'chargino', 'slepton', 'sneutrino']
 evgenConfig.description = '~chi1+/~chi1- production, decay via WW in simplified model, m_C1N2 = %s GeV, m_N1 = %s GeV'%(masses['1000023'],masses['1000022'])
 
 # Filter and event multiplier 
-evt_multiplier = 20
-
-if '2L8' in runArgs.jobConfig[0]:
+evt_multiplier = 30
+
+if '1L202L3' in runArgs.jobConfig[0]:
+    evgenLog.info('1Lepton20 and 2Lepton3 filter is applied')
+
+    if dM==10.: evt_multiplier = 150
+    
+    from GeneratorFilters.GeneratorFiltersConf import MultiElecMuTauFilter
+    filtSeq += MultiElecMuTauFilter("DiLeptonFilter")
+    filtSeq += MultiElecMuTauFilter("SingleLeptonFilter")
+    
+    MultiElecMuTauFilter2 = filtSeq.DiLeptonFilter
+    MultiElecMuTauFilter2.NLeptons = 2
+    MultiElecMuTauFilter2.MinPt = 3000.
+    MultiElecMuTauFilter2.MaxEta = 2.8
+    MultiElecMuTauFilter2.IncludeHadTaus = 0
+
+    MultiElecMuTauFilter1 = filtSeq.SingleLeptonFilter
+    MultiElecMuTauFilter1.NLeptons = 1
+    MultiElecMuTauFilter1.MinPt = 20000.
+    MultiElecMuTauFilter1.MaxEta = 2.8
+    MultiElecMuTauFilter1.IncludeHadTaus = 0
+
+    filtSeq.Expression = "SingleLeptonFilter and DiLeptonFilter"
+
+elif '2L8' in runArgs.jobConfig[0]:
     evgenLog.info('2lepton8 filter is applied')
 
     include ( 'MC15JobOptions/MultiElecMuTauFilter.py' )
@@ -138,7 +160,6 @@ if '2L8' in runArgs.jobConfig[0]:
     filtSeq.MultiElecMuTauFilter.IncludeHadTaus = 0    # don't include hadronic taus
 
     filtSeq.Expression = "MultiElecMuTauFilter"
-   
 
 include ( 'MC15JobOptions/MadGraphControl_SimplifiedModelPostInclude.py' )
 
@@ -147,5 +168,3 @@ if njets>0:
                                "1000024:spinType = 1",
                                "1000023:spinType = 1",
                                "1000022:spinType = 1" ]
-
-

share/DSID312xxx/MC15.312662.MGPy8EG_A14N30LO_2HDMa_bb_monoHyy_tb1_sp035_mA1500_ma500.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312663.MGPy8EG_A14N30LO_2HDMa_ggF_monoHyy_tb1_sp035_mA1500_ma500.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312664.MGPy8EG_A14N30LO_2HDMa_bb_monoHyy_tb5_sp035_mA1500_ma500.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312665.MGPy8EG_A14N30LO_2HDMa_ggF_monoHyy_tb5_sp035_mA1500_ma500.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312666.MGPy8EG_A14N30LO_2HDMa_bb_monoHyy_tb1_sp035_mA200_ma100.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312667.MGPy8EG_A14N30LO_2HDMa_ggF_monoHyy_tb1_sp035_mA200_ma100.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312668.MGPy8EG_A14N30LO_2HDMa_bb_monoHyy_tb1_sp035_mA200_ma300.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312669.MGPy8EG_A14N30LO_2HDMa_ggF_monoHyy_tb1_sp035_mA200_ma300.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312670.MGPy8EG_A14N30LO_2HDMa_bb_monoHyy_tb1_sp035_mA200_ma500.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312671.MGPy8EG_A14N30LO_2HDMa_ggF_monoHyy_tb1_sp035_mA200_ma500.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312672.MGPy8EG_A14N30LO_2HDMa_bb_monoHyy_tb1_sp035_mA600_ma100.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312673.MGPy8EG_A14N30LO_2HDMa_ggF_monoHyy_tb1_sp035_mA600_ma100.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312674.MGPy8EG_A14N30LO_2HDMa_bb_monoHyy_tb1_sp035_mA600_ma300.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312675.MGPy8EG_A14N30LO_2HDMa_ggF_monoHyy_tb1_sp035_mA600_ma300.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312676.MGPy8EG_A14N30LO_2HDMa_bb_monoHyy_tb1_sp035_mA600_ma500.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312677.MGPy8EG_A14N30LO_2HDMa_ggF_monoHyy_tb1_sp035_mA600_ma500.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312678.MGPy8EG_A14N30LO_2HDMa_bb_monoHyy_tb1_sp035_mA900_ma250.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")

share/DSID312xxx/MC15.312679.MGPy8EG_A14N30LO_2HDMa_ggF_monoHyy_tb1_sp035_mA900_ma250.py

@@ -22,4 +22,4 @@ Reweight = {}
 Reweight['tanbeta'] = "scan:[0.3, 1, 5, 10, 20]"
 Reweight['sinp'] = "scan:[0.1, 0.35, 0.7, 0.9]"
 
-include("MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")
+include("MC15JobOptions/MadGraphControl_Pythia8EvtGen_A14NNPDF30LO_Pseudoscalar_2HDMa_monoH.py")