Extend n3fit and vp to deal with two different initial state distributions

.github/workflows/fitbot.yml

@@ -10,7 +10,7 @@ on:
 env:
   N3FIT_MAXNREP: 20 # total number of replicas to fit
   POSTFIT_NREP: 16 # requested replicas for postfit
-  REFERENCE_SET: NNBOT-03c99fd73-2024-07-26 # reference set for exact results
+  REFERENCE_SET: NNBOT-06f20cf6a-2024-07-26 # reference set for exact results
   STABLE_REFERENCE_SET: NNBOT-c0f99b7b3-2024-02-28 # reference set for last tag
   CONDA_PY: 312
   PYTHONHASHSEED: "0"

extra_tests/regression_fits/central_16.json

@@ -51,45 +51,45 @@
   ],
   "stop_epoch": 1100,
   "best_epoch": 1099,
-  "erf_tr": 2.6700103282928467,
-  "erf_vl": 2.596097469329834,
-  "chi2": 2.1046993732452393,
+  "erf_tr": 2.6700093746185303,
+  "erf_vl": 2.5960960388183594,
+  "chi2": 2.1047041416168213,
   "pos_state": "POS_VETO",
   "arc_lengths": [
-    1.3207828111870983,
-    1.4752518408583124,
-    1.1834879869850787,
-    1.001142499763364,
-    1.1960909456851319
+    1.3207826202191888,
+    1.4752515128602395,
+    1.1834880064420275,
+    1.0011424664941873,
+    1.1960902816154753
   ],
   "integrability": [
-    0.000920317608690574,
-    0.0009203176086889364,
-    4.833287800831698e-05,
-    0.46257802098989376,
-    0.0069634128594759925
+    0.000920316459089382,
+    0.0009203164590875224,
+    4.833296725237357e-05,
+    0.46257925033569225,
+    0.0069633987150139465
   ],
   "timing": {
     "walltime": {
-      "Total": 10.047237396240234,
+      "Total": 10.90460753440857,
       "start": 0.0,
-      "replica_set": 0.210205078125,
-      "replica_fitted": 10.047173023223877,
-      "replica_set_to_replica_fitted": 9.836967945098877
+      "replica_set": 0.22848939895629883,
+      "replica_fitted": 10.904474258422852,
+      "replica_set_to_replica_fitted": 10.675984859466553
     },
     "cputime": {
-      "Total": 11.469310126,
+      "Total": 12.365805662,
       "start": 0.0,
-      "replica_set": 0.2088275399999997,
-      "replica_fitted": 11.469243942000002,
-      "replica_set_to_replica_fitted": 11.260416402
+      "replica_set": 0.22668013299999945,
+      "replica_fitted": 12.365671202000001,
+      "replica_set_to_replica_fitted": 12.138991069000003
     }
   },
   "version": {
     "keras": "3.4.1",
     "tensorflow": "2.17.0, mkl=False",
     "numpy": "1.26.4",
-    "nnpdf": "4.0.9.post1058.dev0+0a1b331ae",
-    "validphys": "4.0.9.post1058.dev0+0a1b331ae"
+    "nnpdf": "4.0.9.post1210.dev0+d36bcce78",
+    "validphys": "4.0.9.post1210.dev0+d36bcce78"
   }
 }

extra_tests/regression_fits/diagonal_45.json

@@ -51,45 +51,45 @@
   ],
   "stop_epoch": 1100,
   "best_epoch": 1099,
-  "erf_tr": 3.7433669567108154,
-  "erf_vl": 3.0657339096069336,
-  "chi2": 2.176706075668335,
+  "erf_tr": 3.7433693408966064,
+  "erf_vl": 3.065732717514038,
+  "chi2": 2.1767027378082275,
   "pos_state": "POS_VETO",
   "arc_lengths": [
-    1.31744014798244,
-    1.5070503935489326,
-    1.1761950076336678,
-    1.0013647217831656,
-    1.2246978602489684
+    1.3174405034929306,
+    1.5070529634387448,
+    1.1761946839779471,
+    1.0013647273646804,
+    1.2246958247975697
   ],
   "integrability": [
-    0.0008957566533373817,
-    0.0008957566533358552,
-    4.806766594289691e-05,
-    0.463894024491309,
-    0.007004055194555159
+    0.0008957564787127614,
+    0.0008957564787128725,
+    4.80677109626626e-05,
+    0.46389447897672587,
+    0.007004046346990256
   ],
   "timing": {
     "walltime": {
-      "Total": 9.477155923843384,
+      "Total": 10.154094696044922,
       "start": 0.0,
-      "replica_set": 0.21604132652282715,
-      "replica_fitted": 9.477098941802979,
-      "replica_set_to_replica_fitted": 9.261057615280151
+      "replica_set": 0.22886013984680176,
+      "replica_fitted": 10.154032945632935,
+      "replica_set_to_replica_fitted": 9.925172805786133
     },
     "cputime": {
-      "Total": 10.790387835,
+      "Total": 11.552391722,
       "start": 0.0,
-      "replica_set": 0.21436629899999993,
-      "replica_fitted": 10.790329496999998,
-      "replica_set_to_replica_fitted": 10.575963198
+      "replica_set": 0.22704437600000027,
+      "replica_fitted": 11.552328112999998,
+      "replica_set_to_replica_fitted": 11.325283737
     }
   },
   "version": {
     "keras": "3.4.1",
     "tensorflow": "2.17.0, mkl=False",
     "numpy": "1.26.4",
-    "nnpdf": "4.0.9.post1058.dev0+0a1b331ae",
-    "validphys": "4.0.9.post1058.dev0+0a1b331ae"
+    "nnpdf": "4.0.9.post1210.dev0+d36bcce78",
+    "validphys": "4.0.9.post1210.dev0+d36bcce78"
   }
 }

extra_tests/regression_fits/feature_scaling_81.json

@@ -71,25 +71,25 @@
   ],
   "timing": {
     "walltime": {
-      "Total": 9.83653473854065,
+      "Total": 10.640647411346436,
       "start": 0.0,
-      "replica_set": 0.22139739990234375,
-      "replica_fitted": 9.836406946182251,
-      "replica_set_to_replica_fitted": 9.615009546279907
+      "replica_set": 0.2341294288635254,
+      "replica_fitted": 10.64057731628418,
+      "replica_set_to_replica_fitted": 10.406447887420654
     },
     "cputime": {
-      "Total": 11.082168318,
+      "Total": 11.966201521000002,
       "start": 0.0,
-      "replica_set": 0.2204650259999994,
-      "replica_fitted": 11.082038816,
-      "replica_set_to_replica_fitted": 10.861573790000001
+      "replica_set": 0.2321575600000001,
+      "replica_fitted": 11.966130038000003,
+      "replica_set_to_replica_fitted": 11.733972478000002
     }
   },
   "version": {
     "keras": "3.4.1",
     "tensorflow": "2.17.0, mkl=False",
     "numpy": "1.26.4",
-    "nnpdf": "4.0.9.post1058.dev0+0a1b331ae",
-    "validphys": "4.0.9.post1058.dev0+0a1b331ae"
+    "nnpdf": "4.0.9.post1210.dev0+d36bcce78",
+    "validphys": "4.0.9.post1210.dev0+d36bcce78"
   }
 }

extra_tests/regression_fits/flavour_29.json

@@ -71,25 +71,25 @@
   ],
   "timing": {
     "walltime": {
-      "Total": 4.027747869491577,
+      "Total": 4.325552940368652,
       "start": 0.0,
-      "replica_set": 0.21877336502075195,
-      "replica_fitted": 4.027618646621704,
-      "replica_set_to_replica_fitted": 3.808845281600952
+      "replica_set": 0.22845125198364258,
+      "replica_fitted": 4.325416326522827,
+      "replica_set_to_replica_fitted": 4.096965074539185
     },
     "cputime": {
-      "Total": 4.170468237,
+      "Total": 4.471941011,
       "start": 0.0,
-      "replica_set": 0.2169810080000003,
-      "replica_fitted": 4.170337463000001,
-      "replica_set_to_replica_fitted": 3.9533564550000007
+      "replica_set": 0.226811251,
+      "replica_fitted": 4.471802753,
+      "replica_set_to_replica_fitted": 4.244991502
     }
   },
   "version": {
     "keras": "3.4.1",
     "tensorflow": "2.17.0, mkl=False",
     "numpy": "1.26.4",
-    "nnpdf": "4.0.9.post1058.dev0+0a1b331ae",
-    "validphys": "4.0.9.post1058.dev0+0a1b331ae"
+    "nnpdf": "4.0.9.post1210.dev0+d36bcce78",
+    "validphys": "4.0.9.post1210.dev0+d36bcce78"
   }
 }