GENIE-MC · idkakorin · Jul 5, 2024 · Jul 6, 2024 · Jul 7, 2024 · Jul 7, 2024
diff --git a/config/HybridXSecAlgorithm.xml b/config/HybridXSecAlgorithm.xml
diff --git a/config/LwlynSmithIsoFFCC.xml b/config/LwlynSmithIsoFFCC.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+<!--
+Configuration sets for Llewellyn-Smith QEL CC form factors with isoscalar nucleon
+
+Configurable Parameters:
+..........................................................................................................
+Name                          Type     Optional   Comment                     Default
+..........................................................................................................
+ElasticFormFactorsModel       alg      No         Elastic form factors model  CommonParam[ElasticFF]
+UseElFFTransverseEnhancement  bool     No                                     CommonParam[ElasticFF]
+TransverseEnhancement         alg      No         TransverseEnhancement model CommonParam[ElasticFF]
+AxialFormFactorModel          alg      No         Axial form factor model     
+AnomMagnMoment-P              double   No                                     CommonParam[MagnMoments]
+AnomMagnMoment-N              double   No                                     CommonParam[MagnMoments]
+WeinbergAngle                 double   No         Weinberg angle              CommonParam[WeakInt]
+SU3-D                         double   No                                     CommonParam[StrongInt]
+SU3-F                         double   No                                     CommonParam[StrongInt]
+IsCCFormFactors               bool     Yes        CC(true)/EM(false) FF       true
+-->
+
+    <param_set name="Default"> 
+    <param type="string" name="CommonParam"> WeakInt,MagnMoments,StrongInt,ElasticFF </param>
+
+    <!-- 
+	 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	 Axial form factors used for QEL CC cross section calculation.
+	 Options are:
+	 - genie::DipoleAxialFormFactorModel
+	 - genie::ZExpAxialFormFactorModel, Bhattacharya, Paz, and Hill, Phys.Rev. D84 (2011) 073006 
+	 - genie::MArunAxialFormFactorModel, Kakorin,Kuzmin,Naumov, Eur.Phys.J.C 81 (2021) 1142
+	 <param type="alg" name="AxialFormFactorModel"> genie::ZExpAxialFormFactorModel/Default </param>
+    -->
+  </param_set>
+
+  <param_set name="Dipole"> 
+     <param type="alg" name="AxialFormFactorModel"> genie::DipoleAxialFormFactorModel/Default </param>
+  </param_set>
+
+  <param_set name="ZExp"> 
+     <param type="alg" name="AxialFormFactorModel"> genie::ZExpAxialFormFactorModel/Default </param>
+  </param_set>
+
+  <param_set name="RunningMA"> 
+     <param type="alg" name="AxialFormFactorModel"> genie::MArunAxialFormFactorModel/Default </param>
+  </param_set>
+
+  <param_set name="MK-CC"> 
+    <param type="alg"  name="ElasticFormFactorsModel">  genie::GalsterELFormFactorsModel/MK       </param> 
+    <param type="alg"  name="AxialFormFactorModel">     genie::DipoleAxialFormFactorModel/MK      </param>
+    <param type="bool" name="IsCCFormFactors">          true                                      </param>
+ </param_set>
+
+  <param_set name="MK-EM"> 
+    <param type="alg"  name="ElasticFormFactorsModel">  genie::GalsterELFormFactorsModel/MK       </param>
+    <param type="alg"  name="AxialFormFactorModel">     genie::DipoleAxialFormFactorModel/MK      </param> 
+    <param type="bool" name="IsCCFormFactors">          false                                      </param>
+ </param_set>
+
+
+</alg_conf>
+
diff --git a/config/LwlynSmithQELCCPXSec.xml b/config/LwlynSmithQELCCPXSec.xml
@@ -14,6 +14,8 @@ XSec-Integrator    alg      No
 CabibboAngle       double   No         Cabibbo angle                    CommonParam[CKM]
 QEL-CC-XSecScale   double   yes        XSec Scaling factor for CC       1. 
 QEL-NC-XSecScale   double   yes        XSec Scaling factor for NC       1. 
+PreciseLeptonPol   bool     Yes        Do precise calculation of        No
+                                       lepton polarization
 
 .....................................................................................................
 Parameters needed when Integrating with this model to generate splines:
@@ -40,12 +42,16 @@ IntegralNuclearInfluenceCutoffEnergy double   No
 
      <param type="alg" name = "PauliBlockerAlg"> genie::PauliBlocker/Default </param>
      <param type="bool" name = "DoPauliBlocking"> true </param>
-
+     <param type="bool" name="PreciseLeptonPol"> true  </param>
   </param_set>
 
   <param_set name="Dipole"> 
      <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithFFCC/Dipole </param>
   </param_set>
+
+  <param_set name="IsoscalarDipole"> 
+     <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithIsoFFCC/Dipole </param>
+  </param_set>
 
   <!-- Legacy configuration for use with the historic default tunes (G00_X) -->
   <param_set name="DipoleAndOldIntegrator">
@@ -56,12 +62,15 @@ IntegralNuclearInfluenceCutoffEnergy double   No
 
   <param_set name="ZExp"> 
      <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithFFCC/ZExp </param>
-
+  </param_set>
+
+  <param_set name="IsoscalarZExp"> 
+     <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithIsoFFCC/ZExp </param>
   </param_set>
 
+  <!-- This configuration is suitable only for nuclear targets -->
   <param_set name="RunningMA"> 
      <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithFFCC/RunningMA </param>
-
   </param_set>
 
 </alg_conf>
diff --git a/config/MKFFCC.xml b/config/MKFFCC.xml
diff --git a/config/MKFFEM.xml b/config/MKFFEM.xml
diff --git a/config/MKSPPPXSec2020.xml b/config/MKSPPPXSec2020.xml
@@ -59,8 +59,8 @@ XSec-Integrator             alg     No
     <param type="double" name="RES-Mv">   0.840    </param>
     <param type="double" name="RES-CA50"> 0.882856 </param>
 <!-- Parameters for background contribution   -->
-    <param type="alg"    name="CCFormFactorsAlg">         genie::MKFFCC/Default                     </param>
-    <param type="alg"    name="EMFormFactorsAlg">         genie::MKFFEM/Default                     </param>
+    <param type="alg"    name="CCFormFactorsAlg">         genie::LwlynSmithIsoFFCC/MK-CC                     </param>
+    <param type="alg"    name="EMFormFactorsAlg">         genie::LwlynSmithIsoFFCC/MK-EM                     </param>
 
 <!-- Helicity amplitudes models -->
     <param type="alg"    name="HelictyAmplCCAlg">    genie::RSHelicityAmplModelCC/Default           </param>

diff --git a/config/Messenger.xml b/config/Messenger.xml
@@ -154,6 +154,7 @@
   <priority msgstream="MuELoss">               NOTICE </priority>
   <priority msgstream="MultProb">              INFO   </priority>
   <priority msgstream="Nieves">                NOTICE </priority>
+  <priority msgstream="SuSAv2QE">              NOTICE </priority>
   <priority msgstream="NucDeEx">               WARN   </priority>
   <priority msgstream="NucleonDecay">          NOTICE </priority>
   <priority msgstream="ResonanceDecay">        WARN </priority>

diff --git a/config/Messenger_inuke_verbose.xml b/config/Messenger_inuke_verbose.xml
@@ -130,6 +130,7 @@
   <priority msgstream="MuELoss">               NOTICE </priority>
   <priority msgstream="MultProb">              INFO   </priority>
   <priority msgstream="Nieves">                NOTICE </priority>
+  <priority msgstream="SuSAv2QE">              NOTICE </priority>
   <priority msgstream="NucDeEx">               NOTICE </priority>
   <priority msgstream="NucleonDecay">          NOTICE </priority>
   <priority msgstream="ResonanceDecay">        NOTICE </priority>

diff --git a/config/Messenger_laconic.xml b/config/Messenger_laconic.xml
@@ -148,6 +148,7 @@
   <priority msgstream="MuELoss">                       WARN   </priority>
   <priority msgstream="MultProb">                      WARN   </priority>
   <priority msgstream="Nieves">                        WARN   </priority>
+  <priority msgstream="SuSAv2QE">                      WARN   </priority>
   <priority msgstream="NucDeEx">                       WARN   </priority>
   <priority msgstream="NucleonDecay">                  WARN   </priority>
   <priority msgstream="ResonanceDecay">                WARN   </priority>

diff --git a/config/Messenger_rambling.xml b/config/Messenger_rambling.xml
@@ -147,6 +147,7 @@
   <priority msgstream="MuELoss">               NOTICE </priority>
   <priority msgstream="MultProb">              INFO   </priority>
   <priority msgstream="Nieves">                NOTICE </priority>
+  <priority msgstream="SuSAv2QE">              NOTICE </priority>
   <priority msgstream="NucDeEx">               NOTICE </priority>
   <priority msgstream="NucleonDecay">          NOTICE </priority>
   <priority msgstream="ResonanceDecay">        NOTICE </priority>

diff --git a/config/Messenger_whisper.xml b/config/Messenger_whisper.xml
@@ -146,6 +146,7 @@
   <priority msgstream="MuELoss">               FATAL </priority>
   <priority msgstream="MultProb">              FATAL </priority>
   <priority msgstream="Nieves">                FATAL </priority>
+  <priority msgstream="SuSAv2QE">              FATAL </priority>
   <priority msgstream="NucDeEx">               FATAL </priority>
   <priority msgstream="NucleonDecay">          FATAL </priority>
   <priority msgstream="ResonanceDecay">        FATAL </priority>

diff --git a/config/NievesQELCCPXSec.xml b/config/NievesQELCCPXSec.xml
@@ -6,16 +6,17 @@
 Configuration for the Nieves QEL CCP xsec algorithm.
 
 Configurable Parameters:
-.....................................................................................................
-Name               Type     Optional   Comment                          Default
-.....................................................................................................
-FormFactorsAlg     alg      No         QEL form factors algorithm
-XSec-Integrator    alg      No
-CabibboAngle       double   No         Cabibbo angle                    CommonParam[CKM]
-RPA                bool     Yes        Turn RPA effects on or off       true
-Coulomb            bool     Yes        Turn coulomb effects on or off   true
-QEL-CC-XSecScale   double   Yes        Scaling factor for CC            GPL value
-QEL-NC-XSecScale   double   Yes        Scaling factor for NC            GPL value
+...................................................................................................................
+Name               Type     Optional   Comment                                               Default
+...................................................................................................................
+FormFactorsAlg     alg      No         QEL form factors algorithm                            
+XSec-Integrator    alg      No                                                               
+CabibboAngle       double   No         Cabibbo angle                                         CommonParam[CKM]
+RPA                bool     Yes        Turn RPA effects on or off                            true
+Coulomb            bool     Yes        Turn coulomb effects on or off                        true
+QEL-CC-XSecScale   double   Yes        Scaling factor for CC                                 GPL value
+PreciseLeptonPol   bool     Yes        Do precise calculation of lepton polarization         No
+LindhardFunction   string   Yes        Which Lindhard functions to use?                      OriginalByNieves                               
 
 .....................................................................................................
 Parameters needed when Integrating with this model to generate splines:
@@ -35,29 +36,52 @@ RmaxMode                             string   Yes        Method to use to comput
     <param type="string"  name="CommonParam"> CKM,FermiGas,NUCL </param>
 
     <param type="double" name="QEL-CC-XSecScale"> 1.000 </param>
-    <param type="double" name="QEL-NC-XSecScale"> 1.000 </param>
 
     <param type="alg"  name="XSec-Integrator"> genie::NewQELXSec/Default </param>
     <param type="alg"  name="IntegralNuclearModel"> genie::NuclearModelMap/Default </param>
     <param type="string" name="IntegralNucleonBindingMode"> UseNuclearModel </param>
     <param type="double" name = "IntegralNuclearInfluenceCutoffEnergy"> 10.0 </param>
 
-    <param type="bool" name="RPA">             true                          </param>
+    <param type="bool" name="RPA">             true                         </param>
     <param type="bool" name="Coulomb">         true                         </param>
-    <param type="bool" name="PrintDebugData">  false                          </param>
 
     <param type="alg" name = "PauliBlockerAlg"> genie::PauliBlocker/Default </param>
     <param type="bool" name = "DoPauliBlocking"> true </param>
 
     <!-- Use the same Rmax as in genie::VertexGenerator -->
     <param type="string" name = "RmaxMode"> VertexGenerator </param>
+
+    <param type="bool" name="PreciseLeptonPol"> true  </param>
+    <param type="string" name = "LindhardFunction"> OriginalByNieves </param>
 
     <!-- Use the same Rmax as in Nieves' original paper
       <param type="string" name = "RmaxMode"> Nieves </param>
     -->
 
   </param_set>
 
+  <param_set name="IsoscalarDipole">
+    <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithIsoFFCC/Dipole </param>
+  </param_set>
+
+  <param_set name = "IsoscalarDipoleNoRPA">
+    <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithIsoFFCC/Dipole </param>    
+    <param type="bool" name="RPA">            false                        </param>
+  </param_set>
+
+  <param_set name = "IsoscalarDipoleNoCoulomb">
+    <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithIsoFFCC/Dipole </param>    
+    <param type="bool" name="Coulomb">        false                        </param>
+  </param_set>
+
+  <param_set name = "IsoscalarDipoleNoPauli">
+    <param type="alg"  name="FormFactorsAlg">  genie::LwlynSmithIsoFFCC/Dipole </param>    
+    <param type="bool" name="DoPauliBlocking"> false                        </param>
+  </param_set>
+
+  <param_set name="IsoscalarZExp">
+    <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithIsoFFCC/ZExp </param>
+  </param_set>
 
   <param_set name="Dipole">
     <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithFFCC/Dipole </param>
@@ -82,5 +106,4 @@ RmaxMode                             string   Yes        Method to use to comput
     <param type="alg"  name="FormFactorsAlg"> genie::LwlynSmithFFCC/ZExp </param>
   </param_set>
 
-
 </alg_conf>
diff --git a/config/NievesQELCCXSec.xml b/config/NievesQELCCXSec.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<alg_conf>
+
+<!--
+Configuration for the NievesQELCCXSec xsec algorithm.
+
+Configurable Parameters:
+.....................................................................................................
+Name                          Type     Optional   Comment                                      Default
+
+gsl-integration-type          string    Yes       name of GSL numerical integrator             adaptive
+                                                  (adaptive, vegas, miser, plain)              
+gsl-max-eval                  int       Yes       GSL maximal number of function calls         1000000
+gsl-min-eval                  int       Yes       GSL minimal number of function calls         7500
+gsl-relative-tolerance        double    Yes       relative tolerance of integration            1e-4
+
+gsl-1dim-integration-type     string    Yes       name of GSL numerical integrator             adaptive
+gsl-1dim-max-eval             int       Yes       GSL maximal number of function calls         1000000
+gsl-1dim-relative-tolerance   double    Yes       relative tolerance of integration            1e-4
+.....................................................................................................
+-->
+
+  <param_set name="Default"> 
+    <param type="string" name = "gsl-integration-type"> adaptive </param>
+    <param type="double" name = "gsl-relative-tolerance"> 1e-4 </param>
+    <param type="int"    name = "gsl-min-eval"> 7500 </param>
+    <param type="int"    name = "gsl-max-eval"> 1000000 </param>
+
+    <param type="string" name = "gsl-1dim-integration-type"> adaptive </param>
+    <param type="double" name = "gsl-1dim-relative-tolerance"> 1e-4 </param>
+    <param type="int"    name = "gsl-1dim-max-eval"> 1000000 </param>
+
+  </param_set>
+
+
+
+
+</alg_conf>
diff --git a/config/NievesSimoVacasMECPXSec2016.xml b/config/NievesSimoVacasMECPXSec2016.xml
@@ -14,6 +14,8 @@ MEC-CC-XSecScale      double   Yes        XSec Scaling factor              GPL v
 MECScaleAlg           alg      Yes        XSecScale algorithm used         The cross section is not scaled
                                           to scale the cross section
 QvalueShifterAlg      algo     yes        Possible Qshift algo             none
+PreciseLeptonPol      bool     Yes        Do precise calculation of        No
+                                          lepton polarization
 -->
   <param_set name="Default"> 
       <param type="alg"  name="NumericalIntegrationAlg"> genie::MECXSec/Default </param>
@@ -22,6 +24,9 @@ QvalueShifterAlg      algo     yes        Possible Qshift algo             none
 
       <param type="double" name="MEC-CC-XSecScale"> 1.000 </param>
       <param type="double" name="MEC-NC-XSecScale"> 1.000 </param>
+
+      <param type="bool" name="PreciseLeptonPol"> true  </param>
+
 
   </param_set>
 

diff --git a/config/PaisQELLambdaPXSec.xml b/config/PaisQELLambdaPXSec.xml
@@ -9,6 +9,8 @@ Algorithm Configurable Parameters:
 ......................................................................................................
 Name               Type    Optional   Comment                          Default
 ......................................................................................................
+PreciseLeptonPol   bool     Yes        Do precise calculation of        No
+                                       lepton polarization
 XSec-Integrator    alg     No         xsection integration algorithm
 -->
 
@@ -18,6 +20,7 @@ XSec-Integrator    alg     No         xsection integration algorithm
 
      <param type="alg"  name="FormFactorsAlg">  genie::LwlynSmithFFDeltaS/Default </param>
      <param type="alg"  name="XSec-Integrator"> genie::QELXSec/Default            </param>
+     <param type="bool" name="PreciseLeptonPol"> true  </param>
   </param_set>
 </alg_conf>