Merge pull request #15 from mroda88/master

Sync with master
GENIE-MC · Nov 13, 2019 · fb41db8 · fb41db8
2 parents 9dec82d + c49cb9b
commit fb41db8
Show file tree

Hide file tree

Showing 60 changed files with 3,614 additions and 238 deletions.
diff --git a/config/CommonParam.xml b/config/CommonParam.xml
@@ -302,7 +302,25 @@ Or changing the name of this parameter set
         Set the coupling of dark matter to nucleons
     -->
     <param type="double" name="ZpCoupling"> 0.1 </param>
-
+    <param type="double" name="DarkLeftCharge"> 1.0 </param>
+    <param type="double" name="DarkRightCharge"> 1.0 </param>
+    <param type="double" name="DarkScalarCharge"> 1.0 </param> 
+    <param type="double" name="UpLeftCharge"> 1.0 </param>
+    <param type="double" name="UpRightCharge"> 1.0 </param>
+    <param type="double" name="DownLeftCharge"> 1.0 </param>
+    <param type="double" name="DownRightCharge"> 1.0 </param>
+    <param type="double" name="StrangeLeftCharge"> 1.0 </param>
+    <param type="double" name="StrangeRightCharge"> 1.0 </param>
+    <param type="double" name="CharmLeftCharge"> 1.0 </param>
+    <param type="double" name="CharmRightCharge"> 1.0 </param>
+    <param type="double" name="ElectronLeftCharge"> 1.0 </param>
+    <param type="double" name="ElectronRightCharge"> 1.0 </param>
+    <param type="double" name="DMEL-Mp"> 1.441 </param>
+    <param type="double" name="DMEL-Mpi"> 0.1349766 </param>
+    <param type="double" name="DMEL-Meta"> 0.547862 </param>
+    <param type="double" name="AxialVectorSpin-u"> 0.827 </param>
+    <param type="double" name="AxialVectorSpin-d"> -0.38 </param>
+    <param type="double" name="AxialVectorSpin-s"> -0.0427 </param>
   </param_set>
 
 

diff --git a/config/DMBYStrucFunc.xml b/config/DMBYStrucFunc.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+Configuration for the DMBYStrucFunc DISStructureFuncModelI
+
+Algorithm Configurable Parameters:
+....................................................................................................
+Name                       Type    Opt   Comment                                Default
+....................................................................................................
+BY-A                       double  No    Bodek-Yang scaling var param A         
+By-B                       double  No    Bodek-Yang scaling var param B         
+BY-CsU                     double  No    Bodek-Yang u sea K factor param        
+BY-CsD                     double  No    Bodek-Yang d sea K factor param        
+BY-Cv1U                    double  No    Bodek-Yang u val K factor param        
+BY-Cv2U                    double  No    Bodek-Yang u val K factor param        
+BY-Cv1D                    double  No    Bodek-Yang d val K factor param        
+BY-Cv2D                    double  No    Bodek-Yang d val K factor param        
+
++++ This model inherits from QPMDISStrucFunc and calls its configure
++++ The following parameters have to be the same as in QPMDISStrucFunc.xml
+
+PDF-Set                    alg     No    PDF model
+Charm-Mass                 double  No    charm mass                             CommonParam[Masses]
+Charm-Prod-Off             bool    Yes   charm production is turned off         false
+PDF-Q2min                  double  No    min Q2 for PDF evaluation              From "PDF-Set" 
+IncludeR                   bool    No    include R factor?              
+IncludeNuclMod             bool    No    include nuclear factor?            
+CKM-Vcd                    double  No                                           CommonParam[CKM]
+CKM-Vcs                    double  No                                           CommonParam[CKM]
+CKM-Vud                    double  No                                           CommonParam[CKM]
+CKM-Vus                    double  No                                           CommonParam[CKM]
+Use2016Corrections         bool    No    Use SF corrections?                    
+LowQ2CutoffF1F2            double  No    min for F1/F2 SF relation             
+WeinbergAngle              double  No                                           CommonParam[WeakInt]
+-->
+
+<alg_conf>
+
+  <param_set name="Default"> 
+    <param type="string" name="CommonParam"> CKM,Masses,BoostedDarkMatter </param>
+
+     <param type="alg" name="PDF-Set"> genie::BYPDF/Default </param>
+
+     <param type="double" name="BY-A">     0.538   </param>
+     <param type="double" name="BY-B">     0.305   </param>
+     <param type="double" name="BY-CsU">   0.363   </param>
+     <param type="double" name="BY-CsD">   0.621   </param>
+     <param type="double" name="BY-Cv1U">  0.291   </param>
+     <param type="double" name="BY-Cv2U">  0.189   </param>
+     <param type="double" name="BY-Cv1D">  0.202   </param>
+     <param type="double" name="BY-Cv2D">  0.255   </param>
+
+     <!-- 
+	  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	  Switches controlling the DIS structure function calculation. Those switches specify whether to:
+	  - include an R (~FL) factor into the calculation
+	  - include a nuclear factor (accounting for shadowing/anti-shadowing)
+	  - include corrections for calculating relation between 2xF1 and F2
+	  - Select value for Q2 cutoff in relation between 2xF1 and F2
+     -->
+     <param type="bool"   name="IncludeR">           true  </param>
+     <param type="bool"   name="IncludeNuclMod">     true  </param>
+     <param type="bool"   name="Use2016Corrections"> false </param>
+     <param type="double" name="LowQ2CutoffF1F2">    0.8   </param>
+
+  </param_set>
+
+</alg_conf>
+
diff --git a/config/DMEInteractionListGenerator.xml b/config/DMEInteractionListGenerator.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+  <param_set name="DME">
+  </param_set>
+
+</alg_conf>
+
diff --git a/config/DMEKinematicsGenerator.xml b/config/DMEKinematicsGenerator.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+Configuration for the DMEKinematicsGenerator EventRecordVisitorI
+
+Algorithm Configurable Parameters:
+.......................................................................................................................
+Name                     Type    Opt   Comment                                       Default
+.......................................................................................................................
+UniformOverPhaseSpace    bool    Yes   kinematics uniformly over allowd phase space   false
+                                       wgt = (phase_space_volume)*(diff_xsec)/(xsec)
+MaxXSec-SafetyFactor     double  Yes   multiplies max xsec in rejection method        1.25
+MaxXSec-DiffTolerance    double  Yes   max allowed 200*(xsec-xsecmax)/(xsec+xsecmax)  0.00
+                                       if xsec>xsecmax
+Cache-MinEnergy          double  Yes   minimum energy for which max xsec is cached   -1.00
+                                       if xsec>xsecmax
+-->
+
+<alg_conf>
+
+  <param_set name="Default"> 
+  </param_set>
+
+</alg_conf>
+
diff --git a/config/DMELEventGenerator.xml b/config/DMELEventGenerator.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+Configuration for the DMELEventGenerator EventRecordVisitorI
+
+Configurable Parameters:
+.......................................................................................................................
+Name                     Type    Opt   Comment                                       Default
+.......................................................................................................................
+UniformOverPhaseSpace    bool    Yes   kinematics uniformly over allowd phase space  false
+                                       wgt = (phase_space_volume)*(diff_xsec)/(xsec)
+MaxXSec-SafetyFactor     double  Yes   multiplies max xsec in rejection method       1.6
+MaxXSec-DiffTolerance    double  Yes   max allowed 200*(xsec-xsecmax)/(xsec+xsecmax) 999999
+                                       if xsec>xsecmax
+Cache-MinEnergy          double  Yes   minimum energy for which max xsec is cached   1.00
+
+-->
+
+<alg_conf>
+
+  <param_set name="Default"> 
+    <param type="double" name="Cache-MinEnergy">        1.0       </param>
+    <param type="alg"    name="NuclearModel">           genie::NuclearModelMap/Default            </param>
+  </param_set>
+
+  <param_set name="EM-Default"> 
+
+  </param_set>
+
+<!--
+  <param_set name="CC-Default"> 
+  </param_set>
+
+  <param_set name="NC-Default"> 
+  </param_set>
+
+  <param_set name="CC-Charm-Default"> 
+  </param_set>
+
+  <param_set name="CC-Lambda-Default"> 
+  </param_set>
+-->
+</alg_conf>
+
diff --git a/config/DMELXSec.xml b/config/DMELXSec.xml
@@ -13,8 +13,9 @@ Name                         Type     Optional   Comment
 
   <param_set name="Default"> 
     <param type="string" name = "gsl-integration-type">        adaptive  </param>
-    <param type="int"    name = "gsl-max-eval">                   40000  </param>
+    <param type="int"    name = "gsl-max-size-of-subintervals">                   40000  </param>
     <param type="double" name = "gsl-relative-tolerance">         0.001  </param>
+    <param type="int"    name = "gsl-rule">                             3  </param>
   </param_set>
 
 </alg_conf>

diff --git a/config/DMEOutgoingDarkGenerator.xml b/config/DMEOutgoingDarkGenerator.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+  Configuration sets for DMEOutgoingDarkGenerator EventRecordVisitorI
+
+  <param_set name="Default"> 
+    <param type="string" name="CommonParam"> Lepton </param>
+  </param_set>
+
+</alg_conf>
+
diff --git a/config/DMETargetRemnantGenerator.xml b/config/DMETargetRemnantGenerator.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+  Configuration sets for DMETargetRemnantGenerator EventRecordVisitorI
+
+  <param_set name="Default"> 
+  </param_set>
+
+</alg_conf>
+
diff --git a/config/DMElectronPXSec.xml b/config/DMElectronPXSec.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+<!--
+Configuration for the NuElectronPXSec xsec algorithm.
+
+Configurable Parameters:
+....................................................................................
+Name           Type     Optional   Comment                 Default
+WeinbergAngle  double   No                                 CommonParam[WeakInt]
+....................................................................................
+-->
+
+  <param_set name="Velocity0"> 
+    <param type="string"  name="CommonParam"> BoostedDarkMatter  </param>
+
+     <param type="alg"  name="XSec-Integrator"> genie::DMElectronXSec/Default  </param>
+     <param type="int"  name="velocity-mode">            0      </param>
+  </param_set>
+  <param_set name="Velocity2"> 
+    <param type="string"  name="CommonParam"> BoostedDarkMatter  </param>
+
+     <param type="alg"  name="XSec-Integrator"> genie::DMElectronXSec/Default  </param>
+     <param type="int"  name="velocity-mode">            2      </param>
+  </param_set>
+
+</alg_conf>
+
diff --git a/config/DMElectronXSec.xml b/config/DMElectronXSec.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+<!--
+Configuration for the DMElectronXSec xsec algorithm.
+
+Configurable Parameters:
+....................................................................................
+Name           Type     Optional   Comment                 Default
+....................................................................................
+
+
+-->
+
+  <param_set name="Default"> 
+    <param type="string" name ="gsl-integration-type">    adaptive  </param>
+    <param type="int"    name ="gsl-max-eval" >              40000  </param>
+    <param type="double" name ="gsl-relative-tolerance"  >   0.001  </param>
+  </param_set>
+
+</alg_conf>
+
diff --git a/config/EventGenerator.xml b/config/EventGenerator.xml
@@ -617,6 +617,17 @@ XSecModel                   alg     Yes  Cross section model used at the thread
      <param type="alg"    name="ILstGen">    genie::DMDISInteractionListGenerator/DM-Default        </param>
   </param_set>
 
+  <param_set name="DME"> 
+     <param type="string" name="VldContext"> </param>
+     <param type="int"    name="NModules">   5                                          </param>
+     <param type="alg"    name="Module-0">   genie::InitialStateAppender/Default        </param>
+     <param type="alg"    name="Module-1">   genie::VertexGenerator/Default             </param>
+     <param type="alg"    name="Module-2">   genie::DMEKinematicsGenerator/Default      </param>
+     <param type="alg"    name="Module-3">   genie::DMEOutgoingDarkGenerator/Default   </param>
+     <param type="alg"    name="Module-4">   genie::DMETargetRemnantGenerator/Default   </param>
+     <param type="alg"    name="ILstGen">    genie::DMEInteractionListGenerator/DME  </param>
+  </param_set>
+
   <!-- Very Low Energy Event Generation -->
 
   <param_set name="VLE">

diff --git a/config/EventGeneratorListAssembler.xml b/config/EventGeneratorListAssembler.xml
@@ -458,11 +458,24 @@ Generator-%d                alg     No
      <param type="alg" name="Generator-0">   genie::EventGenerator/DMDIS    </param>
   </param_set>
 
-  <param_set name="DM">
+  <param_set name="DME">
+     <param type="int" name="NGenerators">   1                              </param>
+     <param type="alg" name="Generator-0">   genie::EventGenerator/DME     </param>
+  </param_set>
+
+  <param_set name="DMHAD">
      <param type="int" name="NGenerators">   2                              </param>
      <param type="alg" name="Generator-0">   genie::EventGenerator/DMEL     </param>
      <param type="alg" name="Generator-1">   genie::EventGenerator/DMDIS    </param>
   </param_set>
 
+  <param_set name="DM">
+     <param type="int" name="NGenerators">   3                              </param>
+     <param type="alg" name="Generator-0">   genie::EventGenerator/DMEL     </param>
+     <param type="alg" name="Generator-1">   genie::EventGenerator/DMDIS    </param>
+     <param type="alg" name="Generator-2">   genie::EventGenerator/DME      </param>
+  </param_set>
+
+
 </alg_conf>
 
diff --git a/config/GDM18_00a/ModelConfiguration.xml b/config/GDM18_00a/ModelConfiguration.xml
@@ -137,6 +137,7 @@ STFC, Rutherford Appleton Laboratory
 
     <param type="alg" name="XSecModel@genie::EventGenerator/DMEL">         genie::AhrensDMELPXSec/Velocity0          </param>
   <param type="alg" name="XSecModel@genie::EventGenerator/DMDIS">         genie::QPMDMDISPXSec/Velocity0            </param>
+  <param type="alg" name="XSecModel@genie::EventGenerator/DME">            genie::DMElectronPXSec/Velocity0      </param>
 
  </param_set>
 

diff --git a/config/GDM18_00a/TuneGeneratorList.xml b/config/GDM18_00a/TuneGeneratorList.xml
@@ -47,9 +47,10 @@ Generator-%d                alg     No
 -->
 
   <param_set name="Default"> 
-    <param type="int" name="NGenerators">   2                                  </param>
+    <param type="int" name="NGenerators">   3                                  </param>
      <param type="alg" name="Generator-0">   genie::EventGenerator/DMEL     </param>
      <param type="alg" name="Generator-1">   genie::EventGenerator/DMDIS    </param>    
+     <param type="alg" name="Generator-2">   genie::EventGenerator/DME      </param>    
   </param_set>
 
 </tune_generator_list>

diff --git a/config/GDM18_00b/ModelConfiguration.xml b/config/GDM18_00b/ModelConfiguration.xml
@@ -135,8 +135,9 @@ STFC, Rutherford Appleton Laboratory
   <param type="alg" name="XSecModel@genie::EventGenerator/NucleonDecay">   genie::DummyPXSec/Default             </param>
   <param type="alg" name="XSecModel@genie::EventGenerator/NNBarOsc">       genie::NNBarOscDummyPXSec/Default     </param>
 
-    <param type="alg" name="XSecModel@genie::EventGenerator/DMEL">         genie::AhrensDMELPXSec/Velocity2          </param>
+  <param type="alg" name="XSecModel@genie::EventGenerator/DMEL">         genie::AhrensDMELPXSec/Velocity2          </param>
   <param type="alg" name="XSecModel@genie::EventGenerator/DMDIS">         genie::QPMDMDISPXSec/Velocity2            </param>
+  <param type="alg" name="XSecModel@genie::EventGenerator/DME">            genie::DMElectronPXSec/Velocity2      </param>
 
  </param_set>
 

diff --git a/config/GDM18_00b/TuneGeneratorList.xml b/config/GDM18_00b/TuneGeneratorList.xml
@@ -47,9 +47,10 @@ Generator-%d                alg     No
 -->
 
   <param_set name="Default"> 
-    <param type="int" name="NGenerators">   2                                  </param>
+    <param type="int" name="NGenerators">   3                                  </param>
      <param type="alg" name="Generator-0">   genie::EventGenerator/DMEL     </param>
      <param type="alg" name="Generator-1">   genie::EventGenerator/DMDIS    </param>    
+     <param type="alg" name="Generator-2">   genie::EventGenerator/DME      </param>    
   </param_set>
 
 </tune_generator_list>