From 80da6ac577270830fdb981740a313a03679dd053 Mon Sep 17 00:00:00 2001
From: juacrumar <juacrumar@lairen.eu>
Date: Fri, 17 Jun 2022 11:32:22 +0200
Subject: [PATCH] be explicit on what the jacobian does

---
 new_grids/inputE866deutnlo.dat |  2 +-
 new_grids/inputE866nlo.dat     |  2 +-
 new_grids/inputE906deutnlo.dat |  2 +-
 new_grids/inputE906nlo.dat     |  2 +-
 src/Vrap.C                     |  9 +++++++--
 src/integration.h              | 14 +++++++++-----
 src/settings.h                 |  2 +-
 7 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/new_grids/inputE866deutnlo.dat b/new_grids/inputE866deutnlo.dat
index fb9886f..59f20e5 100644
--- a/new_grids/inputE866deutnlo.dat
+++ b/new_grids/inputE866deutnlo.dat
@@ -13,7 +13,7 @@
   
 Collider piso
 E_CM 38.8
-jacobian866 Yes
+jacobianTau2M Yes
 
 ####################################################
 # Physical Parameters
diff --git a/new_grids/inputE866nlo.dat b/new_grids/inputE866nlo.dat
index 944c276..7ed33e7 100644
--- a/new_grids/inputE866nlo.dat
+++ b/new_grids/inputE866nlo.dat
@@ -13,7 +13,7 @@
   
 Collider pp
 E_CM 38.8
-jacobian866 Yes
+jacobianTau2M Yes
 
 ####################################################
 # Physical Parameters
diff --git a/new_grids/inputE906deutnlo.dat b/new_grids/inputE906deutnlo.dat
index 00aefe3..3ef7372 100644
--- a/new_grids/inputE906deutnlo.dat
+++ b/new_grids/inputE906deutnlo.dat
@@ -13,7 +13,7 @@
   
 Collider piso
 E_CM 15.063
-jacobian866 Yes
+jacobianTau2M Yes
 
 ####################################################
 # Physical Parameters
diff --git a/new_grids/inputE906nlo.dat b/new_grids/inputE906nlo.dat
index 777cfdd..4c7a412 100644
--- a/new_grids/inputE906nlo.dat
+++ b/new_grids/inputE906nlo.dat
@@ -13,7 +13,7 @@
   
 Collider pp
 E_CM 15.06
-jacobian866 Yes
+jacobianTau2M Yes
 
 ####################################################
 # Physical Parameters
diff --git a/src/Vrap.C b/src/Vrap.C
index 849ee7b..3171486 100644
--- a/src/Vrap.C
+++ b/src/Vrap.C
@@ -55,7 +55,7 @@ VrapOptionsHandler::VrapOptionsHandler(){
 	add(new ValueSettingOption<int>("NumberOfYPoints",nbrYPnts,"Sets the number of rapidity values at which to compute."));
 	add(new multipleValueOption<int>("PrintDirection",direction,"Forward",+1,"Reverse",-1,"Sets the order in which output is printed (for td). ") );  
   add(new multipleValueOption<int>("OutputFormat",o_f,"TopDrawStyle",0,"ListValues",1,"Sets the style output is printed (for td or just list dsig/dy). ") );
-	add(new yesOrNoOption("jacobian866",jacobian866,"Sets whether to use the jacobian of (sqrt(s)/M)^3."));
+	add(new yesOrNoOption("jacobianTau2M",jacobianTau2M,"Sets whether to use the jacobian of (M/sqrt(s))^3."));
 	//enableDebug();
 }
 
@@ -126,6 +126,10 @@ void printParamInfo(){
         std::cout << " PDF mode = " << pdfMode << std::endl;
     }
 
+    if (jacobianTau2M) {
+        std::cout << "(jacobianTau2M=True) Transforming the output result to M^3*dsigma/dM" << std::endl;
+    }
+
     std::cout << "-------------------------------------------------------- " << std::endl; 
 };
 
@@ -253,7 +257,8 @@ int main(int argc,char* argv[]){
 
         piner.create_grid(order_flag, pow(Q, 2), coll);
         DVector temp_ans = rap_y();
-        std::cout << "\nFinal result: " << temp_ans[0] << " +/- " << temp_ans[1] << std::endl;
+        std::cout << "\nFinal result: " << temp_ans[0] << " +/- " << temp_ans[1];
+        std::cout << std::endl;
         results << Q << " " << y << " " << temp_ans[0] << " " << temp_ans[1] << std::endl;
     }
 
diff --git a/src/integration.h b/src/integration.h
index 77e7bd5..878648a 100644
--- a/src/integration.h
+++ b/src/integration.h
@@ -623,7 +623,7 @@ DVector int_y(double xil, double xiu){
  return result;
 }
 
-// Routine computes d sigma/dM/dy, plus errors:
+// Routine computes d sigma/dsqrt(tau)/dy, plus errors:
 DVector rap_y(){
     double total, total_error;
     double prefactor = DY_prefactor(Q,alphat);
@@ -635,7 +635,7 @@ DVector rap_y(){
     }
 
     // Multiply the jacobian factor from https://github.com/NNPDF/Hawaiian_vrap/issues/10
-    if (jacobian866) {
+    if (jacobianTau2M) {
       prefactor *= pow(Q/E_CM,3);
     }
     prefactor *= sqrt(2.0)*E_CM;
@@ -712,9 +712,13 @@ DVector rap_y(){
     }
 
     if (f_quiet==0) {
-        std::cout << std::setw(8) << std::setprecision(8) <<  " y = " << y 
-            << ";   d^2sigma/dM/dy =  " << total
-            << "   pm  " << total_error << std::endl;
+        std::cout << std::setw(8) << std::setprecision(8) <<  " y = " << y;
+        if (jacobianTau2M) {
+            std::cout << ";   M^3*d^2sigma/dM/dy =  " << total;
+        } else {
+            std::cout << ";   s*d^2sigma/dsqrt(tau)/dy =  " << total;
+        }
+        std::cout << "   pm  " << total_error << std::endl;
     }
 
     result.fill(2,total,total_error);
diff --git a/src/settings.h b/src/settings.h
index 60f3810..e10c51b 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -40,7 +40,7 @@ std::string pdfFile;
 
 bool useMyAlphaRunning = false;
 bool useOtherPDF;
-bool jacobian866 = false;
+bool jacobianTau2M = false;
 int pdfSet;
 int parton_flag; // 1: all, 2:qqbar 3: qg 4: gg 5:qq 6: qqbar_plus_qq