From a0510340049c93a4750b894a3985fd8d31c9a88a Mon Sep 17 00:00:00 2001
From: Matthew Rosenberg <rosenberg6m@gmail.com>
Date: Fri, 21 Apr 2023 21:00:12 -0500
Subject: [PATCH 01/42] updated version tag for patch release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebc66a53c..a871247b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 # cmake_policy(VERSION 3.19)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(icaruscode VERSION 09.72.00 LANGUAGES CXX)
+project(icaruscode VERSION 09.72.00.01 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="

From 255272e0edbcdb0fdb179605d9b11ecd9577d426 Mon Sep 17 00:00:00 2001
From: Gianluca Petrillo <petrillo@slac.stanford.edu>
Date: Tue, 25 Apr 2023 13:38:05 -0500
Subject: [PATCH 02/42] Fix a bug in PMT digitization

The algorithm creating readout buffers (future `raw::OpDetWaveform`) from the continuous readout was written expecting (and asserting) that a trigger primitive can't be at the first tick of the enable gate.
This was a reasonable assumption when the trigger algorithm looked for a transition from the previous tick from below to above threshold.
Now an alternative algorithm is also available which considers just the value of the sample compared to the threshold, so that expectation is violated and the assertion failed.
A small change in the algorithm makes it robust to that rare occurrence.
---
 icaruscode/PMT/Algorithms/PMTsimulationAlg.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icaruscode/PMT/Algorithms/PMTsimulationAlg.cxx b/icaruscode/PMT/Algorithms/PMTsimulationAlg.cxx
index 2ca5e229c..f318fcf94 100644
--- a/icaruscode/PMT/Algorithms/PMTsimulationAlg.cxx
+++ b/icaruscode/PMT/Algorithms/PMTsimulationAlg.cxx
@@ -560,7 +560,7 @@ icarus::opdet::PMTsimulationAlg::CreateFixedSizeOpDetWaveforms
   std::vector<BufferRange_t> buffers;
   buffers.reserve(std::distance(iNextTrigger, tend)); // worst case
   
-  auto lastBufferEnd { firstTick };
+  auto lastBufferEnd{ firstTick - detinfo::timescales::optical_time_ticks{ 1 }};
   while (iNextTrigger != tend) {
     
     BufferRange_t const buffer = makeBuffer(*iNextTrigger);

From f13967fdb79ad3e4699a82bff0e6d364b1aac67e Mon Sep 17 00:00:00 2001
From: Matthew Rosenberg <rosenberg6m@gmail.com>
Date: Wed, 26 Apr 2023 20:58:59 -0500
Subject: [PATCH 03/42] updated version tag for production patch release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a871247b8..91c76c7e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 # cmake_policy(VERSION 3.19)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(icaruscode VERSION 09.72.00.01 LANGUAGES CXX)
+project(icaruscode VERSION 09.72.00.02 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="

From ade1bb79e34ffaff3ebe1c215d86bba7c0c5e22c Mon Sep 17 00:00:00 2001
From: Matthew Rosenberg <rosenberg6m@gmail.com>
Date: Thu, 27 Apr 2023 21:34:26 -0500
Subject: [PATCH 04/42] updated tags/dependencies for production patch release

---
 CMakeLists.txt   | 2 +-
 ups/product_deps | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91c76c7e3..5d8bc2cbe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 # cmake_policy(VERSION 3.19)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(icaruscode VERSION 09.72.00.02 LANGUAGES CXX)
+project(icaruscode VERSION 09.72.00.03 LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="
diff --git a/ups/product_deps b/ups/product_deps
index bbcce340a..f585ae9c0 100644
--- a/ups/product_deps
+++ b/ups/product_deps
@@ -256,7 +256,7 @@ icarus_signal_processing	v09_63_00_02	-
 icarusalg			v09_72_00	-
 icarusutil			v09_66_02	-
 libwda				v2_30_0a	-
-sbncode				v09_72_00	-
+sbncode				v09_72_00_03	-
 cetmodules			v3_20_00	-	only_for_build
 end_product_list
 ####################################

From e6238544a3c6a1c9ffa8f80459c2c50ccfbe5c79 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Sun, 30 Apr 2023 16:28:08 -0500
Subject: [PATCH 05/42] Update ICARUS WireCell configurations to make more
 parameters configurable by fcl. Add in config for 'fit' field responses.

---
 fcl/detsim/detsim_2d_icarus_fitFR.fcl         |   3 +
 .../detsimmodules_wirecell_ICARUS.fcl         |  25 +++
 .../icarus/icarus_tools.jsonnet               | 170 ++++++++++++++++++
 .../TPC/ICARUSWireCell/icarus/params.jsonnet  |   9 +-
 .../ICARUSWireCell/icarus/simparams.jsonnet   |  17 +-
 .../icarus/wcls-decode-to-sig.jsonnet         |   2 +-
 ...pc-sim-drift-simchannel-omit-noise.jsonnet |   2 +-
 ...wcls-multitpc-sim-drift-simchannel.jsonnet |  49 ++++-
 .../icarus/wcls-sim-drift-simchannel.jsonnet  |   2 +-
 9 files changed, 254 insertions(+), 25 deletions(-)
 create mode 100644 fcl/detsim/detsim_2d_icarus_fitFR.fcl
 create mode 100644 icaruscode/TPC/ICARUSWireCell/icarus/icarus_tools.jsonnet

diff --git a/fcl/detsim/detsim_2d_icarus_fitFR.fcl b/fcl/detsim/detsim_2d_icarus_fitFR.fcl
new file mode 100644
index 000000000..0efb5f5af
--- /dev/null
+++ b/fcl/detsim/detsim_2d_icarus_fitFR.fcl
@@ -0,0 +1,3 @@
+#include "detsim_2d_icarus.fcl"
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
diff --git a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
index 4a801d6f6..14361e6c5 100644
--- a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
+++ b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
@@ -34,6 +34,7 @@ icarus_simwire_wirecell:
         // Make available parameters via Jsonnet's std.extVar()
         params: {
 	    files_fields: "garfield-icarus-fnal-rev1.json.bz2"
+	    file_rcresp: "" # use the RCResponse by default
 	}
         structs: {
             # load values from simulationservices_icarus.fcl
@@ -49,9 +50,33 @@ icarus_simwire_wirecell:
             # Scaling Parameters from int and coh noise components
 	    int_noise_scale: 1.0
 	    coh_noise_scale: 1.09
+
+            # Gain and shaping time
+            gain0: 14.9654 # mV/fC 
+            gain1: 14.9654 # mV/fC 
+            gain2: 14.9654 # mV/fC 
+
+            shaping0: 1.3 # us
+            shaping1: 1.3 # us
+            shaping2: 1.3 # us
+
+            # Time offsets for truth matching
+            time_offset_u: 1.0 # us
+            time_offset_v: 1.0 # us
+            time_offset_y: 1.0 # us
+            
         }
     }
 }
 
+icarus_simwire_wirecell_fitSR: @local::icarus_simwire_wirecell
+# Add in the ER tail
+icarus_simwire_wirecell_fitSR.wcls_main.params.file_rcresp: "icarus_fnal_rc_tail.json"
+# Add in the tuned field responses
+icarus_simwire_wirecell_fitSR.wcls_main.params.files_fields: "icarus_fnal_fit_ks.json.bz2"
+# futz with shaping+gain values
+icarus_simwire_wirecell_fitSR.wcls_main.structs.gain2: 13.2390 # mV/fC
+icarus_simwire_wirecell_fitSR.wcls_main.structs.shaping1: 1.45 # us
+
 
 END_PROLOG
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/icarus_tools.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/icarus_tools.jsonnet
new file mode 100644
index 000000000..8435fb3db
--- /dev/null
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/icarus_tools.jsonnet
@@ -0,0 +1,170 @@
+// This file provides a function which takes a params object (see
+// ../params/) and returns a data structure with a number of
+// sub-objects that may configure various WCT "tool" type componets
+// which are not INodes.
+
+// Some attributes are merely default and you may wish to override
+// them.  For example, the default IDFT FftwDFT and to instead ues
+// TorchDFT you may do something like:
+//
+// local default_tools = tools_maker(params)
+// local tools = std.mergePatch(default_tools,
+//   {dft: {type: "TorchDFT", data: {device: "gpu"}}});
+// 
+
+local wc = import "wirecell.jsonnet";
+
+function(params)
+{
+    // The IRandom pRNG
+    random : {
+        type: "Random",
+        data: {
+            generator: "default",
+            seeds: [0,1,2,3,4],
+        }
+    },
+    // The IDFT FFT implementation 
+    dft : {
+        type: "FftwDFT",
+    },
+
+    // One FR per field file.
+    fields : std.mapWithIndex(function (n, fname) {
+        type: "FieldResponse",
+        name: "field%d"%n,
+        data: { filename: fname }
+    }, params.files.fields),
+
+    field: $.fields[0],         // the nominal field
+
+    // The number of ticks for response waveforms.  For simulation
+    // this must be enlarged beyond what is wanted in the output
+    // readout in order to accept catch early activity into the first
+    // few readout ticks.  When responses are used to deconvolve then
+    // this should best be shortened.  Note: sigproc at time of
+    // writing did not use components for Elec or RC so are not
+    // currently subject to this config.
+    local sim_response_binning = {
+        tick: params.daq.tick,
+        nticks: params.sim.ductor.nticks, // MUST match ductor
+    },
+
+    perchanresp : {
+        type: "PerChannelResponse",
+        data: {
+            filename: params.files.chresp,
+        }
+    },
+    // It's a little awkward to NOT use PerChannelResponse because you
+    // need to give an empty string to a component that wants to use
+    // it an an empty list to the "uses".  Here we package that little
+    // "if" branch.  It's a general pattern not specific to this
+    // object.  Might want to make wc.tn() convert "null" into "" and
+    // g.uses() convert [null] into [].
+    perchanresp_nameuses : if std.type(params.files.chresp) == 'null'
+    then {name:"", uses:[]}
+    else {name:wc.tn(self.perchanresp), uses:[self.perchanresp]},
+
+
+    wires : {
+        type: "WireSchemaFile",
+        data: { filename: params.files.wires }
+    },
+
+    elec_resp : std.mapWithIndex(function (n, e) {
+        type: if std.objectHas(e, "type")
+              then e.type
+              else "ColdElecResponse", // default
+        data: sim_response_binning {
+            shaping: e.shaping,
+            gain: e.gain,
+            postgain: e.postgain,
+            filename: if std.objectHas(e, "filename")
+                      then e.filename
+                      else ""
+        },
+    }, params.elec),
+
+    rc_resp : {
+        type: if std.objectHas(params, 'rc_resp') && std.objectHas(params.rc_resp, "type")
+              then params.rc_resp.type
+              else "RCResponse", // default
+        data: std.prune(sim_response_binning {
+            width: if std.objectHas(params, 'rc_resp') && std.objectHas(params.rc_resp, 'width')
+            then params.rc_resp.width else null,
+
+            filename: if std.objectHas(params, 'rc_resp') && std.objectHas(params.rc_resp, 'filename')
+            then params.rc_resp.filename else null,
+
+            postgain: if std.objectHas(params, 'rc_resp') && std.objectHas(params.rc_resp, 'postgain')
+            then params.rc_resp.postgain else null,
+
+            start: if std.objectHas(params, 'rc_resp') && std.objectHas(params.rc_resp, 'start')
+            then params.rc_resp.start else null,
+        })
+    },
+
+
+    sys_resp : {
+        type: "ResponseSys",
+        data: sim_response_binning {
+            start: params.sys_resp.start,
+            magnitude: params.sys_resp.magnitude,
+            time_smear: params.sys_resp.time_smear,
+        }
+    },
+
+    // there is one trio of PIRs (one per wire plane in a face) for
+    // each field response.  WARNING/fixme: this sets the default DFT
+    // with no way to override!  This config structure needs a redo!
+    pirs : std.mapWithIndex(function (n, fr) [
+        {
+            type: "PlaneImpactResponse",
+            name : "PIR%splane%d" % [fr.name, plane],
+            data : sim_response_binning {
+                plane: plane,
+                dft: wc.tn($.dft),
+                field_response: wc.tn(fr),
+                // note twice we give rc so we have rc^2 in the final convolution
+                short_responses: if params.sys_status == false
+                                    then [wc.tn($.elec_resp[n])]
+                                    else [wc.tn($.elec_resp[n]), wc.tn($.sys_resp)],
+		overall_short_padding: if std.objectHas(params, 'overall_short_padding')
+                                    then params.overall_short_padding
+                                    else if params.sys_status == false
+                                    then 0.1*wc.ms
+                                    // cover the full time range of the convolved short responses
+                                    else 0.1*wc.ms - params.sys_resp.start,
+		// long_responses: [wc.tn($.rc_resp), wc.tn($.rc_resp)],
+        long_responses: if std.objectHas(params, 'rc_resp')
+        then std.makeArray(params.rc_resp.rc_layers, function(x) wc.tn($.rc_resp))
+        else [wc.tn($.rc_resp), wc.tn($.rc_resp)],
+		long_padding: 1.5*wc.ms,
+	    },
+            uses: [$.dft, fr, $.elec_resp[n], $.rc_resp, $.sys_resp],
+        } for plane in [0,1,2]], $.fields),
+
+    // One anode per detector "volume"
+    anodes : [{
+        type : "AnodePlane",
+        name : vol.name,
+        data : {
+            // This ID is used to pick out which wires in the
+            // WireSchema belong to this anode plane.
+            ident : vol.wires,
+            nimpacts: params.sim.nimpacts,
+            // The wire schema file
+            wire_schema: wc.tn($.wires),
+
+            faces : vol.faces,
+        },
+        uses: [$.wires],
+    } for vol in params.det.volumes],
+
+    // Arbitrarily call out the first anode to make single-anode
+    // detector config slightly cleaner.
+    anode: $.anodes[0],
+
+}
+
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/params.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/params.jsonnet
index 8c14af849..9acd1faba 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/params.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/params.jsonnet
@@ -84,15 +84,16 @@ base {
         fullscale: [0.8*wc.millivolt, 3.3*wc.volt],
     },
 
-    elec: super.elec {
+    elec: [super.elec {
         type: "WarmElecResponse",
-        // gain: 17.8075*wc.mV/wc.fC, // 0.027 fC/(ADC*us)
-        // Set gain to (roughly) match data ADC values (docdb 25161)
+        // Old values:
+        //   ICARUS nominal: 17.8075*wc.mV/wc.fC // 0.027 fC/(ADC*us)
+        //   Match data ADC values (docdb 25161): 14.9654*wc.mV/wc.fC, // 0.0321 fC/(ADC*us)
         gain: 14.9654*wc.mV/wc.fC, // 0.0321 fC/(ADC*us)
         shaping: 1.3*wc.us,
         postgain: 1.0,
         start: 0,
-    },
+    }, for _ in [0, 1, 2]],
 
 
     sim: super.sim {
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/simparams.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/simparams.jsonnet
index 80e53eebb..dd9b0619b 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/simparams.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/simparams.jsonnet
@@ -39,15 +39,6 @@ base {
   //    chresp: null,
   //},
 
-  // This sets a relative gain at the input to the ADC.  Note, if
-  // you are looking to fix SimDepoSource, you are in the wrong
-  // place.  See the "scale" parameter of wcls.input.depos() defined
-  // in pgrapher/common/ui/wcls/nodes.jsonnet.
-  elec: super.elec {
-    // postgain: 1.0,
-    // shaping: 2.2 * wc.us,
-  },
-
   sys_status: false,
   sys_resp: {
     // overall_short_padding should take into account this offset "start".
@@ -56,8 +47,8 @@ base {
     time_smear: 1.0 * wc.us,
   },
 
-  rc_resp: {
-    width: 1.1*wc.ms,
-    rc_layers: 1,
-  }
+   rc_resp: {
+     width: 1.1*wc.ms,
+     rc_layers: 1,
+   }
 }
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-decode-to-sig.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-decode-to-sig.jsonnet
index 5fe7ec897..f7ecc2f79 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-decode-to-sig.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-decode-to-sig.jsonnet
@@ -41,7 +41,7 @@ local params = params_init {
   },
 };
 
-local tools_maker = import 'pgrapher/common/tools.jsonnet';
+local tools_maker = import 'pgrapher/experiment/icarus/icarus_tools.jsonnet';
 local tools = tools_maker(params);
 
 local wcls_maker = import 'pgrapher/ui/wcls/nodes.jsonnet';
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-omit-noise.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-omit-noise.jsonnet
index 0fd6b5521..de5bbfdd9 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-omit-noise.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel-omit-noise.jsonnet
@@ -7,7 +7,7 @@ local f = import 'pgrapher/common/funcs.jsonnet';
 local wc = import 'wirecell.jsonnet';
 
 local io = import 'pgrapher/common/fileio.jsonnet';
-local tools_maker = import 'pgrapher/common/tools.jsonnet';
+local tools_maker = import 'pgrapher/experiment/icarus/tools.jsonnet';
 // local params = import 'pgrapher/experiment/icarus/simparams.jsonnet';
 local base = import 'pgrapher/experiment/icarus/simparams.jsonnet';
 local params = base {
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet
index 0d90c1e46..227f17e9d 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet
@@ -7,9 +7,29 @@ local f = import 'pgrapher/common/funcs.jsonnet';
 local wc = import 'wirecell.jsonnet';
 
 local io = import 'pgrapher/common/fileio.jsonnet';
-local tools_maker = import 'pgrapher/common/tools.jsonnet';
+local tools_maker = import 'pgrapher/experiment/icarus/icarus_tools.jsonnet';
 // local params = import 'pgrapher/experiment/icarus/simparams.jsonnet';
 local base = import 'pgrapher/experiment/icarus/simparams.jsonnet';
+
+// load the electronics response parameters
+local er_params = [
+  {
+    gain: std.extVar('gain0')*wc.mV/wc.fC,
+    shaping: std.extVar('shaping0')*wc.us,
+  },
+
+  {
+    gain: std.extVar('gain1')*wc.mV/wc.fC,
+    shaping: std.extVar('shaping1')*wc.us,
+  },
+
+  {
+    gain: std.extVar('gain2')*wc.mV/wc.fC,
+    shaping: std.extVar('shaping2')*wc.us,
+  },
+];
+
+
 local params = base {
   lar: super.lar {
     // Longitudinal diffusion constant
@@ -24,6 +44,25 @@ local params = base {
   files: super.files {
     fields: [ std.extVar('files_fields'), ],
   },
+
+  rc_resp: if std.extVar('file_rcresp') != "" then
+  {
+    // "icarus_fnal_rc_tail.json"
+    filename: std.extVar('file_rcresp'),
+    postgain: 1.0,
+    start: 0.0,
+    tick: 0.4*wc.us,
+    nticks: 4255,
+    type: "JsonElecResponse",
+    rc_layers: 1
+  }
+  else super.rc_resp,
+
+  elec: std.mapWithIndex(function (n, e)
+    e + {
+      gain: er_params[n].gain,
+      shaping: er_params[n].shaping,
+    }, super.elec),
 };
 
 local tools = tools_maker(params);
@@ -181,15 +220,15 @@ local wcls_simchannel_sink = g.pnode({
 
     // GP: The shaping time of the electronics response (1.3us) shifts the peak
     //     of the field response time. Eyeballing simulation times, it does this
-    //     by a bit less than the 1.3us.
+    //     by a bit less than the 1.3us (1us).
     //
     //     N.B. for future: there is likely an additional offset on the two induction
     //     planes due to where the deconvolution precisely defines where the "peak"
     //     of the pulse is. One may want to refine these parameters to account for that.
     //     This perturbation shouldn't be more than a tick or two.
-    u_time_offset: 1.0 * wc.us,
-    v_time_offset: 1.0 * wc.us,
-    y_time_offset: 1.0 * wc.us,
+    u_time_offset: std.extVar('time_offset_u') * wc.us,
+    v_time_offset: std.extVar('time_offset_v') * wc.us,
+    y_time_offset: std.extVar('time_offset_y') * wc.us,
 
     g4_ref_time: -1500 * wc.us, // G4RefTime from detectorclocks_icarus.fcl
     use_energy: true,
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-sim-drift-simchannel.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-sim-drift-simchannel.jsonnet
index 3c67b55ab..9571169b4 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-sim-drift-simchannel.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-sim-drift-simchannel.jsonnet
@@ -11,7 +11,7 @@ local f = import 'pgrapher/common/funcs.jsonnet';
 local wc = import 'wirecell.jsonnet';
 
 local io = import 'pgrapher/common/fileio.jsonnet';
-local tools_maker = import 'pgrapher/common/tools.jsonnet';
+local tools_maker = import 'pgrapher/experiment/icarus/tools.jsonnet';
 local params = import 'pgrapher/experiment/icarus/simparams.jsonnet';
 
 local tools = tools_maker(params);

From e27f8bc13ae1bfe26d993fde7e629d88b8d35d54 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Sun, 30 Apr 2023 16:37:41 -0500
Subject: [PATCH 06/42] Add in simulation configs with RHC NuMI flux
 configuration.

---
 fcl/gen/numi/genie_icarus_numioffaxis.fcl                     | 3 +++
 fcl/gen/numi/prodcorsika_genie_protononly_icarus_numi_RHC.fcl | 3 +++
 fcl/gen/numi/simulation_genie_icarus_numi_RHC.fcl             | 3 +++
 3 files changed, 9 insertions(+)
 create mode 100644 fcl/gen/numi/prodcorsika_genie_protononly_icarus_numi_RHC.fcl
 create mode 100644 fcl/gen/numi/simulation_genie_icarus_numi_RHC.fcl

diff --git a/fcl/gen/numi/genie_icarus_numioffaxis.fcl b/fcl/gen/numi/genie_icarus_numioffaxis.fcl
index 078f4365d..34a217a26 100644
--- a/fcl/gen/numi/genie_icarus_numioffaxis.fcl
+++ b/fcl/gen/numi/genie_icarus_numioffaxis.fcl
@@ -90,6 +90,9 @@ icarus_genie_NuMI: {
 icarus_genie_NuMI_rock: @local::icarus_genie_NuMI
 icarus_genie_NuMI_rock.DetectorLocation: "icarus-numi-rock"
 
+# RHC Config
+icarus_genie_NuMI_RHC: @local::icarus_genie_NuMI
+icarus_genie_NuMI_RHC.FluxSearchPaths: "/cvmfs/sbn.osgstorage.org/pnfs/fnal.gov/usr/sbn/persistent/stash/physics/beam/GENIE/NuMI/standard/v02_00_RHC/"
 
 ################################################################################
 
diff --git a/fcl/gen/numi/prodcorsika_genie_protononly_icarus_numi_RHC.fcl b/fcl/gen/numi/prodcorsika_genie_protononly_icarus_numi_RHC.fcl
new file mode 100644
index 000000000..40da7ef21
--- /dev/null
+++ b/fcl/gen/numi/prodcorsika_genie_protononly_icarus_numi_RHC.fcl
@@ -0,0 +1,3 @@
+#include "prodcorsika_genie_protononly_icarus_numi.fcl"
+
+physics.producers.generator: @local::icarus_genie_NuMI_RHC # from `genie_icarus_numi.fcl`
diff --git a/fcl/gen/numi/simulation_genie_icarus_numi_RHC.fcl b/fcl/gen/numi/simulation_genie_icarus_numi_RHC.fcl
new file mode 100644
index 000000000..bc799bd85
--- /dev/null
+++ b/fcl/gen/numi/simulation_genie_icarus_numi_RHC.fcl
@@ -0,0 +1,3 @@
+#include "simulation_genie_icarus_numi.fcl"
+
+physics.producers.generator: @local::icarus_genie_NuMI_RHC # from `genie_icarus_numi.fcl`

From 97ae16ba14f18a265d54abbdfa2b6233a2befe93 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Sun, 30 Apr 2023 16:39:38 -0500
Subject: [PATCH 07/42] Add in standalone Calibration NTupler configs.

---
 fcl/reco/CMakeLists.txt                 |  1 +
 fcl/reco/ntuple/CMakeLists.txt          |  3 ++
 fcl/reco/ntuple/calibntupler_icarus.fcl | 49 +++++++++++++++++++++++++
 3 files changed, 53 insertions(+)
 create mode 100644 fcl/reco/ntuple/CMakeLists.txt
 create mode 100644 fcl/reco/ntuple/calibntupler_icarus.fcl

diff --git a/fcl/reco/CMakeLists.txt b/fcl/reco/CMakeLists.txt
index 975867446..de9682fc7 100644
--- a/fcl/reco/CMakeLists.txt
+++ b/fcl/reco/CMakeLists.txt
@@ -13,6 +13,7 @@ add_subdirectory(ForCITests)
 #add_subdirectory(archive)
 add_subdirectory(Definitions)
 add_subdirectory(larcv)
+add_subdirectory(ntuple)
 add_subdirectory(Stage0)
 add_subdirectory(Stage1)
 
diff --git a/fcl/reco/ntuple/CMakeLists.txt b/fcl/reco/ntuple/CMakeLists.txt
new file mode 100644
index 000000000..2bda0f610
--- /dev/null
+++ b/fcl/reco/ntuple/CMakeLists.txt
@@ -0,0 +1,3 @@
+cet_enable_asserts()
+
+install_fhicl()
diff --git a/fcl/reco/ntuple/calibntupler_icarus.fcl b/fcl/reco/ntuple/calibntupler_icarus.fcl
new file mode 100644
index 000000000..79a94843e
--- /dev/null
+++ b/fcl/reco/ntuple/calibntupler_icarus.fcl
@@ -0,0 +1,49 @@
+# Configuration for running the Calibration NTupler
+# on a stage-1 reco file
+#
+#include "stage1_icarus_defs.fcl"
+#include "services_common_icarus.fcl"
+#include "channelmapping_icarus.fcl"
+
+process_name: ntuple
+
+services:
+{
+  TFileService:           { }
+  IICARUSChannelMap:      @local::icarus_channelmappinggservice
+                          @table::icarus_wirecalibration_services
+}
+
+#source is a root file
+source:
+{
+  module_type: RootInput
+  maxEvents:  10        # Number of events to create
+  saveMemoryObjectThreshold: 0
+}
+
+# only do analysis
+physics:
+{
+
+ producers: {}
+
+ filters: {}
+
+ analyzers:
+ {
+     @table::icarus_stage1_analyzers
+ }
+
+ outana: [ @sequence::icarus_analysis_modules ]
+ reco: []
+ trigger_paths: [reco]
+ end_paths: [outana]
+}
+
+physics.analyzers.caloskimE.SelectEvents:      [  ]
+physics.analyzers.caloskimW.SelectEvents:      [  ]
+physics.analyzers.simpleLightAna.SelectEvents: [  ]
+physics.analyzers.supera.SelectEvents:         [  ]
+
+outputs: {}

From dff55125ea9c50c8e5bf20f92633a080fa2d543f Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Tue, 2 May 2023 17:11:30 -0500
Subject: [PATCH 08/42] Fix jsonnet so each plane can have independent
 gain+shaping. Tune collection gain.

---
 .../ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl  |  2 +-
 .../TPC/ICARUSWireCell/icarus/icarus_tools.jsonnet    |  7 ++++---
 .../icarus/wcls-multitpc-sim-drift-simchannel.jsonnet | 11 +++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
index 14361e6c5..899cbf58b 100644
--- a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
+++ b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
@@ -75,7 +75,7 @@ icarus_simwire_wirecell_fitSR.wcls_main.params.file_rcresp: "icarus_fnal_rc_tail
 # Add in the tuned field responses
 icarus_simwire_wirecell_fitSR.wcls_main.params.files_fields: "icarus_fnal_fit_ks.json.bz2"
 # futz with shaping+gain values
-icarus_simwire_wirecell_fitSR.wcls_main.structs.gain2: 13.2390 # mV/fC
+icarus_simwire_wirecell_fitSR.wcls_main.structs.gain2: 12.4915 # mV/fC
 icarus_simwire_wirecell_fitSR.wcls_main.structs.shaping1: 1.45 # us
 
 
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/icarus_tools.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/icarus_tools.jsonnet
index 8435fb3db..2e0d72a04 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/icarus_tools.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/icarus_tools.jsonnet
@@ -76,6 +76,7 @@ function(params)
         type: if std.objectHas(e, "type")
               then e.type
               else "ColdElecResponse", // default
+        name: "Plane%iElectronicsResponse" % n,
         data: sim_response_binning {
             shaping: e.shaping,
             gain: e.gain,
@@ -128,8 +129,8 @@ function(params)
                 field_response: wc.tn(fr),
                 // note twice we give rc so we have rc^2 in the final convolution
                 short_responses: if params.sys_status == false
-                                    then [wc.tn($.elec_resp[n])]
-                                    else [wc.tn($.elec_resp[n]), wc.tn($.sys_resp)],
+                                    then [wc.tn($.elec_resp[plane])]
+                                    else [wc.tn($.elec_resp[plane]), wc.tn($.sys_resp)],
 		overall_short_padding: if std.objectHas(params, 'overall_short_padding')
                                     then params.overall_short_padding
                                     else if params.sys_status == false
@@ -142,7 +143,7 @@ function(params)
         else [wc.tn($.rc_resp), wc.tn($.rc_resp)],
 		long_padding: 1.5*wc.ms,
 	    },
-            uses: [$.dft, fr, $.elec_resp[n], $.rc_resp, $.sys_resp],
+            uses: [$.dft, fr, $.elec_resp[plane], $.rc_resp, $.sys_resp],
         } for plane in [0,1,2]], $.fields),
 
     // One anode per detector "volume"
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet
index 227f17e9d..395c5ba5b 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet
@@ -29,7 +29,6 @@ local er_params = [
   },
 ];
 
-
 local params = base {
   lar: super.lar {
     // Longitudinal diffusion constant
@@ -58,11 +57,11 @@ local params = base {
   }
   else super.rc_resp,
 
-  elec: std.mapWithIndex(function (n, e)
-    e + {
-      gain: er_params[n].gain,
-      shaping: er_params[n].shaping,
-    }, super.elec),
+  elec: std.mapWithIndex(function (n, eparam)
+    super.elec[0] + {
+      gain: eparam.gain,
+      shaping: eparam.shaping,
+    }, er_params),
 };
 
 local tools = tools_maker(params);

From f1eb1294cc7dbb6ffd32d870bad5e94b753f0d45 Mon Sep 17 00:00:00 2001
From: Gianluca Petrillo <petrillo@slac.stanford.edu>
Date: Thu, 4 May 2023 16:42:48 -0500
Subject: [PATCH 09/42] Removed flash filter from Stage1 standard
 configuration.

Configuration of that ilter throughout the repository has been fixed.
---
 fcl/reco/Definitions/stage0_icarus_defs.fcl   |  6 +-----
 .../Definitions/stage0_icarus_defs_run1.fcl   |  6 +-----
 fcl/reco/Definitions/stage1_icarus_defs.fcl   |  8 --------
 .../Run1/stage1_multiTPC_icarus_gauss.fcl     |  3 +--
 fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl   |  3 +--
 icaruscode/Filters/run_flashfilter_data.fcl   | 20 +++++--------------
 6 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/fcl/reco/Definitions/stage0_icarus_defs.fcl b/fcl/reco/Definitions/stage0_icarus_defs.fcl
index 7d536a780..2303c17f9 100644
--- a/fcl/reco/Definitions/stage0_icarus_defs.fcl
+++ b/fcl/reco/Definitions/stage0_icarus_defs.fcl
@@ -119,11 +119,7 @@ icarus_stage0_filters:
   #
    flashfilterBNB: { module_type:         "FilterOpFlash" 
                      OpFlashProducerList: ["opflashCryoE","opflashCryoW"] 
-#                     WindowStartTime:     -1489.6 # -1489.4 - 0.2us safe margin
-#                     WindowEndTime:       -1487.6 # -1487.8 + 0.2us safe margin
-#                     WindowStartTime:     -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
-#                     WindowEndTime:       -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
-                     WindowStartTime:     -0.2 # Gate is now recentered by Gianluca/Andrea
+                     WindowStartTime:     -0.2 # 0.2us safe margin
                      WindowEndTime:        1.8 
                    }
    flashfilterNuMI: { module_type:         "FilterOpFlash" 
diff --git a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
index 37a5e2c2c..d1f857693 100644
--- a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
+++ b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
@@ -126,11 +126,7 @@ icarus_stage0_filters:
   #
    flashfilterBNB: { module_type:         "FilterOpFlash" 
                      OpFlashProducerList: ["opflashCryoE","opflashCryoW"] 
-#                     WindowStartTime:     -1489.6 # -1489.4 - 0.2us safe margin
-#                     WindowEndTime:       -1487.6 # -1487.8 + 0.2us safe margin
-#                     WindowStartTime:     -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
-#                     WindowEndTime:       -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
-                     WindowStartTime:     -0.2 # Gate is now recentered by Gianluca/Andrea
+                     WindowStartTime:     -0.2 # 0.2us safe margin
                      WindowEndTime:        1.8 
                    }
    flashfilterNuMI: { module_type:         "FilterOpFlash" 
diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl
index 5b96ba316..c6fc08c5c 100644
--- a/fcl/reco/Definitions/stage1_icarus_defs.fcl
+++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl
@@ -69,14 +69,6 @@ icarus_stage1_producers:
 
 icarus_stage1_filters:
 {
-   flashfilter: { module_type: "FilterOpFlash" 
-                  OpFlashProducerList: ["opflashCryoW","opflashCryoE"] 
-#                  WindowStartTime: -1489.6 # -1489.4 - 0.2us safe margin
-#                  WindowEndTime:   -1487.6 # -1487.8 + 0.2us safe margin
-                  WindowStartTime: -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
-                  WindowEndTime:   -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
-                }
-
    TPCHitFilterCryoW: @local::icarus_FilterNumberTPCHits
    TPCHitFilterCryoE: @local::icarus_FilterNumberTPCHits
 }
diff --git a/fcl/reco/Stage1/Run1/stage1_multiTPC_icarus_gauss.fcl b/fcl/reco/Stage1/Run1/stage1_multiTPC_icarus_gauss.fcl
index 78c91493a..d9ad45958 100644
--- a/fcl/reco/Stage1/Run1/stage1_multiTPC_icarus_gauss.fcl
+++ b/fcl/reco/Stage1/Run1/stage1_multiTPC_icarus_gauss.fcl
@@ -2,8 +2,7 @@
 
 process_name: stage1
 
-physics.reco: [ flashfilter,
-                @sequence::icarus_filter_cluster3D,
+physics.reco: [ @sequence::icarus_filter_cluster3D,
 		@sequence::icarus_pandora_Gauss,
 		@sequence::icarus_reco_fm,
                 @sequence::icarus_crttrack,
diff --git a/fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl b/fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl
index e8d37d918..45fc0d295 100644
--- a/fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl
+++ b/fcl/reco/Stage1/Run2/stage1_run2_icarus.fcl
@@ -2,8 +2,7 @@
 
 process_name: stage1
 
-physics.reco: [ flashfilter,
-                @sequence::icarus_filter_cluster3D,
+physics.reco: [ @sequence::icarus_filter_cluster3D,
                 @sequence::icarus_pandora_Gauss,
                 @sequence::icarus_reco_fm,
                 @sequence::icarus_crttrack,
diff --git a/icaruscode/Filters/run_flashfilter_data.fcl b/icaruscode/Filters/run_flashfilter_data.fcl
index 399732bf5..0246b5b48 100644
--- a/icaruscode/Filters/run_flashfilter_data.fcl
+++ b/icaruscode/Filters/run_flashfilter_data.fcl
@@ -5,15 +5,7 @@
 
 process_name: OpReco
 
-services:
-{
-  @table::icarus_basic_services
-}
-
-source:
-{
-  module_type: RootInput
-}
+services: @local::icarus_minimum_services  # from services_common_icarus.fcl
 
 physics:
 {
@@ -22,8 +14,8 @@ physics:
  {
    ophit:  @local::icarus_ophit_data
    ophitfull:    @local::icarus_ophitdebugger_data
-   opflashCryo0: @local::ICARUSSimpleFlashDataCryo0
-   opflashCryo1: @local::ICARUSSimpleFlashDataCryo1
+   opflashCryo0: @local::ICARUSSimpleFlashDataCryoE
+   opflashCryo1: @local::ICARUSSimpleFlashDataCryoW
    
  }
  analyzers: { 
@@ -33,10 +25,8 @@ physics:
  filters: {
    flashfilter: { module_type: "FilterOpFlash" 
                   OpFlashProducerList: ["opflashCryo0","opflashCryo1"] 
-#                  WindowStartTime: -1489.6 # -1489.4 - 0.2us safe margin
-#                  WindowEndTime:   -1487.6 # -1487.8 + 0.2us safe margin
-                  WindowStartTime: -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
-                  WindowEndTime:   -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
+                  WindowStartTime:     -0.2 # 0.2us safe margin
+                  WindowEndTime:        1.8
                 }
  }
 

From eb596f5bfa1c7274e9d44ebafa78b9a798ebb95b Mon Sep 17 00:00:00 2001
From: Gianluca Petrillo <petrillo@slac.stanford.edu>
Date: Thu, 4 May 2023 16:43:38 -0500
Subject: [PATCH 10/42] Updated list of FHiCL to be skipped by unit test

---
 fcl/SkipTesting.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/fcl/SkipTesting.txt b/fcl/SkipTesting.txt
index 771897663..ab365ff85 100644
--- a/fcl/SkipTesting.txt
+++ b/fcl/SkipTesting.txt
@@ -37,7 +37,6 @@ set_caf_calconst.fcl
 # This should at least allow the issues not to grow.
 #
 
-job/OnlineDecoder.fcl
 job/bnbanaicarus21apr21.fcl
 job/dirtanaicarus21apr21.fcl
 job/icarus_ci_nucosmics_anatree_quick_test_icaruscode.fcl
@@ -55,13 +54,9 @@ job/prodcosmics_corsika_proton_21apr21_ob.fcl
 job/prodgenie_nu_spill_indirt.fcl
 job/prodsingle_full_optical_electronic.fcl
 job/prodsingle_optical_electronic.fcl
-job/run_flashfilter_data.fcl
 job/run_icarus_flashfinder.fcl
 job/run_opreco.fcl
 job/run_opreco_data.fcl
-job/stage0_EastCryo_icarus.fcl
-job/stage0_multiTPC_splitstream_east_icarus.fcl
-job/stage0_multiTPC_splitstream_west_icarus.fcl
 job/standard_g4_icarus_21apr21_noob.fcl
 job/standard_g4_icarus_21apr21_ob.fcl
 job/study_ophit_singlep.fcl
@@ -72,7 +67,6 @@ job/study_ophit_singlep_290.fcl
 job/study_ophit_singlep_310.fcl
 job/study_ophit_singlep_330.fcl
 job/study_ophit_singlep_350.fcl
-job/testDecoderFilter.fcl
 job/var_10pe_5hits_1us_020ns.fcl
 job/var_20pe_5hits_1us_020ns.fcl
 job/var_30pe_5hits_1us_020ns.fcl

From 2c4bf37e9f17c4509d250c2b2e58e5ba83253784 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Tue, 16 May 2023 14:40:32 -0500
Subject: [PATCH 11/42] Tune gain on all three planes.

---
 .../TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
index 899cbf58b..4f71a190d 100644
--- a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
+++ b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
@@ -74,8 +74,10 @@ icarus_simwire_wirecell_fitSR: @local::icarus_simwire_wirecell
 icarus_simwire_wirecell_fitSR.wcls_main.params.file_rcresp: "icarus_fnal_rc_tail.json"
 # Add in the tuned field responses
 icarus_simwire_wirecell_fitSR.wcls_main.params.files_fields: "icarus_fnal_fit_ks.json.bz2"
-# futz with shaping+gain values
-icarus_simwire_wirecell_fitSR.wcls_main.structs.gain2: 12.4915 # mV/fC
+# futz with shaping+gain values (note these are really just scale factors and should not be taken literally)
+icarus_simwire_wirecell_fitSR.wcls_main.structs.gain0: 9.87267438 # mV/fC 
+icarus_simwire_wirecell_fitSR.wcls_main.structs.gain1: 12.13244978 # mV/fC
+icarus_simwire_wirecell_fitSR.wcls_main.structs.gain2: 13.0261362 # mV/fC
 icarus_simwire_wirecell_fitSR.wcls_main.structs.shaping1: 1.45 # us
 
 

From e665b16ca6375b15884d02557ddf3717e0b13de3 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Tue, 16 May 2023 14:40:41 -0500
Subject: [PATCH 12/42] Typo fixes.

---
 .../icarus/wcls-multitpc-sim-drift-simchannel.jsonnet           | 2 +-
 icaruscode/TPC/ICARUSWireCell/icarus/wct-sim-check.jsonnet      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet
index 395c5ba5b..1ed8feb43 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/wcls-multitpc-sim-drift-simchannel.jsonnet
@@ -58,7 +58,7 @@ local params = base {
   else super.rc_resp,
 
   elec: std.mapWithIndex(function (n, eparam)
-    super.elec[0] + {
+    super.elec[n] + {
       gain: eparam.gain,
       shaping: eparam.shaping,
     }, er_params),
diff --git a/icaruscode/TPC/ICARUSWireCell/icarus/wct-sim-check.jsonnet b/icaruscode/TPC/ICARUSWireCell/icarus/wct-sim-check.jsonnet
index d474dd0b4..5d1e26576 100644
--- a/icaruscode/TPC/ICARUSWireCell/icarus/wct-sim-check.jsonnet
+++ b/icaruscode/TPC/ICARUSWireCell/icarus/wct-sim-check.jsonnet
@@ -7,7 +7,7 @@ local f = import 'pgrapher/common/funcs.jsonnet';
 local wc = import 'wirecell.jsonnet';
 
 local io = import 'pgrapher/common/fileio.jsonnet';
-local tools_maker = import 'pgrapher/common/tools.jsonnet';
+local tools_maker = import 'pgrapher/experiment/icarus/icarus_tools.jsonnet';
 local params = import 'pgrapher/experiment/icarus/simparams.jsonnet';
 
 local tools = tools_maker(params);

From 4b83fd340fc033ce968e7232904096f91cb5f3d2 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Tue, 16 May 2023 23:40:13 -0500
Subject: [PATCH 13/42] Update calorimetry constant for tuned signal shape
 simulation.

---
 icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl b/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
index 449fda020..0e5bc1560 100644
--- a/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
+++ b/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
@@ -9,7 +9,7 @@ icarus_calorimetryalgmc:	  @local::standard_calorimetryalgmc
 # Calorimetry constants from G. Putnam (Nov 2022)
 # Informed by MC calibration -- docdb 28639.
 # NOTE: needs to be revisted if/when the data processing is updated
-icarus_calorimetryalgmc.CalAreaConstants: [0.01343, 0.01338, 0.01219]
+icarus_calorimetryalgmc.CalAreaConstants: [0.01343, 0.01338, 0.01276]
 
 icarus_calorimetryalgdata.CalAreaConstants: @local::icarus_data_calconst
 icarus_calorimetryalgdata.CaloDoLifeTimeCorrection: false # handled by NormTools

From cdd24a20cf91968db6b7934c5b39559da7b24fd4 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Wed, 17 May 2023 12:46:45 -0500
Subject: [PATCH 14/42] Tune gain to match Mikes ADC plots

---
 .../TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
index 4f71a190d..9c6993c62 100644
--- a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
+++ b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
@@ -75,8 +75,8 @@ icarus_simwire_wirecell_fitSR.wcls_main.params.file_rcresp: "icarus_fnal_rc_tail
 # Add in the tuned field responses
 icarus_simwire_wirecell_fitSR.wcls_main.params.files_fields: "icarus_fnal_fit_ks.json.bz2"
 # futz with shaping+gain values (note these are really just scale factors and should not be taken literally)
-icarus_simwire_wirecell_fitSR.wcls_main.structs.gain0: 9.87267438 # mV/fC 
-icarus_simwire_wirecell_fitSR.wcls_main.structs.gain1: 12.13244978 # mV/fC
+icarus_simwire_wirecell_fitSR.wcls_main.structs.gain0: 10.2636323 # mV/fC 
+icarus_simwire_wirecell_fitSR.wcls_main.structs.gain1: 12.1420344 # mV/fC
 icarus_simwire_wirecell_fitSR.wcls_main.structs.gain2: 13.0261362 # mV/fC
 icarus_simwire_wirecell_fitSR.wcls_main.structs.shaping1: 1.45 # us
 

From 84f7b87c289de9ac127df337fab4f9326d17f8e5 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Wed, 17 May 2023 16:51:24 -0500
Subject: [PATCH 15/42] Fix cal constant in the correct place

---
 fcl/caf/cafmaker_add_detsim2d_icarus.fcl         | 5 ++++-
 icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
index f766c1f57..d51c1ec3d 100644
--- a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
+++ b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
@@ -10,5 +10,8 @@ physics.producers.mcreco.G4ModName: @erase
 physics.producers.mcreco.MCParticleLabel: "largeant"
 physics.producers.mcreco.SimChannelLabel: "daq:simpleSC"
 
-this_cal_constants: [1.343e-2, 1.338e-2, 0.01227]
+# Mini production, pre signal shape tuning
+# this_cal_constants: [1.343e-2, 1.338e-2, 0.01227]
+# Post signal shape tuning
+this_cal_constants: [1.343e-2, 1.338e-2, 0.01276]
 #include "set_caf_calconst.fcl"
diff --git a/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl b/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
index 0e5bc1560..449fda020 100644
--- a/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
+++ b/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
@@ -9,7 +9,7 @@ icarus_calorimetryalgmc:	  @local::standard_calorimetryalgmc
 # Calorimetry constants from G. Putnam (Nov 2022)
 # Informed by MC calibration -- docdb 28639.
 # NOTE: needs to be revisted if/when the data processing is updated
-icarus_calorimetryalgmc.CalAreaConstants: [0.01343, 0.01338, 0.01276]
+icarus_calorimetryalgmc.CalAreaConstants: [0.01343, 0.01338, 0.01219]
 
 icarus_calorimetryalgdata.CalAreaConstants: @local::icarus_data_calconst
 icarus_calorimetryalgdata.CaloDoLifeTimeCorrection: false # handled by NormTools

From 3296b673148c6d051fdf69c82314e79de8df2290 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Thu, 18 May 2023 13:47:31 -0500
Subject: [PATCH 16/42] Add in stage1 reco files with correct truth matching
 label for 2D drift.

---
 .../Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl    | 11 +++++++++++
 .../Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl   | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl
 create mode 100644 fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl

diff --git a/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl b/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl
new file mode 100644
index 000000000..cbb1cf55b
--- /dev/null
+++ b/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl
@@ -0,0 +1,11 @@
+#include "stage1_run2_icarus_MC.fcl"
+
+# In the 2D-detsim, SimChannel objects are made by the WireCell
+# drift simulation (daq), not LArG4 (largeant). Thus, we need
+# to overwrite the truth matching labels in the calibration ntuple maker
+
+# Used in backtracker service
+services.BackTrackerService.BackTracker.SimChannelModuleLabel: "daq:simpleSC"
+
+physics.analyzers.caloskimE.SimChannelproducer: "daq:simpleSC"
+physics.analyzers.caloskimW.SimChannelproducer: "daq:simpleSC"
diff --git a/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl b/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl
new file mode 100644
index 000000000..8a5aa604f
--- /dev/null
+++ b/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl
@@ -0,0 +1,11 @@
+#include "stage1_run2_icarus_MC_slimout.fcl"
+
+# In the 2D-detsim, SimChannel objects are made by the WireCell
+# drift simulation (daq), not LArG4 (largeant). Thus, we need
+# to overwrite the truth matching labels in the calibration ntuple maker
+
+# Used in backtracker service
+services.BackTrackerService.BackTracker.SimChannelModuleLabel: "daq:simpleSC"
+
+physics.analyzers.caloskimE.SimChannelproducer: "daq:simpleSC"
+physics.analyzers.caloskimW.SimChannelproducer: "daq:simpleSC"

From af395489675cf501dbb734042d2c02b64bb3c888 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Thu, 18 May 2023 14:02:34 -0500
Subject: [PATCH 17/42] Revert "Add in stage1 reco files with correct truth
 matching label for 2D drift."

This reverts commit bc9bb19090bb9e96735dff2ac43610d42cdd366e.
---
 .../Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl    | 11 -----------
 .../Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl   | 11 -----------
 2 files changed, 22 deletions(-)
 delete mode 100644 fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl
 delete mode 100644 fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl

diff --git a/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl b/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl
deleted file mode 100644
index cbb1cf55b..000000000
--- a/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_detsim2d.fcl
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "stage1_run2_icarus_MC.fcl"
-
-# In the 2D-detsim, SimChannel objects are made by the WireCell
-# drift simulation (daq), not LArG4 (largeant). Thus, we need
-# to overwrite the truth matching labels in the calibration ntuple maker
-
-# Used in backtracker service
-services.BackTrackerService.BackTracker.SimChannelModuleLabel: "daq:simpleSC"
-
-physics.analyzers.caloskimE.SimChannelproducer: "daq:simpleSC"
-physics.analyzers.caloskimW.SimChannelproducer: "daq:simpleSC"
diff --git a/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl b/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl
deleted file mode 100644
index 8a5aa604f..000000000
--- a/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC_slimout_detsim2d.fcl
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "stage1_run2_icarus_MC_slimout.fcl"
-
-# In the 2D-detsim, SimChannel objects are made by the WireCell
-# drift simulation (daq), not LArG4 (largeant). Thus, we need
-# to overwrite the truth matching labels in the calibration ntuple maker
-
-# Used in backtracker service
-services.BackTrackerService.BackTracker.SimChannelModuleLabel: "daq:simpleSC"
-
-physics.analyzers.caloskimE.SimChannelproducer: "daq:simpleSC"
-physics.analyzers.caloskimW.SimChannelproducer: "daq:simpleSC"

From 93123c4d072730831c5dbf19a860b06c9da1101d Mon Sep 17 00:00:00 2001
From: Matthew Rosenberg <rosenberg6m@gmail.com>
Date: Thu, 18 May 2023 14:18:53 -0500
Subject: [PATCH 18/42] updated icarus_data dependency

---
 ups/product_deps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ups/product_deps b/ups/product_deps
index f585ae9c0..baad50503 100644
--- a/ups/product_deps
+++ b/ups/product_deps
@@ -251,7 +251,7 @@ wpdir	product_dir	wire-cell-cfg
 ####################################
 product				version		qual	flags		<table_format=2>
 fftw				v3_3_9		-
-icarus_data			v09_70_00	-
+icarus_data			v09_71_00	-
 icarus_signal_processing	v09_63_00_02	-
 icarusalg			v09_72_00	-
 icarusutil			v09_66_02	-

From a0a7d4e3d5d0de5a30fe5f15d166a4e3f71d1ae2 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Thu, 18 May 2023 23:42:32 -0500
Subject: [PATCH 19/42] Fix truth-match labels in Calibration NTuple-r for 2D
 drift sim.

---
 fcl/reco/Stage1/Run2/stage1_run2_icarus_MC.fcl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC.fcl b/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC.fcl
index 95918c5dc..3f9590ae7 100644
--- a/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC.fcl
+++ b/fcl/reco/Stage1/Run2/stage1_run2_icarus_MC.fcl
@@ -38,10 +38,10 @@ physics.reco: [
 
 # Turn on truth-info for track skimmer 
 physics.analyzers.caloskimE.G4producer: "largeant"
-physics.analyzers.caloskimE.SimChannelproducer: "largeant"
+physics.analyzers.caloskimE.SimChannelproducer: "daq:simpleSC"
 physics.analyzers.caloskimE.RawDigitproducers: ["MCDecodeTPCROI:PHYSCRATEDATATPCEW", "MCDecodeTPCROI:PHYSCRATEDATATPCEE"]
 physics.analyzers.caloskimW.G4producer: "largeant"
-physics.analyzers.caloskimW.SimChannelproducer: "largeant"
+physics.analyzers.caloskimW.SimChannelproducer: "daq:simpleSC"
 physics.analyzers.caloskimW.RawDigitproducers: ["MCDecodeTPCROI:PHYSCRATEDATATPCWW", "MCDecodeTPCROI:PHYSCRATEDATATPCWE"]
 
 physics.outana:            [ @sequence::icarus_analysis_modules ]
@@ -68,6 +68,10 @@ services.SpaceChargeService: {
 }
 
 services.BackTrackerService:        @local::standard_backtrackerservice
+# In the 2D-detsim, SimChannel objects are made by the WireCell
+# drift simulation (daq), not LArG4 (largeant). Thus, we need
+# to overwrite the truth matching labels in the calibration ntuple maker
+services.BackTrackerService.BackTracker.SimChannelModuleLabel: "daq:simpleSC"
 services.ParticleInventoryService:  @local::standard_particleinventoryservice
 
 physics.producers.mcassociationsGausCryoE.HitParticleAssociations.HitModuleLabelVec: ["cluster3DCryoE"]

From 4b6805985df23b3688a59eee175c61ff2d6032fa Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Mon, 22 May 2023 19:28:13 -0500
Subject: [PATCH 20/42] Fix gain value

---
 fcl/caf/cafmaker_add_detsim2d_icarus.fcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
index d51c1ec3d..c3f8fe0e0 100644
--- a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
+++ b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
@@ -13,5 +13,5 @@ physics.producers.mcreco.SimChannelLabel: "daq:simpleSC"
 # Mini production, pre signal shape tuning
 # this_cal_constants: [1.343e-2, 1.338e-2, 0.01227]
 # Post signal shape tuning
-this_cal_constants: [1.343e-2, 1.338e-2, 0.01276]
+this_cal_constants: [1.343e-2, 1.338e-2, 0.01262]
 #include "set_caf_calconst.fcl"

From bb0984b1891c2d3471d1efb6e2a1293c289a2dc6 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Mon, 22 May 2023 21:15:56 -0500
Subject: [PATCH 21/42] Fix gain one more time...

---
 fcl/caf/cafmaker_add_detsim2d_icarus.fcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
index c3f8fe0e0..969eb4e7a 100644
--- a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
+++ b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
@@ -13,5 +13,5 @@ physics.producers.mcreco.SimChannelLabel: "daq:simpleSC"
 # Mini production, pre signal shape tuning
 # this_cal_constants: [1.343e-2, 1.338e-2, 0.01227]
 # Post signal shape tuning
-this_cal_constants: [1.343e-2, 1.338e-2, 0.01262]
+this_cal_constants: [1.343e-2, 1.338e-2, 0.01285]
 #include "set_caf_calconst.fcl"

From cb3f9ced07a2a673e6077d4a08ca3d605f8f156e Mon Sep 17 00:00:00 2001
From: Gianluca Petrillo <petrillo@slac.stanford.edu>
Date: Tue, 9 May 2023 23:45:07 -0500
Subject: [PATCH 22/42] Removed 'nofilter' configurations

They are equivalent to the mainline configurations, by which they are now replaced.
---
 .../stage1_multiTPC_nofilter_icarus_gauss.fcl | 52 --------------
 ....fcl => stage1_singleTPC_icarus_gauss.fcl} |  0
 .../Run2/stage1_run2_nofilter_icarus.fcl      | 69 -------------------
 3 files changed, 121 deletions(-)
 delete mode 100644 fcl/reco/Stage1/Run1/stage1_multiTPC_nofilter_icarus_gauss.fcl
 rename fcl/reco/Stage1/Run1/{stage1_singleTPC_nofilter_icarus_gauss.fcl => stage1_singleTPC_icarus_gauss.fcl} (100%)
 delete mode 100644 fcl/reco/Stage1/Run2/stage1_run2_nofilter_icarus.fcl

diff --git a/fcl/reco/Stage1/Run1/stage1_multiTPC_nofilter_icarus_gauss.fcl b/fcl/reco/Stage1/Run1/stage1_multiTPC_nofilter_icarus_gauss.fcl
deleted file mode 100644
index 1eb3d261d..000000000
--- a/fcl/reco/Stage1/Run1/stage1_multiTPC_nofilter_icarus_gauss.fcl
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "stage1_icarus_driver_common.fcl"
-
-process_name: stage1
-
-physics.reco: [ @sequence::icarus_filter_cluster3D,
-                @sequence::icarus_pandora_Gauss,
-		@sequence::icarus_reco_fm,
-                @sequence::icarus_crttrack,
-		@sequence::icarus_crtt0match,
-                caloskimCalorimetryCryoE, caloskimCalorimetryCryoW]
-
-physics.outana:            [ caloskimE, caloskimW, simpleLightAna, CRTDataAnalysis]
-physics.trigger_paths:     [ reco ]
-physics.end_paths:         [ outana, stream1 ]
-outputs.out1.fileName:     "%ifb_%tc-%p.root"
-outputs.out1.dataTier:     "reconstructed"
-outputs.out1.SelectEvents: [ reco ]
-outputs.out1.outputCommands: [
-  "keep *_*_*_*",
-  "drop *_caloskimCalorimetryCryoE_*_*",
-  "drop *_caloskimCalorimetryCryoW_*_*"
-]
-
-# Disabled Space-Charge service for calorimetry
-services.SpaceChargeService: {
-    EnableCalEfieldSCE: false
-    EnableCalSpatialSCE: false
-    EnableCorrSCE: false
-    EnableSimEfieldSCE: false
-    EnableSimSpatialSCE: false
-    InputFilename: "SCEoffsets/SCEoffsets_ICARUS_E500_voxelTH3.root"
-    RepresentationType: "Voxelized_TH3"
-    service_provider: "SpaceChargeServiceICARUS"
-}
-
-services.message.destinations :
-{
-  STDCOUT:
-  {
-     type:      "cout"      #tells the message service to output this destination to cout
-     threshold: "WARNING"   #tells the message service that this destination applies to WARNING and higher level messages
-     categories:
-     {
-       Cluster3D:
-       {
-         limit: -1
-         reportEvery: 1
-       }
-     }
-  }
-}
-
diff --git a/fcl/reco/Stage1/Run1/stage1_singleTPC_nofilter_icarus_gauss.fcl b/fcl/reco/Stage1/Run1/stage1_singleTPC_icarus_gauss.fcl
similarity index 100%
rename from fcl/reco/Stage1/Run1/stage1_singleTPC_nofilter_icarus_gauss.fcl
rename to fcl/reco/Stage1/Run1/stage1_singleTPC_icarus_gauss.fcl
diff --git a/fcl/reco/Stage1/Run2/stage1_run2_nofilter_icarus.fcl b/fcl/reco/Stage1/Run2/stage1_run2_nofilter_icarus.fcl
deleted file mode 100644
index 8fa57a650..000000000
--- a/fcl/reco/Stage1/Run2/stage1_run2_nofilter_icarus.fcl
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "stage1_icarus_driver_common.fcl"
-
-process_name: stage1
-
-physics.reco: [ @sequence::icarus_filter_cluster3D, 
-                @sequence::icarus_pandora_Gauss,
-		            @sequence::icarus_reco_fm,
-                @sequence::icarus_crttrack,
-		            @sequence::icarus_crtt0match,
-                caloskimCalorimetryCryoE, caloskimCalorimetryCryoW]
-
-physics.outana:            [ @sequence::icarus_analysis_modules ]
-physics.trigger_paths:     [ reco ]
-physics.end_paths:         [ outana, stream1 ]
-outputs.out1.fileName:     "%ifb_%tc-%p.root"
-outputs.out1.dataTier:     "reconstructed"
-outputs.out1.outputCommands: [
-  "keep *_*_*_*",
-  "drop *_caloskimCalorimetryCryoE_*_*",
-  "drop *_caloskimCalorimetryCryoW_*_*"
-]
-
-physics.analyzers.supera.unique_filename: true
-
-# Disabled Space-Charge service for calorimetry
-services.SpaceChargeService: {
-    EnableCalEfieldSCE: false
-    EnableCalSpatialSCE: false
-    EnableCorrSCE: false
-    EnableSimEfieldSCE: false
-    EnableSimSpatialSCE: false
-    InputFilename: "SCEoffsets/SCEoffsets_ICARUS_E500_voxelTH3.root"
-    RepresentationType: "Voxelized_TH3"
-    service_provider: "SpaceChargeServiceICARUS"
-}
-
-# Note there is a selection on the number of hits at the cluster3D level
-physics.analyzers.caloskimE.SelectEvents:      [ reco ]
-physics.analyzers.caloskimW.SelectEvents:      [ reco ]
-physics.analyzers.simpleLightAna.SelectEvents: [ reco ]
-physics.analyzers.supera.SelectEvents:         [ reco ]
-
-services.message.destinations :
-{
-  STDCOUT:
-  {
-     type:      "cout"      #tells the message service to output this destination to cout
-     threshold: "DEBUG"     #tells the message service that this destination applies to WARNING and higher level messages
-     categories:
-     {
-       Cluster3DICARUS:
-       {
-         limit: 5
-         reportEvery: 1
-       }
-       SnippetHit3D:
-       {
-         limit: 5
-         reportEvery: 1
-       }
-       default:
-       {
-         limit: 0  #don't print anything at the infomsg level except the explicitly named categories
-         reportEvery: 0
-       }
-     }
-  }
-}
-

From 73b36260643b47b85b689076e423ef6211295b3a Mon Sep 17 00:00:00 2001
From: Gianluca Petrillo <petrillo@slac.stanford.edu>
Date: Thu, 18 May 2023 16:45:59 -0500
Subject: [PATCH 23/42] Fixed configuration using a renamed one.

---
 ...lter_icarus_nosupera.fcl => stage1_runA_icarus_nosupera.fcl} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename fcl/reco/Stage1/RunA/{stage1_runA_nofilter_icarus_nosupera.fcl => stage1_runA_icarus_nosupera.fcl} (72%)

diff --git a/fcl/reco/Stage1/RunA/stage1_runA_nofilter_icarus_nosupera.fcl b/fcl/reco/Stage1/RunA/stage1_runA_icarus_nosupera.fcl
similarity index 72%
rename from fcl/reco/Stage1/RunA/stage1_runA_nofilter_icarus_nosupera.fcl
rename to fcl/reco/Stage1/RunA/stage1_runA_icarus_nosupera.fcl
index d0c42890c..b6778b06c 100644
--- a/fcl/reco/Stage1/RunA/stage1_runA_nofilter_icarus_nosupera.fcl
+++ b/fcl/reco/Stage1/RunA/stage1_runA_icarus_nosupera.fcl
@@ -1,4 +1,4 @@
-#include "stage1_run2_nofilter_icarus.fcl"
+#include "stage1_run2_icarus.fcl"
 
 # don't run supera -- crashes on old files
 physics.outana: [

From ed503f601707cd22b1cb997a38aa62b51b87a610 Mon Sep 17 00:00:00 2001
From: Matthew Rosenberg <rosenberg6m@gmail.com>
Date: Tue, 23 May 2023 21:45:59 -0500
Subject: [PATCH 24/42] updated CMake version for production patch release

---
 CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d8bc2cbe..26246aa1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,10 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 # cmake_policy(VERSION 3.19)
 
 find_package(cetmodules 3.20.00 REQUIRED)
-project(icaruscode VERSION 09.72.00.03 LANGUAGES CXX)
+
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.72.00.03-p01)
+#project(icaruscode VERSION 09.72.00.03 LANGUAGES CXX)
+project(icaruscode LANGUAGES CXX)
 
 message(STATUS
   "\n-- ============================================================================="

From b6c667c4833af5936486e59c01c5729c477bd94f Mon Sep 17 00:00:00 2001
From: SFBayLaser <usher@slac.stanford.edu>
Date: Wed, 7 Jun 2023 08:47:22 -0700
Subject: [PATCH 25/42] These are the commits associated with PR #590 along the
 develop branch now ported to the production branch

---
 fcl/reco/Definitions/stage0_icarus_defs.fcl   | 13 ++-
 .../Definitions/stage0_icarus_defs_run1.fcl   | 14 ++-
 .../stage0_icarus_driver_common.fcl           |  1 +
 .../stage0_icarus_driver_common_run1.fcl      |  1 +
 fcl/reco/Definitions/stage1_icarus_defs.fcl   | 21 +++--
 fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl   |  3 +-
 .../Stage0/Run1/stage0_run1_icarus_lite.fcl   |  4 +-
 .../Stage0/Run1/stage0_run1_icarus_mc.fcl     |  4 +-
 .../Stage0/Run1/stage0_run1_raw_icarus.fcl    |  2 +-
 .../Run1/stage0_run1_raw_icarus_lite.fcl      |  4 +-
 .../Stage0/Run1/stage0_run1_rawpmt_icarus.fcl |  2 +-
 .../Stage0/Run1/stage0_run1_wc_icarus.fcl     |  2 +-
 .../Run1/stage0_run1_wc_icarus_lite.fcl       |  4 +-
 ...gic_raw_to_triggeremu_icarus_Run1_data.fcl |  4 +-
 icaruscode/Filters/CMakeLists.txt             |  3 +
 .../Filters/FilterDataIntegrity_module.cc     | 91 +++++++++++++++++++
 .../Filters/icarus_FilterDataIntegrity.fcl    |  8 ++
 17 files changed, 156 insertions(+), 25 deletions(-)
 create mode 100644 icaruscode/Filters/FilterDataIntegrity_module.cc
 create mode 100644 icaruscode/Filters/icarus_FilterDataIntegrity.fcl

diff --git a/fcl/reco/Definitions/stage0_icarus_defs.fcl b/fcl/reco/Definitions/stage0_icarus_defs.fcl
index 2303c17f9..790be8fed 100644
--- a/fcl/reco/Definitions/stage0_icarus_defs.fcl
+++ b/fcl/reco/Definitions/stage0_icarus_defs.fcl
@@ -15,6 +15,7 @@
 #include "crt_decoderdefs_icarus.fcl"
 #include "crthitproducer.fcl"
 #include "wcls-decode-to-sig-base.fcl"
+#include "icarus_FilterDataIntegrity.fcl"
 #include "icarus_FilterCRTPMTMatching.fcl"
 
 BEGIN_PROLOG
@@ -119,7 +120,11 @@ icarus_stage0_filters:
   #
    flashfilterBNB: { module_type:         "FilterOpFlash" 
                      OpFlashProducerList: ["opflashCryoE","opflashCryoW"] 
-                     WindowStartTime:     -0.2 # 0.2us safe margin
+#                     WindowStartTime:     -1489.6 # -1489.4 - 0.2us safe margin
+#                     WindowEndTime:       -1487.6 # -1487.8 + 0.2us safe margin
+#                     WindowStartTime:     -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
+#                     WindowEndTime:       -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
+                     WindowStartTime:     -0.2 # Gate is now recentered by Gianluca/Andrea
                      WindowEndTime:        1.8 
                    }
    flashfilterNuMI: { module_type:         "FilterOpFlash" 
@@ -154,6 +159,8 @@ icarus_stage0_filters:
                              TriggerType:        "Unknown"
                           }
 
+   filterdataintegrity: @local::icarus_FilterDataIntegrity
+
    crtpmtmatchingfilter: @local::icarus_FilterCRTPMTMatching
 }
 
@@ -261,6 +268,7 @@ icarus_stage0_CRT:                  [
                                     ]
  
 icarus_stage0_data:                 [
+                                      filterdataintegrity,
                                       @sequence::icarus_stage0_PMT, 
                                       @sequence::icarus_stage0_CRT,
                                       daqTPCROI, 
@@ -268,6 +276,7 @@ icarus_stage0_data:                 [
                                     ]
  
 icarus_stage0_2d_data:              [
+                                      filterdataintegrity,
                                       @sequence::icarus_stage0_PMT, 
                                       @sequence::icarus_stage0_CRT,
                                       daqTPCROI, 
@@ -275,6 +284,7 @@ icarus_stage0_2d_data:              [
                                     ]
  
 icarus_stage0_data_crtpmtfilter:    [
+                                      filterdataintegrity,
                                       @sequence::icarus_stage0_PMT, 
                                       @sequence::icarus_stage0_CRT,
                                       crtpmtmatchingfilter,
@@ -283,6 +293,7 @@ icarus_stage0_data_crtpmtfilter:    [
                                     ]
 
 icarus_stage0_2d_data_crtpmtfilter: [
+                                      filterdataintegrity,
                                       @sequence::icarus_stage0_PMT, 
                                       @sequence::icarus_stage0_CRT,
                                       crtpmtmatchingfilter,
diff --git a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
index d1f857693..ddfa0d4ab 100644
--- a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
+++ b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
@@ -15,6 +15,7 @@
 #include "crt_decoderdefs_icarus.fcl"
 #include "crthitproducer.fcl"
 #include "wcls-decode-to-sig-base.fcl"
+#include "icarus_FilterDataIntegrity.fcl"
 #include "icarus_FilterCRTPMTMatching.fcl"
 
 BEGIN_PROLOG
@@ -126,7 +127,11 @@ icarus_stage0_filters:
   #
    flashfilterBNB: { module_type:         "FilterOpFlash" 
                      OpFlashProducerList: ["opflashCryoE","opflashCryoW"] 
-                     WindowStartTime:     -0.2 # 0.2us safe margin
+#                     WindowStartTime:     -1489.6 # -1489.4 - 0.2us safe margin
+#                     WindowEndTime:       -1487.6 # -1487.8 + 0.2us safe margin
+#                     WindowStartTime:     -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
+#                     WindowEndTime:       -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
+                     WindowStartTime:     -0.2 # Gate is now recentered by Gianluca/Andrea
                      WindowEndTime:        1.8 
                    }
    flashfilterNuMI: { module_type:         "FilterOpFlash" 
@@ -160,6 +165,9 @@ icarus_stage0_filters:
                              TriggerDataLabel:   "daqTrigger"
                              TriggerType:        "Unknown"
                           }
+
+   filterdataintegrity: @local::icarus_FilterDataIntegrity
+
    crtpmtmatchingfilter: @local::icarus_FilterCRTPMTMatching
 }
 
@@ -265,6 +273,7 @@ icarus_stage0_CRT:                 [
                                    ]
 
 icarus_stage0_data:                [
+                                     filterdataintegrity,
                                      @sequence::icarus_stage0_PMT, 
                                      @sequence::icarus_stage0_CRT,
                                      daqTPCROI, 
@@ -272,6 +281,7 @@ icarus_stage0_data:                [
                                    ]
  
 icarus_stage0_data_crtpmtfilter:   [
+                                     filterdataintegrity,
                                      @sequence::icarus_stage0_PMT, 
                                      @sequence::icarus_stage0_CRT,
                                      crtpmtmatchingfilter,
@@ -280,6 +290,7 @@ icarus_stage0_data_crtpmtfilter:   [
                                   ]
 
 icarus_stage0_2d_data:             [
+                                     filterdataintegrity,
                                      @sequence::icarus_stage0_PMT, 
                                      @sequence::icarus_stage0_CRT,
                                      daqTPCROI, 
@@ -287,6 +298,7 @@ icarus_stage0_2d_data:             [
                                    ]
 
 icarus_stage0_2d_data_crtpmtfilter: [
+                                      filterdataintegrity,
                                       @sequence::icarus_stage0_PMT, 
                                       @sequence::icarus_stage0_CRT,
                                       crtpmtmatchingfilter,
diff --git a/fcl/reco/Definitions/stage0_icarus_driver_common.fcl b/fcl/reco/Definitions/stage0_icarus_driver_common.fcl
index 7608cf558..6aff4f89b 100644
--- a/fcl/reco/Definitions/stage0_icarus_driver_common.fcl
+++ b/fcl/reco/Definitions/stage0_icarus_driver_common.fcl
@@ -65,6 +65,7 @@ outputs:
    fileName: "%ifb_%tc-%p.root"
    fileProperties: {maxInputFiles: 1}
    checkFileName: false
+   SelectEvents: [path]
  }
 }
 
diff --git a/fcl/reco/Definitions/stage0_icarus_driver_common_run1.fcl b/fcl/reco/Definitions/stage0_icarus_driver_common_run1.fcl
index dc997d1ee..726435996 100644
--- a/fcl/reco/Definitions/stage0_icarus_driver_common_run1.fcl
+++ b/fcl/reco/Definitions/stage0_icarus_driver_common_run1.fcl
@@ -65,6 +65,7 @@ outputs:
    fileName: "%ifb_%tc-%p.root"
    fileProperties: {maxInputFiles: 1}
    checkFileName: false
+   SelectEvents: [path]
  }
 }
 
diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl
index c6fc08c5c..51b71feb8 100644
--- a/fcl/reco/Definitions/stage1_icarus_defs.fcl
+++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl
@@ -69,6 +69,14 @@ icarus_stage1_producers:
 
 icarus_stage1_filters:
 {
+   flashfilter: { module_type: "FilterOpFlash" 
+                  OpFlashProducerList: ["opflashCryoW","opflashCryoE"] 
+#                  WindowStartTime: -1489.6 # -1489.4 - 0.2us safe margin
+#                  WindowEndTime:   -1487.6 # -1487.8 + 0.2us safe margin
+                  WindowStartTime: -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
+                  WindowEndTime:   -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
+                }
+
    TPCHitFilterCryoW: @local::icarus_FilterNumberTPCHits
    TPCHitFilterCryoE: @local::icarus_FilterNumberTPCHits
 }
@@ -147,18 +155,13 @@ icarus_analysis_larcv_modules:     [  @sequence::icarus_analysis_modules
                                    ]
 
 # Set up filtering of cluster3D hits by cryostat
-icarus_filter_cluster3DCryoW:      [ cluster3DCryoW,
+# Changed slightly to faciliate larcv processing
+icarus_filter_cluster3D:           [ cluster3DCryoE,
+                                     cluster3DCryoW,
+                                     TPCHitFilterCryoE,
                                      TPCHitFilterCryoW
                                    ]
 
-icarus_filter_cluster3DCryoE:      [ cluster3DCryoE,
-                                     TPCHitFilterCryoE
-                                   ]
-
-icarus_filter_cluster3D:           [ @sequence::icarus_filter_cluster3DCryoW,
-                                     @sequence::icarus_filter_cluster3DCryoE
-                                   ]
-
 icarus_reco_cluster3DCryoW:        [ cluster3DCryoW ]
 
 icarus_reco_cluster3DCryoE:        [ cluster3DCryoE ]
diff --git a/fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl b/fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl
index ae254b12c..2cc30e40f 100644
--- a/fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl
+++ b/fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl
@@ -15,7 +15,8 @@ physics.trigger_paths: [ path ]
 physics.end_paths:     [ outana, streamROOT ]
 
 # Drop the artdaq format files on output
-outputs.outCommon.outputCommands:         ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", "drop *_daqTPCROI_*_*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*" ]
+outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", "drop *_daqTPCROI_*_*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*" ]
+#outputs.rootOutput.SelectEvents:   [path]
 
 ## Modify the event selection for the purity analyzers
 physics.analyzers.purityinfoana0.SelectEvents:    [ path ]
diff --git a/fcl/reco/Stage0/Run1/stage0_run1_icarus_lite.fcl b/fcl/reco/Stage0/Run1/stage0_run1_icarus_lite.fcl
index 27a18c817..989573630 100644
--- a/fcl/reco/Stage0/Run1/stage0_run1_icarus_lite.fcl
+++ b/fcl/reco/Stage0/Run1/stage0_run1_icarus_lite.fcl
@@ -14,5 +14,5 @@
 #include "stage0_run1_icarus.fcl"
 
 # Drop truth data products.
-outputs.outCommon.outputCommands: [ @sequence::outputs.outCommon.outputCommands,
-                                    @sequence::reco_drops ]
+outputs.rootOutput.outputCommands: [ @sequence::outputs.rootOutput.outputCommands,
+                                     @sequence::reco_drops ]
diff --git a/fcl/reco/Stage0/Run1/stage0_run1_icarus_mc.fcl b/fcl/reco/Stage0/Run1/stage0_run1_icarus_mc.fcl
index 075fdc969..edb0f373c 100644
--- a/fcl/reco/Stage0/Run1/stage0_run1_icarus_mc.fcl
+++ b/fcl/reco/Stage0/Run1/stage0_run1_icarus_mc.fcl
@@ -29,8 +29,8 @@ physics.trigger_paths: [ path ]
 physics.end_paths:     [ outana, streamROOT ]
 
 # Drop the artdaq format files on output
-#outputs.outCommon.outputCommands: ["keep *_*_*_*", "drop *_MCDecodeTPCROI_*_*", "drop *_decon1droi_*_*","drop raw::RawDigits_*_*_*" ]
-outputs.outCommon.outputCommands: ["keep *_*_*_*", "drop *_decon1droi_*_*" ]
+#outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_MCDecodeTPCROI_*_*", "drop *_decon1droi_*_*","drop raw::RawDigits_*_*_*" ]
+outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_decon1droi_*_*" ]
 
 # Set the expected input for ophit
 physics.producers.ophit:     @local::icarus_ophit_MC
diff --git a/fcl/reco/Stage0/Run1/stage0_run1_raw_icarus.fcl b/fcl/reco/Stage0/Run1/stage0_run1_raw_icarus.fcl
index 0c6852152..f38cbef77 100644
--- a/fcl/reco/Stage0/Run1/stage0_run1_raw_icarus.fcl
+++ b/fcl/reco/Stage0/Run1/stage0_run1_raw_icarus.fcl
@@ -5,4 +5,4 @@
 #include "stage0_run1_icarus.fcl"
 
 # Drop the artdaq format files on output
-outputs.outCommon.outputCommands:  ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*" ]
+outputs.rootOutput.outputCommands:  ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*" ]
diff --git a/fcl/reco/Stage0/Run1/stage0_run1_raw_icarus_lite.fcl b/fcl/reco/Stage0/Run1/stage0_run1_raw_icarus_lite.fcl
index 5f4a08c8e..07814c4ec 100644
--- a/fcl/reco/Stage0/Run1/stage0_run1_raw_icarus_lite.fcl
+++ b/fcl/reco/Stage0/Run1/stage0_run1_raw_icarus_lite.fcl
@@ -15,5 +15,5 @@
 
 # Drop truth data products.
 
-outputs.outCommon.outputCommands: [ @sequence::outputs.outCommon.outputCommands,
-                                    @sequence::reco_drops ]
+outputs.rootOutput.outputCommands: [ @sequence::outputs.rootOutput.outputCommands,
+                                     @sequence::reco_drops ]
diff --git a/fcl/reco/Stage0/Run1/stage0_run1_rawpmt_icarus.fcl b/fcl/reco/Stage0/Run1/stage0_run1_rawpmt_icarus.fcl
index 3faae2940..a84d6c092 100644
--- a/fcl/reco/Stage0/Run1/stage0_run1_rawpmt_icarus.fcl
+++ b/fcl/reco/Stage0/Run1/stage0_run1_rawpmt_icarus.fcl
@@ -18,7 +18,7 @@ physics.trigger_paths: [ path ]
 physics.end_paths:     [ outana, streamROOT ]
 
 # Drop the artdaq format files on output
-outputs.outCommon.outputCommands:         ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_daqTPCROI_*_*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*" ]
+outputs.rootOutput.outputCommands:         ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_daqTPCROI_*_*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*" ]
 
 ## Modify the event selection for the purity analyzers
 physics.analyzers.purityinfoana0.SelectEvents:    [ path ]
diff --git a/fcl/reco/Stage0/Run1/stage0_run1_wc_icarus.fcl b/fcl/reco/Stage0/Run1/stage0_run1_wc_icarus.fcl
index 417b160f2..cbb9d2dca 100644
--- a/fcl/reco/Stage0/Run1/stage0_run1_wc_icarus.fcl
+++ b/fcl/reco/Stage0/Run1/stage0_run1_wc_icarus.fcl
@@ -16,7 +16,7 @@ physics.trigger_paths: [ path ]
 physics.end_paths:     [ outana, streamCommon ]
 
 # Drop the artdaq format files on output
-outputs.outCommon.outputCommands:         ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_daqTPCROI_*_*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*", "drop *_decon2Droi*_*_*", "drop *_roifindr_*_*" ]
+outputs.rootOutput.outputCommands:         ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_daqTPCROI_*_*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*", "drop *_decon2Droi*_*_*", "drop *_roifindr_*_*" ]
 
 # Override the hit finder input 
 physics.producers.gaushitTPCWW.CalDataModuleLabel: "roifinder2d:PHYSCRATEDATATPCWW"
diff --git a/fcl/reco/Stage0/Run1/stage0_run1_wc_icarus_lite.fcl b/fcl/reco/Stage0/Run1/stage0_run1_wc_icarus_lite.fcl
index ffe741c2e..53e2e639b 100644
--- a/fcl/reco/Stage0/Run1/stage0_run1_wc_icarus_lite.fcl
+++ b/fcl/reco/Stage0/Run1/stage0_run1_wc_icarus_lite.fcl
@@ -15,5 +15,5 @@
 
 # Drop truth data products.
 
-outputs.outCommon.outputCommands: [ @sequence::outputs.outCommon.outputCommands,
-                                    @sequence::reco_drops ]
+outputs.rootOutput.outputCommands: [ @sequence::outputs.rootOutput.outputCommands,
+                                     @sequence::reco_drops ]
diff --git a/icaruscode/Analysis/trigger/magic_raw_to_triggeremu_icarus_Run1_data.fcl b/icaruscode/Analysis/trigger/magic_raw_to_triggeremu_icarus_Run1_data.fcl
index 7a8f46ca4..60f187ae4 100644
--- a/icaruscode/Analysis/trigger/magic_raw_to_triggeremu_icarus_Run1_data.fcl
+++ b/icaruscode/Analysis/trigger/magic_raw_to_triggeremu_icarus_Run1_data.fcl
@@ -145,7 +145,7 @@ physics.filters: {
 
 physics.pathE: [
     @sequence::physics.pathE
-  , @sequence::icarus_filter_cluster3DCryoE
+  , @sequence::icarus_reco_cluster3DCryoE
   , @sequence::icarus_reco_pandoraGausCryoE
   , fmatchCryoE
   , @sequence::icarus_crttrack
@@ -153,7 +153,7 @@ physics.pathE: [
   ]
 physics.pathW: [
     @sequence::physics.pathW
-  , @sequence::icarus_filter_cluster3DCryoW
+  , @sequence::icarus_reco_cluster3DCryoW
   , @sequence::icarus_reco_pandoraGausCryoW
   , fmatchCryoW
   , @sequence::icarus_crttrack
diff --git a/icaruscode/Filters/CMakeLists.txt b/icaruscode/Filters/CMakeLists.txt
index ebb6ac5af..de5843ade 100644
--- a/icaruscode/Filters/CMakeLists.txt
+++ b/icaruscode/Filters/CMakeLists.txt
@@ -2,6 +2,8 @@ art_make_library()
 set(  MODULE_LIBRARIES
     sbnobj::Common_Trigger
     icarusalg::Utilities
+    sbndaq_artdaq_core::sbndaq-artdaq-core_Overlays_ICARUS
+    artdaq_core::artdaq-core_Utilities
     larcorealg::Geometry
     larcore::Geometry_Geometry_service
     larsim::Simulation
@@ -38,6 +40,7 @@ set(  MODULE_LIBRARIES
   )
 cet_build_plugin(FilterNeutrinosActiveVolume art::module LIBRARIES ${MODULE_LIBRARIES})
 cet_build_plugin(FilterNumberTPCHits art::module LIBRARIES ${MODULE_LIBRARIES})
+cet_build_plugin(FilterDataIntegrity art::module LIBRARIES ${MODULE_LIBRARIES})
 cet_build_plugin(FilterOpFlash art::module LIBRARIES ${MODULE_LIBRARIES})
 cet_build_plugin(FilterParticlesActiveVolume art::module LIBRARIES ${MODULE_LIBRARIES})
 cet_build_plugin(TriggerTypeFilter art::module LIBRARIES ${MODULE_LIBRARIES})
diff --git a/icaruscode/Filters/FilterDataIntegrity_module.cc b/icaruscode/Filters/FilterDataIntegrity_module.cc
new file mode 100644
index 000000000..9c9741b2a
--- /dev/null
+++ b/icaruscode/Filters/FilterDataIntegrity_module.cc
@@ -0,0 +1,91 @@
+////////////////////////////////////////////////////////////////////////
+//
+// FilterDataIntegrity class
+//
+////////////////////////////////////////////////////////////////////////
+
+/// Framework includes
+#include "art/Framework/Core/ModuleMacros.h"
+#include "art/Framework/Core/EDFilter.h"
+#include "art/Framework/Principal/Event.h"
+#include "messagefacility/MessageLogger/MessageLogger.h"
+
+#include "artdaq-core/Data/Fragment.hh"
+
+#include <set>
+#include <string>
+
+///filters for events, etc
+namespace filter
+{
+
+    class FilterDataIntegrity : public art::EDFilter
+    {
+
+    public:
+        explicit FilterDataIntegrity(fhicl::ParameterSet const &);
+
+        bool filter(art::Event &evt) override;
+
+    private:
+
+    // We will use this to keep track of the expected fragments in an event
+    // but note we will assume the first event is complete to set this list
+    std::set<int> fExpectedFragments;
+
+    }; //class FilterDataIntegrity
+}
+
+///////////////////////////////////////////////////////
+
+filter::FilterDataIntegrity::FilterDataIntegrity(fhicl::ParameterSet const &pset)
+    : EDFilter{pset}
+{
+    return;
+}
+
+bool filter::FilterDataIntegrity::filter(art::Event &event)
+{
+    bool filterPass = true;
+
+	// get all the artdaq fragment collections in the event.
+	std::vector<art::Handle<std::vector<artdaq::Fragment>>> fragmentHandles;
+	fragmentHandles = event.getMany<std::vector<artdaq::Fragment>>();
+
+    std::set<int> missingFragments(fExpectedFragments);
+    int           emptyFragments(0);
+
+    for (const auto& handle : fragmentHandles)
+    {
+        for (const auto& fragment : *handle)
+        {
+            int fragmentID = fragment.fragmentID();
+
+            fExpectedFragments.insert(fragmentID);
+            missingFragments.erase(fragmentID);
+
+            std::string instanceName = handle.provenance()->productInstanceName();
+            std::size_t found        = instanceName.find("Empty");
+
+            if (found != std::string::npos) emptyFragments++;
+        }
+    }
+
+    mf::LogDebug("FilterDataIntegrity") << "Expected fragments: " << fExpectedFragments.size() << " expected, has " << missingFragments.size() << " missing. There are " << emptyFragments << " empty fragments";
+
+    if (!missingFragments.empty() || emptyFragments > 0)
+    {
+        mf::LogInfo("FilterDataIntegrity") << "Bad fragments: " << missingFragments.size() << ", " << emptyFragments;
+
+        filterPass = false;
+    }
+
+    return filterPass;
+}
+
+namespace filter
+{
+
+    DEFINE_ART_MODULE(FilterDataIntegrity)
+
+} //namespace filt
diff --git a/icaruscode/Filters/icarus_FilterDataIntegrity.fcl b/icaruscode/Filters/icarus_FilterDataIntegrity.fcl
new file mode 100644
index 000000000..869dacace
--- /dev/null
+++ b/icaruscode/Filters/icarus_FilterDataIntegrity.fcl
@@ -0,0 +1,8 @@
+BEGIN_PROLOG
+
+icarus_FilterDataIntegrity:
+{ 
+  module_type:     "FilterDataIntegrity"
+}
+
+END_PROLOG

From fec80fbc67055cd8c2926b3559e608cee57bb59c Mon Sep 17 00:00:00 2001
From: SFBayLaser <usher@slac.stanford.edu>
Date: Wed, 7 Jun 2023 08:48:02 -0700
Subject: [PATCH 26/42] This is the commit for PR #591 which reverts and
 inadvertent add of the 3D hit building

---
 .../SnippetHit3DBuilderICARUS_tool.cc         | 154 +++++++-----------
 1 file changed, 58 insertions(+), 96 deletions(-)
 mode change 100755 => 100644 icaruscode/TPC/Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc

diff --git a/icaruscode/TPC/Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc b/icaruscode/TPC/Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc
old mode 100755
new mode 100644
index 9e2824d3d..1fd737383
--- a/icaruscode/TPC/Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc
+++ b/icaruscode/TPC/Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc
@@ -143,13 +143,6 @@ class SnippetHit3DBuilderICARUS : virtual public IHit3DBuilder
      */
     size_t BuildHitPairMap(PlaneToSnippetHitMap& planeToHitVectorMap, reco::HitPairList& hitPairList) const;
 
-    /**
-     * @brief This defines a structure allowing us to see which hits have already been matched. Generally, if two
-     *        hits have been matched then there is no point considering them anymore as it simply means duplicate
-     *        space points will be created
-     */
-    using MatchedHitMap = std::unordered_map<const reco::ClusterHit2D*,std::set<const reco::ClusterHit2D*>>;
-
     /**
      *  @brief Given the ClusterHit2D objects, build the HitPairMap
      */
@@ -167,13 +160,13 @@ class SnippetHit3DBuilderICARUS : virtual public IHit3DBuilder
     /**
      *  @brief This algorithm takes lists of hit pairs and finds good triplets
      */
-    void findGoodTriplets(HitMatchTripletVecMap&, HitMatchTripletVecMap&, MatchedHitMap&, reco::HitPairList&, bool = false) const;
+    void findGoodTriplets(HitMatchTripletVecMap&, HitMatchTripletVecMap&, reco::HitPairList&, bool = false) const;
 
     /**
      * @brief This will look at storing pair "orphans" where the 2D hits are otherwise unused
      */
 
-    int saveOrphanPairs(HitMatchTripletVecMap&, MatchedHitMap&, reco::HitPairList&) const;
+    int saveOrphanPairs(HitMatchTripletVecMap&, reco::HitPairList&) const;
 
     /**
      *  @brief Make a HitPair object by checking two hits
@@ -188,14 +181,13 @@ class SnippetHit3DBuilderICARUS : virtual public IHit3DBuilder
      *  @brief Make a 3D HitPair object by checking two hits
      */
     bool makeHitTriplet(reco::ClusterHit3D&       pairOut,
-                        MatchedHitMap&            matchedHitMap,
                         const reco::ClusterHit3D& pairIn,
                         const reco::ClusterHit2D* hit2) const;
 
     /**
      *  @brief Make a 3D HitPair object from a valid pair and a dead channel in the missing plane
      */
-    bool makeDeadChannelPair(reco::ClusterHit3D& pairOut, const reco::ClusterHit3D& pair, MatchedHitMap&, size_t maxStatus = 4, size_t minStatus = 0, float minOverlap=0.2) const;
+    bool makeDeadChannelPair(reco::ClusterHit3D& pairOut, const reco::ClusterHit3D& pair, size_t maxStatus = 4, size_t minStatus = 0, float minOverlap=0.2) const;
 
     /**
      * @brief function to detemine if two wires "intersect" (in the 2D sense)
@@ -497,8 +489,6 @@ void SnippetHit3DBuilderICARUS::BuildChannelStatusVec(PlaneToWireToHitSetMap& pl
         }
     }
 
-    std::cout << "SnippetHit3D finds " << m_numBadChannels << " bad channels" << std::endl;
-
     return;
 }
 
@@ -609,7 +599,9 @@ void SnippetHit3DBuilderICARUS::BuildHit3D(reco::HitPairList& hitPairList) const
 
     // The first task is to take the lists of input 2D hits (a map of view to sorted lists of 2D hits)
     // and then to build a list of 3D hits to be used in downstream processing
+    std::cout << "--> Calling BuildChannelStatusVec" << std::endl;
     BuildChannelStatusVec(m_planeToWireToHitSetMap);
+    std::cout << "--- done with channel status building" << std::endl;
 
     size_t numHitPairs = BuildHitPairMap(m_planeToSnippetHitMap, hitPairList);
 
@@ -749,9 +741,6 @@ size_t SnippetHit3DBuilderICARUS::BuildHitPairMapByTPC(PlaneSnippetHitMapItrPair
     size_t nDeadChanHits(0);
     size_t nOrphanPairs(0);
 
-    // Structure to keep track of hit associations
-    MatchedHitMap matchedHitMap;
-
     //*********************************************************************************
     // Basically, we try to loop until done...
     while(1)
@@ -790,13 +779,13 @@ size_t SnippetHit3DBuilderICARUS::BuildHitPairMapByTPC(PlaneSnippetHitMapItrPair
         nDeadChanHits  += hitPairList.size() - curHitListSize;
         curHitListSize  = hitPairList.size();
 
-        if (n12Pairs > n13Pairs) findGoodTriplets(pair12Map, pair13Map, matchedHitMap, hitPairList);
-        else                     findGoodTriplets(pair13Map, pair12Map, matchedHitMap, hitPairList);
+        if (n12Pairs > n13Pairs) findGoodTriplets(pair12Map, pair13Map, hitPairList);
+        else                     findGoodTriplets(pair13Map, pair12Map, hitPairList);
 
         if (m_saveMythicalPoints)
         {
-            nOrphanPairs += saveOrphanPairs(pair12Map, matchedHitMap, hitPairList);
-            nOrphanPairs += saveOrphanPairs(pair13Map, matchedHitMap, hitPairList);
+            nOrphanPairs += saveOrphanPairs(pair12Map, hitPairList);
+            nOrphanPairs += saveOrphanPairs(pair13Map, hitPairList);
         }
 
         nTriplets += hitPairList.size() - curHitListSize;
@@ -810,9 +799,9 @@ size_t SnippetHit3DBuilderICARUS::BuildHitPairMapByTPC(PlaneSnippetHitMapItrPair
 }
 
 int SnippetHit3DBuilderICARUS::findGoodHitPairs(SnippetHitMap::iterator& firstSnippetItr,
-                                                SnippetHitMap::iterator& startItr,
-                                                SnippetHitMap::iterator& endItr,
-                                                HitMatchTripletVecMap&   hitMatchMap) const
+                                          SnippetHitMap::iterator& startItr,
+                                          SnippetHitMap::iterator& endItr,
+                                          HitMatchTripletVecMap&   hitMatchMap) const
 {
     int numPairs(0);
 
@@ -863,11 +852,7 @@ int SnippetHit3DBuilderICARUS::findGoodHitPairs(SnippetHitMap::iterator& firstSn
     return numPairs;
 }
 
-void SnippetHit3DBuilderICARUS::findGoodTriplets(HitMatchTripletVecMap& pair12Map, 
-                                                 HitMatchTripletVecMap& pair13Map, 
-                                                 MatchedHitMap&         matchedHitMap,
-                                                 reco::HitPairList&     hitPairList, 
-                                                 bool                   tagged) const
+void SnippetHit3DBuilderICARUS::findGoodTriplets(HitMatchTripletVecMap& pair12Map, HitMatchTripletVecMap& pair13Map, reco::HitPairList& hitPairList, bool tagged) const
 {
     // Build triplets from the two lists of hit pairs
     if (!pair12Map.empty())
@@ -915,7 +900,7 @@ void SnippetHit3DBuilderICARUS::findGoodTriplets(HitMatchTripletVecMap& pair12Ma
                         // If success try for the triplet
                         reco::ClusterHit3D triplet;
 
-                        if (makeHitTriplet(triplet, matchedHitMap, pair1, hit2))
+                        if (makeHitTriplet(triplet, pair1, hit2))
                         {
                             triplet.setID(hitPairList.size());
                             hitPairList.emplace_back(triplet);
@@ -937,7 +922,7 @@ void SnippetHit3DBuilderICARUS::findGoodTriplets(HitMatchTripletVecMap& pair12Ma
                 const reco::ClusterHit3D* pair = pairMapPair.first;
 
                 // Here we look to see if we failed to make a triplet because the partner wire was dead/noisy/sick
-                if (makeDeadChannelPair(deadChanPair, *pair, matchedHitMap, 4, 0, 0.)) tempDeadChanVec.emplace_back(deadChanPair);
+                if (makeDeadChannelPair(deadChanPair, *pair, 4, 0, 0.)) tempDeadChanVec.emplace_back(deadChanPair);
             }
 
             // Handle the dead wire triplets
@@ -982,7 +967,7 @@ void SnippetHit3DBuilderICARUS::findGoodTriplets(HitMatchTripletVecMap& pair12Ma
     return;
 }
 
-int SnippetHit3DBuilderICARUS::saveOrphanPairs(HitMatchTripletVecMap& pairMap, MatchedHitMap& matchedHitMap, reco::HitPairList& hitPairList) const
+int SnippetHit3DBuilderICARUS::saveOrphanPairs(HitMatchTripletVecMap& pairMap, reco::HitPairList& hitPairList) const
 {
     int curTripletCount = hitPairList.size();
 
@@ -1006,9 +991,6 @@ int SnippetHit3DBuilderICARUS::saveOrphanPairs(HitMatchTripletVecMap& pairMap, M
                 const reco::ClusterHit2D* hit1 = std::get<0>(hit2Dhit3DPair);
                 const reco::ClusterHit2D* hit2 = std::get<1>(hit2Dhit3DPair);
 
-                // Have these already been used in some fashion?
-                if (matchedHitMap[hit1].find(hit2) != matchedHitMap[hit1].end()) continue;
-
                 if (m_outputHistograms)
                 {
                     m_2hit1stPHVec.emplace_back(hit1->getHit()->PeakAmplitude());
@@ -1029,8 +1011,6 @@ int SnippetHit3DBuilderICARUS::saveOrphanPairs(HitMatchTripletVecMap& pairMap, M
                         // Add to the list
                         hitPairList.emplace_back(hit3D);
                         hitPairList.back().setID(hitPairList.size()-1);
-                        matchedHitMap[hit1].insert(hit2);
-                        matchedHitMap[hit2].insert(hit1);
                     }
                 }
             }
@@ -1192,7 +1172,6 @@ bool SnippetHit3DBuilderICARUS::makeHitPair(reco::ClusterHit3D&       hitPair,
 
 
 bool SnippetHit3DBuilderICARUS::makeHitTriplet(reco::ClusterHit3D&       hitTriplet,
-                                               MatchedHitMap&            matchedHitMap,
                                                const reco::ClusterHit3D& pair,
                                                const reco::ClusterHit2D* hit) const
 {
@@ -1238,12 +1217,8 @@ bool SnippetHit3DBuilderICARUS::makeHitTriplet(reco::ClusterHit3D&       hitTrip
             if      (!hit0) hit0 = pairHitVec[2];
             else if (!hit1) hit1 = pairHitVec[2];
 
-            bool notMatched =  matchedHitMap[hit].find(hit0)  == matchedHitMap[hit].end() 
-                            && matchedHitMap[hit].find(hit1)  == matchedHitMap[hit].end()
-                            && matchedHitMap[hit0].find(hit1) == matchedHitMap[hit0].end();
-
             // If good pairs made here then we can try to make a triplet
-            if (notMatched && makeHitPair(pair0h, hit0, hit, m_hitWidthSclFctr) && makeHitPair(pair1h, hit1, hit, m_hitWidthSclFctr))
+            if (makeHitPair(pair0h, hit0, hit, m_hitWidthSclFctr) && makeHitPair(pair1h, hit1, hit, m_hitWidthSclFctr))
             {
                 // Get a copy of the input hit vector (note the order is by plane - by definition)
                 reco::ClusterHit2DVec hitVector = pair.getHits();
@@ -1455,13 +1430,8 @@ bool SnippetHit3DBuilderICARUS::makeHitTriplet(reco::ClusterHit3D&       hitTrip
                                           wireIDVec);
                     
                     // Since we are keeping the triplet, mark the hits as used
-                    for(size_t hit2DIdx = 0; hit2DIdx < hitVector.size(); hit2DIdx++)
+                    for(const auto& hit2D : hitVector)
                     {
-                        const reco::ClusterHit2D* hit2D = hitVector[hit2DIdx];
-
-                        matchedHitMap[hit2D].insert(hitVector[(hit2DIdx+1)%hitVector.size()]);
-                        matchedHitMap[hit2D].insert(hitVector[(hit2DIdx+2)%hitVector.size()]);
-
                         if (hit2D->getStatusBits() & reco::ClusterHit2D::USEDINTRIPLET) hit2D->setStatusBit(reco::ClusterHit2D::SHAREDINTRIPLET);
 
                         hit2D->setStatusBit(reco::ClusterHit2D::USEDINTRIPLET);
@@ -1535,11 +1505,11 @@ bool SnippetHit3DBuilderICARUS::WireIDsIntersect(const geo::WireID& wireID0, con
 }
 
 float SnippetHit3DBuilderICARUS::closestApproach(const Eigen::Vector3f& P0,
-                                                 const Eigen::Vector3f& u0,
-                                                 const Eigen::Vector3f& P1,
-                                                 const Eigen::Vector3f& u1,
-                                                 float&                 arcLen0,
-                                                 float&                 arcLen1) const
+                                           const Eigen::Vector3f& u0,
+                                           const Eigen::Vector3f& P1,
+                                           const Eigen::Vector3f& u1,
+                                           float&                 arcLen0,
+                                           float&                 arcLen1) const
 {
     // Technique is to compute the arclength to each point of closest approach
     Eigen::Vector3f w0 = P0 - P1;
@@ -1579,7 +1549,6 @@ float SnippetHit3DBuilderICARUS::chargeIntegral(float peakMean,
 
 bool SnippetHit3DBuilderICARUS::makeDeadChannelPair(reco::ClusterHit3D&       pairOut,
                                                     const reco::ClusterHit3D& pair,
-                                                    MatchedHitMap&            matchedHitMap,
                                                     size_t                    maxChanStatus,
                                                     size_t                    minChanStatus,
                                                     float                     minOverlap) const
@@ -1605,56 +1574,49 @@ bool SnippetHit3DBuilderICARUS::makeDeadChannelPair(reco::ClusterHit3D&       pa
         missPlane = 1;
     }
 
-    // It can be the case that these hits have already been associated to a space point
-    if (matchedHitMap[hit0].find(hit1) != matchedHitMap[hit0].end())
-    {
-        // Which plane is missing?
-        geo::WireID wireID0 = hit0->WireID();
-        geo::WireID wireID1 = hit1->WireID();
-
-        // Ok, recover the wireID expected in the third plane...
-        geo::WireID wireIn(wireID0.Cryostat,wireID0.TPC,missPlane,0);
-        geo::WireID wireID = NearestWireID(pair.getPosition(), wireIn);
+    // Which plane is missing?
+    geo::WireID wireID0 = hit0->WireID();
+    geo::WireID wireID1 = hit1->WireID();
 
-        // There can be a round off issue so check the next wire as well
-        bool wireStatus    = m_channelStatus[wireID.Plane][wireID.Wire]   < maxChanStatus && m_channelStatus[wireID.Plane][wireID.Wire]   >= minChanStatus;
-        bool wireOneStatus = m_channelStatus[wireID.Plane][wireID.Wire+1] < maxChanStatus && m_channelStatus[wireID.Plane][wireID.Wire+1] >= minChanStatus;
+    // Ok, recover the wireID expected in the third plane...
+    geo::WireID wireIn(wireID0.Cryostat,wireID0.TPC,missPlane,0);
+    geo::WireID wireID = NearestWireID(pair.getPosition(), wireIn);
 
-        // Make sure they are of at least the minimum status
-        if(wireStatus || wireOneStatus)
-        {
-            // Sort out which is the wire we're dealing with
-            if (!wireStatus) wireID.Wire += 1;
+    // There can be a round off issue so check the next wire as well
+    bool wireStatus    = m_channelStatus[wireID.Plane][wireID.Wire]   < maxChanStatus && m_channelStatus[wireID.Plane][wireID.Wire]   >= minChanStatus;
+    bool wireOneStatus = m_channelStatus[wireID.Plane][wireID.Wire+1] < maxChanStatus && m_channelStatus[wireID.Plane][wireID.Wire+1] >= minChanStatus;
 
-            // Want to refine position since we "know" the missing wire
-            geo::WireIDIntersection widIntersect0;
+    // Make sure they are of at least the minimum status
+    if(wireStatus || wireOneStatus)
+    {
+        // Sort out which is the wire we're dealing with
+        if (!wireStatus) wireID.Wire += 1;
 
-            if (m_geometry->WireIDsIntersect(wireID0, wireID, widIntersect0))
-            {
-                geo::WireIDIntersection widIntersect1;
+        // Want to refine position since we "know" the missing wire
+        geo::WireIDIntersection widIntersect0;
 
-                if (m_geometry->WireIDsIntersect(wireID1, wireID, widIntersect1))
-                {
-                    Eigen::Vector3f newPosition(pair.getPosition()[0],pair.getPosition()[1],pair.getPosition()[2]);
+        if (m_geometry->WireIDsIntersect(wireID0, wireID, widIntersect0))
+        {
+            geo::WireIDIntersection widIntersect1;
 
-                    newPosition[1] = (newPosition[1] + widIntersect0.y + widIntersect1.y) / 3.;
-                    newPosition[2] = (newPosition[2] + widIntersect0.z + widIntersect1.z - 2. * m_zPosOffset) / 3.;
+            if (m_geometry->WireIDsIntersect(wireID1, wireID, widIntersect1))
+            {
+                Eigen::Vector3f newPosition(pair.getPosition()[0],pair.getPosition()[1],pair.getPosition()[2]);
 
-                    pairOut = pair;
-                    pairOut.setWireID(wireID);
-                    pairOut.setPosition(newPosition);
+                newPosition[1] = (newPosition[1] + widIntersect0.y + widIntersect1.y) / 3.;
+                newPosition[2] = (newPosition[2] + widIntersect0.z + widIntersect1.z - 2. * m_zPosOffset) / 3.;
 
-                    if (hit0->getStatusBits() & reco::ClusterHit2D::USEDINTRIPLET) hit0->setStatusBit(reco::ClusterHit2D::SHAREDINTRIPLET);
-                    if (hit1->getStatusBits() & reco::ClusterHit2D::USEDINTRIPLET) hit1->setStatusBit(reco::ClusterHit2D::SHAREDINTRIPLET);
+                pairOut = pair;
+                pairOut.setWireID(wireID);
+                pairOut.setPosition(newPosition);
 
-                    hit0->setStatusBit(reco::ClusterHit2D::USEDINTRIPLET);
-                    hit1->setStatusBit(reco::ClusterHit2D::USEDINTRIPLET);
+                if (hit0->getStatusBits() & reco::ClusterHit2D::USEDINTRIPLET) hit0->setStatusBit(reco::ClusterHit2D::SHAREDINTRIPLET);
+                if (hit1->getStatusBits() & reco::ClusterHit2D::USEDINTRIPLET) hit1->setStatusBit(reco::ClusterHit2D::SHAREDINTRIPLET);
 
-                    matchedHitMap[hit0].insert(hit1);
-                    matchedHitMap[hit1].insert(hit0);
+                hit0->setStatusBit(reco::ClusterHit2D::USEDINTRIPLET);
+                hit1->setStatusBit(reco::ClusterHit2D::USEDINTRIPLET);
 
-                    result  = true;
-                }
+                result  = true;
             }
         }
     }
@@ -1944,9 +1906,9 @@ void SnippetHit3DBuilderICARUS::CollectArtHits(const art::Event& evt) const
 //------------------------------------------------------------------------------------------------------------------------------------------
 
 void SnippetHit3DBuilderICARUS::CreateNewRecobHitCollection(art::Event&              event,
-                                                            reco::HitPairList&       hitPairList,
-                                                            std::vector<recob::Hit>& hitPtrVec,
-                                                            RecobHitToPtrMap&        recobHitToPtrMap)
+                                                      reco::HitPairList&       hitPairList,
+                                                      std::vector<recob::Hit>& hitPtrVec,
+                                                      RecobHitToPtrMap&        recobHitToPtrMap)
 {
     // Set up the timing
     cet::cpu_timer theClockBuildNewHits;

From f681c294ff01a553c0bbc6a4051035d1960bba6c Mon Sep 17 00:00:00 2001
From: SFBayLaser <usher@slac.stanford.edu>
Date: Wed, 7 Jun 2023 11:42:34 -0700
Subject: [PATCH 27/42] Fixing some commits that were trying to revert to a
 previous setup

---
 fcl/reco/Definitions/stage0_icarus_defs.fcl      | 6 +-----
 fcl/reco/Definitions/stage0_icarus_defs_run1.fcl | 8 ++------
 fcl/reco/Definitions/stage1_icarus_defs.fcl      | 8 --------
 fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl      | 3 +--
 4 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/fcl/reco/Definitions/stage0_icarus_defs.fcl b/fcl/reco/Definitions/stage0_icarus_defs.fcl
index 790be8fed..94533b3f3 100644
--- a/fcl/reco/Definitions/stage0_icarus_defs.fcl
+++ b/fcl/reco/Definitions/stage0_icarus_defs.fcl
@@ -120,11 +120,7 @@ icarus_stage0_filters:
   #
    flashfilterBNB: { module_type:         "FilterOpFlash" 
                      OpFlashProducerList: ["opflashCryoE","opflashCryoW"] 
-#                     WindowStartTime:     -1489.6 # -1489.4 - 0.2us safe margin
-#                     WindowEndTime:       -1487.6 # -1487.8 + 0.2us safe margin
-#                     WindowStartTime:     -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
-#                     WindowEndTime:       -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
-                     WindowStartTime:     -0.2 # Gate is now recentered by Gianluca/Andrea
+                     WindowStartTime:     -0.2 # 0.2us safe margin
                      WindowEndTime:        1.8 
                    }
    flashfilterNuMI: { module_type:         "FilterOpFlash" 
diff --git a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
index ddfa0d4ab..2832fe321 100644
--- a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
+++ b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
@@ -127,12 +127,8 @@ icarus_stage0_filters:
   #
    flashfilterBNB: { module_type:         "FilterOpFlash" 
                      OpFlashProducerList: ["opflashCryoE","opflashCryoW"] 
-#                     WindowStartTime:     -1489.6 # -1489.4 - 0.2us safe margin
-#                     WindowEndTime:       -1487.6 # -1487.8 + 0.2us safe margin
-#                     WindowStartTime:     -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
-#                     WindowEndTime:       -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
-                     WindowStartTime:     -0.2 # Gate is now recentered by Gianluca/Andrea
-                     WindowEndTime:        1.8 
+                     WindowStartTime:     -0.2 # 0.2us safe margin
+#                    WindowEndTime:        1.8 
                    }
    flashfilterNuMI: { module_type:         "FilterOpFlash" 
                       OpFlashProducerList: ["opflashCryoE","opflashCryoW"] 
diff --git a/fcl/reco/Definitions/stage1_icarus_defs.fcl b/fcl/reco/Definitions/stage1_icarus_defs.fcl
index 51b71feb8..3fa48719a 100644
--- a/fcl/reco/Definitions/stage1_icarus_defs.fcl
+++ b/fcl/reco/Definitions/stage1_icarus_defs.fcl
@@ -69,14 +69,6 @@ icarus_stage1_producers:
 
 icarus_stage1_filters:
 {
-   flashfilter: { module_type: "FilterOpFlash" 
-                  OpFlashProducerList: ["opflashCryoW","opflashCryoE"] 
-#                  WindowStartTime: -1489.6 # -1489.4 - 0.2us safe margin
-#                  WindowEndTime:   -1487.6 # -1487.8 + 0.2us safe margin
-                  WindowStartTime: -1490.8 # 9.6 us - 1500 us offset - 0.4us safe margin
-                  WindowEndTime:   -1488.4 # 11.2 -1500 us offset + 0.4us safe margin
-                }
-
    TPCHitFilterCryoW: @local::icarus_FilterNumberTPCHits
    TPCHitFilterCryoE: @local::icarus_FilterNumberTPCHits
 }
diff --git a/fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl b/fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl
index 2cc30e40f..5fe3dbdac 100644
--- a/fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl
+++ b/fcl/reco/Stage0/Run1/stage0_run1_icarus.fcl
@@ -15,8 +15,7 @@ physics.trigger_paths: [ path ]
 physics.end_paths:     [ outana, streamROOT ]
 
 # Drop the artdaq format files on output
-outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", "drop *_daqTPCROI_*_*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*" ]
-#outputs.rootOutput.SelectEvents:   [path]
+outputs.rootOutput.outputCommands: ["keep *_*_*_*", "drop *_*_*_DAQ*", "drop *_ophituncorrected_*_*", "drop *_daqTPCROI_*_*", "drop *_decon1droi_*_*", "drop *_decon1DroiTPC*_*_*" ]outputs.rootOutput.SelectEvents:   [path]
 
 ## Modify the event selection for the purity analyzers
 physics.analyzers.purityinfoana0.SelectEvents:    [ path ]

From 111e769b2e676121d4b1323f555d4caeb505b4a9 Mon Sep 17 00:00:00 2001
From: SFBayLaser <usher@slac.stanford.edu>
Date: Wed, 7 Jun 2023 11:45:03 -0700
Subject: [PATCH 28/42] remove # to prevent a line from being commented out

---
 fcl/reco/Definitions/stage0_icarus_defs_run1.fcl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
index 2832fe321..aa82ccc42 100644
--- a/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
+++ b/fcl/reco/Definitions/stage0_icarus_defs_run1.fcl
@@ -128,7 +128,7 @@ icarus_stage0_filters:
    flashfilterBNB: { module_type:         "FilterOpFlash" 
                      OpFlashProducerList: ["opflashCryoE","opflashCryoW"] 
                      WindowStartTime:     -0.2 # 0.2us safe margin
-#                    WindowEndTime:        1.8 
+                     WindowEndTime:        1.8 
                    }
    flashfilterNuMI: { module_type:         "FilterOpFlash" 
                       OpFlashProducerList: ["opflashCryoE","opflashCryoW"] 

From 4e4c922f349f9c83556ca9dfef06ef6661975b06 Mon Sep 17 00:00:00 2001
From: SFBayLaser <usher@slac.stanford.edu>
Date: Wed, 7 Jun 2023 11:57:06 -0700
Subject: [PATCH 29/42] Making sure the naming of the root output is consistent

---
 fcl/reco/Definitions/stage1_icarus_driver_common.fcl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fcl/reco/Definitions/stage1_icarus_driver_common.fcl b/fcl/reco/Definitions/stage1_icarus_driver_common.fcl
index 66671049f..28133b77c 100644
--- a/fcl/reco/Definitions/stage1_icarus_driver_common.fcl
+++ b/fcl/reco/Definitions/stage1_icarus_driver_common.fcl
@@ -46,8 +46,8 @@ physics:
 
  #reco sequence and trigger_paths to be defined elsewhere
 
- stream1:    [ out1 ]
- end_paths:  [stream1]
+ stream1:    [ rootOutput ]
+ end_paths:  [ stream1 ]
 
 }
 
@@ -56,7 +56,7 @@ physics:
 #entry in the output stream you want those to go to, where XXX is the label of the filter module(s)
 outputs:
 {
- out1:
+ rootOutput:
  {
    module_type: RootOutput
    dataTier: "reconstructed"

From 191b0877a9f6e0090207bd6f42ebb6e5e54366e6 Mon Sep 17 00:00:00 2001
From: SFBayLaser <usher@slac.stanford.edu>
Date: Wed, 7 Jun 2023 12:29:20 -0700
Subject: [PATCH 30/42] Reverting, I was confusing stage 1 with stage 0...

---
 fcl/reco/Definitions/stage1_icarus_driver_common.fcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fcl/reco/Definitions/stage1_icarus_driver_common.fcl b/fcl/reco/Definitions/stage1_icarus_driver_common.fcl
index 28133b77c..a8304f707 100644
--- a/fcl/reco/Definitions/stage1_icarus_driver_common.fcl
+++ b/fcl/reco/Definitions/stage1_icarus_driver_common.fcl
@@ -46,7 +46,7 @@ physics:
 
  #reco sequence and trigger_paths to be defined elsewhere
 
- stream1:    [ rootOutput ]
+ stream1:    [ out1 ]
  end_paths:  [ stream1 ]
 
 }
@@ -56,7 +56,7 @@ physics:
 #entry in the output stream you want those to go to, where XXX is the label of the filter module(s)
 outputs:
 {
- rootOutput:
+ out1:
  {
    module_type: RootOutput
    dataTier: "reconstructed"

From 3ce1a2975d21f9e10ed68e3347feb7b6af7904b1 Mon Sep 17 00:00:00 2001
From: Matthew Rosenberg <rosenberg6m@gmail.com>
Date: Wed, 7 Jun 2023 17:25:15 -0500
Subject: [PATCH 31/42] updated CMake tag for production patch release

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26246aa1c..190cd154a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
 
 find_package(cetmodules 3.20.00 REQUIRED)
 
-set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.72.00.03-p01)
+set(${PROJECT_NAME}_CMAKE_PROJECT_VERSION_STRING 09.72.00.03-p02)
 #project(icaruscode VERSION 09.72.00.03 LANGUAGES CXX)
 project(icaruscode LANGUAGES CXX)
 

From 73f2b9bcd2177f7b422cddb1fab33c9bf005706b Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Fri, 28 Jul 2023 15:38:44 -0500
Subject: [PATCH 32/42] Update MC calo const. Fix bug in Cryostat enumeration.

---
 fcl/caf/cafmaker_add_detsim2d_icarus.fcl | 5 +++--
 fcl/caf/cafmaker_defs.fcl                | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
index 969eb4e7a..0c06987de 100644
--- a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
+++ b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
@@ -12,6 +12,7 @@ physics.producers.mcreco.SimChannelLabel: "daq:simpleSC"
 
 # Mini production, pre signal shape tuning
 # this_cal_constants: [1.343e-2, 1.338e-2, 0.01227]
-# Post signal shape tuning
-this_cal_constants: [1.343e-2, 1.338e-2, 0.01285]
+# Post signal shape tuning, post gain fixing
+# See docdb 32139
+this_cal_constants: [1.343e-2, 1.338e-2, 0.01265]
 #include "set_caf_calconst.fcl"
diff --git a/fcl/caf/cafmaker_defs.fcl b/fcl/caf/cafmaker_defs.fcl
index 6519be686..a66b1f767 100644
--- a/fcl/caf/cafmaker_defs.fcl
+++ b/fcl/caf/cafmaker_defs.fcl
@@ -43,6 +43,7 @@ recoana_mccalo_producers: {
 # Overwrite Labels
 recoana_mccalo_producers.pandoraCaloGausCryoE.TrackModuleLabel: "pandoraTrackGausCryoE"
 recoana_mccalo_producers.pandoraCaloGausCryoW.TrackModuleLabel: "pandoraTrackGausCryoW"
+recoana_mccalo_producers.pandoraCaloGausCryoW.Cryostat: 1
 
 # Setup CaloAlg for VertexCharge
 recoana_mccalo_producers.vertexChargeCryoE.CaloAlg: @local::icarus_calorimetryalgmc

From 95b12d83ddd5f71b973bf9b39f917baa2701fcff Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Fri, 28 Jul 2023 15:39:46 -0500
Subject: [PATCH 33/42] Update NormTools. Switch TPC and YZ normalization to be
 per-run.

---
 .../TPC/Calorimetry/NormalizeTPCSQL_tool.cc   | 20 ++++++-----
 .../TPC/Calorimetry/NormalizeTPC_tool.cc      | 24 ++++++-------
 .../TPC/Calorimetry/NormalizeYZSQL_tool.cc    | 20 ++++++-----
 .../TPC/Calorimetry/NormalizeYZ_tool.cc       | 34 +++++++++----------
 .../TPC/Calorimetry/normtools_icarus.fcl      | 18 +++++-----
 5 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc b/icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc
index d12a802c5..efcac84d7 100644
--- a/icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc
+++ b/icaruscode/TPC/Calorimetry/NormalizeTPCSQL_tool.cc
@@ -49,9 +49,9 @@ class NormalizeTPCSQL : public INormalizeCharge
   };
 
   // Helpers
-  ScaleInfo GetScaleInfo(uint64_t timestamp);
+  ScaleInfo GetScaleInfo(uint64_t run);
 
-  // Cache timestamp requests
+  // Cache run requests
   std::map<uint64_t, ScaleInfo> fScaleInfos;
 };
 
@@ -69,16 +69,18 @@ icarus::calo::NormalizeTPCSQL::NormalizeTPCSQL(fhicl::ParameterSet const &pset):
 
 void icarus::calo::NormalizeTPCSQL::configure(const fhicl::ParameterSet& pset) {}
 
-icarus::calo::NormalizeTPCSQL::ScaleInfo icarus::calo::NormalizeTPCSQL::GetScaleInfo(uint64_t timestamp) {
+icarus::calo::NormalizeTPCSQL::ScaleInfo icarus::calo::NormalizeTPCSQL::GetScaleInfo(uint64_t run) {
   // check the cache
-  if (fScaleInfos.count(timestamp)) {
-    return fScaleInfos.at(timestamp);
+  if (fScaleInfos.count(run)) {
+    return fScaleInfos.at(run);
   }
 
-  // Lookup the data
-  fDB.UpdateData(timestamp*1e9);
+  // Look up the run
+  //
+  // Translate the run into a fake "timestamp"
+  fDB.UpdateData((run+1000000000)*1000000000);
 
-  // Collect the timestamp info
+  // Collect the run info
   ScaleInfo thisscale;
 
   // Iterate over the rows
@@ -89,7 +91,7 @@ icarus::calo::NormalizeTPCSQL::ScaleInfo icarus::calo::NormalizeTPCSQL::GetScale
     thisscale.scale[ch] = scale;
   }
   // Set the cache
-  fScaleInfos[timestamp] = thisscale;
+  fScaleInfos[run] = thisscale;
 
   return thisscale;
 }
diff --git a/icaruscode/TPC/Calorimetry/NormalizeTPC_tool.cc b/icaruscode/TPC/Calorimetry/NormalizeTPC_tool.cc
index 906b44a07..85f071321 100644
--- a/icaruscode/TPC/Calorimetry/NormalizeTPC_tool.cc
+++ b/icaruscode/TPC/Calorimetry/NormalizeTPC_tool.cc
@@ -45,10 +45,10 @@ class NormalizeTPC : public INormalizeCharge
   };
 
   // Helpers
-  ScaleInfo GetScaleInfo(uint64_t timestamp);
-  std::string URL(uint64_t timestamp);
+  ScaleInfo GetScaleInfo(uint64_t run);
+  std::string URL(uint64_t run);
 
-  // Cache timestamp requests
+  // Cache run requests
   std::map<uint64_t, ScaleInfo> fScaleInfos;
 };
 
@@ -68,19 +68,19 @@ void icarus::calo::NormalizeTPC::configure(const fhicl::ParameterSet& pset) {
   fVerbose = pset.get<bool>("Verbose", false);
 }
 
-std::string icarus::calo::NormalizeTPC::URL(uint64_t timestamp) {
-  return fURL + std::to_string(timestamp);
+std::string icarus::calo::NormalizeTPC::URL(uint64_t run) {
+  return fURL + std::to_string(run);
 }
 
-icarus::calo::NormalizeTPC::ScaleInfo icarus::calo::NormalizeTPC::GetScaleInfo(uint64_t timestamp) {
+icarus::calo::NormalizeTPC::ScaleInfo icarus::calo::NormalizeTPC::GetScaleInfo(uint64_t run) {
   // check the cache
-  if (fScaleInfos.count(timestamp)) {
-    return fScaleInfos.at(timestamp);
+  if (fScaleInfos.count(run)) {
+    return fScaleInfos.at(run);
   }
 
   // Otherwise, look it up
   int error = 0;
-  std::string url = URL(timestamp);
+  std::string url = URL(run);
 
   if (fVerbose) std::cout << "NormalizeTPC Tool -- New Scale info, requesting data from url:\n" << url << std::endl;
 
@@ -97,7 +97,7 @@ icarus::calo::NormalizeTPC::ScaleInfo icarus::calo::NormalizeTPC::GetScaleInfo(u
       << "). HTTP error status: " << getHTTPstatus(d) << ". HTTP error message: " << getHTTPmessage(d);
   }
 
-  // Collect the timestamp info
+  // Collect the run info
   ScaleInfo thisscale;
 
   // Number of rows
@@ -128,7 +128,7 @@ icarus::calo::NormalizeTPC::ScaleInfo icarus::calo::NormalizeTPC::GetScaleInfo(u
   }
 
   // Set the cache
-  fScaleInfos[timestamp] = thisscale;
+  fScaleInfos[run] = thisscale;
 
   return thisscale;
 }
@@ -136,7 +136,7 @@ icarus::calo::NormalizeTPC::ScaleInfo icarus::calo::NormalizeTPC::GetScaleInfo(u
 double icarus::calo::NormalizeTPC::Normalize(double dQdx, const art::Event &e, 
     const recob::Hit &hit, const geo::Point_t &location, const geo::Vector_t &direction, double t0) {
   // Get the info
-  ScaleInfo i = GetScaleInfo(e.time().timeHigh());
+  ScaleInfo i = GetScaleInfo(e.id().runID().run());
 
   // Lookup the TPC, cryo
   unsigned tpc = hit.WireID().TPC;
diff --git a/icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc b/icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc
index d6755797e..8c1619bad 100644
--- a/icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc
+++ b/icaruscode/TPC/Calorimetry/NormalizeYZSQL_tool.cc
@@ -78,11 +78,11 @@ class NormalizeYZSQL : public INormalizeCharge
     ScaleBin const* findBin(const Point& point) const noexcept;
 
   };
-  // Cache timestamp requests
+  // Cache run requests
   std::map<uint64_t, ScaleInfo> fScaleInfos;
 
   // Helpers
-  const ScaleInfo& GetScaleInfo(uint64_t timestamp);
+  const ScaleInfo& GetScaleInfo(uint64_t run);
 };
 
 DEFINE_ART_CLASS_TOOL(NormalizeYZSQL)
@@ -153,16 +153,18 @@ icarus::calo::NormalizeYZSQL::NormalizeYZSQL(fhicl::ParameterSet const &pset):
 
 void icarus::calo::NormalizeYZSQL::configure(const fhicl::ParameterSet& pset) {}
 
-const icarus::calo::NormalizeYZSQL::ScaleInfo& icarus::calo::NormalizeYZSQL::GetScaleInfo(uint64_t timestamp) {
+const icarus::calo::NormalizeYZSQL::ScaleInfo& icarus::calo::NormalizeYZSQL::GetScaleInfo(uint64_t run) {
   // check the cache
-  if (fScaleInfos.count(timestamp)) {
-    return fScaleInfos.at(timestamp);
+  if (fScaleInfos.count(run)) {
+    return fScaleInfos.at(run);
   }
 
-  // Prep data
-  fDB.UpdateData(timestamp*1e9);
+  // Look up the run
+  //
+  // Translate the run into a fake "timestamp"
+  fDB.UpdateData((run+1000000000)*1000000000);
 
-  // Collect the timestamp info
+  // Collect the run info
   ScaleInfo thisscale;
 
   // Lookup the channels
@@ -207,7 +209,7 @@ const icarus::calo::NormalizeYZSQL::ScaleInfo& icarus::calo::NormalizeYZSQL::Get
   std::sort(thisscale.bins.begin(), thisscale.bins.end());
 
   // Set the cache
-  return fScaleInfos[timestamp] = std::move(thisscale);
+  return fScaleInfos[run] = std::move(thisscale);
 
 }
 
diff --git a/icaruscode/TPC/Calorimetry/NormalizeYZ_tool.cc b/icaruscode/TPC/Calorimetry/NormalizeYZ_tool.cc
index 2dbc919c9..be46495d7 100644
--- a/icaruscode/TPC/Calorimetry/NormalizeYZ_tool.cc
+++ b/icaruscode/TPC/Calorimetry/NormalizeYZ_tool.cc
@@ -57,10 +57,10 @@ class NormalizeYZ : public INormalizeCharge
   };
 
   // Helpers
-  const ScaleInfo& GetScaleInfo(uint64_t timestamp);
-  std::string URL(uint64_t timestamp);
+  const ScaleInfo& GetScaleInfo(uint64_t run);
+  std::string URL(uint64_t run);
 
-  // Cache timestamp requests
+  // Cache run requests
   std::map<uint64_t, ScaleInfo> fScaleInfos;
 };
 
@@ -80,19 +80,19 @@ void icarus::calo::NormalizeYZ::configure(const fhicl::ParameterSet& pset) {
   fVerbose = pset.get<bool>("Verbose", false);
 }
 
-std::string icarus::calo::NormalizeYZ::URL(uint64_t timestamp) {
-  return fURL + std::to_string(timestamp);
+std::string icarus::calo::NormalizeYZ::URL(uint64_t run) {
+  return fURL + std::to_string(run);
 }
 
-const icarus::calo::NormalizeYZ::ScaleInfo& icarus::calo::NormalizeYZ::GetScaleInfo(uint64_t timestamp) {
+const icarus::calo::NormalizeYZ::ScaleInfo& icarus::calo::NormalizeYZ::GetScaleInfo(uint64_t run) {
   // check the cache
-  if (fScaleInfos.count(timestamp)) {
-    return fScaleInfos.at(timestamp);
+  if (fScaleInfos.count(run)) {
+    return fScaleInfos.at(run);
   }
 
   // Otherwise, look it up
   int error = 0;
-  std::string url = URL(timestamp);
+  std::string url = URL(run);
 
   if (fVerbose) std::cout << "NormalizeYZ Tool -- New Scale info, requesting data from url:\n" << url << std::endl;
 
@@ -109,7 +109,7 @@ const icarus::calo::NormalizeYZ::ScaleInfo& icarus::calo::NormalizeYZ::GetScaleI
       << "). HTTP error status: " << getHTTPstatus(d) << ". HTTP error message: " << getHTTPmessage(d);
   }
 
-  // Collect the timestamp info
+  // Collect the run info
   ScaleInfo thisscale;
 
   // Get the First row to get tzero
@@ -132,18 +132,18 @@ const icarus::calo::NormalizeYZ::ScaleInfo& icarus::calo::NormalizeYZ::GetScaleI
       thisscale = scale;
       found_scale_t0 = true;
 
-      if (fVerbose) std::cout << "NormalizeYZ Tool -- Found prior matching T0 from timestamp: " << scale_pair.first << std::endl;
+      if (fVerbose) std::cout << "NormalizeYZ Tool -- Found prior matching T0 from run: " << scale_pair.first << std::endl;
 
       break;
     }
   }
 
   if (found_scale_t0) {
-    fScaleInfos[timestamp] = thisscale;
-    return fScaleInfos.at(timestamp);
+    fScaleInfos[run] = thisscale;
+    return fScaleInfos.at(run);
   }
 
-  // We haven't seen this timestamp before and we haven't seen the valid t0 before.
+  // We haven't seen this run before and we haven't seen the valid t0 before.
   //
   // Process the HTTP response
   thisscale.tzero = tzero;
@@ -213,14 +213,14 @@ const icarus::calo::NormalizeYZ::ScaleInfo& icarus::calo::NormalizeYZ::GetScaleI
   }
 
   // Set the cache
-  fScaleInfos[timestamp] = thisscale;
-  return fScaleInfos.at(timestamp);
+  fScaleInfos[run] = thisscale;
+  return fScaleInfos.at(run);
 }
 
 double icarus::calo::NormalizeYZ::Normalize(double dQdx, const art::Event &e, 
     const recob::Hit &hit, const geo::Point_t &location, const geo::Vector_t &direction, double t0) {
   // Get the info
-  ScaleInfo i = GetScaleInfo(e.time().timeHigh());
+  ScaleInfo i = GetScaleInfo(e.id().runID().run());
 
   double scale = 1;
   bool found_bin = false;;
diff --git a/icaruscode/TPC/Calorimetry/normtools_icarus.fcl b/icaruscode/TPC/Calorimetry/normtools_icarus.fcl
index fb490e314..20692808b 100644
--- a/icaruscode/TPC/Calorimetry/normtools_icarus.fcl
+++ b/icaruscode/TPC/Calorimetry/normtools_icarus.fcl
@@ -17,7 +17,7 @@ wirenorm: {
 yznorm: {
   tool_type: NormalizeYZ
   Timeout: 200
-  URL: "https://dbdata0vm.fnal.gov:9443/icarus_con_prod/app/data?f=test_tpc_yz_correction_data&t="
+  URL: "https://dbdata0vm.fnal.gov:9443/icarus_con_prod/app/data?f=tpc_yz_correction_data&t="
   Verbose: false
 }
 
@@ -44,14 +44,11 @@ tpcgain_sql: {
 
 tpcgain_local: {
   tool_type: NormalizeTPCLocal
-  # Recombination floating, muon+proton fit
-  # CalConstants: [81.04, 79.5, 82.88, 81.88]
-  # Recombination fixed, muon+proton fit
-  CalConstants: [80.32, 79.82, 82.24, 81.68]
+  # Relative normalization of the TPCs
+  CalConstants: [1.0118, 1.0000, 1.0333, 1.0230]
   Verbose: false
 }
 
-
 yznorm_sql: {
   tool_type: NormalizeYZSQL
   DBFileName: tpc_yz_correction_data
@@ -59,10 +56,11 @@ yznorm_sql: {
   Verbose: false
 }
 
-# icarus_calonormtools: [@local::driftnorm, @local::yznorm, @local::tpcgain]
-icarus_calonormtools: [@local::driftnorm_sql, @local::yznorm_sql, @local::tpcgain_local]
+icarus_calonormtools: [@local::driftnorm, @local::yznorm, @local::tpcgain]
+# icarus_calonormtools: [@local::driftnorm_sql, @local::yznorm_sql, @local::tpcgain_sql]
 
-# The norm tools already take care of this
-icarus_data_calconst: [1., 1., 1.]
+# Gain with angular dep. recombination
+# Assume equal on planes -- this is __wrong__ -- will need to be fixed when they are calibrated
+icarus_data_calconst: [0.013390, 0.013390, 0.013390]
 
 END_PROLOG

From 9a29e21ccb2de77245324035bd676b38827b1c96 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Fri, 28 Jul 2023 15:40:29 -0500
Subject: [PATCH 34/42] Use SQLite interface to normalization.

---
 icaruscode/TPC/Calorimetry/normtools_icarus.fcl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/icaruscode/TPC/Calorimetry/normtools_icarus.fcl b/icaruscode/TPC/Calorimetry/normtools_icarus.fcl
index 20692808b..695466c27 100644
--- a/icaruscode/TPC/Calorimetry/normtools_icarus.fcl
+++ b/icaruscode/TPC/Calorimetry/normtools_icarus.fcl
@@ -56,8 +56,8 @@ yznorm_sql: {
   Verbose: false
 }
 
-icarus_calonormtools: [@local::driftnorm, @local::yznorm, @local::tpcgain]
-# icarus_calonormtools: [@local::driftnorm_sql, @local::yznorm_sql, @local::tpcgain_sql]
+# icarus_calonormtools: [@local::driftnorm, @local::yznorm, @local::tpcgain]
+icarus_calonormtools: [@local::driftnorm_sql, @local::yznorm_sql, @local::tpcgain_sql]
 
 # Gain with angular dep. recombination
 # Assume equal on planes -- this is __wrong__ -- will need to be fixed when they are calibrated

From 8e3b21106597ede39414f7ca4ba6f46110e1fe07 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Fri, 28 Jul 2023 15:41:01 -0500
Subject: [PATCH 35/42] Tune induction gain to data.

---
 .../TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
index 9c6993c62..3541a44ab 100644
--- a/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
+++ b/icaruscode/TPC/ICARUSWireCell/detsimmodules_wirecell_ICARUS.fcl
@@ -75,10 +75,8 @@ icarus_simwire_wirecell_fitSR.wcls_main.params.file_rcresp: "icarus_fnal_rc_tail
 # Add in the tuned field responses
 icarus_simwire_wirecell_fitSR.wcls_main.params.files_fields: "icarus_fnal_fit_ks.json.bz2"
 # futz with shaping+gain values (note these are really just scale factors and should not be taken literally)
-icarus_simwire_wirecell_fitSR.wcls_main.structs.gain0: 10.2636323 # mV/fC 
-icarus_simwire_wirecell_fitSR.wcls_main.structs.gain1: 12.1420344 # mV/fC
+icarus_simwire_wirecell_fitSR.wcls_main.structs.gain0: 11.9918701 # mV/fC 
+icarus_simwire_wirecell_fitSR.wcls_main.structs.gain1: 12.6181926 # mV/fC
 icarus_simwire_wirecell_fitSR.wcls_main.structs.gain2: 13.0261362 # mV/fC
 icarus_simwire_wirecell_fitSR.wcls_main.structs.shaping1: 1.45 # us
-
-
 END_PROLOG

From 62e0a35d12dca0d9348c537d6b3fb5eab7dc1fee Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Fri, 28 Jul 2023 15:41:57 -0500
Subject: [PATCH 36/42] Update to angular dependent recombination correction.

---
 fcl/caf/cafmakerjob_icarus_data.fcl                      | 2 --
 icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl         | 3 +++
 icaruscode/TPC/Calorimetry/icarus_data_recombination.fcl | 7 -------
 3 files changed, 3 insertions(+), 9 deletions(-)
 delete mode 100644 icaruscode/TPC/Calorimetry/icarus_data_recombination.fcl

diff --git a/fcl/caf/cafmakerjob_icarus_data.fcl b/fcl/caf/cafmakerjob_icarus_data.fcl
index 2894adb93..90e428270 100644
--- a/fcl/caf/cafmakerjob_icarus_data.fcl
+++ b/fcl/caf/cafmakerjob_icarus_data.fcl
@@ -32,5 +32,3 @@ physics.producers.cafmaker.SimChannelLabel: ""
 physics.producers.cafmaker.SystWeightLabels: []
 
 physics.producers.cafmaker.TriggerLabel: "daqTrigger" # the general configuration, for MC, has a different one (see also https://github.com/SBNSoftware/icaruscode/issues/556)
-
-#include "icarus_data_recombination.fcl"
diff --git a/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl b/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
index 449fda020..52aab1aa9 100644
--- a/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
+++ b/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
@@ -13,6 +13,9 @@ icarus_calorimetryalgmc.CalAreaConstants: [0.01343, 0.01338, 0.01219]
 
 icarus_calorimetryalgdata.CalAreaConstants: @local::icarus_data_calconst
 icarus_calorimetryalgdata.CaloDoLifeTimeCorrection: false # handled by NormTools
+icarus_calorimetryalgdata.ModBoxA: 0.9022
+icarus_calorimetryalgdata.ModBoxBTF1: "[0]*x**2 + [1]*x + [2]"
+icarus_calorimetryalgdata.ModBoxBParam: [2.01812433e-05, -3.13322811e-03, 3.28764217e-01]
 
 standard_gnocchicaloicarus:
 {
diff --git a/icaruscode/TPC/Calorimetry/icarus_data_recombination.fcl b/icaruscode/TPC/Calorimetry/icarus_data_recombination.fcl
deleted file mode 100644
index 6b32d8ed5..000000000
--- a/icaruscode/TPC/Calorimetry/icarus_data_recombination.fcl
+++ /dev/null
@@ -1,7 +0,0 @@
-# Recombination floating, muon+proton fit
-# services.DetectorPropertiesService.ModBoxAlpha: 0.939
-# services.DetectorPropertiesService.ModBoxBeta: 0.192
-
-# Recombination fixed
-services.DetectorPropertiesService.ModBoxAlpha: 0.93
-services.DetectorPropertiesService.ModBoxBeta: 0.212

From e851606ae4dcae06cb8c17c85bd76fca2450ef6e Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Sat, 21 Oct 2023 19:20:14 -0500
Subject: [PATCH 37/42] Update to ellipsoid modified box model.

---
 icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl | 6 +++---
 icaruscode/TPC/Calorimetry/normtools_icarus.fcl  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl b/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
index 52aab1aa9..f59db9a83 100644
--- a/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
+++ b/icaruscode/TPC/Calorimetry/calorimetryICARUS.fcl
@@ -13,9 +13,9 @@ icarus_calorimetryalgmc.CalAreaConstants: [0.01343, 0.01338, 0.01219]
 
 icarus_calorimetryalgdata.CalAreaConstants: @local::icarus_data_calconst
 icarus_calorimetryalgdata.CaloDoLifeTimeCorrection: false # handled by NormTools
-icarus_calorimetryalgdata.ModBoxA: 0.9022
-icarus_calorimetryalgdata.ModBoxBTF1: "[0]*x**2 + [1]*x + [2]"
-icarus_calorimetryalgdata.ModBoxBParam: [2.01812433e-05, -3.13322811e-03, 3.28764217e-01]
+icarus_calorimetryalgdata.ModBoxA: 0.906
+icarus_calorimetryalgdata.ModBoxBTF1: "[0]/TMath::Sqrt(TMath::Sin(x*TMath::Pi()/180)**2 + TMath::Cos(x*TMath::Pi()/180)**2/[1]**2)"
+icarus_calorimetryalgdata.ModBoxBParam: [0.203, 1.25]
 
 standard_gnocchicaloicarus:
 {
diff --git a/icaruscode/TPC/Calorimetry/normtools_icarus.fcl b/icaruscode/TPC/Calorimetry/normtools_icarus.fcl
index 695466c27..9e864019f 100644
--- a/icaruscode/TPC/Calorimetry/normtools_icarus.fcl
+++ b/icaruscode/TPC/Calorimetry/normtools_icarus.fcl
@@ -56,11 +56,11 @@ yznorm_sql: {
   Verbose: false
 }
 
-# icarus_calonormtools: [@local::driftnorm, @local::yznorm, @local::tpcgain]
-icarus_calonormtools: [@local::driftnorm_sql, @local::yznorm_sql, @local::tpcgain_sql]
+icarus_calonormtools: [@local::driftnorm, @local::yznorm, @local::tpcgain]
+# icarus_calonormtools: [@local::driftnorm_sql, @local::yznorm_sql, @local::tpcgain_sql]
 
 # Gain with angular dep. recombination
 # Assume equal on planes -- this is __wrong__ -- will need to be fixed when they are calibrated
-icarus_data_calconst: [0.013390, 0.013390, 0.013390]
+icarus_data_calconst: [0.013316, 0.013316, 0.013316]
 
 END_PROLOG

From 3e6d8e7a0dad57d02074580b6b633802c9069050 Mon Sep 17 00:00:00 2001
From: Andrew Mastbaum <mastbaum@physics.rutgers.edu>
Date: Mon, 31 Jul 2023 09:33:47 -0500
Subject: [PATCH 38/42] add geant4reweight producer to cafmaker_defs

Note: job fcls are not modified in this commit.
---
 fcl/caf/cafmaker_defs.fcl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fcl/caf/cafmaker_defs.fcl b/fcl/caf/cafmaker_defs.fcl
index a66b1f767..19d6e7957 100644
--- a/fcl/caf/cafmaker_defs.fcl
+++ b/fcl/caf/cafmaker_defs.fcl
@@ -14,6 +14,7 @@
 #include "eventweight_genie_sbn.fcl"
 #include "eventweight_genie_systtools.fcl"
 #include "eventweight_flux_sbn.fcl"
+#include "eventweight_geant4_sbn.fcl"
 #include "mcreco.fcl"
 #include "mcsproducer.fcl"
 #include "rangeproducer.fcl"
@@ -114,6 +115,7 @@ recoana_caf_preprocess_producers: {
   genieweight: @local::sbn_eventweight_genie
   systtools: @local::sbn_systtools
   fluxweight: @local::sbn_eventweight_flux
+  geant4weight: @local::sbn_eventweight_geant4
 }
 
 # Overwrite labels
@@ -129,6 +131,7 @@ recoana_caf_preprocess_producers.pandoraPidGausCryoW.CalorimetryModuleLabel: "pa
 
 recoana_caf_preprocess_producers.genieweight.weight_functions: @local::recoana_caf_preprocess_producers.genieweight.weight_functions_genie
 recoana_caf_preprocess_producers.fluxweight.weight_functions: @local::recoana_caf_preprocess_producers.fluxweight.weight_functions_flux
+recoana_caf_preprocess_producers.geant4weight.weight_functions: @local::recoana_caf_preprocess_producers.geant4weight.weight_functions_reint
 
 # Producers for making SCE products
 recoana_sce_producers: {
@@ -257,7 +260,7 @@ caf_preprocess_data_sequence: [
     # TODO: rns??
     ]
 
-caf_preprocess_evtw_sequence: [@sequence::caf_preprocess_sequence, rns, genieweight, fluxweight]
+caf_preprocess_evtw_sequence: [@sequence::caf_preprocess_sequence, rns, genieweight, fluxweight, geant4weight]
 
 caf_preprocess_sce_sequence: [ mcreco,
   # Run the SCE correction
@@ -279,7 +282,7 @@ caf_preprocess_sce_sequence: [ mcreco,
   # TODO: rns??
 ]
 
-caf_preprocess_sce_evtw_sequence: [@sequence::caf_preprocess_sce_sequence, rns, genieweight, fluxweight]
+caf_preprocess_sce_evtw_sequence: [@sequence::caf_preprocess_sce_sequence, rns, genieweight, fluxweight, geant4weight]
 
 # CAFMaker config
 cafmaker: @local::standard_cafmaker
@@ -313,7 +316,7 @@ cafmaker.OpFlashLabel: "opflash"
 cafmaker.TriggerLabel: "emuTrigger"
 cafmaker.FlashTrigLabel: "" # unavailable
 cafmaker.SimChannelLabel: "largeant"
-cafmaker.SystWeightLabels: ["genieweight", "fluxweight"]
+cafmaker.SystWeightLabels: ["genieweight", "fluxweight", "geant4weight"]
 cafmaker.TrackHitFillRREndCut: 30 # include entire PID region
 
 # Add CAFMaker to the list of producers

From 621cf3eb828f07f0e1a95bd21de1d6ecd05d98f1 Mon Sep 17 00:00:00 2001
From: Guadalupe Moreno Granados <lupis.mo05@gmail.com>
Date: Tue, 19 Sep 2023 09:46:05 -0500
Subject: [PATCH 39/42] We associated the T0Module to the cafmakerjob

---
 fcl/caf/cafmaker_add_detsim2d_icarus.fcl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
index 0c06987de..0947f5883 100644
--- a/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
+++ b/fcl/caf/cafmaker_add_detsim2d_icarus.fcl
@@ -10,6 +10,10 @@ physics.producers.mcreco.G4ModName: @erase
 physics.producers.mcreco.MCParticleLabel: "largeant"
 physics.producers.mcreco.SimChannelLabel: "daq:simpleSC"
 
+### adding t0 info in the calorimetry variables
+physics.producers.pandoraCaloGausCryoE.T0ModuleLabel: "pandoraGausCryoE"
+physics.producers.pandoraCaloGausCryoW.T0ModuleLabel: "pandoraGausCryoW" 
+
 # Mini production, pre signal shape tuning
 # this_cal_constants: [1.343e-2, 1.338e-2, 0.01227]
 # Post signal shape tuning, post gain fixing

From 24430c99398e26c4815ebf13dc3b6027dd4b8d02 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Sat, 21 Oct 2023 20:07:54 -0500
Subject: [PATCH 40/42] Add in configurations for MeVPrtl generation points,
 GENIE systematics, G4 systematics, and detsim detector variations

---
 fcl/CMakeLists.txt                            |    1 +
 ...icarus_v1.fcl => config_All_icarus_v2.fcl} |    4 +-
 ...nfig_GENIEReWeightMultisigma_icarus_v1.fcl |  222 -
 ...nfig_GENIEReWeightMultisigma_icarus_v2.fcl |  348 +
 ...onfig_GENIEReWeightMultisim_icarus_v2.fcl} |  185 +-
 .../configs/config_test_Multisigma.fcl        |   44 +
 .../SystTools/eventweight_genie_systtools.fcl |    2 +-
 ...carus_v1.fcl => syst_params_icarus_v2.fcl} | 9999 ++++++++++-------
 .../cafmakerjob_icarus_data_rereco_numi.fcl   |   68 +
 ...fmakerjob_icarus_data_rereco_numi_Run1.fcl |    3 +
 ...ob_icarus_data_rereco_numi_Run2OffBeam.fcl |    4 +
 ...job_icarus_data_rereco_numi_Run2OnBeam.fcl |    5 +
 ...fmakerjob_icarus_systtools_and_fluxwgt.fcl |    4 +-
 ...reco_numi_icarus_systtools_and_fluxwgt.fcl |   60 +
 fcl/configurations/database_icarus.fcl        |    2 +-
 fcl/gen/MultiVertex/cohlikevertex_icarus.fcl  |   91 +
 fcl/gen/mevprtl/CMakeLists.txt                |    1 +
 fcl/gen/mevprtl/alp/CMakeLists.txt            |    1 +
 .../mevprtl/alp/alp_corsika_p_gen_icarus.fcl  |    6 +
 fcl/gen/mevprtl/alp/alp_em_gen_icarus.fcl     |   64 +
 fcl/gen/mevprtl/alp/alp_em_tree_icarus.fcl    |   38 +
 fcl/gen/mevprtl/alp/alp_gen_icarus.fcl        |   60 +
 fcl/gen/mevprtl/alp/alp_gen_icarus_M300.fcl   |    4 +
 fcl/gen/mevprtl/alp/alp_gen_icarus_M350.fcl   |    4 +
 fcl/gen/mevprtl/alp/alp_gen_icarus_M400.fcl   |    4 +
 fcl/gen/mevprtl/alp/alp_gen_icarus_M450.fcl   |    4 +
 fcl/gen/mevprtl/alp/alp_gen_icarus_M500.fcl   |    4 +
 fcl/gen/mevprtl/alp/alp_gen_icarus_M600.fcl   |    6 +
 fcl/gen/mevprtl/alp/alp_gen_icarus_M650.fcl   |    6 +
 fcl/gen/mevprtl/alp/alp_gen_icarus_M700.fcl   |    6 +
 fcl/gen/mevprtl/alp/alp_gen_icarus_M750.fcl   |    6 +
 fcl/gen/mevprtl/alp/alp_tree_icarus.fcl       |   33 +
 fcl/gen/mevprtl/alp/alp_tree_icarus_M300.fcl  |    4 +
 fcl/gen/mevprtl/alp/alp_tree_icarus_M500.fcl  |    4 +
 fcl/gen/mevprtl/alp/alp_tree_icarus_M600.fcl  |    4 +
 fcl/gen/mevprtl/alp/alp_tree_icarus_M700.fcl  |    4 +
 fcl/gen/mevprtl/higgs/dissH_M280.fcl          |   13 +
 fcl/gen/mevprtl/higgs/dissH_M300.fcl          |    9 +
 fcl/gen/mevprtl/higgs/dissH_M330.fcl          |   13 +
 fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl |    6 +
 fcl/numi-anaA/CMakeLists.txt                  |    1 +
 .../detsim_2d_icarus_fitFR_ind0gainhi.fcl     |    9 +
 .../detsim_2d_icarus_fitFR_ind0gainlo.fcl     |    9 +
 .../detsim_2d_icarus_fitFR_ind0gainvhi.fcl    |    9 +
 .../detsim_2d_icarus_fitFR_ind0gainvlo.fcl    |    9 +
 .../detsim_2d_icarus_fitFR_ind0var.fcl        |    9 +
 .../detsim_2d_icarus_fitFR_ind1bin0.fcl       |   13 +
 .../detsim_2d_icarus_fitFR_ind1bin14.fcl      |   13 +
 .../detsim_2d_icarus_fitFR_noise1-2x.fcl      |   11 +
 .../detsim_2d_icarus_fitFR_oldgain.fcl        |    9 +
 .../detsim_2d_icarus_fitFR_ind0gain0-5x.fcl   |    8 +
 .../detsim_2d_icarus_fitFR_ind0gain0-6x.fcl   |    8 +
 .../detsim_2d_icarus_fitFR_ind0gain0-7x.fcl   |    8 +
 .../detsim_2d_icarus_fitFR_ind0gain0-8x.fcl   |    8 +
 .../detsim_2d_icarus_fitFR_ind0gain0-9x.fcl   |    8 +
 .../test/detsim_2d_icarus_fitFR_ind0var.fcl   |    9 +
 .../test/detsim_2d_icarus_fitFR_ind1bin0.fcl  |    9 +
 .../test/detsim_2d_icarus_fitFR_ind1bin14.fcl |    9 +
 .../detsim_2d_icarus_fitFR_noise1-20x.fcl     |    7 +
 .../detsim_2d_icarus_fitFR_noise1-25x.fcl     |    7 +
 ...2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl |    8 +
 ...2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl |    8 +
 ...2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl |    8 +
 ...2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl |    8 +
 .../detsim_2d_icarus_fitFR_noise1-30x.fcl     |    7 +
 .../detsim_2d_icarus_fitFR_noise1-35x.fcl     |    7 +
 ...d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl |    8 +
 ...d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl |    8 +
 ...d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl |    8 +
 ...d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl |    8 +
 .../test/detsim_2d_icarus_fitFR_oldgain.fcl   |    9 +
 71 files changed, 7116 insertions(+), 4490 deletions(-)
 rename fcl/caf/SystTools/configs/{config_All_icarus_v1.fcl => config_All_icarus_v2.fcl} (79%)
 delete mode 100644 fcl/caf/SystTools/configs/config_GENIEReWeightMultisigma_icarus_v1.fcl
 create mode 100644 fcl/caf/SystTools/configs/config_GENIEReWeightMultisigma_icarus_v2.fcl
 rename fcl/caf/SystTools/configs/{config_GENIEReWeightMultisim_icarus_v1.fcl => config_GENIEReWeightMultisim_icarus_v2.fcl} (55%)
 create mode 100644 fcl/caf/SystTools/configs/config_test_Multisigma.fcl
 rename fcl/caf/SystTools/{syst_params_icarus_v1.fcl => syst_params_icarus_v2.fcl} (61%)
 create mode 100644 fcl/caf/cafmakerjob_icarus_data_rereco_numi.fcl
 create mode 100644 fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run1.fcl
 create mode 100644 fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run2OffBeam.fcl
 create mode 100644 fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run2OnBeam.fcl
 create mode 100644 fcl/caf/cafmakerjob_rereco_numi_icarus_systtools_and_fluxwgt.fcl
 create mode 100644 fcl/gen/MultiVertex/cohlikevertex_icarus.fcl
 create mode 100644 fcl/gen/mevprtl/alp/CMakeLists.txt
 create mode 100644 fcl/gen/mevprtl/alp/alp_corsika_p_gen_icarus.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_em_gen_icarus.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_em_tree_icarus.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus_M300.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus_M350.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus_M400.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus_M450.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus_M500.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus_M600.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus_M650.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus_M700.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_gen_icarus_M750.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_tree_icarus.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_tree_icarus_M300.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_tree_icarus_M500.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_tree_icarus_M600.fcl
 create mode 100644 fcl/gen/mevprtl/alp/alp_tree_icarus_M700.fcl
 create mode 100644 fcl/gen/mevprtl/higgs/dissH_M280.fcl
 create mode 100644 fcl/gen/mevprtl/higgs/dissH_M330.fcl
 create mode 100644 fcl/numi-anaA/CMakeLists.txt
 create mode 100644 fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainhi.fcl
 create mode 100644 fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainlo.fcl
 create mode 100644 fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainvhi.fcl
 create mode 100644 fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainvlo.fcl
 create mode 100644 fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0var.fcl
 create mode 100644 fcl/numi-anaA/detsim_2d_icarus_fitFR_ind1bin0.fcl
 create mode 100644 fcl/numi-anaA/detsim_2d_icarus_fitFR_ind1bin14.fcl
 create mode 100644 fcl/numi-anaA/detsim_2d_icarus_fitFR_noise1-2x.fcl
 create mode 100644 fcl/numi-anaA/detsim_2d_icarus_fitFR_oldgain.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-5x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-6x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-7x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-8x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-9x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0var.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin0.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin14.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-20x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-25x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-30x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl
 create mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_oldgain.fcl

diff --git a/fcl/CMakeLists.txt b/fcl/CMakeLists.txt
index 9480b355f..a56cc52af 100644
--- a/fcl/CMakeLists.txt
+++ b/fcl/CMakeLists.txt
@@ -9,5 +9,6 @@ add_subdirectory(caf)
 add_subdirectory(services)
 add_subdirectory(utilities)
 add_subdirectory(compatibility)
+add_subdirectory(numi-anaA)
 
 install_fhicl()
diff --git a/fcl/caf/SystTools/configs/config_All_icarus_v1.fcl b/fcl/caf/SystTools/configs/config_All_icarus_v2.fcl
similarity index 79%
rename from fcl/caf/SystTools/configs/config_All_icarus_v1.fcl
rename to fcl/caf/SystTools/configs/config_All_icarus_v2.fcl
index bb8626622..bd30e9e5a 100644
--- a/fcl/caf/SystTools/configs/config_All_icarus_v1.fcl
+++ b/fcl/caf/SystTools/configs/config_All_icarus_v2.fcl
@@ -1,5 +1,5 @@
-#include "config_GENIEReWeightMultisigma_icarus_v1.fcl"
-#include "config_GENIEReWeightMultisim_icarus_v1.fcl"
+#include "config_GENIEReWeightMultisigma_icarus_v2.fcl"
+#include "config_GENIEReWeightMultisim_icarus_v2.fcl"
 #include "config_MINERvA_E2p2h_icarus_v1.fcl"
 #include "config_MINERvAq0q3Tune_icarus_v1.fcl"
 #include "config_MiscInteractionSysts_icarus_v1.fcl"
diff --git a/fcl/caf/SystTools/configs/config_GENIEReWeightMultisigma_icarus_v1.fcl b/fcl/caf/SystTools/configs/config_GENIEReWeightMultisigma_icarus_v1.fcl
deleted file mode 100644
index d31286ada..000000000
--- a/fcl/caf/SystTools/configs/config_GENIEReWeightMultisigma_icarus_v1.fcl
+++ /dev/null
@@ -1,222 +0,0 @@
-GENIEReWeight_Multisigma_Tool_Config: {
-    tool_type: "GENIEReWeight"
-    instance_name: "ICARUS_v1_multisigma"
-
-    # Keep one GENIEReWeight instance per discrete dial tweak in memory
-    # Requires no reconfigures within the event loop
-    UseFullHERG: true
-
-    ignore_parameter_dependence: true
-
-    ################################## CCQE Parameters
-
-    MaCCQEIsShapeOnly: false
-
-    MaCCQE_central_value: 0
-    MaCCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # ReWeight to dipole vector form factor when VecFFCCQEshape = 1
-    # Takes so much time
-    #VecFFCCQEshape_central_value: 0
-    #VecFFCCQEshape_variation_descriptor: "[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0]"
-
-    # ReWeight to z-exp axial form factor when AxFFCCQEshape = 1
-    AxFFCCQEshape_central_value : 0
-    AxFFCCQEshape_variation_descriptor: "[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0]"
-
-    # Mirrored responses for CAFana
-    # KF variation; 1sigma = +-35%
-    CCQEPauliSupViaKF_central_value: 0
-    CCQEPauliSupViaKF_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # 0 => FermiGas, 1 => SF (spectral function)
-    CCQEMomDistroFGtoSF_central_value: 0
-    CCQEMomDistroFGtoSF_variation_descriptor: "[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0]"
-
-    ################################## NCEl Parameters
-
-    MaNCEL_central_value: 0
-    MaNCEL_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    EtaNCEL_central_value: 0
-    EtaNCEL_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    ################################## RES Parameters
-    ################# CCRES
-
-    CCRESIsShapeOnly: false
-
-    MaCCRES_central_value: 0
-    MaCCRES_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    MvCCRES_central_value: 0
-    MvCCRES_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    ################# NCRES
-
-    NCRESIsShapeOnly: false
-
-    MaNCRES_central_value: 0
-    MaNCRES_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    MvNCRES_central_value: 0
-    MvNCRES_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    ################# Non-RES
-
-    # nu+p, CC
-
-    NonRESBGvpCC1pi_central_value: 0
-    NonRESBGvpCC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    NonRESBGvpCC2pi_central_value: 0
-    NonRESBGvpCC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # nu+p, NC
-
-    NonRESBGvpNC1pi_central_value: 0
-    NonRESBGvpNC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    NonRESBGvpNC2pi_central_value: 0
-    NonRESBGvpNC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # nu+n, CC
-
-    NonRESBGvnCC1pi_central_value: 0
-    NonRESBGvnCC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    NonRESBGvnCC2pi_central_value: 0
-    NonRESBGvnCC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # nu+n, NC
-
-    NonRESBGvnNC1pi_central_value: 0
-    NonRESBGvnNC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    NonRESBGvnNC2pi_central_value: 0
-    NonRESBGvnNC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # nubar+p, CC
-
-    NonRESBGvbarpCC1pi_central_value: 0
-    NonRESBGvbarpCC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    NonRESBGvbarpCC2pi_central_value: 0
-    NonRESBGvbarpCC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # nubar+p, NC
-
-    NonRESBGvbarpNC1pi_central_value: 0
-    NonRESBGvbarpNC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    NonRESBGvbarpNC2pi_central_value: 0
-    NonRESBGvbarpNC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # nubar+n, CC
-
-    NonRESBGvbarnCC1pi_central_value: 0
-    NonRESBGvbarnCC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    NonRESBGvbarnCC2pi_central_value: 0
-    NonRESBGvbarnCC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # nubar+n, NC
-
-    NonRESBGvbarnNC1pi_central_value: 0
-    NonRESBGvbarnNC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    NonRESBGvbarnNC2pi_central_value: 0
-    NonRESBGvbarnNC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    ################# Other
-
-    RDecBR1gamma_central_value: 0
-    RDecBR1gamma_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    RDecBR1eta_central_value: 0
-    RDecBR1eta_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # Mirrored responses for CAFana
-    # Pion angular distibution in Delta -> pi N (0 => isotropic, 1 => RS)
-    Theta_Delta2Npi_central_value: 0
-    Theta_Delta2Npi_variation_descriptor: "[0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0]"
-
-    ################################## COH Parameters
-
-    # Disabled as they produce an odd response and CCCoh isn't a significant
-    # signal/background in the TDR sensitivity studies.
-    # MaCOHpi_central_value: 0
-    # MaCOHpi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    # R0COHpi_central_value: 0
-    # R0COHpi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    ################################## DIS BY Parameters
-
-    AhtBY_central_value: 0
-    AhtBY_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    BhtBY_central_value: 0
-    BhtBY_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    CV1uBY_central_value: 0
-    CV1uBY_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    CV2uBY_central_value: 0
-    CV2uBY_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    ################################## AGKY Hadronization Parameters
-
-    ## Disabled as they are very slow, will hopefully re-enable in the future
-    # AGKYxF1pi_central_value: 0
-    # AGKYxF1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-    #
-    # AGKYpT1pi_central_value: 0
-    # AGKYpT1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    ################################## FZone Parameters
-
-    FormZone_central_value: 0
-    FormZone_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    ################################## FSI Parameters
-
-    MFP_pi_central_value: 0
-    MFP_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrCEx_pi_central_value: 0
-    FrCEx_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrElas_pi_central_value: 0
-    FrElas_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrInel_pi_central_value: 0
-    FrInel_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrAbs_pi_central_value: 0
-    FrAbs_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrPiProd_pi_central_value: 0
-    FrPiProd_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    MFP_N_central_value: 0
-    MFP_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrCEx_N_central_value: 0
-    FrCEx_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrElas_N_central_value: 0
-    FrElas_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrInel_N_central_value: 0
-    FrInel_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrAbs_N_central_value: 0
-    FrAbs_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-    FrPiProd_N_central_value: 0
-    FrPiProd_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
-
-}
-
-syst_providers: [GENIEReWeight_Multisigma_Tool_Config]
diff --git a/fcl/caf/SystTools/configs/config_GENIEReWeightMultisigma_icarus_v2.fcl b/fcl/caf/SystTools/configs/config_GENIEReWeightMultisigma_icarus_v2.fcl
new file mode 100644
index 000000000..bba81a7f1
--- /dev/null
+++ b/fcl/caf/SystTools/configs/config_GENIEReWeightMultisigma_icarus_v2.fcl
@@ -0,0 +1,348 @@
+GENIEReWeight_Multisigma_Tool_Config: {
+
+    tool_type: "GENIEReWeight"
+
+    # Updated 25 July 2023 by S. Gardiner
+    instance_name: "ICARUS_v2_multisigma"
+
+    # Keep one GENIEReWeight instance per discrete dial tweak in memory
+    # Requires no reconfigures within the event loop
+    UseFullHERG: true
+
+    ignore_parameter_dependence: true
+
+    ################################## CCQE Parameters
+
+    # Adjust coefficients in the z-expansion parameterization
+    # of the CCQE axial-vector form factor
+
+    ZExpA1CCQE_central_value: 0
+    ZExpA1CCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ZExpA2CCQE_central_value: 0
+    ZExpA2CCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ZExpA3CCQE_central_value: 0
+    ZExpA3CCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ZExpA4CCQE_central_value: 0
+    ZExpA4CCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # This dial provides the ability to scale the CCQE cross section
+    # normalization by a constant factor while using the z-expansion
+    # for the axial-vector form factor. However, since varying the
+    # coefficients for the individual terms (as is done above) also
+    # impacts the normalization, this one is left out for now.
+    #
+    #ZNormCCQE_central_value: 0
+    #ZNormCCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # Assesses a shape-only variation of the CCQE cross section by
+    # switching the parameterization of the vector form factors
+    # from BBBA07 (default for the AR23_20i_00_000 model set) to
+    # a dipole (VecFFCCQEshape = 1).
+    #
+    VecFFCCQEshape_central_value: 0
+    VecFFCCQEshape_variation_descriptor: "[1.0]"
+
+    # GENIE Reweight provides a similar dial for doing a shape-only
+    # systematic variation that switches from a dipole axial-vector
+    # form factor (AxFFCCQEshape = 0) to the z-expansion parameterization
+    # (AxFFCCQEshape = 1). However, the weight calculator does not yet
+    # support going in the other direction (z-exp to dipole). This dial
+    # is thus currently excluded as incompatible with our AR23_20i_00_000
+    # base model set.
+    #AxFFCCQEshape_central_value : 0
+    #AxFFCCQEshape_variation_descriptor: "[1.0]"
+
+    # The weight calculator for adjusting the Fermi momentum kF has always
+    # been a bit of a hack. You can zero out some events by increasing
+    # kF, but you can't create new ones by reducing kF. I'd recommend
+    # revisiting these nuclear model uncertainties in light of the
+    # spectral-function-like version of the correlated Fermi gas model
+    # that we're using in AR23_20i_00_000. I will therefore exclude this
+    # dial for now.
+    #CCQEPauliSupViaKF_central_value: 0
+    #CCQEPauliSupViaKF_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # This weight calculator assumes use of the Bodek-Ritchie global Fermi gas
+    # (in, e.g., the G18_02a_00_000 model set) and reweights the nucleon
+    # momentum distribution to a spectral function (as implemented in
+    # genie::SpectralFunc) as a variation (CCQEMomDistroFGtoSF = 1). This dial
+    # has multiple issues for us. First, we use a modified version of GENIE's
+    # correlated Fermi gas model, which differs substantially from the
+    # Bodek-Ritchie global Fermi gas. Second, genie::SpectralFunc does not yet
+    # support an argon target nucleus. Rather than try to hack this dial to be
+    # compatible with our model set, I will exclude it and recommend that we
+    # use a different strategy for assessing systematics on the GENIE model of
+    # the nuclear ground state.
+    #CCQEMomDistroFGtoSF_central_value: 0
+    #CCQEMomDistroFGtoSF_variation_descriptor: "[1.0]"
+
+    # This dial varies the strength of the RPA corrections that are applied in
+    # the Valencia CCQE model. The implementation was contributed to GENIE by
+    # MicroBooNE and is documented in Phys. Rev. D 105, 072001 (2022).
+    RPA_CCQE_central_value: 0
+    RPA_CCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # This dial varies the strength of the electromagnetic potential used by
+    # the Valencia CCQE model to apply Coulomb corrections to the cross
+    # section. The implementation was contributed to GENIE by MicroBooNE and is
+    # documented in Phys. Rev. D 105, 072001 (2022).
+    CoulombCCQE_central_value: 0
+    CoulombCCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################################## NCEl Parameters
+
+    MaNCEL_central_value: 0
+    MaNCEL_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    EtaNCEL_central_value: 0
+    EtaNCEL_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################################## MEC Parameters
+
+    # Constant scaling factor for the CCMEC total cross section
+    NormCCMEC_central_value: 0
+    NormCCMEC_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # Constant scaling factor for the NCMEC total cross section
+    NormNCMEC_central_value: 0
+    NormNCMEC_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # This dial performs a shape-only transformation of the differential cross
+    # section in lepton kinematics between the Valencia model (XSecShape_CCMEC
+    # = 0) and the GENIE Empirical model (XSecShape_CCMEC = 1). The GENIE
+    # weight calculator could be adapted to be compatible with the SuSAv2 CCMEC
+    # model used in AR23_20i_00_000, but GENIE code changes are required that
+    # are not finished yet. For now, I disable this weight calculator. Further
+    # details are given in Phys. Rev. D 105, 072001 (2022).
+    #XSecShape_CCMEC_central_value: 0
+    #XSecShape_CCMEC_variation_descriptor: "[1.0]"
+
+    # Adjusts the angular distribution when decaying a two-nucleon cluster
+    # into two final-state nucleons.
+    # DecayAngMEC = 0 gives the default isotropic angular distribution
+    # DecayAngMEC = 1 gives an alternative distribution proportional to
+    # cos^2(theta). See also Phys. Rev. D 105, 072001 (2022).
+    DecayAngMEC_central_value: 0
+    DecayAngMEC_variation_descriptor: "[1.0]"
+
+    # Adjusts the fractional contribution of initial-state pn pairs to the
+    # total CCMEC cross section. This weight calculator is not yet compatible
+    # with the SuSAv2 CCMEC model used in AR23_20i_00_000, so I disable
+    # it for now.
+    #FracPN_CCMEC_central_value: 0
+    #FracPN_CCMEC_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # Adjusts the fractional contribution of diagrams involving an internal
+    # Delta line to the total CCMEC cross section. The Valencia CCMEC model
+    # includes information to calculate this contribution, but SuSAv2 does not.
+    # Since we use SuSAv2 as the CCMEC model in AR23_20i_00_000, I disable this
+    # dial for now.
+    #FracDelta_CCMEC_central_value: 0
+    #FracDelta_CCMEC_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################################## RES Parameters
+    ################# CCRES
+
+    CCRESIsShapeOnly: false
+
+    MaCCRES_central_value: 0
+    MaCCRES_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    MvCCRES_central_value: 0
+    MvCCRES_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################# NCRES
+
+    NCRESIsShapeOnly: false
+
+    MaNCRES_central_value: 0
+    MaNCRES_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    MvNCRES_central_value: 0
+    MvNCRES_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################# Non-RES
+
+    # nu+p, CC
+
+    NonRESBGvpCC1pi_central_value: 0
+    NonRESBGvpCC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NonRESBGvpCC2pi_central_value: 0
+    NonRESBGvpCC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # nu+p, NC
+
+    NonRESBGvpNC1pi_central_value: 0
+    NonRESBGvpNC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NonRESBGvpNC2pi_central_value: 0
+    NonRESBGvpNC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # nu+n, CC
+
+    NonRESBGvnCC1pi_central_value: 0
+    NonRESBGvnCC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NonRESBGvnCC2pi_central_value: 0
+    NonRESBGvnCC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # nu+n, NC
+
+    NonRESBGvnNC1pi_central_value: 0
+    NonRESBGvnNC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NonRESBGvnNC2pi_central_value: 0
+    NonRESBGvnNC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # nubar+p, CC
+
+    NonRESBGvbarpCC1pi_central_value: 0
+    NonRESBGvbarpCC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NonRESBGvbarpCC2pi_central_value: 0
+    NonRESBGvbarpCC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # nubar+p, NC
+
+    NonRESBGvbarpNC1pi_central_value: 0
+    NonRESBGvbarpNC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NonRESBGvbarpNC2pi_central_value: 0
+    NonRESBGvbarpNC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # nubar+n, CC
+
+    NonRESBGvbarnCC1pi_central_value: 0
+    NonRESBGvbarnCC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NonRESBGvbarnCC2pi_central_value: 0
+    NonRESBGvbarnCC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # nubar+n, NC
+
+    NonRESBGvbarnNC1pi_central_value: 0
+    NonRESBGvbarnNC1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NonRESBGvbarnNC2pi_central_value: 0
+    NonRESBGvbarnNC2pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################# Other
+
+    RDecBR1gamma_central_value: 0
+    RDecBR1gamma_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    RDecBR1eta_central_value: 0
+    RDecBR1eta_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # Pion angular distibution in Delta -> pi N decays
+    # Theta_Delta2Npi = 0 gives the Rein-Sehgal angular distribution
+    # Theta_Delta2Npi = 1 gives an isotropic angular distribution
+    Theta_Delta2Npi_central_value: 0
+    Theta_Delta2Npi_variation_descriptor: "[1.0]"
+
+    # Photon angular distribution in Delta -> photon N decays
+    # ThetaDelta2NRad = 0 gives the default isotropic angular distribution
+    # ThetaDelta2NRad = 1 gives an alternative distribution proportional to
+    # cos^2(theta). See also Phys. Rev. D 105, 072001 (2022).
+    ThetaDelta2NRad_central_value: 0
+    ThetaDelta2NRad_variation_descriptor: "[1.0]"
+
+    ################################## COH Parameters
+
+    # The MaCOHpi and R0COHpi weight calculators are not compatible with the
+    # Berger-Sehgal coherent pion production model used in our AR23_20i_00_000
+    # GENIE model set. I disable them here and add simple normalization scaling
+    # factors used by MicroBooNE. Systematics on this channel are likely worth
+    # revisiting at some point.
+
+    # MaCOHpi_central_value: 0
+    # MaCOHpi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # R0COHpi_central_value: 0
+    # R0COHpi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NormCCCOH_central_value: 0
+    NormCCCOH_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NormNCCOH_central_value: 0
+    NormNCCOH_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################################## DIS BY Parameters
+
+    AhtBY_central_value: 0
+    AhtBY_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    BhtBY_central_value: 0
+    BhtBY_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    CV1uBY_central_value: 0
+    CV1uBY_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    CV2uBY_central_value: 0
+    CV2uBY_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################################## AGKY Hadronization Parameters
+
+    ## Disabled as they are very slow, will hopefully re-enable in the future
+    # AGKYxF1pi_central_value: 0
+    # AGKYxF1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+    #
+    # AGKYpT1pi_central_value: 0
+    # AGKYpT1pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################################## FZone Parameters
+
+    # The formation zone weight calculator is broken in GENIE v3 and
+    # still needs to be fixed. I exclude it for now.
+    #FormZone_central_value: 0
+    #FormZone_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    ################################## FSI Parameters
+
+    MFP_pi_central_value: 0
+    MFP_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    FrCEx_pi_central_value: 0
+    FrCEx_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # The elastic FSI fate was removed in hA2018, so I disable the
+    # associated weight calculators
+    #FrElas_pi_central_value: 0
+    #FrElas_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    FrInel_pi_central_value: 0
+    FrInel_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    FrAbs_pi_central_value: 0
+    FrAbs_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    FrPiProd_pi_central_value: 0
+    FrPiProd_pi_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    MFP_N_central_value: 0
+    MFP_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    FrCEx_N_central_value: 0
+    FrCEx_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # The elastic FSI fate was removed in hA2018, so I disable the
+    # associated weight calculators
+    #FrElas_N_central_value: 0
+    #FrElas_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    FrInel_N_central_value: 0
+    FrInel_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    FrAbs_N_central_value: 0
+    FrAbs_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    FrPiProd_N_central_value: 0
+    FrPiProd_N_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+}
+
+syst_providers: [GENIEReWeight_Multisigma_Tool_Config]
diff --git a/fcl/caf/SystTools/configs/config_GENIEReWeightMultisim_icarus_v1.fcl b/fcl/caf/SystTools/configs/config_GENIEReWeightMultisim_icarus_v2.fcl
similarity index 55%
rename from fcl/caf/SystTools/configs/config_GENIEReWeightMultisim_icarus_v1.fcl
rename to fcl/caf/SystTools/configs/config_GENIEReWeightMultisim_icarus_v2.fcl
index 0f0c55c48..9a55694cf 100644
--- a/fcl/caf/SystTools/configs/config_GENIEReWeightMultisim_icarus_v1.fcl
+++ b/fcl/caf/SystTools/configs/config_GENIEReWeightMultisim_icarus_v2.fcl
@@ -1,28 +1,80 @@
 GENIEReWeight_Multisim_Tool_Config: {
+
     tool_type: "GENIEReWeight"
-    instance_name: "ICARUS_v1_multisim"
+
+    # Updated 25 July 2023 by S. Gardiner
+    instance_name: "ICARUS_v2_multisim"
 
     # Keep one GENIEReWeight instance per discrete dial tweak in memory
     # Requires no reconfigures within the event loop
     UseFullHERG: true
 
-    ignore_parameter_dependence: true
+    ignore_parameter_dependence: false
 
     ################################## CCQE Parameters
 
-    MaCCQEIsShapeOnly: false
-
-    MaCCQE_central_value: 0
-    MaCCQE_nthrows: 100
-    MaCCQE_random_distribution: "gaussian"
-    MaCCQE_variation_descriptor: "{-1,1}"
-
-    # Mirrored responses for CAFana
-    # KF variation; 1sigma = +-35%
-    CCQEPauliSupViaKF_central_value: 0
-    CCQEPauliSupViaKF_nthrows: 100
-    CCQEPauliSupViaKF_random_distribution: "gaussian"
-    CCQEPauliSupViaKF_variation_descriptor: "{-1,1}"
+    # Adjust coefficients in the z-expansion parameterization
+    # of the CCQE axial-vector form factor
+
+    ZExpA1CCQE_central_value: 0
+    ZExpA1CCQE_nthrows: 100
+    ZExpA1CCQE_random_distribution: "gaussian"
+    ZExpA1CCQE_variation_descriptor: "{-1,1}"
+
+    ZExpA2CCQE_central_value: 0
+    ZExpA2CCQE_nthrows: 100
+    ZExpA2CCQE_random_distribution: "gaussian"
+    ZExpA2CCQE_variation_descriptor: "{-1,1}"
+
+    ZExpA3CCQE_central_value: 0
+    ZExpA3CCQE_nthrows: 100
+    ZExpA3CCQE_random_distribution: "gaussian"
+    ZExpA3CCQE_variation_descriptor: "{-1,1}"
+
+    ZExpA4CCQE_central_value: 0
+    ZExpA4CCQE_nthrows: 100
+    ZExpA4CCQE_random_distribution: "gaussian"
+    ZExpA4CCQE_variation_descriptor: "{-1,1}"
+
+    # This dial provides the ability to scale the CCQE cross section
+    # normalization by a constant factor while using the z-expansion
+    # for the axial-vector form factor. However, since varying the
+    # coefficients for the individual terms (as is done above) also
+    # impacts the normalization, this one is left out for now.
+    #
+    #ZNormCCQE_central_value: 0
+    #ZNormCCQE_nthrows: 100
+    #ZNormCCQE_random_distribution: "gaussian"
+    #ZNormCCQE_variation_descriptor: "{-1,1}"
+
+    # The weight calculator for adjusting the Fermi momentum kF has always
+    # been a bit of a hack. You can zero out some events by increasing
+    # kF, but you can't create new ones by reducing kF. I'd recommend
+    # revisiting these nuclear model uncertainties in light of the
+    # spectral-function-like version of the correlated Fermi gas model
+    # that we're using in AR23_20i_00_000. I will therefore exclude this
+    # dial for now.
+    #CCQEPauliSupViaKF_central_value: 0
+    #CCQEPauliSupViaKF_nthrows: 100
+    #CCQEPauliSupViaKF_random_distribution: "gaussian"
+    #CCQEPauliSupViaKF_variation_descriptor: "{-1,1}"
+
+    # This dial varies the strength of the RPA corrections that are applied in
+    # the Valencia CCQE model. The implementation was contributed to GENIE by
+    # MicroBooNE and is documented in Phys. Rev. D 105, 072001 (2022).
+    RPA_CCQE_central_value: 0
+    RPA_CCQE_nthrows: 100
+    RPA_CCQE_random_distribution: "gaussian"
+    RPA_CCQE_variation_descriptor: "{-1,1}"
+
+    # This dial varies the strength of the electromagnetic potential used by
+    # the Valencia CCQE model to apply Coulomb corrections to the cross
+    # section. The implementation was contributed to GENIE by MicroBooNE and is
+    # documented in Phys. Rev. D 105, 072001 (2022).
+    CoulombCCQE_central_value: 0
+    CoulombCCQE_nthrows: 100
+    CoulombCCQE_random_distribution: "gaussian"
+    CoulombCCQE_variation_descriptor: "{-1,1}"
 
     ################################## NCEl Parameters
 
@@ -36,6 +88,39 @@ GENIEReWeight_Multisim_Tool_Config: {
     EtaNCEL_random_distribution: "gaussian"
     EtaNCEL_variation_descriptor: "{-1,1}"
 
+    ################################## MEC Parameters
+
+    # Constant scaling factor for the CCMEC total cross section
+    NormCCMEC_central_value: 0
+    NormCCMEC_nthrows: 100
+    NormCCMEC_random_distribution: "gaussian"
+    NormCCMEC_variation_descriptor: "{-1,1}"
+
+    # Constant scaling factor for the NCMEC total cross section
+    NormNCMEC_central_value: 0
+    NormNCMEC_nthrows: 100
+    NormNCMEC_random_distribution: "gaussian"
+    NormNCMEC_variation_descriptor: "{-1,1}"
+
+    # Adjusts the fractional contribution of initial-state pn pairs to the
+    # total CCMEC cross section. This weight calculator is not yet compatible
+    # with the SuSAv2 CCMEC model used in AR23_20i_00_000, so I disable
+    # it for now.
+    #FracPN_CCMEC_central_value: 0
+    #FracPN_CCMEC_nthrows: 100
+    #FracPN_CCMEC_random_distribution: "gaussian"
+    #FracPN_CCMEC_variation_descriptor: "{-1,1}"
+
+    # Adjusts the fractional contribution of diagrams involving an internal
+    # Delta line to the total CCMEC cross section. The Valencia CCMEC model
+    # includes information to calculate this contribution, but SuSAv2 does not.
+    # Since we use SuSAv2 as the CCMEC model in AR23_20i_00_000, I disable this
+    # dial for now.
+    #FracDelta_CCMEC_central_value: 0
+    #FracDelta_CCMEC_nthrows: 100
+    #FracDelta_CCMEC_random_distribution: "gaussian"
+    #FracDelta_CCMEC_variation_descriptor: "{-1,1}"
+
     ################################## RES Parameters
     ################# CCRES
 
@@ -177,18 +262,32 @@ GENIEReWeight_Multisim_Tool_Config: {
 
     ################################## COH Parameters
 
-    # Disabled as they produce an odd response and CCCoh isn't a significant
-    # signal/background in the TDR sensitivity studies.
+    # The MaCOHpi and R0COHpi weight calculators are not compatible with the
+    # Berger-Sehgal coherent pion production model used in our AR23_20i_00_000
+    # GENIE model set. I disable them here and add simple normalization scaling
+    # factors used by MicroBooNE. Systematics on this channel are likely worth
+    # revisiting at some point.
+
     # MaCOHpi_central_value: 0
     # MaCOHpi_nthrows: 100
-    # MaCOHpi_random_distribution:: "gaussian"
+    # MaCOHpi_random_distribution: "gaussian"
     # MaCOHpi_variation_descriptor: "{-1,1}"
 
     # R0COHpi_central_value: 0
     # R0COHpi_nthrows: 100
-    # R0COHpi_random_distribution:: "gaussian"
+    # R0COHpi_random_distribution: "gaussian"
     # R0COHpi_variation_descriptor: "{-1,1}"
 
+    NormCCCOH_central_value: 0
+    NormCCCOH_nthrows: 100
+    NormCCCOH_random_distribution: "gaussian"
+    NormCCCOH_variation_descriptor: "{-1,1}"
+
+    NormNCCOH_central_value: 0
+    NormNCCOH_nthrows: 100
+    NormNCCOH_random_distribution: "gaussian"
+    NormNCCOH_variation_descriptor: "{-1,1}"
+
     ################################## DIS BY Parameters
 
     AhtBY_central_value: 0
@@ -226,10 +325,12 @@ GENIEReWeight_Multisim_Tool_Config: {
 
     ################################## FZone Parameters
 
-    FormZone_central_value: 0
-    FormZone_nthrows: 100
-    FormZone_random_distribution: "gaussian"
-    FormZone_variation_descriptor: "{-1,1}"
+    # The formation zone weight calculator is broken in GENIE v3 and
+    # still needs to be fixed. I exclude it for now.
+    #FormZone_central_value: 0
+    #FormZone_nthrows: 100
+    #FormZone_random_distribution: "gaussian"
+    #FormZone_variation_descriptor: "{-1,1}"
 
     ################################## FSI Parameters
 
@@ -238,15 +339,17 @@ GENIEReWeight_Multisim_Tool_Config: {
     MFP_pi_random_distribution: "gaussian"
     MFP_pi_variation_descriptor: "{-1,1}"
 
-    FrCEx_pi_central_value: 0
-    FrCEx_pi_nthrows: 100
-    FrCEx_pi_random_distribution: "gaussian"
-    FrCEx_pi_variation_descriptor: "{-1,1}"
+    #FrCEx_pi_central_value: 0
+    #FrCEx_pi_nthrows: 100
+    #FrCEx_pi_random_distribution: "gaussian"
+    #FrCEx_pi_variation_descriptor: "{-1,1}"
 
-    FrElas_pi_central_value: 0
-    FrElas_pi_nthrows: 100
-    FrElas_pi_random_distribution: "gaussian"
-    FrElas_pi_variation_descriptor: "{-1,1}"
+    # The elastic FSI fate was removed in hA2018, so I disable the
+    # associated weight calculators
+    #FrElas_pi_central_value: 0
+    #FrElas_pi_nthrows: 100
+    #FrElas_pi_random_distribution: "gaussian"
+    #FrElas_pi_variation_descriptor: "{-1,1}"
 
     FrInel_pi_central_value: 0
     FrInel_pi_nthrows: 100
@@ -268,15 +371,17 @@ GENIEReWeight_Multisim_Tool_Config: {
     MFP_N_random_distribution: "gaussian"
     MFP_N_variation_descriptor: "{-1,1}"
 
-    FrCEx_N_central_value: 0
-    FrCEx_N_nthrows: 100
-    FrCEx_N_random_distribution: "gaussian"
-    FrCEx_N_variation_descriptor: "{-1,1}"
-
-    FrElas_N_central_value: 0
-    FrElas_N_nthrows: 100
-    FrElas_N_random_distribution: "gaussian"
-    FrElas_N_variation_descriptor: "{-1,1}"
+    #FrCEx_N_central_value: 0
+    #FrCEx_N_nthrows: 100
+    #FrCEx_N_random_distribution: "gaussian"
+    #FrCEx_N_variation_descriptor: "{-1,1}"
+
+    # The elastic FSI fate was removed in hA2018, so I disable the
+    # associated weight calculators
+    #FrElas_N_central_value: 0
+    #FrElas_N_nthrows: 100
+    #FrElas_N_random_distribution: "gaussian"
+    #FrElas_N_variation_descriptor: "{-1,1}"
 
     FrInel_N_central_value: 0
     FrInel_N_nthrows: 100
diff --git a/fcl/caf/SystTools/configs/config_test_Multisigma.fcl b/fcl/caf/SystTools/configs/config_test_Multisigma.fcl
new file mode 100644
index 000000000..b952eaa40
--- /dev/null
+++ b/fcl/caf/SystTools/configs/config_test_Multisigma.fcl
@@ -0,0 +1,44 @@
+GENIEReWeight_Multisigma_Tool_Config: {
+
+    tool_type: "GENIEReWeight"
+
+    # Updated 25 July 2023 by S. Gardiner
+    instance_name: "ICARUS_v2_multisigma"
+
+    # Keep one GENIEReWeight instance per discrete dial tweak in memory
+    # Requires no reconfigures within the event loop
+    UseFullHERG: true
+
+    ignore_parameter_dependence: true
+
+    ################################## CCQE Parameters
+
+    # This dial varies the strength of the RPA corrections that are applied in
+    # the Valencia CCQE model. The implementation was contributed to GENIE by
+    # MicroBooNE and is documented in Phys. Rev. D 105, 072001 (2022).
+    RPA_CCQE_central_value: 0
+    RPA_CCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # This dial varies the strength of the electromagnetic potential used by
+    # the Valencia CCQE model to apply Coulomb corrections to the cross
+    # section. The implementation was contributed to GENIE by MicroBooNE and is
+    # documented in Phys. Rev. D 105, 072001 (2022).
+    CoulombCCQE_central_value: 0
+    CoulombCCQE_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    # Photon angular distribution in Delta -> photon N decays
+    # ThetaDelta2NRad = 0 gives the default isotropic angular distribution
+    # ThetaDelta2NRad = 1 gives an alternative distribution proportional to
+    # cos^2(theta). See also Phys. Rev. D 105, 072001 (2022).
+    ThetaDelta2NRad_central_value: 0
+    ThetaDelta2NRad_variation_descriptor: "[1.0]"
+
+    NormCCCOH_central_value: 0
+    NormCCCOH_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+    NormNCCOH_central_value: 0
+    NormNCCOH_variation_descriptor: "[-1,+1,-2,+2,-3,+3]"
+
+}
+
+syst_providers: [GENIEReWeight_Multisigma_Tool_Config]
diff --git a/fcl/caf/SystTools/eventweight_genie_systtools.fcl b/fcl/caf/SystTools/eventweight_genie_systtools.fcl
index e35917150..94098e4f4 100644
--- a/fcl/caf/SystTools/eventweight_genie_systtools.fcl
+++ b/fcl/caf/SystTools/eventweight_genie_systtools.fcl
@@ -1,4 +1,4 @@
-#include "syst_params_icarus_v1.fcl"
+#include "syst_params_icarus_v2.fcl"
 
 BEGIN_PROLOG
 
diff --git a/fcl/caf/SystTools/syst_params_icarus_v1.fcl b/fcl/caf/SystTools/syst_params_icarus_v2.fcl
similarity index 61%
rename from fcl/caf/SystTools/syst_params_icarus_v1.fcl
rename to fcl/caf/SystTools/syst_params_icarus_v2.fcl
index afbceb9ec..cb313fef7 100644
--- a/fcl/caf/SystTools/syst_params_icarus_v1.fcl
+++ b/fcl/caf/SystTools/syst_params_icarus_v2.fcl
@@ -1,10 +1,6 @@
-## Generated by "GenerateSystProviderConfig" command:
-## https://github.com/LArSoft/systematicstools/blob/v01_00_04/systematicstools/app/GenerateSystProviderConfig.cc
-## cmd : GenerateSystProviderConfig -c icaruscode/fcl/caf/SystTools/configs/config_All_icarus_v1.fcl -o syst_params_icarus_v1.fcl
-
 BEGIN_PROLOG
 generated_systematic_provider_configuration: {
-   GENIEReWeight_ICARUS_v1_multisigma: {
+   GENIEReWeight_ICARUS_v2_multisigma: {
       AhtBY: {
          centralParamValue: 0
          paramVariations: [
@@ -16,7 +12,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "AhtBY"
-         systParamId: 26
+         systParamId: 38
       }
       BhtBY: {
          centralParamValue: 0
@@ -29,37 +25,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "BhtBY"
-         systParamId: 27
-      }
-      CCQEMomDistroFGtoSF: {
-         centralParamValue: 0
-         paramVariations: [
-            1.00000000000000005551e-1,
-            2.00000000000000011102e-1,
-            2.99999999999999988898e-1,
-            4.00000000000000022204e-1,
-            5e-1,
-            5.99999999999999977796e-1,
-            6.99999999999999955591e-1,
-            8.00000000000000044409e-1,
-            9.00000000000000022204e-1,
-            1
-         ]
-         prettyName: "CCQEMomDistroFGtoSF"
-         systParamId: 42
-      }
-      CCQEPauliSupViaKF: {
-         centralParamValue: 0
-         paramVariations: [
-            -1,
-            1,
-            -2,
-            2,
-            -3,
-            3
-         ]
-         prettyName: "CCQEPauliSupViaKF"
-         systParamId: 41
+         systParamId: 39
       }
       CV1uBY: {
          centralParamValue: 0
@@ -72,7 +38,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "CV1uBY"
-         systParamId: 28
+         systParamId: 40
       }
       CV2uBY: {
          centralParamValue: 0
@@ -85,9 +51,9 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "CV2uBY"
-         systParamId: 29
+         systParamId: 41
       }
-      EtaNCEL: {
+      CoulombCCQE: {
          centralParamValue: 0
          paramVariations: [
             -1,
@@ -97,10 +63,16 @@ generated_systematic_provider_configuration: {
             -3,
             3
          ]
-         prettyName: "EtaNCEL"
-         systParamId: 2
+         prettyName: "CoulombCCQE"
+         systParamId: 6
+      }
+      DecayAngMEC: {
+         centralParamValue: 1
+         isCorrection: true
+         prettyName: "DecayAngMEC"
+         systParamId: 9
       }
-      FormZone: {
+      EtaNCEL: {
          centralParamValue: 0
          paramVariations: [
             -1,
@@ -110,8 +82,8 @@ generated_systematic_provider_configuration: {
             -3,
             3
          ]
-         prettyName: "FormZone"
-         systParamId: 30
+         prettyName: "EtaNCEL"
+         systParamId: 11
       }
       FrAbs_N: {
          centralParamValue: 0
@@ -124,7 +96,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "FrAbs_N"
-         systParamId: 39
+         systParamId: 50
       }
       FrAbs_pi: {
          centralParamValue: 0
@@ -137,7 +109,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "FrAbs_pi"
-         systParamId: 34
+         systParamId: 45
       }
       FrCEx_N: {
          centralParamValue: 0
@@ -150,7 +122,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "FrCEx_N"
-         systParamId: 37
+         systParamId: 48
       }
       FrCEx_pi: {
          centralParamValue: 0
@@ -163,7 +135,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "FrCEx_pi"
-         systParamId: 32
+         systParamId: 43
       }
       FrInel_N: {
          centralParamValue: 0
@@ -176,7 +148,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "FrInel_N"
-         systParamId: 38
+         systParamId: 49
       }
       FrInel_pi: {
          centralParamValue: 0
@@ -189,7 +161,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "FrInel_pi"
-         systParamId: 33
+         systParamId: 44
       }
       FrPiProd_N: {
          centralParamValue: 0
@@ -202,7 +174,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "FrPiProd_N"
-         systParamId: 40
+         systParamId: 51
       }
       FrPiProd_pi: {
          centralParamValue: 0
@@ -215,7 +187,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "FrPiProd_pi"
-         systParamId: 35
+         systParamId: 46
       }
       MFP_N: {
          centralParamValue: 0
@@ -228,7 +200,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "MFP_N"
-         systParamId: 36
+         systParamId: 47
       }
       MFP_pi: {
          centralParamValue: 0
@@ -241,20 +213,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "MFP_pi"
-         systParamId: 31
-      }
-      MaCCQE: {
-         centralParamValue: 0
-         paramVariations: [
-            -1,
-            1,
-            -2,
-            2,
-            -3,
-            3
-         ]
-         prettyName: "MaCCQE"
-         systParamId: 0
+         systParamId: 42
       }
       MaCCRES: {
          centralParamValue: 0
@@ -267,7 +226,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "MaCCRES"
-         systParamId: 3
+         systParamId: 12
       }
       MaNCEL: {
          centralParamValue: 0
@@ -280,7 +239,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "MaNCEL"
-         systParamId: 1
+         systParamId: 10
       }
       MaNCRES: {
          centralParamValue: 0
@@ -293,7 +252,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "MaNCRES"
-         systParamId: 5
+         systParamId: 14
       }
       MvCCRES: {
          centralParamValue: 0
@@ -306,7 +265,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "MvCCRES"
-         systParamId: 4
+         systParamId: 13
       }
       MvNCRES: {
          centralParamValue: 0
@@ -319,7 +278,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "MvNCRES"
-         systParamId: 6
+         systParamId: 15
       }
       NonRESBGvbarnCC1pi: {
          centralParamValue: 0
@@ -332,7 +291,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvbarnCC1pi"
-         systParamId: 19
+         systParamId: 28
       }
       NonRESBGvbarnCC2pi: {
          centralParamValue: 0
@@ -345,7 +304,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvbarnCC2pi"
-         systParamId: 20
+         systParamId: 29
       }
       NonRESBGvbarnNC1pi: {
          centralParamValue: 0
@@ -358,7 +317,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvbarnNC1pi"
-         systParamId: 21
+         systParamId: 30
       }
       NonRESBGvbarnNC2pi: {
          centralParamValue: 0
@@ -371,7 +330,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvbarnNC2pi"
-         systParamId: 22
+         systParamId: 31
       }
       NonRESBGvbarpCC1pi: {
          centralParamValue: 0
@@ -384,7 +343,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvbarpCC1pi"
-         systParamId: 15
+         systParamId: 24
       }
       NonRESBGvbarpCC2pi: {
          centralParamValue: 0
@@ -397,7 +356,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvbarpCC2pi"
-         systParamId: 16
+         systParamId: 25
       }
       NonRESBGvbarpNC1pi: {
          centralParamValue: 0
@@ -410,7 +369,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvbarpNC1pi"
-         systParamId: 17
+         systParamId: 26
       }
       NonRESBGvbarpNC2pi: {
          centralParamValue: 0
@@ -423,7 +382,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvbarpNC2pi"
-         systParamId: 18
+         systParamId: 27
       }
       NonRESBGvnCC1pi: {
          centralParamValue: 0
@@ -436,7 +395,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvnCC1pi"
-         systParamId: 11
+         systParamId: 20
       }
       NonRESBGvnCC2pi: {
          centralParamValue: 0
@@ -449,7 +408,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvnCC2pi"
-         systParamId: 12
+         systParamId: 21
       }
       NonRESBGvnNC1pi: {
          centralParamValue: 0
@@ -462,7 +421,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvnNC1pi"
-         systParamId: 13
+         systParamId: 22
       }
       NonRESBGvnNC2pi: {
          centralParamValue: 0
@@ -475,7 +434,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvnNC2pi"
-         systParamId: 14
+         systParamId: 23
       }
       NonRESBGvpCC1pi: {
          centralParamValue: 0
@@ -488,7 +447,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvpCC1pi"
-         systParamId: 7
+         systParamId: 16
       }
       NonRESBGvpCC2pi: {
          centralParamValue: 0
@@ -501,7 +460,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvpCC2pi"
-         systParamId: 8
+         systParamId: 17
       }
       NonRESBGvpNC1pi: {
          centralParamValue: 0
@@ -514,7 +473,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvpNC1pi"
-         systParamId: 9
+         systParamId: 18
       }
       NonRESBGvpNC2pi: {
          centralParamValue: 0
@@ -527,7 +486,59 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NonRESBGvpNC2pi"
-         systParamId: 10
+         systParamId: 19
+      }
+      NormCCCOH: {
+         centralParamValue: 0
+         paramVariations: [
+            -1,
+            1,
+            -2,
+            2,
+            -3,
+            3
+         ]
+         prettyName: "NormCCCOH"
+         systParamId: 36
+      }
+      NormCCMEC: {
+         centralParamValue: 0
+         paramVariations: [
+            -1,
+            1,
+            -2,
+            2,
+            -3,
+            3
+         ]
+         prettyName: "NormCCMEC"
+         systParamId: 7
+      }
+      NormNCCOH: {
+         centralParamValue: 0
+         paramVariations: [
+            -1,
+            1,
+            -2,
+            2,
+            -3,
+            3
+         ]
+         prettyName: "NormNCCOH"
+         systParamId: 37
+      }
+      NormNCMEC: {
+         centralParamValue: 0
+         paramVariations: [
+            -1,
+            1,
+            -2,
+            2,
+            -3,
+            3
+         ]
+         prettyName: "NormNCMEC"
+         systParamId: 8
       }
       RDecBR1eta: {
          centralParamValue: 0
@@ -540,7 +551,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "RDecBR1eta"
-         systParamId: 24
+         systParamId: 33
       }
       RDecBR1gamma: {
          centralParamValue: 0
@@ -553,28 +564,103 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "RDecBR1gamma"
-         systParamId: 23
+         systParamId: 32
       }
-      Theta_Delta2Npi: {
+      RPA_CCQE: {
          centralParamValue: 0
          paramVariations: [
-            1.00000000000000005551e-1,
-            2.00000000000000011102e-1,
-            2.99999999999999988898e-1,
-            4.00000000000000022204e-1,
-            5e-1,
-            5.99999999999999977796e-1,
-            6.99999999999999955591e-1,
-            8.00000000000000044409e-1,
-            9.00000000000000022204e-1,
-            1
+            -1,
+            1,
+            -2,
+            2,
+            -3,
+            3
          ]
+         prettyName: "RPA_CCQE"
+         systParamId: 5
+      }
+      ThetaDelta2NRad: {
+         centralParamValue: 1
+         isCorrection: true
+         prettyName: "ThetaDelta2NRad"
+         systParamId: 35
+      }
+      Theta_Delta2Npi: {
+         centralParamValue: 1
+         isCorrection: true
          prettyName: "Theta_Delta2Npi"
-         systParamId: 25
+         systParamId: 34
+      }
+      VecFFCCQEshape: {
+         centralParamValue: 1
+         isCorrection: true
+         prettyName: "VecFFCCQEshape"
+         systParamId: 4
+      }
+      ZExpA1CCQE: {
+         centralParamValue: 0
+         paramVariations: [
+            -1,
+            1,
+            -2,
+            2,
+            -3,
+            3
+         ]
+         prettyName: "ZExpA1CCQE"
+         systParamId: 0
+      }
+      ZExpA2CCQE: {
+         centralParamValue: 0
+         paramVariations: [
+            -1,
+            1,
+            -2,
+            2,
+            -3,
+            3
+         ]
+         prettyName: "ZExpA2CCQE"
+         systParamId: 1
+      }
+      ZExpA3CCQE: {
+         centralParamValue: 0
+         paramVariations: [
+            -1,
+            1,
+            -2,
+            2,
+            -3,
+            3
+         ]
+         prettyName: "ZExpA3CCQE"
+         systParamId: 2
+      }
+      ZExpA4CCQE: {
+         centralParamValue: 0
+         paramVariations: [
+            -1,
+            1,
+            -2,
+            2,
+            -3,
+            3
+         ]
+         prettyName: "ZExpA4CCQE"
+         systParamId: 3
       }
-      instance_name: "ICARUS_v1_multisigma"
+      instance_name: "ICARUS_v2_multisigma"
       parameter_headers: [
-         "MaCCQE",
+         "ZExpA1CCQE",
+         "ZExpA2CCQE",
+         "ZExpA3CCQE",
+         "ZExpA4CCQE",
+         "VecFFCCQEshape",
+         "RPA_CCQE",
+         "CoulombCCQE",
+         "NormCCMEC",
+         "NormNCMEC",
+         "DecayAngMEC",
          "MaNCEL",
          "EtaNCEL",
          "MaCCRES",
@@ -600,11 +686,13 @@ generated_systematic_provider_configuration: {
          "RDecBR1gamma",
          "RDecBR1eta",
          "Theta_Delta2Npi",
+         "ThetaDelta2NRad",
+         "NormCCCOH",
+         "NormNCCOH",
          "AhtBY",
          "BhtBY",
          "CV1uBY",
          "CV2uBY",
-         "FormZone",
          "MFP_pi",
          "FrCEx_pi",
          "FrInel_pi",
@@ -614,12 +702,10 @@ generated_systematic_provider_configuration: {
          "FrCEx_N",
          "FrInel_N",
          "FrAbs_N",
-         "FrPiProd_N",
-         "CCQEPauliSupViaKF",
-         "CCQEMomDistroFGtoSF"
+         "FrPiProd_N"
       ]
       tool_options: {
-         AxFFCCQEDipoleToZExp: false
+         AxFFCCQEDipoleToZExp: true
          CCRESIsShapeOnly: false
          DISBYIsShapeOnly: false
          MaCCQEIsShapeOnly: false
@@ -632,456 +718,676 @@ generated_systematic_provider_configuration: {
       }
       tool_type: "GENIEReWeight"
    }
-   GENIEReWeight_ICARUS_v1_multisim: {
+   GENIEReWeight_ICARUS_v2_multisim: {
       AhtBY: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            -1.15283549541644592118,
-            -8.08767914733292681007e-1,
-            8.20022578660356882274e-1,
-            1.93566217995863842916,
-            -5.04829640006487001536e-1,
-            3.49014689749240991645e-1,
-            2.22288621584697670963e-2,
-            1.25896201738297341954,
-            -1.24475574876325789653,
-            -4.69314001328364982513e-1,
-            1.89130595260708811445,
-            -1.07939738424007436457,
-            -1.9585541523112415252e-1,
-            -2.82871677168818536074,
-            -2.94442912294941183671e-1,
-            -8.99813423166224923833e-1,
-            -1.73902512144823728768,
-            -1.83287092894563463652,
-            7.94804151220169008418e-1,
-            1.82124809816652050154e-1,
-            1.11116282460598514437e-2,
-            -4.89710368351783942309e-1,
-            -2.49983910593272184997,
-            3.46281283435695641515e-1,
-            2.77294656931828864543e-1,
-            -4.01146880533388539014e-1,
-            1.0825567081375351286,
-            -3.57505798498686411246e-1,
-            8.92577828056265842882e-1,
-            1.37561882582175859513e-1,
-            -2.2373337001491472309e-1,
-            -8.02566294116245693147e-1,
-            2.34378443999041330414,
-            1.51910790144141638613,
-            -2.72644665698182420144,
-            3.23916939024653682822e-1,
-            1.04727225361159792527,
-            2.1479727587917150089,
-            -6.05488432976188595269e-1,
-            7.57482538771714480896e-2,
-            -4.1118511258417797527e-2,
-            -4.87240378508160876248e-1,
-            1.6937314331515818111e-1,
-            -1.08024341637383702874,
-            -1.01874830927315085383,
-            -9.27831422319906451435e-1,
-            -7.14697276926395619334e-1,
-            -1.80845947862849965038e-1,
-            1.15838940138180634953,
-            7.28451332599434508985e-1,
-            1.99759762012058161851,
-            -2.30925485093510435286e-1,
-            -2.02049799233647542351,
-            -2.11294689436500737756,
-            -9.18980795509065917503e-2,
-            7.27159648609925657325e-1,
-            1.92179364396549301475,
-            -5.75116951305308043985e-1,
-            7.83087130879070891787e-1,
-            -2.42156352633070309777e-1,
-            -1.45345557512858558624,
-            -1.67665086397674212293,
-            -2.12947115504831030464,
-            8.81750500722658370201e-1,
-            1.97225775987581997128,
-            1.47993204405159217707,
-            4.01548333785547939545e-1,
-            1.93924128961526082149e-1,
-            3.3540811115707069856e-1,
-            1.25921099956571502787,
-            6.32712240472849574147e-1,
-            3.83753214853816748686e-1,
-            -1.17707414283609779204,
-            9.90870760005540043847e-3,
-            6.00615227524610717502e-1,
-            1.93226986379142540162e-1,
-            -1.81359166788751569044,
-            -1.22730900497431671958,
-            -3.68550467358834177301e-1,
-            -2.17825218812838850013,
-            -1.20691738330080955421,
-            -5.42283494347668204583e-1,
-            5.17591342819753386095e-1,
-            4.48398671748916566315e-1,
-            -8.94558628287273505109e-1,
-            -1.83803100959074455778e-1,
-            1.33407196443377562556e-1,
-            -2.97831227966417422248e-1,
-            5.6502428591403397462e-1,
-            -6.00925121416810537056e-1,
-            7.74644559429762735725e-1,
-            9.37997938013778731481e-1,
-            2.06289723798343260786e-1,
-            -5.73396768958215341527e-1,
-            1.7500378927884976954e-1,
-            -1.22523667439844263782,
-            -5.26606454724743433538e-1,
-            5.44110440220084368157e-1,
-            1.58528347892123999685,
-            -1.62308748607753883242
+            2.55000659899953285858,
+            -1.68461202659550535188,
+            -9.03739245857937412154e-1,
+            -3.97499918766615556454e-1,
+            1.63583729095525848285e-1,
+            -1.02764093178295334852,
+            1.64770044543094096312,
+            1.37571758881502831384e-1,
+            2.45806901151617018808e-1,
+            -7.60700110809755747354e-1,
+            -5.44328975749105659077e-1,
+            3.6925313138170656746e-1,
+            1.73052083192124672717e-1,
+            -7.05685110278303939779e-1,
+            -2.34263536222717405622,
+            -5.71861809183625724451e-1,
+            -7.92270298490334368147e-1,
+            -6.81985016385190601085e-1,
+            -1.27470588210345359137,
+            -4.58405520694513679558e-1,
+            7.84631861970338628787e-1,
+            -1.73431636242998066244,
+            1.07881361000390585403,
+            -1.6381937535951200946,
+            2.35176014883458917026,
+            -1.41516970290971155766e-1,
+            3.44794466483144323998e-1,
+            8.07083864066012401928e-1,
+            1.01403903457366006968,
+            4.66476796540338023433e-1,
+            7.27226706794236621434e-1,
+            -1.20462341866520961098,
+            1.91306168775080831512e-2,
+            2.36849518548848436694,
+            1.67373489818592613432,
+            -1.43066485718135938399,
+            6.7814799913159462541e-1,
+            -2.21335638978925108855e-1,
+            2.03392302164407789977e-1,
+            3.42609278662655336589e-1,
+            -6.82812711493758328629e-1,
+            -9.10370261970454008882e-1,
+            1.64953418168851922987e-1,
+            4.45276018817452101661e-1,
+            1.71592190922711905487e-2,
+            -1.92658574982869035264e-1,
+            -6.65022740320613259257e-1,
+            -9.90622816866525313095e-1,
+            -1.88849655959408346817,
+            1.31268525858185225452,
+            -6.87431104065608145071e-1,
+            4.95750705785533762882e-1,
+            -1.6823878910402001452,
+            -1.48078108367029864789e-1,
+            1.17761813480779808927,
+            -8.10221505279217657502e-1,
+            -8.57279222911426885823e-1,
+            5.44980763744150720207e-1,
+            -8.51214038966872366121e-2,
+            2.8166919647324917958e-2,
+            8.98202167768841430728e-1,
+            -1.18772772496666445541,
+            -1.07651246478314677191,
+            2.07439260451103835159e-1,
+            -6.07077296521408182883e-1,
+            8.94083044420278250097e-2,
+            -2.77138800943048568826,
+            -1.07136621600637305107,
+            2.14308778963701623832e-1,
+            1.17507937670679041275,
+            1.36220209488108046081,
+            3.13227065816477301397e-1,
+            1.31167857295231704562,
+            -1.00043256134266411728,
+            3.55313953234846047202e-1,
+            7.65187691408946935034e-1,
+            -1.72070214343911120913e-1,
+            -7.56486852317047459016e-2,
+            1.03406291788700838152e-1,
+            1.82235528969788962428,
+            -9.27262071609445293063e-1,
+            1.70475610918582942688,
+            -1.39154810888976632199,
+            3.96760291475927173721e-1,
+            5.23708438381730534417e-1,
+            1.06142551531626727623,
+            -1.11187071397228542935,
+            2.56755633335208288681e-1,
+            1.38675003831492921202e-1,
+            6.54428688785375078929e-1,
+            -1.06366608249909039285e-1,
+            -6.13533842641556637076e-1,
+            -1.39106663760868509705,
+            3.3343230138893048542e-1,
+            -1.35714790602212520554,
+            6.01501309253490212825e-1,
+            5.27240004504109349703e-1,
+            4.92070325841952427304e-1,
+            -4.10811241818856087704e-1,
+            -6.27775025447376844312e-1
          ]
          prettyName: "AhtBY"
-         systParamId: 68
+         responseParamId: 91
+         systParamId: 92
       }
       BhtBY: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            -1.83956979198874570613,
-            5.90424047519744088497e-1,
-            9.8861786316205380043e-1,
-            -4.96913001612253713013e-1,
-            -1.0108830268944066777,
-            -1.01842822045192335501e-1,
-            -4.17511318927096475306e-1,
-            -3.54573052132173327511e-1,
-            1.13809202489118344026,
-            -1.260315829861432535,
-            3.68179179977733028739e-1,
-            -4.0920675105375825531e-1,
-            7.7100053074412777665e-1,
-            -8.84404661249544449264e-2,
-            1.66091883822323121978e-1,
-            -3.79136278994147091215e-1,
-            -2.14613022163388789121e-1,
-            -3.52892734306374578068e-1,
-            7.9246212891544709489e-1,
-            -4.39351177854677477086e-1,
-            7.8720734080535303967e-1,
-            6.74895529486280842946e-1,
-            2.15045084088158977575e-1,
-            3.19084341883888900071e-1,
-            8.198069676318808785e-1,
-            -1.06317820488430858639e-1,
-            -6.00706258757199296205e-1,
-            1.28793660366509787885,
-            -3.09312706701375006446e-1,
-            8.43079636450256408864e-1,
-            -5.15534686752740611837e-1,
-            4.63627262557912200869e-1,
-            4.88504556815979651407e-1,
-            3.86404495091041910726e-1,
-            -1.25983951475387478958,
-            -6.35316228031649887775e-1,
-            2.98259368005891312148e-1,
-            -1.11353810646359532854e-1,
-            1.02058803261151506692e-1,
-            -2.46793123021775778758e-1,
-            -1.2134746706995285237,
-            7.62310479021343523343e-1,
-            3.35313307262544602061e-1,
-            -4.20601002778238086677e-1,
-            2.20467402754020769251e-1,
-            -5.19532984068525438559e-1,
-            -1.56381896970153588811e-1,
-            -1.91008662602967227429,
-            -1.31501500958864170343,
-            -1.97438404442331427724,
-            -7.82680447858987993204e-2,
-            -3.87532018903742475624e-2,
-            1.70672495648681876723,
-            1.07968009380283221782e-2,
-            9.55204970992571067434e-1,
-            -1.36521258446479487603,
-            -1.04914057452992759423,
-            5.10809085872322640731e-2,
-            5.23208835462574906039e-1,
-            -2.53916237484430240556,
-            -2.57517066046731968321e-1,
-            1.09354430597176338624e-1,
-            9.55759250421886030757e-1,
-            1.90769778812959556191,
-            -3.55860721344405895802e-3,
-            4.39730843203140375763e-1,
-            -8.1308247957300905373e-1,
-            -5.74021072217194006093e-2,
-            8.68989536961883635158e-1,
-            2.92885957016672282549,
-            9.29723768979692000158e-1,
-            2.55170357934042524306e-1,
-            -6.7254122431719798314e-1,
-            -1.52149277286532180753,
-            1.20163593065602070098,
-            -3.89674772166094363079e-1,
-            7.63310459843520194845e-1,
-            5.48109321565409146615e-1,
-            3.60320347045239075534e-1,
-            -9.17216404171742993867e-1,
-            -8.40478188217062549548e-1,
-            -2.27364673586249210757,
-            -2.31810685908506203257e-1,
-            5.56673009597374382484e-2,
-            1.4893591563500119257e-1,
-            1.28687925587768842162e-1,
-            -1.87811617670407993153,
-            -5.210006018995078092e-1,
-            8.35809804333025874179e-1,
-            -1.53643800307890621148,
-            1.02066356962506521455,
-            6.96947760969447882573e-1,
-            7.07595412451846983437e-1,
-            1.19896212546422659129e-1,
-            1.06370681857719792673e-1,
-            -1.14176094911803494014,
-            2.14630427229966447289e-1,
-            -1.49516657721223711341,
-            7.06034539027121932353e-2,
-            6.65003434653861136283e-1
+            4.8518668457101782332e-1,
+            -1.05621011387114083213,
+            -1.3151224813781587919,
+            8.9902827206865598697e-2,
+            -6.2364800958817290244e-1,
+            -2.54197283866693379828e-1,
+            1.77051152958207080879,
+            5.43568710566307844445e-1,
+            1.11496696930377292567,
+            -2.30211661654477417471,
+            4.10705589334433227022e-2,
+            4.33679091269459582314e-1,
+            -1.53987551275788492333,
+            -2.09084387732441845387,
+            2.11339501705679860821e-1,
+            3.01473326107557282327e-1,
+            -2.28831618167701811295e-1,
+            -6.53128343530701149788e-1,
+            3.10624570887154893839e-1,
+            5.39579991136389103268e-1,
+            3.75207524219686394673e-1,
+            -1.82504432513706404961,
+            -1.75673758307258648381e-1,
+            7.53771936779449536203e-1,
+            -2.73469280035154416186e-1,
+            -3.35805287262390783631e-1,
+            -9.9936752380971471954e-1,
+            -2.68337004572859783025,
+            -6.64823487961452963546e-1,
+            -2.45619956326155658433e-1,
+            -1.05574836081928635778,
+            -7.37864327035865241733e-1,
+            -1.03455070410253635593,
+            -1.40305229962646182962,
+            2.93277585071085589163e-2,
+            3.17714444579910382238e-1,
+            -4.58338827000366433317e-1,
+            -1.17785952043877428785,
+            -1.09623851864343757612e-1,
+            -3.95198347821759443654e-1,
+            1.2712237393185135681e-1,
+            8.83697744826678621699e-1,
+            -3.95312124874095272703e-3,
+            1.4142967342651824314,
+            -6.43504490250224603365e-1,
+            1.81662509339340427772,
+            -2.9639251847939629414e-1,
+            9.77329412666557983957e-2,
+            4.49711542884589032809e-1,
+            -9.8720648135043398419e-1,
+            2.99438476989880186796e-1,
+            9.76878160034437281745e-1,
+            1.47852828963093263503,
+            3.91503119616900763234e-1,
+            1.08851259230860186733,
+            -1.23553067388407344929,
+            1.19537034678840781154,
+            -7.10273812921112801533e-1,
+            -1.09787759295641440538,
+            1.91617142266035500597,
+            -9.19072748472674727616e-1,
+            -6.07962028359571915459e-1,
+            -3.56307810729336704725e-1,
+            6.55737331864027050976e-1,
+            -7.85259807205412774245e-1,
+            1.55960437863476086839,
+            -1.44187137146184496395,
+            3.10533464611600695804e-1,
+            8.03892625178835307231e-1,
+            1.21955067344318979217,
+            2.24019791193608064361,
+            1.36681924241222385596,
+            -9.85288347604335923435e-1,
+            -2.35767370872924410252e-2,
+            -4.41055148619727666048e-1,
+            -6.18704105943260529443e-1,
+            7.2022217027170254422e-1,
+            -1.32344263979168097478,
+            -2.35361261999035453751e-1,
+            1.20303920892909266271,
+            2.68099796368842901995e-1,
+            -5.0379322920134417263e-1,
+            -1.31074609284219278926,
+            1.84169729755427669105,
+            1.04545099238539784814,
+            8.11237382519803151837e-1,
+            3.52773980720191893123e-1,
+            1.91677454591302076636,
+            -3.06716623251911124637e-1,
+            -5.92589907279290395437e-1,
+            4.93693485026957604167e-2,
+            -4.09782869187581777481e-1,
+            8.18942186609751043846e-1,
+            4.47771501356722390064e-1,
+            -1.53792322381374324536,
+            5.4410496180425316215e-1,
+            5.08206457548512569034e-1,
+            -4.15874129908436140912e-1,
+            1.44164924126928606363e-1,
+            2.88029181017177948743e-1
          ]
          prettyName: "BhtBY"
-         systParamId: 69
+         responseParamId: 91
+         systParamId: 93
+      }
+      CCRESVariationResponse: {
+         paramVariations: [
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38,
+            39,
+            40,
+            41,
+            42,
+            43,
+            44,
+            45,
+            46,
+            47,
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            58,
+            59,
+            60,
+            61,
+            62,
+            63,
+            64,
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            91,
+            92,
+            93,
+            94,
+            95,
+            96,
+            97,
+            98,
+            99
+         ]
+         prettyName: "CCRESVariationResponse"
+         systParamId: 64
+      }
+      COHVariationResponse: {
+         paramVariations: [
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38,
+            39,
+            40,
+            41,
+            42,
+            43,
+            44,
+            45,
+            46,
+            47,
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            58,
+            59,
+            60,
+            61,
+            62,
+            63,
+            64,
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            91,
+            92,
+            93,
+            94,
+            95,
+            96,
+            97,
+            98,
+            99
+         ]
+         prettyName: "COHVariationResponse"
+         systParamId: 88
       }
-      CCQEPauliSupViaKF: {
+      CV1uBY: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            1.34025471632212433981,
-            -9.68855139125500253172e-1,
-            -4.17247224833054541904e-1,
-            5.12923677956265033906e-1,
-            2.66819003169423474287e-1,
-            -8.7073079248464257951e-1,
-            -3.95020470116964783625e-1,
-            1.56482439081097129963e-1,
-            2.75169506232888605446e-1,
-            -3.82359501187397199384e-1,
-            1.33387548407516609572,
-            7.33793743779008300621e-1,
-            6.57200480490028438041e-1,
-            -8.21784630049287034836e-1,
-            4.20005082501075266421e-1,
-            7.57031096220446477613e-3,
-            8.76411441099363197615e-1,
-            7.46877640695249866987e-1,
-            1.00345309378232072639,
-            7.42467587867982392602e-1,
-            1.42222841377814113173,
-            5.16980873411876096224e-2,
-            3.97251691418653463117e-1,
-            1.36511056619774739929,
-            1.60376825623107999164,
-            -8.25331468494225672927e-1,
-            1.62397023222266656539,
-            -3.11617137801258825558e-1,
-            1.19788555395322071639,
-            -9.30415223139464342417e-1,
-            -7.3570940509972126975e-1,
-            1.59219258604217306363,
-            1.2602058339376949192,
-            6.98619588998682039538e-1,
-            -8.94756473321896783624e-1,
-            -8.35723346433610458917e-1,
-            -7.57019277111048327633e-1,
-            -1.18944646573944501355,
-            1.24881219562405587631,
-            9.27197812085340467014e-1,
-            -1.6956914954073576407e-1,
-            -1.3160349410746527421e-1,
-            1.48353818550059712855,
-            -1.44502009123698882398,
-            5.62234930521371967238e-1,
-            7.25702015462983518468e-1,
-            3.70681982438189228102e-1,
-            9.32234996292792494899e-1,
-            -9.29444499361194442777e-1,
-            -6.30659793140661339983e-1,
-            9.75304100502648707582e-1,
-            -5.32935789488623190557e-1,
-            -5.24596213333067273865e-1,
-            -1.07184664811643259874,
-            8.53011460685027533835e-1,
-            -6.87544846776005025291e-1,
-            -4.97920992001999296317e-1,
-            5.7868462100644313395e-1,
-            1.30714353549702333446,
-            -9.35938937958634253889e-1,
-            1.19276876871703962912,
-            -2.81261648455683577197e-1,
-            4.16296285922361841703e-1,
-            -1.12303057718433851875,
-            -9.51336823755928540081e-1,
-            7.7655765857821884568e-2,
-            -6.35045938544529176006e-1,
-            2.49395048350685133443,
-            1.62147692305574753213,
-            -5.06023256639554497305e-1,
-            -1.12074563382613479057,
-            5.80181159267578072658e-1,
-            2.83258267611169178846e-1,
-            1.35670374885696071871e-3,
-            2.67137011282134650969,
-            2.68972371555079997618e-2,
-            1.07354704248186072491,
-            5.57030307910849620256e-1,
-            3.63394258710572556903e-2,
-            -6.9330095314323758604e-1,
-            1.1637945159003044715,
-            -1.51600805772217483991,
-            -4.58242849274156816008e-1,
-            1.52896072760994461426,
-            -2.54654797777158936611,
-            -1.86428732665796986767e-1,
-            -3.18153803935640244749e-1,
-            -2.30447447936238558608e-1,
-            -7.73519383436245711039e-1,
-            -1.1664914982737262239e-1,
-            6.49699546554519780095e-1,
-            -4.31826442814708610918e-1,
-            6.99881832546839111053e-1,
-            -1.01820870472930247175,
-            -1.1784028615104154003,
-            1.83522760140770124782e-1,
-            -6.02593578161754961364e-1,
-            7.24025289870607546838e-1,
-            -1.04741533840733147542,
-            1.55208388183042278463e-1
+            3.2674797737963245936e-1,
+            -9.40281051337868434281e-2,
+            -1.15918533181016636391,
+            2.66639622098268025407e-1,
+            1.31363450627957756289,
+            -7.84504373129139565002e-1,
+            -2.95753864181206235773e-2,
+            1.15757864820467926137,
+            -5.32133114588943412215e-1,
+            -3.75941666683137609706e-1,
+            4.05531656562290315771e-2,
+            -8.05384258501084637771e-1,
+            3.28227114935429997722e-1,
+            -1.14013991372756606779,
+            -1.8749485258466169757e-1,
+            -9.97607729492777761671e-1,
+            4.0371596250079283541e-1,
+            -9.12617133522115459021e-2,
+            -1.66919688886744854717e-1,
+            -7.65746646792622276401e-1,
+            -5.9052575335582480065e-1,
+            -7.20180274720489177476e-1,
+            6.05585911273334720484e-1,
+            1.01195592698820546751,
+            7.15098571544688810242e-1,
+            2.03769123784564243351,
+            -1.54957485369867242753,
+            -5.58387235994577735276e-1,
+            -8.36969692538746645738e-1,
+            1.05375319393967625814,
+            -1.31259250409611039068,
+            1.30200877916289936564,
+            -4.95718859890068863638e-2,
+            5.68381558647565732212e-2,
+            1.02634757025036327249e-1,
+            6.14841880454560563152e-1,
+            3.25104687345707021873e-1,
+            4.12963891107235914202e-1,
+            2.08332268949863541607,
+            -6.2478942972837103742e-1,
+            5.10305187260217785195e-1,
+            8.82533763239787605315e-1,
+            -8.32597078184600158934e-1,
+            -1.19686671218354367952,
+            -1.32312935315724655716,
+            4.84414826256618746836e-1,
+            -1.6032362655010399255,
+            1.19172238036114319648,
+            -3.85629334050410221835e-1,
+            6.42861839070289486919e-1,
+            -2.38965747623707709668e-2,
+            -8.08601633495554694697e-1,
+            1.5021027153388890607,
+            1.00846061433192857315,
+            -8.81860199206149886209e-1,
+            -1.86826042040872802863e-1,
+            1.5276736120078320269,
+            1.51979313298098639429,
+            1.05352917746656826736,
+            1.79086543287682253833,
+            1.0786296455162143193,
+            4.086385313428701066e-2,
+            -9.26473093052419982563e-1,
+            8.47427021233170707504e-1,
+            -7.25493827515795858263e-2,
+            -1.88138528767398183206,
+            -4.28565980947134494983e-1,
+            1.55792787428521384285,
+            -8.69956699481781559058e-1,
+            -1.77428593201031659099e-1,
+            2.78011057172433129203e-1,
+            -2.43373499775271340262e-1,
+            -3.20261057278939886839e-1,
+            -1.38489457294593854009,
+            6.34597047412064019234e-1,
+            -1.83812234016551057092e-1,
+            5.71632189308386329252e-1,
+            7.1928149677564101605e-1,
+            -9.11348303614098798064e-1,
+            7.97856626381988065511e-1,
+            -2.2175561323611392428e-1,
+            1.49691505338009744897,
+            -7.67659728106375172096e-1,
+            5.55475815184012122749e-1,
+            2.51131442552863681783,
+            5.24467685506813552365e-1,
+            -1.22379687829904493235,
+            2.91751528341506805031e-1,
+            1.10657675136944452787e-1,
+            -2.95988477355296986104,
+            -2.16629946693832442506,
+            1.33166760382277904462,
+            3.85825134289316251657e-2,
+            -1.36970651384031749664e-1,
+            -8.46983900465364647481e-1,
+            -5.21981484164337539156e-1,
+            1.1748409566901214518,
+            9.13074002482202939923e-1,
+            4.97709673756089598928e-1,
+            1.26081520042674810611
          ]
-         prettyName: "CCQEPauliSupViaKF"
-         systParamId: 83
+         prettyName: "CV1uBY"
+         responseParamId: 91
+         systParamId: 94
       }
-      CV1uBY: {
+      CV2uBY: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            1.31692326280404348182,
-            -4.4897849011760054827e-1,
-            6.67917876118918618644e-1,
-            -7.62606240979719185447e-1,
-            -3.52028460958223710087e-1,
-            -3.46905600007581915722e-1,
-            7.49202985289925238455e-1,
-            -6.52257907209685572347e-1,
-            -8.61811748276340883201e-1,
-            -2.40048831915970567463e-1,
-            -5.81435642670471874993e-1,
-            -6.8820448796835431704e-1,
-            7.49261777699216868776e-1,
-            9.1810564106098291326e-1,
-            5.76398022039051882714e-1,
-            -7.18292644429814219897e-1,
-            -3.57252551060416478901e-1,
-            1.17581335470338843585,
-            2.7821094326124373719e-1,
-            -8.44534144763702032677e-1,
-            1.96727088656227039332e-1,
-            1.14254268417511317679,
-            -4.62372386217198005909e-1,
-            -8.99476825498065735154e-1,
-            4.25439341429151407503e-1,
-            -3.43484224870486756775e-2,
-            3.93686210996247565319e-1,
-            -8.85782919857326489499e-1,
-            -4.40812491269304218555e-1,
-            3.87287269305921222351e-1,
-            1.07429656534996009754,
-            1.48676709897396147619e-1,
-            -3.77300954444149738709e-1,
-            4.48949255636989064122e-1,
-            2.96028504735641961876e-1,
-            1.21338821125827034386,
-            -1.04874149412230788236,
-            4.63598586562870340622e-1,
-            -3.79214475605911705003e-1,
-            -4.00520465848551721066e-1,
-            -9.65504511648215602015e-1,
-            5.50522541473826176883e-1,
-            4.14279169621071363672e-1,
-            -3.33341776562650973781e-2,
-            1.619246067571773251,
-            -8.3757562788375816698e-1,
-            3.56032515520577561019e-2,
-            -4.3716108961992333759e-1,
-            2.64826226575906042982e-1,
-            -1.58891933726248629766e-1,
-            -3.71487417616922499519e-1,
-            -2.14985550109210254988,
-            5.18573227322399521455e-1,
-            -7.95272521373306839898e-1,
-            1.56408577350088418001,
-            8.86166835794422680372e-1,
-            -5.16780546697507392473e-1,
-            8.64920271833780507365e-1,
-            1.16760373664889907652e-1,
-            8.3303183227151722523e-1,
-            1.64912822045130691428,
-            -4.18832300357043441075e-1,
-            -1.93298468677018026041e-1,
-            9.55466778642339087391e-1,
-            7.58327349511944359683e-1,
-            1.24421473255118231194,
-            7.5012389684588169636e-3,
-            -1.32130866593890994309,
-            -3.67649119149643488491e-1,
-            9.41686987347879700394e-1,
-            -9.33592296602142712736e-1,
-            -3.15908611856920273908,
-            5.79488701383138571366e-1,
-            7.24696662561304605354e-1,
-            1.41430252916001730767,
-            -9.21058223446747703633e-1,
-            1.89513028284688050951e-1,
-            -9.52937600456864597476e-1,
-            -1.52201948177269641427,
-            -8.50387379560609613094e-1,
-            -4.0208459280296976468e-1,
-            6.43993237765334902711e-1,
-            7.05169033228495223398e-1,
-            2.48554042529164666286e-2,
-            -1.99407141690319728022e-1,
-            -3.68299587091753533041e-1,
-            8.31456906429665965064e-1,
-            -1.65470312278705011799,
-            -7.80647641016399718161e-1,
-            -8.63712965812261784793e-2,
-            5.00693776226524326321e-4,
-            1.82704679582157303308,
-            -1.42912999325058742706,
-            3.55525042297425541982e-1,
-            -8.3598772853617309142e-1,
-            7.08069450153679502691e-1,
-            -1.15405687733154893593,
-            1.83119908209839876018e-3,
-            6.7892938840390359978e-1,
-            -6.71423826843054349922e-1
+            -2.26867806380375680586e-1,
+            9.04826404248414428722e-2,
+            -5.81626563356242076708e-1,
+            4.10704489805758021781e-1,
+            2.91756393024837412664e-1,
+            7.96846797698344766481e-1,
+            1.13655879515829427717,
+            -1.41191374463479429879e-1,
+            -3.60379352284338760892e-1,
+            4.80129823896296104024e-1,
+            1.85965416489212082007e-1,
+            -1.85931740687870972195,
+            -1.97071785444026710554e-2,
+            -6.64617193697830455079e-1,
+            3.49446750475527534441e-1,
+            2.49101377301516435647e-1,
+            -8.57488731890002187086e-1,
+            4.03594535752994421074e-1,
+            4.51744877990186533001e-1,
+            5.83811473190333551919e-1,
+            9.36785252016532177244e-1,
+            -1.31408825870327894414,
+            -1.29385257217623284021,
+            1.07050135844978666633,
+            -1.35763863248159433184,
+            -5.12376954113477833808e-1,
+            -4.72142748295652947554e-1,
+            3.59331401174177222924e-1,
+            -1.71682441143414621365,
+            -5.06876707508574830818e-1,
+            -2.42707950943436556734e-1,
+            2.66968267371449685665e-1,
+            -7.99563053245142651981e-1,
+            3.23108651591252127311e-1,
+            -6.65868034953062237769e-1,
+            -6.26158229036900326747e-1,
+            -2.9443331880485773544e-1,
+            -1.36618672174063338076,
+            -8.20688581882857426386e-1,
+            -6.00696924284642649883e-2,
+            8.52649453743778207304e-1,
+            7.54949701453299981679e-1,
+            4.83855160089187663619e-1,
+            -1.45656011599674073409,
+            1.36848498718459521406,
+            -5.79780766278942927272e-1,
+            -8.18694667957996502494e-1,
+            -1.85308527065437522729,
+            -1.52364569760262114073,
+            -8.20652021479316262642e-1,
+            -6.08509149466181856192e-2,
+            -9.54686217735277176111e-1,
+            -1.41133763763575359462,
+            1.14505797741397380429e-1,
+            -6.9827338455599463618e-2,
+            -1.8783611903351996042e-1,
+            1.1087791233922692502,
+            -5.61946752782950031957e-1,
+            -1.32192981079424098922,
+            -1.3298266225036484145e-1,
+            -4.83632998615699874478e-2,
+            -1.22413955613789404708,
+            2.66514649682193072167e-1,
+            -5.63438205715726891931e-1,
+            9.5688256010223293746e-1,
+            1.51640807611814698586e-1,
+            1.25811132229186412035e-1,
+            1.31245194674222270814e-1,
+            -1.97804260807161824687,
+            -3.36907816403642423886e-1,
+            1.99963805867822974616e-1,
+            -7.50237821941876714682e-1,
+            6.62984540289006218927e-1,
+            2.45522324140608816379e-1,
+            -9.11060509101555227041e-1,
+            -1.04394667987463374281,
+            5.49196069725575219955e-1,
+            9.10115731126749261115e-1,
+            -3.22835447886008430896e-1,
+            -2.78020040629395337461e-1,
+            -1.23971382410593133905,
+            7.95047526254881592456e-2,
+            -5.95657721370476567202e-1,
+            -9.54588426807413958919e-1,
+            -2.41609682677102766135,
+            1.69478694949431485384,
+            -2.29511778315034664644,
+            -1.92270776139267685068,
+            -8.54859653987162654287e-2,
+            3.0243384823432051256e-1,
+            -1.04280089624207672472,
+            -4.08048242201985100763e-1,
+            5.11922428729034706407e-2,
+            2.46412063701854366915e-1,
+            -1.54183771984362061325e-1,
+            -1.22389543449302928835,
+            1.72312177365236823823e-1,
+            -1.56975566508487140993,
+            5.27143884233872039857e-1,
+            -9.18552928315047312324e-1
          ]
-         prettyName: "CV1uBY"
-         systParamId: 70
+         prettyName: "CV2uBY"
+         responseParamId: 91
+         systParamId: 95
       }
-      CV2uBY: {
+      CoulombCCQE: {
          centralParamValue: 0
          isRandomlyThrown: true
          oneSigmaShifts: [
@@ -1089,2239 +1395,3469 @@ generated_systematic_provider_configuration: {
             1
          ]
          paramVariations: [
-            3.25832315782934089921e-1,
-            -1.61784632865351607478,
-            1.19032723091535075355,
-            2.65357176177523301774e-1,
-            1.53490402857681385029,
-            1.43271968824411866095,
-            1.14427009207384289269,
-            1.90565496427089708931,
-            -8.62745989096666998641e-1,
-            9.55899962627353327882e-1,
-            -6.90999000444140309973e-1,
-            1.51053368762513163213e-3,
-            -9.54377035568547804623e-1,
-            1.12251637330823128558,
-            -8.44253241368400519917e-1,
-            3.73834019448808285713e-1,
-            2.22335372130181480044e-1,
-            9.33936035019697019521e-1,
-            1.14737470119996487483,
-            4.25264808604861183072e-2,
-            -1.02718262022685177803e-1,
-            -3.88675565494088215424e-1,
-            5.20440952248321764273e-1,
-            -2.01940136117495727675e-1,
-            -2.72987973388884519466,
-            -6.86050928762539785621e-2,
-            -9.6260219935876009667e-2,
-            -5.70914110112965667021e-1,
-            1.40939101330270682988e-1,
-            3.871421823466641432e-1,
-            2.14886501091821363607e-1,
-            -5.11098208184367797102e-1,
-            5.42725955695999018324e-1,
-            7.54825381166609354899e-1,
-            7.25320436872122664695e-1,
-            -3.54895517484615286019e-1,
-            -2.04130378835766235213,
-            -7.0084407724904618231e-1,
-            8.70093422837616981003e-2,
-            -8.76186775446116117294e-1,
-            2.63103597896000962475e-1,
-            -1.81740613083710411679,
-            -1.47237352033412816077,
-            -9.04736708200421180237e-1,
-            -1.20250338698922387692,
-            1.24660769096721502081,
-            -1.07775711338839386144,
-            1.49124694013762137956,
-            1.07277359476311007214,
-            6.45855576638300843406e-1,
-            1.10393590452836232174,
-            -1.11468811180698956775,
-            -4.10641382343934768784e-1,
-            -6.40619089788047602063e-1,
-            1.67556767779321402756,
-            3.07593634581440122933e-1,
-            4.74451727900815245498e-1,
-            -4.06935449917124270058e-1,
-            -8.05631344563989881813e-1,
-            2.48790647283374033449,
-            -5.46396717645246443595e-1,
-            1.72708888366079493792,
-            6.02225580626790102379e-1,
-            -1.03857419818767560127e-1,
-            -1.69216480445633710161,
-            8.91289880285445756947e-1,
-            1.59662738268089687832e-1,
-            9.87714321709469933452e-1,
-            -1.21248719362600079763e-1,
-            -1.09914130810804766547,
-            1.34330784771638866992,
-            -9.50545639122689078881e-1,
-            -2.05280294802415108624e-1,
-            5.84237270269550301727e-1,
-            4.08679938466656067497e-1,
-            -6.32937982744433913496e-1,
-            7.046058757673222539e-1,
-            4.6931704606691332371e-1,
-            -5.73681247270204530686e-1,
-            -1.54299961752812242466,
-            3.88177565196026086447e-1,
-            -1.64495422978291516714,
-            3.6097337458100275942e-1,
-            -2.709090201638444384e-1,
-            1.38812276556179803322,
-            1.35960651391662468157,
-            4.32755500036585000201e-3,
-            -7.36705765651916255621e-1,
-            -1.06030458208746680704,
-            -2.8234998280340761756e-1,
-            -9.6011259368757082e-2,
-            1.40100428937573751043,
-            2.33581152871005714999,
-            -2.17756979985699178348e-2,
-            2.65950095287957877233e-1,
-            1.24390733281139653776,
-            -1.77070531451938051326,
-            1.77758284637787339344e-1,
-            -4.21585187417431242474e-2,
-            -2.43977294943629630097
+            5.5785198979947880904e-1,
+            7.29239821070120974866e-1,
+            4.28761738641903533686e-1,
+            5.51915545779653515801e-1,
+            -1.13874452720082230961,
+            -5.64813301588044325285e-1,
+            3.04248531230259688929e-1,
+            -8.09765299133478944071e-1,
+            1.06668367120433024708e-1,
+            -8.42389116708627261332e-2,
+            2.84820883602903640597e-1,
+            1.02614487775196328023,
+            1.30639114684905388586,
+            -1.19677218353113667959,
+            -4.32033518858073839475e-1,
+            -1.08243238237569228133,
+            8.29618618760650794464e-1,
+            -6.33634676049072642634e-1,
+            2.06591931766957603855,
+            4.66965724021061456828e-1,
+            -9.98414594017957623961e-1,
+            1.29484899968466171671,
+            -4.24233379200523452734e-1,
+            -1.17528036679159009203,
+            3.84484453992178232262e-1,
+            1.63473137120576295089,
+            -1.50851236230280100203e-1,
+            8.28390152960362557977e-1,
+            4.11390698815161881541e-1,
+            1.52572568242483863621,
+            2.13485289144531409367e-1,
+            2.72982243202131436011e-1,
+            -8.18206944536390756717e-1,
+            -7.67336689449193559698e-2,
+            -3.67368824321052611648e-1,
+            1.12568433366332576462,
+            4.94453040364354001746e-1,
+            -7.29401378119286958324e-1,
+            -8.43938087326181474168e-1,
+            -8.60145751620313481212e-1,
+            4.16872429002450750612e-1,
+            -1.77111093322697782382e-1,
+            1.43570157126332614839e-1,
+            -1.66530421739742151566,
+            4.91290852356666252199e-1,
+            -6.70369467752582992581e-1,
+            1.75240299129666166067,
+            -1.94693639723785127948,
+            1.25522277334714577046e-1,
+            -2.30398062369811251759e-1,
+            1.37985309820004076187,
+            1.62611219610431900762e-1,
+            5.83928219044444030139e-1,
+            1.73916725985540665533,
+            4.47093396032285816943e-1,
+            -7.2537179805016249734e-1,
+            -2.28718084406731386737e-1,
+            -8.49934357479208646424e-1,
+            -2.55152345499015398289,
+            -1.74336304410918546681e-1,
+            7.99301471187440076838e-2,
+            -5.64910446747588279592e-1,
+            -3.44695980753148334408e-1,
+            1.42428832425646989535,
+            9.11953178736546798966e-1,
+            -1.11277899556225334798,
+            9.66459945984755597337e-1,
+            1.29791011525127897297e-1,
+            -1.07674922101271941521,
+            2.91138256116830862474e-1,
+            -1.27169172591378276671e-1,
+            -5.00170676686876092276e-1,
+            -5.33101537210393106037e-1,
+            4.17152263785150800857e-1,
+            6.29512457565917782354e-1,
+            5.10824983042709623859e-1,
+            -7.14578801951039066509e-1,
+            1.15008986001856827741,
+            -5.33947183121380342108e-1,
+            1.75848361257500007682,
+            7.61192822771865729159e-1,
+            -1.89694386428871430983e-1,
+            1.03982517591576373306,
+            -1.95084466509573206672,
+            2.16957035864474456766e-1,
+            -1.61980654704901055885e-1,
+            6.45382474120336224743e-1,
+            -2.43162957409308572165e-1,
+            -1.44889146248859912447,
+            4.8003409726170692684e-1,
+            4.97896567488953278868e-1,
+            6.9395479433196272101e-1,
+            3.09728519612611885581e-1,
+            -2.04318733256941165166,
+            -7.52753409503356674115e-1,
+            1.32502144272766991806e-1,
+            5.11351428048257394821e-1,
+            -2.62339980108095283118e-1,
+            -5.36366066258795681776e-1,
+            -1.04399595998198857494
          ]
-         prettyName: "CV2uBY"
-         systParamId: 71
+         prettyName: "CoulombCCQE"
+         systParamId: 58
+      }
+      DISBYVariationResponse: {
+         paramVariations: [
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38,
+            39,
+            40,
+            41,
+            42,
+            43,
+            44,
+            45,
+            46,
+            47,
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            58,
+            59,
+            60,
+            61,
+            62,
+            63,
+            64,
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            91,
+            92,
+            93,
+            94,
+            95,
+            96,
+            97,
+            98,
+            99
+         ]
+         prettyName: "DISBYVariationResponse"
+         systParamId: 91
       }
       EtaNCEL: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            2.87343955683190321881e-1,
-            5.94704758917228737403e-1,
-            9.55660511431337456045e-1,
-            -6.58164029319767807102e-1,
-            1.58063906931796527289,
-            -6.03028464226659899339e-1,
-            4.6695009208422721958e-1,
-            -4.6041585810659796385e-1,
-            5.57032733610632810328e-2,
-            8.74579227804433312343e-1,
-            1.37466394925306722996,
-            -1.46643910268051042012e-1,
-            1.83678863124086078074,
-            -6.3411078747153870605e-1,
-            -4.12292477580802341208e-1,
-            -6.703554445467189149e-1,
-            1.10154391401646378768,
-            3.11328193952337528572,
-            -5.11135317391035570722e-1,
-            -7.834191838989690293e-1,
-            6.90748228275104958485e-1,
-            -8.77832540985502562947e-1,
-            -2.23483088595998014014,
-            -3.49779055459438714681e-1,
-            3.1684234585048559607e-1,
-            1.42898900349023172396,
-            9.13063093059163888299e-1,
-            -4.03967136092452328011e-1,
-            1.24563587907576756031,
-            1.19695594694396745261,
-            2.63590578164892785917e-1,
-            1.57438093757976815823,
-            6.66735375559788789879e-1,
-            2.39920197876304419626e-1,
-            1.71741847561571236991e-1,
-            -9.63513607076389555495e-1,
-            -3.80226241734221537261e-1,
-            -8.21099134163992716573e-1,
-            6.29507067124180696993e-1,
-            1.57504496048093495242e-1,
-            1.80751038601367097769,
-            -1.34965344416544685835,
-            -7.53378058781005721656e-2,
-            -1.43242725129071035717,
-            -1.41948884594973701034,
-            -3.7679718961972846758e-1,
-            -1.8929903489298866015e-1,
-            -2.50814582730893964602e-1,
-            -1.68171396278328955098,
-            2.31121253073682669799e-1,
-            1.16649840210639954563,
-            -1.37654842960001788654,
-            -4.79533744655489813091e-1,
-            -2.30014541047499987414,
-            -1.52284590776992412309,
-            -1.31172171362011225071,
-            1.87538458402199126329e-1,
-            3.39166557751080025018e-2,
-            7.50108111173608871347e-1,
-            -1.02843990278339725286,
-            8.29498174798178777856e-1,
-            1.81889935516826972695e-1,
-            -9.24132963037006538443e-1,
-            -6.76934489360455859952e-1,
-            5.82056212107078807527e-1,
-            -9.64018115067981629096e-1,
-            1.03781689514069830338,
-            -8.09985655302380758158e-1,
-            4.68428273683951013062e-1,
-            1.24284971676307653965,
-            9.72800999493542706276e-1,
-            7.66783030196031889503e-1,
-            1.50653991003790621583,
-            3.62400896922903170694e-1,
-            8.20342464978880303583e-1,
-            1.09974778471362943932,
-            -7.97302674462904592545e-1,
-            -1.051052511826118252,
-            -4.75199267903402444713e-1,
-            -1.13998664935005500354,
-            -1.03043976549400206899,
-            -2.42659614871919088186e-1,
-            9.9610163156859193867e-2,
-            4.97753847502395874169e-1,
-            2.44494180577731423654e-1,
-            -1.29561984971527127675e-1,
-            -2.5388090736860124963e-1,
-            2.91654546986184870505e-1,
-            -6.03593932188695281305e-1,
-            -3.61553188093701405315e-1,
-            2.22058570256469867132,
-            -6.18742849372650227657e-1,
-            1.06950564375731738131,
-            -1.06785927525183632625,
-            -4.92425096937469108926e-1,
-            5.8050986574589591438e-1,
-            7.94142552840699122996e-1,
-            6.68848122239966702551e-1,
-            -3.38410279303287958585e-2,
-            8.79033194546307239392e-1
+            7.79862478412510357062e-2,
+            -1.37376157799648929148e-1,
+            8.48260039441766533486e-1,
+            7.79416555494641616342e-1,
+            -3.39996547785442804201e-1,
+            -2.24294218333482259231e-1,
+            9.24200916760604451738e-1,
+            4.06794856808997962183e-2,
+            3.46446113256398680047e-1,
+            -3.43854211891896188735e-1,
+            -7.39039000952948388345e-1,
+            7.62765442605134680321e-1,
+            2.24212416637272848874,
+            -1.50490880280066052777,
+            1.76110540151305716705,
+            6.33440132887821527596e-1,
+            6.63836694023771434203e-1,
+            2.95761281297258404877,
+            -5.81806425780552194382e-1,
+            8.16414740506980901591e-2,
+            6.59739051510494056707e-1,
+            1.05409276215781710917,
+            -5.17153110149503048021e-2,
+            -2.01790151217334701172,
+            2.76831059718244232304e-1,
+            -1.36373523677294050671,
+            -1.03885249853067063164,
+            -1.42062979353204754673,
+            1.02436965098043386568,
+            1.80542660344982852649,
+            -6.84492235418140304581e-1,
+            8.38762037565201290512e-1,
+            9.45947334910444914691e-1,
+            2.97976269030439888663e-1,
+            -3.37007084182699423458e-1,
+            6.85706063259146070266e-1,
+            -4.11676046493170966212e-2,
+            -6.62779572241201875293e-1,
+            -5.41137615554057482825e-1,
+            1.3804018360496383977,
+            4.40861842836346926044e-2,
+            9.7312200175671781377e-1,
+            -1.38438798201327850634,
+            1.2857917485614608899e-1,
+            -1.11364231016039927358e-1,
+            1.55972094048123421928,
+            7.03933858551509139545e-1,
+            -1.17518379882695731681e-2,
+            -1.4932960517141999901,
+            -4.33461111173392532603e-1,
+            5.31633886900848229295e-1,
+            4.06519143295090146228e-1,
+            8.19950087798621440882e-1,
+            7.38812347972296667997e-1,
+            5.72754523158033657104e-1,
+            -2.5758202158306636731e-1,
+            -1.01321525440561588383,
+            1.21259554158023252768,
+            -8.88236528474095399233e-1,
+            4.83217640494243594329e-1,
+            2.78390993515217344267e-1,
+            8.67836266641786591158e-1,
+            7.27428858394157606959e-1,
+            -4.98676188751911553254e-1,
+            -1.93256117911354619032,
+            5.24948369651280888348e-1,
+            8.6039924188740468658e-1,
+            -1.5531592136773448784e-2,
+            8.30496803184111898055e-1,
+            -1.43014162429600383275e-1,
+            -2.40748226805627574265,
+            -4.11214250722880481081e-1,
+            -7.8462510746900124281e-2,
+            -6.8433972453522205065e-3,
+            -8.7465227558254088347e-2,
+            -2.26207207287912570592,
+            1.48759307189809386607,
+            3.58628973752974589129e-1,
+            -1.51708284807597038046,
+            -5.69731149257585833823e-1,
+            4.74138904838794228436e-1,
+            -3.99669578751750548262e-2,
+            -1.03769644153829077027,
+            -3.0881190205221481504e-1,
+            -1.4597592313698319888,
+            7.35892453000204560531e-1,
+            3.28478605129554013242e-1,
+            1.6255287295283642468,
+            9.47714866403541522644e-1,
+            -6.53039471531321136233e-1,
+            -3.72331797452165658147e-1,
+            5.69839343942829201772e-1,
+            1.09613179330627596997,
+            -4.94657097935140954714e-1,
+            1.83139056605427685831,
+            -2.12387920809657626542e-1,
+            -4.18472242482570977451e-1,
+            1.68689073375931819498,
+            -2.14013652006493071411,
+            -1.48329502695596682216
          ]
          prettyName: "EtaNCEL"
-         systParamId: 45
+         responseParamId: 61
+         systParamId: 63
+      }
+      FSI_N_VariationResponse: {
+         paramVariations: [
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38,
+            39,
+            40,
+            41,
+            42,
+            43,
+            44,
+            45,
+            46,
+            47,
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            58,
+            59,
+            60,
+            61,
+            62,
+            63,
+            64,
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            91,
+            92,
+            93,
+            94,
+            95,
+            96,
+            97,
+            98,
+            99
+         ]
+         prettyName: "FSI_N_VariationResponse"
+         systParamId: 101
+      }
+      FSI_pi_VariationResponse: {
+         paramVariations: [
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38,
+            39,
+            40,
+            41,
+            42,
+            43,
+            44,
+            45,
+            46,
+            47,
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            58,
+            59,
+            60,
+            61,
+            62,
+            63,
+            64,
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            91,
+            92,
+            93,
+            94,
+            95,
+            96,
+            97,
+            98,
+            99
+         ]
+         prettyName: "FSI_pi_VariationResponse"
+         systParamId: 96
       }
-      FormZone: {
+      FrAbs_N: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            -1.42671453778882684205,
-            1.66808833696878733299,
-            -4.04369308249553846557e-2,
-            8.65746138236148654599e-1,
-            -1.19879519438615833593,
-            -1.01607240985235303121,
-            -2.41299096441223714926e-1,
-            3.25520946618962025987e-1,
-            -6.33187282897971326356e-1,
-            3.31059551952757491478e-1,
-            3.66108976533669749909e-1,
-            -8.28848993416765877917e-1,
-            6.80000523009632096283e-1,
-            1.79735847362056166965,
-            1.46379383495444792551,
-            3.01141676328741558777e-1,
-            -1.22360252222824955615e-1,
-            1.2349030965721297104,
-            -2.41163897756446393705e-1,
-            2.56045090601908220673e-1,
-            -2.68827423130562848108e-1,
-            -9.42860561809750058471e-2,
-            -5.15970466132545046989e-1,
-            -9.07543493402777290413e-1,
-            -4.90408129053196362168e-1,
-            -2.16336956964551990756e-1,
-            -1.08465391616863193747,
-            9.10683263678479376635e-2,
-            8.55831475072072023202e-1,
-            -3.77345834453731210356e-1,
-            5.98355975500599157613e-1,
-            1.73506983990726670886e-1,
-            -1.02400439730450809606,
-            6.62444927586803733455e-1,
-            -9.64924306468374570755e-1,
-            -1.26112126543987024263,
-            -1.53598070765473881938e-1,
-            -6.89934500206444284442e-2,
-            -2.93671495220886891175,
-            2.56390953744041923124e-2,
-            3.73863062679158197898e-1,
-            3.18856750860205151454e-1,
-            5.15755953452536441972e-1,
-            4.36191816269169807541e-1,
-            -1.30094580502774914699,
-            1.53979267714580869697e-1,
-            -6.6920217997649322772e-1,
-            2.20327653246450316793e-1,
-            1.06341767226426564541,
-            -1.68205526317363784905,
-            -4.26590602725183398736e-1,
-            -6.20285671502138535871e-1,
-            -1.4834932866180474461e-3,
-            -5.49418840543096198559e-1,
-            5.32712181279247243282e-1,
-            2.05515548096238225007e-2,
-            6.9493767104646908539e-1,
-            -4.52568544882718026834e-1,
-            -4.96890825081032994071e-1,
-            4.39364935539624107408e-2,
-            -6.58939787703802348773e-1,
-            -1.83775109864513663815,
-            1.39517656696599545718e-1,
-            5.4526620052457352994e-1,
-            -4.76844829461271491056e-1,
-            -1.32649158149472867763,
-            -1.1790446812481412131,
-            2.00417187406090402391,
-            9.28026848251413460922e-1,
-            1.22213383686973142694,
-            -3.81606350730852972308e-1,
-            -3.01645757558101912377e-1,
-            3.34302960642492208443e-1,
-            -3.39922956569112244551,
-            -7.35088470522057058076e-1,
-            -1.47796370023333878407,
-            -8.58892698326595427361e-1,
-            5.44922593584084347107e-1,
-            5.26348235065977609892e-1,
-            -1.17206277542324199814,
-            -9.63291704868316833732e-1,
-            8.88531029425842361347e-3,
-            2.06307379394838702469e-1,
-            6.82045323055010116464e-2,
-            1.16345254818406762531,
-            8.57501220742628245119e-1,
-            -5.46348051930338862725e-1,
-            2.10177720219072661223,
-            -4.40694899247870530701e-1,
-            -4.63918508052016953513e-1,
-            -6.09997652277216140249e-1,
-            -1.40072833879388913836,
-            -7.69090950566806319522e-1,
-            4.3399056552841153156e-2,
-            1.14966318416512103262,
-            7.29518033195411419456e-1,
-            -3.417003576452455893e-1,
-            1.81123749406776474169e-1,
-            -1.26361650666282399058,
-            1.4746336161490420924
+            -6.27595205622000551493e-1,
+            5.67717788745965568076e-1,
+            9.19599422981081771056e-1,
+            -4.73855731504027460899e-2,
+            -1.30591681272033333094,
+            1.49263670116429314483,
+            1.09709501942017517706,
+            5.95883180052187877429e-1,
+            1.61165185327069648835,
+            8.66336409075545210712e-1,
+            1.99814421054501728525e-1,
+            -2.57207083312993634028e-1,
+            -9.94491473585128182844e-3,
+            -1.33304008570170240411,
+            -1.27546421077629634766,
+            1.17265305106868791829e-1,
+            -2.36319680661405989719e-1,
+            -2.30812288704075017909e-2,
+            9.20126199827676183318e-1,
+            9.68195657785749674851e-1,
+            1.07265171264336614532e-1,
+            -6.53557092405405715141e-1,
+            -2.53873207803026668117,
+            9.16270412598979011598e-1,
+            -2.32166156838790938011,
+            5.80652107640641790276e-1,
+            -5.29966916118993602858e-1,
+            -3.94217237369245521172e-1,
+            -1.0438538892474475972,
+            -8.19071781210367722004e-1,
+            5.74394157486187495465e-1,
+            -1.04011903359095958521,
+            5.99571369084650585002e-1,
+            5.06225153622148066335e-2,
+            8.72021897796121825408e-1,
+            -6.99738262455093074088e-1,
+            2.15307452493856049669e-1,
+            2.04076724151290439524e-1,
+            1.41711928903073047792,
+            1.27739182819353924714,
+            5.72006977947876193991e-2,
+            7.32280614304192889463e-1,
+            3.63937853083505125085e-1,
+            -8.13207098687060869757e-1,
+            5.03583594757482932991e-1,
+            -1.57675406107134520595e-2,
+            -1.69794828453934543155,
+            5.42252530800166221425e-1,
+            -1.37098318310792910424,
+            5.80464483969397801455e-2,
+            -1.38124070836525003614,
+            1.19998899480557474906e-1,
+            1.03514382027460749569,
+            -1.67355540213226627877,
+            3.89382486135511740599e-1,
+            2.54517746829277247134e-1,
+            -8.89221392231696050601e-2,
+            2.98588041579924023949e-1,
+            -1.50654124207491357801e-1,
+            -6.59797488658434128084e-1,
+            1.54702882926861073898,
+            -1.40774272430205904527,
+            1.81097888781402427405e-1,
+            -1.61066497081115450607e-1,
+            -2.75449610291830593312,
+            3.4951503096115305036e-1,
+            1.45596699143150609679,
+            8.30698018650884217884e-1,
+            -5.71963114171500142113e-1,
+            -4.77788364969728596154e-1,
+            -1.6777366142280520922,
+            -2.69333396686831960665,
+            -3.94510820993478894536e-1,
+            -1.142385043877935491,
+            -2.87968527798151074926e-1,
+            -5.58989425956342711466e-2,
+            -1.12634127528324201606,
+            -1.34602520873904274445,
+            -1.04173674746530164903,
+            -5.0777933768983019025e-1,
+            -1.38260987745478070021e-1,
+            -3.57220571097687622508e-1,
+            4.12926956528171684724e-1,
+            -4.23430242156785485719e-1,
+            1.38868816985546983389,
+            2.75674657886103957605e-1,
+            -4.56505196842730942564e-1,
+            -4.97792366473183811593e-1,
+            1.06470441066097265548,
+            -5.32804671973158394671e-1,
+            1.48548889769512793002,
+            -6.84979613878304971486e-1,
+            7.87590686232922165821e-1,
+            -1.35154207965521977464,
+            -1.96967267598802432682e-2,
+            -8.08388773072722166546e-1,
+            -1.69788994737291565329,
+            3.1450940420390061103e-1,
+            -7.07086530743891050754e-1,
+            -4.44385812126629864416e-1
          ]
-         prettyName: "FormZone"
-         systParamId: 72
+         prettyName: "FrAbs_N"
+         responseParamId: 101
+         systParamId: 104
       }
-      FrAbs_N: {
+      FrAbs_pi: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            -4.15176310556111261008e-1,
-            3.59149465410228185824e-1,
-            -3.75206247406325299476e-2,
-            3.71439712661597920551e-1,
-            -3.85366235392213041244e-1,
-            1.96317265285402964281,
-            -1.00389595547431276223,
-            -1.24160431567456458479e-1,
-            -4.21836626871825992602e-1,
-            -8.582816078298123319e-1,
-            6.06820157262306092427e-1,
-            1.10503479501541823637,
-            4.79884654794556442248e-1,
-            2.97208809405297647022e-1,
-            1.16886884141800306836,
-            1.72269418760546511038,
-            9.87732528295779177441e-1,
-            -3.95271532647228696078e-1,
-            -7.37017987601455315527e-1,
-            -2.54767148959373601613,
-            -9.53311878830450099009e-1,
-            5.885329985286313903e-1,
-            -3.25858857297710635681e-1,
-            -1.44885199471981440666,
-            -2.47970360908127851474e-1,
-            1.26222967008190845029,
-            -7.63312095279724101005e-1,
-            -1.03073967002067123921,
-            -4.68489660838278643151e-1,
-            4.75902557247625146442e-1,
-            -1.7078385308557151312,
-            6.7465273256342195296e-1,
-            -2.55160923148120000192,
-            -1.10782515311453622076,
-            -2.65705985806241440361e-1,
-            5.70247110889248398635e-1,
-            1.74650790530865118733,
-            -1.95447629468543160325e-1,
-            -9.75574956092046585709e-1,
-            2.74633016323853285101,
-            1.20978977005951793267,
-            -8.8721868809256698718e-1,
-            -3.72512840493350927407e-1,
-            8.93346671190646146599e-1,
-            1.25322645091301088094,
-            -4.59133783809848594615e-1,
-            9.66504086958595021173e-2,
-            1.56380549385855438516,
-            1.91400983654695898417e-2,
-            -1.76366673514972323311e-2,
-            8.62709637918376848198e-1,
-            2.00899049163219406422e-1,
-            -4.15777845969007964211e-1,
-            -5.75683356033811266528e-1,
-            3.52994410275638881291e-1,
-            1.03198995175966024007,
-            9.69478266181289183301e-1,
-            -1.70728288325143173765,
-            1.3155395074765166008,
-            1.44496769873504044002e-1,
-            -1.64478366768909056717,
-            -1.21476301467902181308,
-            -9.89858185002350565718e-1,
-            -9.39074784070047408058e-1,
-            1.9401186021496474865,
-            6.01324606922579163459e-1,
-            8.0794334721779925701e-1,
-            -2.2193948070040496745,
-            -1.95073226796206478095e-1,
-            1.74600414280004345713,
-            -1.36852970640249121947e-1,
-            -1.35528301666643469225,
-            8.35406722618899477695e-1,
-            -1.12285436866737087236,
-            -4.12183748860006138326e-1,
-            2.38677536457292782668e-1,
-            -4.72746473993337967823e-1,
-            1.09806478304872912055,
-            1.52262083122866199308e-2,
-            -2.14827224688454387902e-1,
-            7.97729954089346993129e-1,
-            8.38266374124152724434e-1,
-            -1.03845761492287080863,
-            7.24096338228022995409e-1,
-            -8.45514843560541518031e-1,
-            -7.18219617430395529389e-1,
-            -7.30127436145578179172e-1,
-            1.45853784516922324599e-1,
-            -3.31531580597195008053e-1,
-            5.49467670119792361838e-1,
-            2.2270815990332346046e-1,
-            -1.93036458856815390517e-1,
-            -1.97013374997175150227,
-            9.29752438097768196812e-1,
-            -1.4534900700459727485,
-            -8.50108520560773128771e-1,
-            -4.25350319235606511015e-1,
-            -4.56468351834770358355e-1,
-            -5.4051126310633856864e-1,
-            2.8439542443783527581
+            3.39326436991932545162e-1,
+            -4.61645910889153798795e-2,
+            -8.60127764365195002227e-1,
+            4.05576679304547826899e-1,
+            -3.39415010788654936125e-1,
+            2.20008910601699803067,
+            -7.68238625908437722245e-1,
+            8.87936019027380729618e-1,
+            -5.62166446807286557252e-1,
+            -1.30117860940410690063,
+            9.75548009640338387172e-1,
+            -4.0071229251425694029e-1,
+            -3.38561517242663090332e-1,
+            -1.61218025134197961989,
+            2.42180988983274669835,
+            1.65476124109965261333,
+            1.37685625718434401232e-1,
+            1.25079991234582821313,
+            -6.85833406475330309426e-1,
+            3.05142990202701991365,
+            -2.8588275275965641109e-1,
+            -1.60654161046416121827,
+            5.02220685270114874932e-1,
+            -5.8344895169509825017e-1,
+            6.29845023929971215004e-1,
+            -3.80766969172745883832e-1,
+            -1.93650812159746638086e-1,
+            -1.3054157550687581768,
+            -1.58124147078070098615,
+            5.75439702926802909566e-1,
+            5.38250385161918032395e-1,
+            -1.4825692934602413553e-1,
+            -1.04725339445163334595,
+            1.09838523327993975442,
+            -1.24181848103045708309e-1,
+            1.31448463856742275846e-1,
+            6.77226387782878247457e-1,
+            1.08778689475811041198,
+            1.18566285675379101683,
+            3.85750281293259000837e-1,
+            -4.33816921577251823905e-1,
+            7.00505771076028294075e-1,
+            -5.31240323633037969664e-1,
+            -9.4117950311573417288e-1,
+            -8.07120497908500933448e-1,
+            -1.02929513421858542799,
+            -3.10667216506319912583e-2,
+            6.82704776596696261137e-1,
+            -1.37745348247908827588,
+            -1.53409846832117602311,
+            -5.52138203731796228801e-1,
+            -4.21787077578942792844e-1,
+            2.90119048515001975996e-1,
+            6.09089654147339842893e-1,
+            8.94997601404068254816e-1,
+            -2.01392748103682128757e-1,
+            4.16684452792136839072e-1,
+            -2.21863363999263540904,
+            1.93744847984067408708e-1,
+            7.94965825267454961889e-1,
+            -5.32249951840052193397e-1,
+            3.60585781398619076299e-1,
+            -1.76190441729350166788,
+            2.40951616911289656642,
+            -1.70479016086566070864e-1,
+            -3.02032954315368640241e-1,
+            1.52670791553003504237e-1,
+            -7.12447940164104620564e-1,
+            -3.74602123102045547753e-1,
+            -1.50817067621026396074e-1,
+            -7.16707441549399471015e-1,
+            4.00052308360273750631e-2,
+            1.53078604196277334726e-1,
+            1.40039475681977099164,
+            6.4293495796583860491e-2,
+            -4.1336512034188149789e-1,
+            -7.38914918213977922612e-1,
+            1.42091192906034513577,
+            -1.03176382128054155984,
+            1.23971199743935597826e-1,
+            5.03265030406280899911e-1,
+            -8.660357247374469436e-1,
+            1.66496555343129082338,
+            -7.52959833303400327686e-1,
+            -1.54462723042183697197e-1,
+            8.4033814879387092045e-1,
+            1.30229403440029134487,
+            -3.41997619609821168485e-1,
+            -1.68728287928815690044,
+            1.28990510159837801218,
+            2.70292029637857644797e-1,
+            1.42928180869882259785,
+            4.91170561637153557655e-1,
+            7.40328238706835950467e-1,
+            4.47429242501917512342e-1,
+            7.89805346387494923432e-3,
+            -1.35980482865681900906e-1,
+            -1.15424022979758555962,
+            2.35443387982400692549e-2,
+            1.42340253129749377825e-1
          ]
-         prettyName: "FrAbs_N"
-         systParamId: 81
+         prettyName: "FrAbs_pi"
+         responseParamId: 96
+         systParamId: 99
       }
-      FrAbs_pi: {
+      FrInel_N: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            1.67302901305684836863,
-            6.33354498688144973428e-1,
-            -7.6188453980490600248e-1,
-            5.86387405409993567318e-1,
-            1.43399284850702746219,
-            2.4916573627749019626e-1,
-            -9.0510442199307894473e-1,
-            -1.06561233581801895198,
-            7.42406668303344341453e-1,
-            -1.00023423158719060311,
-            1.18680937559319787944,
-            1.30449140133825602916,
-            -1.71265414872096455312e-1,
-            6.92937322689462925629e-2,
-            -9.94759557974340680175e-1,
-            1.2071787054526454952,
-            3.68590402929674043619e-1,
-            8.2297734491351715036e-1,
-            2.64387045003779963537e-1,
-            5.87495570284465085109e-1,
-            -7.34429879595163148664e-1,
-            2.6631398548057538811e-1,
-            4.26733115136666230072e-1,
-            1.18075374519913478544,
-            -1.83697296529766362916,
-            7.75841560280547404282e-1,
-            -1.90040166395721432657,
-            -7.32441458639351283821e-1,
-            -1.79969242957501468494e-1,
-            -1.5415988375620641726,
-            -5.36652484985062794287e-1,
-            4.54443905466733744092e-1,
-            -2.00551318394744729212e-2,
-            5.78511878903071874447e-1,
-            3.62888087202120845909e-1,
-            -2.13795178863536428082,
-            1.21577277621619650461,
-            -3.26041263309566065054e-1,
-            2.78390571399092356941,
-            -6.2387538461453151406e-1,
-            -6.64901305009491405684e-1,
-            4.6535935263187977462e-1,
-            -3.99690806746052784693e-1,
-            -1.32288846333614484863,
-            5.92613132559814195788e-2,
-            1.20913531988363143199,
-            -4.15061050206329607004e-1,
-            6.96081243549739214771e-1,
-            -1.07263576504503452269e-1,
-            -6.90827847659397226154e-2,
-            -1.97111450436257829022e-1,
-            1.23014441933850166011e-1,
-            -1.20885974566358878057,
-            2.10090893317200899659,
-            -1.1971839139789162143,
-            1.195445692472061755e-1,
-            9.4747809205353961115e-1,
-            -2.5468281377399715204e-1,
-            -5.3099769028743937227e-1,
-            -2.31147349888274478147,
-            1.37192786703692393147,
-            -4.83646048665470951189e-1,
-            1.8721441650745955787,
-            1.70344720472824584512,
-            3.56984303001834368807e-2,
-            3.65931694602726409471,
-            -2.03790467128877317293,
-            8.15145691739548095001e-1,
-            -2.17907694342915325691,
-            1.26367628933031728167,
-            -4.75274439414368823908e-2,
-            1.65610340000454603349,
-            1.4961928588226605652e-1,
-            1.51954229776044114075,
-            -2.12802855525802758763,
-            6.88564162503228716083e-1,
-            1.68469720359402619358,
-            4.89223709385471439148e-1,
-            4.37095147720247823031e-1,
-            -1.48029011164547585899,
-            1.65667528715923939586e-1,
-            -1.45027940125638199476,
-            -1.49167236568915440031,
-            1.82615269140463754027,
-            2.28109720213492545016e-1,
-            9.1054083793226225918e-1,
-            9.38951048414471078907e-1,
-            -5.69526789859405635497e-1,
-            1.92223780875552252567,
-            8.53390039070667572041e-1,
-            -7.80543419188004738984e-1,
-            2.53047485594098009454e-1,
-            1.19752263198319530701,
-            -1.04720358717831407702,
-            8.5981583429178831679e-1,
-            3.04575959352751057807,
-            1.35179283539119721169,
-            -1.23904888110240962718,
-            2.70585979142002719389e-1,
-            -9.5301381176048638455e-1
+            -2.13332802861588666232,
+            1.35804932884649742775,
+            1.75941035219623875818,
+            -5.57931750211748678225e-1,
+            -4.44732077091195610041e-1,
+            -1.97093891023813916341e-1,
+            -1.1465173808864721483,
+            -6.90381060441149219109e-2,
+            -6.5820297148312256752e-1,
+            -1.91856000437323381824,
+            2.60906890280033776364,
+            4.31388505066056693327e-1,
+            2.52483306077544378265e-1,
+            1.66266866483566411183,
+            5.80291378278789071743e-1,
+            1.71708920591194869054,
+            1.20831636936879727173,
+            1.10198280420475480668,
+            8.37184713874161712255e-1,
+            -5.09322314596908687356e-1,
+            5.67149307474144048768e-1,
+            9.2344546840238428409e-1,
+            -4.88514939708068807178e-1,
+            -4.977082046652782088e-1,
+            -3.73477662619176253855e-1,
+            -1.60081085191862248877e-3,
+            6.56996803296539422234e-1,
+            1.11816649762690345504,
+            3.69108123437214719065e-1,
+            5.7142148929502345478e-1,
+            -5.33245498620154689817e-1,
+            -3.43799265031455691943e-1,
+            -1.92996744329176705968,
+            1.23468237896644894569,
+            1.9693753419341386568,
+            3.44399389467448469038e-1,
+            -1.24410601978759061126,
+            5.75827318627992856825e-1,
+            1.3356895587776482226e-1,
+            1.51130772464718399206,
+            -7.91648134642855105803e-1,
+            -1.00531409098913071531,
+            2.07676911427740439053e-2,
+            -1.03314041180451798851,
+            2.39583446273629874224e-1,
+            7.06047851645830615297e-1,
+            -4.71774580216627673068e-2,
+            -3.48412296788449848961,
+            -6.88708564304147285995e-1,
+            4.47222547777342327446e-1,
+            -9.73914368829886800683e-1,
+            -5.93977531277443904223e-1,
+            -3.49146591535406336515e-1,
+            -1.93517960448868153733e-1,
+            -3.93520216331722585967e-2,
+            2.84187741512868019544e-1,
+            1.07300127632028252656,
+            2.20589002159526081925,
+            1.64082481900208865255,
+            -9.59654560386014737761e-2,
+            1.08979125887851857613,
+            -6.16110274465986540449e-1,
+            -2.54316146510716267759e-1,
+            3.56192640935483362252e-1,
+            8.8405071850949812351e-1,
+            1.79324054050250714099,
+            1.29210668151452456875,
+            7.8380101104719313021e-1,
+            -2.40509239099766336523,
+            -1.06332400131935522758,
+            1.5511999620587095805,
+            -7.1618685246976099279e-1,
+            -1.3100816797571365746e-1,
+            -3.5545238668009687677e-1,
+            7.03383865755485615523e-1,
+            1.11857372341930869086e-1,
+            8.64009412459503245429e-1,
+            -1.7330081685697000804,
+            -4.73228995912402458646e-2,
+            8.70144757177162442296e-1,
+            4.12357788074330600114e-1,
+            2.58699352103087476529e-1,
+            -3.7103364934541871456e-1,
+            9.01327554114507045746e-1,
+            3.46211123836234924145e-1,
+            1.90120954928028385034,
+            9.89498352638308042994e-2,
+            -6.00965257368493155354e-1,
+            -1.64032086307358992983,
+            -8.13511645369842939512e-2,
+            1.28743526732481600172e-1,
+            -1.42127058952055751462,
+            2.19321390057842124932e-1,
+            6.9833211537383499401e-1,
+            -7.17707479206218579293e-1,
+            -7.62566671103365317785e-2,
+            9.56293563912076205469e-1,
+            -2.92864971490868319925e-1,
+            -2.92976716664752556696e-1,
+            3.00380786436032887199e-1
          ]
-         prettyName: "FrAbs_pi"
-         systParamId: 76
+         prettyName: "FrInel_N"
+         responseParamId: 101
+         systParamId: 103
       }
-      FrCEx_N: {
+      FrInel_pi: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            4.51321735894190279037e-1,
-            -5.31951777648426160638e-1,
-            -2.04758425432991275628,
-            4.62776341555068859712e-1,
-            -1.47612295832996309741,
-            -1.70298284943018640725,
-            -8.95479588472822274348e-1,
-            -4.22264546748328362114e-1,
-            -1.27580451660916072143,
-            6.58926964994337560633e-1,
-            3.40779066962199506108e-1,
-            -5.91342761105523750942e-1,
-            7.25450262255673217204e-1,
-            -2.38571716741941663997,
-            1.45122910266754678865,
-            -1.27929968464397081362,
-            -5.9663143013492558886e-1,
-            2.15952777312571508883e-1,
-            9.54294085797825930584e-1,
-            1.46570287572672830478,
-            1.72604017021131150855e-1,
-            -5.34002388510846581759e-1,
-            3.50756574385447217335e-1,
-            1.21647013451029528674,
-            2.38019828459250681885e-1,
-            -7.693681689921011424e-1,
-            -5.23576980804737912578e-1,
-            8.74662918120905685804e-1,
-            1.68261158461419896293e-1,
-            1.59964604419596478913,
-            1.10108848323484975751,
-            -3.94954208481957169674e-1,
-            3.91780046779065471707e-1,
-            -9.63438173305052325546e-1,
-            1.49899376075147827692,
-            -6.9622632305845288947e-1,
-            -9.08009082463541394858e-1,
-            -4.61300718242309837347e-1,
-            1.37469437286236106921,
-            -9.47745377283353507281e-1,
-            -1.95673609165782025343,
-            -3.84297784213399162834e-1,
-            -6.29084768968805496669e-1,
-            -9.51161717556836983078e-1,
-            9.57060323707529359005e-1,
-            1.34634345651108056074,
-            1.91463616368057021333,
-            -6.14550098790312637753e-1,
-            -4.16307213564069689138e-1,
-            -2.80487988818895139786,
-            7.91191932345274850924e-1,
-            2.11797399267798280853e-1,
-            3.24588636227748916774e-1,
-            1.00184458556826316844,
-            -8.52063875187038188841e-1,
-            2.58180442939861976015e-1,
-            3.84293330576369329687e-1,
-            -1.14689612537031937478,
-            -8.3176934588934992032e-1,
-            4.30164302214970151184e-1,
-            -1.1461946489766976498,
-            -1.99573601747402995521,
-            6.44426232078330496478e-1,
-            -3.90419342532613289354e-1,
-            -2.2072042887185783222,
-            -2.26420250099569919655,
-            6.00279840343879600439e-1,
-            4.76721580402826750067e-1,
-            -1.51355314426077386392e-1,
-            9.97167334281816142294e-1,
-            5.10690334230382125824e-1,
-            3.35464620465713458941e-1,
-            -7.10542821139526270535e-1,
-            -8.34688882807216314674e-1,
-            -1.8771450359904517935,
-            3.08518805172949328597e-1,
-            -2.20057506000120556289e-1,
-            1.68139673322865446092e-1,
-            5.23125636351155498538e-1,
-            2.06103577266987074423e-2,
-            2.29144850478206790756e-1,
-            8.96396705066721422028e-1,
-            3.82684637978275732362e-1,
-            1.49609067888505387067,
-            2.26385821240785767294e-1,
-            1.3943218740177245607,
-            1.02514014117802831905,
-            -1.37186321875100158962,
-            2.54085684640019626723e-1,
-            4.03723748181816721736e-1,
-            -2.83201395710795766902,
-            9.35412071421727664422e-1,
-            1.95493825420551692318,
-            3.03177443479534569626e-1,
-            -1.13751586039567409436,
-            -7.26444915907744737105e-1,
-            4.94366652307641485375e-2,
-            1.37781832486923305758,
-            2.7631877963873235915e-1,
-            -6.98250024466004148849e-1
+            1.93009938087478283286,
+            1.01387042404076588298,
+            -5.43512021230467157196e-1,
+            -6.28972751910685801136e-1,
+            1.22479599356091783946,
+            -1.20228367205016714592e-1,
+            6.65692750579973263614e-2,
+            1.5235499884070580201,
+            8.9720936401726580911e-1,
+            -2.67371415734881967552,
+            -3.28848585891218347932e-1,
+            4.72735660396832513275e-1,
+            4.28483681596132814917e-1,
+            -2.52453033536257753777e-1,
+            1.13800257889120182142,
+            -1.66651936459156629899e-1,
+            4.54176985333090865726e-1,
+            1.09749661529754116707,
+            5.04452913530109792184e-1,
+            2.3236735493817603504e-1,
+            -1.46043701413857029969e-1,
+            4.13278994355134654537e-1,
+            -8.98791840369508210351e-1,
+            1.34254162680188460222,
+            -2.46986285763274610039e-1,
+            1.03096431493104168098,
+            -1.2152407971383308305e-1,
+            -3.0582891723977678744e-1,
+            -3.26947307730237113343e-1,
+            -7.14564564733377594052e-1,
+            4.18549442978951080629e-1,
+            -8.11811171098654527079e-1,
+            -2.37614566163551543809,
+            7.83850092982149360132e-1,
+            -1.26735088094287529081,
+            5.76294519265944549247e-1,
+            2.07007249341942561882e-1,
+            6.35366607341485145621e-2,
+            8.47316013520532318459e-1,
+            7.17901595393410363322e-1,
+            1.1719830782509208511,
+            -1.83758261998594507602,
+            -6.26003445111607881302e-1,
+            9.73850841784667853318e-1,
+            -9.20081244940071596439e-1,
+            -3.51326759465987403797e-1,
+            1.81189217992918027988,
+            6.0699086072388319657e-1,
+            8.09230802046593478138e-1,
+            -4.3849012117798696897e-1,
+            9.43813093302597216905e-1,
+            -6.20867970040839378676e-1,
+            8.5657194581592532856e-1,
+            2.33905228663011888202e-1,
+            -1.88182542761888227378e-1,
+            2.11128570418210381732,
+            7.85842102123309849127e-1,
+            -1.14618826026777628768e-1,
+            3.7863250803668763167e-1,
+            -7.43609477616084091345e-1,
+            2.98735422766779501469e-1,
+            1.2400086330167672255,
+            4.18256283703437925503e-1,
+            8.59758130982450796687e-1,
+            2.37674759642272626081,
+            -1.81205176568512515978,
+            9.47353316963535752038e-1,
+            -1.16758616120486241607e-1,
+            7.47423569883158972482e-2,
+            1.67660868793622769291e-1,
+            1.05543406544275297776,
+            9.02848200632154984646e-1,
+            3.35908154638909606238e-1,
+            -1.22751223481950955119,
+            9.44366841214774210833e-1,
+            -2.19407430359779997975e-1,
+            -8.28996566672690060606e-1,
+            -1.38257888549039559267e-1,
+            2.56802571022310788251,
+            -2.15297241641944192558e-1,
+            -5.19161944426502652838e-1,
+            -1.04871818966150734398e-1,
+            2.62237023959597581602e-1,
+            -5.39813963512335459605e-1,
+            -4.91705489465041056807e-1,
+            6.23915412245388822932e-1,
+            1.92480934952321061648e-2,
+            3.37891003028783165618e-1,
+            -1.18723428129363162142,
+            -2.67967211783962655502e-1,
+            3.8319468413064927681e-1,
+            4.83609255483371316964e-2,
+            -8.11611523119555977601e-1,
+            5.61299266208367897413e-1,
+            1.27486192877186210737,
+            3.97196650306869070146e-1,
+            7.23213753324524755151e-1,
+            3.49478465017207085008e-1,
+            1.49030831244348638265,
+            6.77734148827260490799e-2
          ]
-         prettyName: "FrCEx_N"
-         systParamId: 79
+         prettyName: "FrInel_pi"
+         responseParamId: 96
+         systParamId: 98
       }
-      FrCEx_pi: {
+      FrPiProd_N: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            1.66918603368249995889,
-            5.64185617669439865018e-1,
-            2.64550836104141540162e-1,
-            -1.83186110585353700841,
-            -5.24420724537941612686e-2,
-            5.49277412878069082325e-1,
-            3.73931434304691001635e-1,
-            2.81044739445170888015e-1,
-            6.09544835769511683665e-1,
-            -1.91028296807140884894,
-            -4.51726401220906181866e-1,
-            5.01068774118984205934e-1,
-            -6.11334195353559817221e-1,
-            -3.7277150137103295946e-2,
-            5.65848181629429292094e-1,
-            -4.59168903978982523295e-1,
-            4.60101580244468011394e-2,
-            -2.56731302220367496592e-1,
-            -1.94660715042050802559,
-            5.32845174137959065597e-1,
-            -8.94688181576643981607e-1,
-            -2.37075565327623388745e-1,
-            7.08897560279334482125e-1,
-            -1.09437001709944470296e-1,
-            -2.15612623741405773359,
-            -9.56797041228041877936e-1,
-            -1.01605309036231816755,
-            -2.35189339351426357494e-1,
-            -3.95526432291312068923e-1,
-            -1.8780382305920020336,
-            -1.44671735416483637771,
-            5.55741459296620221586e-1,
-            -1.89625650790565425385e-1,
-            -1.1986053198279885551e-2,
-            7.96735935614597434729e-1,
-            9.480930238937358423e-1,
-            1.63704070644344290564,
-            2.6063186440402036359e-1,
-            -6.17771094960126831985e-1,
-            9.48096760016085560174e-1,
-            6.63124200869599778052e-1,
-            -7.74166611358174217017e-1,
-            4.03437649683936527811e-1,
-            1.01215130509980877349,
-            4.2875264993484657472e-1,
-            -2.3439564921476963022,
-            2.63329836470105639601e-2,
-            -5.43935392016298036033e-1,
-            3.05311043302578521974e-1,
-            2.33465915833871578977e-1,
-            9.42626454809172398264e-1,
-            1.22654883719120166852,
-            -5.92159606277965377963e-1,
-            1.31460058986055194907,
-            1.35378456594393425938,
-            -1.12707934325026321032e-1,
-            -1.20884494039547263355,
-            1.46944693990572661235,
-            -1.13181033494774885284,
-            -1.90887016011598831255,
-            -1.04666050088060691436,
-            5.84908595942463943596e-2,
-            -8.28878643950489046865e-1,
-            1.10620155886576188031,
-            -1.04909210970673449914,
-            7.37010315243834979171e-1,
-            -5.80499183460443268778e-1,
-            -6.48283921282977182443e-1,
-            -1.78513709437255085888,
-            8.45807834244414191716e-1,
-            -8.72962431602929633812e-1,
-            8.48086213820932188767e-1,
-            1.99895868433522472252,
-            1.31202347417523035311,
-            -1.31350008955750496842e-1,
-            1.78307258289589709577,
-            -3.29048619054783442195e-1,
-            -6.89289491108041163514e-1,
-            -3.93787293880548561198e-1,
-            1.87643398866372312916,
-            -1.59391732128787588785,
-            4.48168971469688148801e-1,
-            -3.48517816627451293421e-1,
-            -2.66553104685270159102e-1,
-            -1.28548272927755569128,
-            1.71541195951280012189,
-            1.46024766417848250732,
-            -2.48405568564593476344e-2,
-            4.96900356902503559375e-1,
-            -1.36896169865758504658e-1,
-            7.80042304399844732554e-2,
-            -1.2499769086845373689,
-            -6.34722117943113173233e-1,
-            -3.19617136151113367948e-1,
-            5.15720399557889397357e-1,
-            1.26609366964689740165,
-            1.91628050809394623322,
-            2.39753948165125274627,
-            -4.84114090964924137506e-1,
-            7.70306923362927720156e-1
+            1.92212548454907006246,
+            1.25032590894385897684,
+            -1.47358395972805089613e-1,
+            -3.12990641240305844661e-1,
+            1.24258974519672271697,
+            4.25782501695461446101e-1,
+            -6.22897169796922001161e-1,
+            1.81294325163128322576e-1,
+            -1.40951811064374532556,
+            -1.18754075922588997472,
+            1.19366882475366242744,
+            -1.27086843061660781373,
+            -1.93620660468324629067e-1,
+            9.79089623152733734557e-1,
+            4.64249492842546351845e-1,
+            2.74000042221514639174e-1,
+            -8.80606101753291348189e-1,
+            1.88086681692165136326e-1,
+            -7.34473394655837608092e-1,
+            -7.08204043932585625143e-1,
+            -6.90950086432051469032e-1,
+            -1.14138396926074947579,
+            -2.86254827018568913655e-1,
+            3.90036714864709976869e-1,
+            -1.68555496471504540068,
+            -1.47803372828929524552e-1,
+            1.00373727246347810294,
+            -1.24687846911133895511e-1,
+            2.09975754305807199573e-1,
+            -5.52737533253557788981e-1,
+            -9.21919766465942591704e-2,
+            7.93194347481595118943e-1,
+            -4.65244119051372306828e-1,
+            1.61841094752118608291,
+            -1.09721924671989690125,
+            1.17641292337099145904,
+            1.2984374040751034407,
+            2.28691913370413768547,
+            -1.57213520353553959374,
+            -1.34937650331393887981,
+            1.29231251498325283578,
+            2.31484144673673597481,
+            -2.80821973909799071922e-1,
+            6.83606140890675395561e-1,
+            -3.02829698757217657956e-1,
+            1.23122056632721155189,
+            -7.77024309214730646289e-1,
+            7.53313203999654512621e-1,
+            8.17967448375957917328e-1,
+            -1.33392752979224860077,
+            -5.41601201644899776788e-1,
+            -5.00886746880714217589e-1,
+            3.65142653821272478165e-1,
+            5.08360799354160897146e-1,
+            -8.56818874331946034317e-1,
+            9.40733178189281038506e-1,
+            -8.9053312326945377464e-1,
+            6.01822665181660942935e-1,
+            -1.03230874666612737478,
+            -1.47304628105135382299,
+            -4.79466948599529874109e-1,
+            -1.35942833259714634941,
+            1.14493339370923963294,
+            1.16435562382408153148,
+            -3.41184943397410622712e-1,
+            -5.29831159107757243554e-1,
+            3.37273250266828389377e-2,
+            9.78852805525211588922e-1,
+            -9.99254065345860809089e-1,
+            8.34675923574588085607e-1,
+            -1.84896715755316098928,
+            2.50291232396554796935,
+            -6.49562009405502571724e-1,
+            -1.2387998357978529107,
+            -6.57454170809217197657e-1,
+            5.61364755097055967425e-1,
+            -7.79490897741029198365e-1,
+            -8.56254951792900897978e-1,
+            3.29939705008102213135e-1,
+            -9.80514821652850421252e-1,
+            -1.30949606472738561483e-3,
+            -7.41744502683185258363e-1,
+            -1.1666470329177327514,
+            1.50103273121767410991e-1,
+            6.37342528231508498315e-1,
+            3.75870067931310614107e-1,
+            1.17980169396512191149,
+            -6.8187333508709446761e-1,
+            -1.0719628821981082023,
+            4.3744232880294831034e-1,
+            -6.70072816894213385552e-1,
+            3.9595827249867387998e-1,
+            9.76384849150251699079e-1,
+            1.22517743766721443066,
+            2.30018915405583079803,
+            5.66835749439137059902e-1,
+            1.38938437660523894657,
+            -1.00003484323301483627,
+            2.30992503500131629579,
+            3.63242859145137098054e-1
          ]
-         prettyName: "FrCEx_pi"
-         systParamId: 74
+         prettyName: "FrPiProd_N"
+         responseParamId: 101
+         systParamId: 105
       }
-      FrInel_N: {
+      FrPiProd_pi: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            4.09100472607064002961e-1,
-            -7.96722801151438342337e-1,
-            3.97294092862660541687e-1,
-            -1.56585567936309000281,
-            1.35341426491894556428,
-            2.80764104698769889623e-1,
-            -7.95049602565475965754e-1,
-            -4.77146874788590413807e-1,
-            -1.18286332136271835069e-1,
-            -7.47894046826940828154e-1,
-            -2.49107452905815396349,
-            4.94164922460367195267e-1,
-            -5.64200308729225885607e-1,
-            -1.63758805900008952428,
-            1.22915011247370045688e-1,
-            4.80784422353207008261e-1,
-            -1.56857358214877146141e-1,
-            -2.54968766950627534484e-1,
-            2.52525097088809158397e-1,
-            -1.12944128856633962954,
-            4.59989957799430693175e-1,
-            -6.74486919231258474916e-1,
-            9.81453939403986452827e-2,
-            2.59416181690316438591e-1,
-            -8.00691107620626119079e-1,
-            6.30845829187257206572e-2,
-            4.45684284196458557759e-1,
-            -2.46771061226446694614e-2,
-            1.66775817108218671336,
-            -9.11299740591320572847e-1,
-            2.11904646716560574049,
-            -1.90173071257662362754,
-            -6.38853372369398875286e-1,
-            -6.62316251344301831772e-1,
-            2.63752911639641096642e-1,
-            4.17238595124517885893e-1,
-            -1.31174650828077088427,
-            -4.39604777816105241062e-1,
-            8.70778289786951487095e-1,
-            -5.70821315050063282648e-1,
-            7.25996025991816895662e-1,
-            2.08122845866965677786,
-            -8.32283788483054065566e-1,
-            -2.53386366781720551167e-1,
-            -1.22669681105492678341,
-            6.94329142072633742622e-1,
-            -7.25800801535232187334e-1,
-            8.86470604540298245944e-1,
-            -1.14384802478958058636,
-            -2.38528395371001122882,
-            6.51441420836450735266e-1,
-            -1.89153951926113755855e-1,
-            2.05889809022723579979e-1,
-            -6.20914538179934250017e-1,
-            3.18995218377540468158e-1,
-            8.6259196345697120023e-1,
-            2.3622728652753444134e-2,
-            1.32099146832711089594,
-            1.69526152430505416824,
-            2.31583694031043951789e-1,
-            8.19050875563413383063e-1,
-            -1.15243177826382470208,
-            -1.9225655194678911708e-1,
-            -2.43712656269361060968e-1,
-            -8.0009756363315653882e-1,
-            -1.07136788002545468856,
-            -1.78551818181393118223,
-            -1.10559161474640488265,
-            1.69817258856121755528,
-            -7.20729746173384477892e-1,
-            -9.12848769556068084796e-1,
-            1.00497615627677583383,
-            7.11163814274262118253e-1,
-            6.80429779899902831275e-1,
-            1.75748319419335707892,
-            -7.97990889825066052055e-1,
-            3.00169386014413286379e-1,
-            6.01440970988200568348e-2,
-            4.65197544337116297708e-1,
-            -6.36009133127247716644e-1,
-            3.26857700981180498978e-1,
-            -1.18895260371119804166e-1,
-            3.57608004185462846625e-1,
-            -1.2384283914558287254,
-            9.04118458577225919681e-2,
-            3.93207928835070885665e-1,
-            -9.01087275684911648277e-1,
-            2.44151566960265742345e-1,
-            1.09714620698172860003,
-            2.69721465933022153116e-1,
-            4.85744791392892838466e-1,
-            -8.38124940294199038959e-1,
-            -1.17943347188024638683,
-            1.32984244632239301254,
-            -4.63244746514713201524e-1,
-            -1.43563416963316270447,
-            -2.4387637631415466366,
-            -1.75594256400579240562e-1,
-            8.15243009094803405823e-1,
-            -9.15252208679282031056e-1
+            -7.69592972399814195805e-2,
+            2.01395419906493344797e-1,
+            -9.16217394459064270185e-3,
+            9.36051112753085168272e-1,
+            8.30647372067953859709e-2,
+            1.97481559858672550689e-1,
+            -2.79186277308570796052,
+            1.16232864982606276527,
+            1.86251704311537014114,
+            1.22857199305566888725,
+            -4.34654541052613585528e-1,
+            -6.42931970141942699115e-1,
+            1.22388907952704503734e-1,
+            1.40751019447643432869,
+            -5.53752090208502120716e-2,
+            5.38005480363568766577e-1,
+            -9.4922178453591499192e-1,
+            1.82789025666078708277,
+            1.46311638646418140652,
+            -1.82687982033621865163,
+            6.67816650686087198707e-1,
+            -1.50014372847860733007e-1,
+            3.45527359584032134343e-1,
+            -4.51038925635755927335e-1,
+            7.82540493838229100909e-1,
+            6.7235878863887788004e-1,
+            2.65020839182598444417e-1,
+            -7.79789195068071872008e-2,
+            1.78266452709234179963,
+            4.43036316840484611923e-1,
+            -5.59311159756824771705e-1,
+            -1.27400478967779895445e-1,
+            2.66112103046774128856e-1,
+            2.68840104754030639889e-1,
+            2.6115446133013336949e-1,
+            -1.41907063742477013157,
+            -1.36784936930117145826e-1,
+            -3.13734816726837562051e-1,
+            2.12458465120669615089,
+            -1.40793384586260716951,
+            -9.80212415731412933795e-2,
+            -6.37676183551894704138e-1,
+            -1.30877809307941517236e-1,
+            -4.97969892790871504484e-1,
+            5.01953730409095633114e-1,
+            1.55390400634761305376,
+            3.24513128094374214694e-1,
+            1.37242957139883681172,
+            1.54079425171163153507,
+            -5.16957435446540491952e-1,
+            6.47870728532148332235e-1,
+            4.47404027624111744199e-1,
+            -1.1696275686069987354e-1,
+            -3.14122866333273853545e-1,
+            -1.39946428546356554934e-1,
+            -7.08841058266169610214e-1,
+            7.84367032647600215256e-1,
+            -1.3465636912581837592,
+            1.11648928989832763037,
+            5.78158624187094627445e-1,
+            -7.25790961369049303364e-1,
+            -2.91896316230243391132,
+            2.82410724070921048678e-1,
+            4.0433229703866485627e-1,
+            -8.22361370469707697595e-1,
+            -3.48065330689279250898e-1,
+            -1.1344403572535348701,
+            1.32254694304857867149e-1,
+            -4.86853627912893882623e-1,
+            -1.05603123233252538249,
+            5.63908387276726208448e-1,
+            7.14800603070856466204e-1,
+            -8.14163735597177806724e-1,
+            1.76681575290614900631,
+            1.09851297148951337901e-1,
+            -9.51166306252415272304e-1,
+            1.19609750826330341056,
+            -5.55640488466769943976e-1,
+            -1.15482942494544316148,
+            -4.79023833270696419717e-1,
+            1.91219822282570373062,
+            1.80674554382288035659e-2,
+            2.27222924792321784304e-1,
+            -8.33041945000825401202e-1,
+            -3.34387022069053740925e-1,
+            1.76485924619623957277,
+            1.39409262310893744541,
+            -6.65972414727146966307e-1,
+            6.75679962666970914537e-3,
+            7.87413733741217924944e-2,
+            -5.61484870318456064098e-1,
+            5.55504579324026193099e-1,
+            -1.17702771253477300739,
+            4.76873725899454037336e-1,
+            2.63035261212881343873e-1,
+            8.77282698338333388755e-1,
+            3.29948322171324137653e-1,
+            -9.07806376401254278008e-1,
+            1.41111945327694887631,
+            -6.44256997003861964224e-1
          ]
-         prettyName: "FrInel_N"
-         systParamId: 80
+         prettyName: "FrPiProd_pi"
+         responseParamId: 96
+         systParamId: 100
       }
-      FrInel_pi: {
+      MFP_N: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            6.53823127273371884627e-2,
-            2.90387768049615913046e-1,
-            3.73853539399723433512e-1,
-            4.84820029777221106482e-1,
-            -1.08085741714277361325,
-            1.47412121203118529067,
-            -6.25581383118423373091e-1,
-            -1.73300740082393334163,
-            1.44656473634776339132,
-            1.03394555218170736133,
-            1.62281753446725768297e-1,
-            2.98343421250197360362e-1,
-            -1.51509016796237139246,
-            1.34516673421277821454,
-            6.49709557212246966579e-3,
-            -2.15108781445647878616e-1,
-            -1.37652080714769242675,
-            3.82283164251092211217e-1,
-            -1.20218368080549486976,
-            1.95489654434854931431,
-            5.50416339332331472356e-1,
-            -4.81200282831566850117e-1,
-            -7.90982931902211583441e-1,
-            -8.09357334494651636803e-1,
-            3.65218065389202706239e-1,
-            -6.53631594742720839486e-2,
-            -7.13349682969677489908e-1,
-            4.79230888602686977418e-1,
-            6.15517279368181027821e-2,
-            -1.15922781624762483155,
-            -1.19078552729037556723,
-            -4.93624160974942771674e-1,
-            -1.71780898932054681971,
-            6.62334653532387074293e-1,
-            -1.52546299957285080851,
-            -1.10748786692903958273e-1,
-            3.80987895205927351583e-1,
-            2.39438170726061355653e-1,
-            -5.51035174919642600777e-1,
-            -3.43349469443885724207e-1,
-            -1.41562991317595820995,
-            6.7753019257675772824e-1,
-            -1.70327955821885451693e-1,
-            9.72232389494287141396e-1,
-            -1.3482900951345827556e-1,
-            -4.17584256311079524138e-2,
-            8.74776101580343801167e-1,
-            4.67161482202993694202e-1,
-            8.77877584638859898014e-1,
-            6.58359490763113286427e-1,
-            4.0161510205015821251e-1,
-            7.77906202334069929449e-1,
-            7.11175840310199647298e-1,
-            2.00655200183495280308e-1,
-            -7.95039975880134974773e-1,
-            2.62752100127561050158,
-            -6.17781094638918532036e-2,
-            -7.65901593188668017298e-1,
-            -2.11718911741583371011,
-            -2.38306219958539844406e-1,
-            2.58289229516202034631e-1,
-            3.43907242383057198953e-1,
-            1.63760647657440627789,
-            -4.0409994939738907993e-1,
-            2.29035525545484355825e-2,
-            -3.54700147128195031332e-1,
-            1.59468493437239344779,
-            -6.50248313549104062226e-1,
-            -1.13906447785544173712,
-            3.84304949679137530794e-1,
-            -1.76557886061080115958,
-            -1.92767963395787922387,
-            -1.87735354320566705244e-1,
-            -2.34180668799243818512,
-            -3.69237688628139992808e-1,
-            -6.28955294410754928158e-1,
-            -2.32728091826247762697e-1,
-            -1.16315516586296130441,
-            1.34104505158412701249,
-            -1.5149023782426027096e-1,
-            -1.14754954248494889235,
-            -9.79111676276327891344e-1,
-            -2.60577034786316663606e-1,
-            1.79412950456682129818,
-            4.52529423536085703694e-2,
-            6.58182687492413764918e-2,
-            1.08567968503238354572,
-            -6.92907138110914422313e-1,
-            -8.63105594113158791636e-1,
-            1.4472370790660602502,
-            -7.27463864861702447229e-1,
-            1.34394063741431768477,
-            -4.9757409313220611613e-2,
-            -3.21987111335006126467e-1,
-            -1.6407878247949849726,
-            -1.48138429213720734801,
-            -1.0894346296387930062e-1,
-            3.68087158646996925881e-1,
-            -1.29809881103336577368,
-            1.36508268372291396986
+            3.25953204006978636276e-1,
+            9.30671296769514988512e-1,
+            5.61351415039093359916e-1,
+            -1.0626604182978682811,
+            1.71031496973557933794e-1,
+            -7.10123994030377736486e-1,
+            -2.92496232278259063464e-2,
+            -3.85979741716580893041e-1,
+            5.74616063527317422199e-1,
+            1.55082918977891104362,
+            -3.39876848434021383571e-1,
+            1.99843805997484719184e-1,
+            1.73845390829589385717,
+            -5.83747888132820566542e-2,
+            6.51324398040637908558e-1,
+            3.04531904343976200789e-1,
+            -1.16900451111234857104e-1,
+            -4.63059001846895301746e-1,
+            1.09357752073736236298,
+            -3.61068388776456083988e-1,
+            -1.00724938931188368052,
+            -2.66290927679692701613e-1,
+            -1.71563566400515665755,
+            1.0111556191466890553,
+            7.15374801525427428395e-1,
+            2.46770456774305246839,
+            -1.21874312934316747503e-1,
+            -2.19771915629487252231e-1,
+            -1.28426293226401511127,
+            -4.63040469247734842728e-1,
+            5.77082655459054127967e-1,
+            7.01710427165485456369e-2,
+            -8.35001067186419088095e-1,
+            -1.16980750305671774014e-1,
+            6.65031882224007553361e-1,
+            1.46851517659496000334,
+            1.45804562209433230535,
+            -2.17471909684216235803,
+            8.55434707998242949145e-1,
+            2.23210150423761716221e-1,
+            2.12448949602486036881,
+            1.35268980982735459451e-1,
+            -4.33938684527085338782e-1,
+            -6.95002708528165480395e-1,
+            -1.71334690582759990862e-1,
+            -5.64929399956029087981e-1,
+            4.31126244560755766955e-1,
+            1.72948191782584997922e-1,
+            2.10964418166127165577,
+            1.40868155058308586192,
+            5.21707086518647167317e-1,
+            6.6479342366559457389e-1,
+            1.47001810437019231337,
+            4.16018379401465576706e-1,
+            -1.95489035102995600823,
+            -2.52539150863242545242,
+            -8.23267889370738581434e-1,
+            1.14940125137035087377,
+            1.53232776757897010134e-1,
+            1.33832910004670657678,
+            1.82544373829943284981,
+            6.47452484869872946227e-1,
+            -5.47494965437680281006e-1,
+            -1.11597375018279862391e-1,
+            8.62008110768061053264e-1,
+            2.94238185751600711537e-1,
+            -9.56284808880384362695e-1,
+            -2.58365009229559072779e-1,
+            -3.39057258599319788495e-1,
+            1.0571893240052316898,
+            2.7782414547894612733e-1,
+            -4.6613116464315551557e-1,
+            1.2136801544164528277,
+            4.14479252686397570127e-1,
+            -8.569260515159595748e-1,
+            1.77928509299540404953,
+            2.09585483519264315078e-1,
+            1.79319293873619861612e-1,
+            -9.50618276107283777243e-1,
+            7.65561185571807967243e-1,
+            -7.61354964179703275207e-1,
+            4.55081701826563878033e-1,
+            4.97143519881428408436e-1,
+            -5.45845513181519303991e-1,
+            7.77855658183879472567e-1,
+            -6.30862241250374489177e-1,
+            4.94374800317529949911e-1,
+            3.76967861664973480362e-1,
+            6.45590992435900123958e-1,
+            -7.96401274321101859677e-1,
+            -1.80010722313366122727,
+            -1.86633250597273203653e-1,
+            -6.36014350402211992019e-1,
+            -6.53917087646166406145e-1,
+            9.93009214597159628468e-1,
+            -2.81445723001242986694e-1,
+            8.91836955530814767812e-1,
+            4.42598119067757145295e-1,
+            -6.82713514406257493405e-1,
+            6.76892254170105789335e-1
          ]
-         prettyName: "FrInel_pi"
-         systParamId: 75
+         prettyName: "MFP_N"
+         responseParamId: 101
+         systParamId: 102
       }
-      FrPiProd_N: {
+      MFP_pi: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            6.42119325167997273551e-2,
-            -2.4537337290827938574,
-            -1.13617200923541106228,
-            9.28513089834070770578e-1,
-            2.85159075839141462616e-1,
-            1.14199903820717740821,
-            7.00626997122478889501e-1,
-            2.56758967221478506815e-1,
-            3.0761082462381716951,
-            1.48070842645428490947,
-            3.61907750599764377331e-1,
-            -1.71653168774223185977,
-            1.02846877035128669853,
-            -3.45331338594105918816e-1,
-            1.02507168337183540707,
-            2.63363032581157043011e-2,
-            7.70557542843447240699e-1,
-            1.01458483792542542012,
-            -6.53606723048905241535e-2,
-            -1.31402145473626763561,
-            -1.60429342283565223859,
-            1.10455777843259772553,
-            1.03668450318881033567,
-            -7.32963328918026235659e-2,
-            5.62753387540943506018e-1,
-            1.98908740555165963748,
-            -8.7431183978164495052e-1,
-            -8.05997917022011241273e-3,
-            -5.04372253535478529129e-3,
-            4.72273357515916147875e-1,
-            1.12562170437922395849e-1,
-            3.47480482584626604314e-1,
-            1.91717430679178546526,
-            2.98960258038592330276e-1,
-            -5.25726272010207273944e-1,
-            7.17568601836598984889e-1,
-            -8.30307647873041010378e-1,
-            -5.44945265426775710127e-2,
-            -6.37116568914422254366e-1,
-            9.22005426106963676958e-1,
-            1.31668419121240809488,
-            4.49712873805749535627e-1,
-            1.20280792846425121922,
-            -2.3168019593426101288,
-            -1.95802819826538798686e-1,
-            -1.92049545714278613318,
-            1.27585886819121685498,
-            1.01102295871412128925,
-            -7.89676029777379828722e-1,
-            5.72392933705818229839e-1,
-            -1.47865499637506370156,
-            -1.80816491961347125539,
-            -1.06063286050371208269,
-            -1.34013093807783278955,
-            -1.2188615200485144463,
-            -1.01709507548935884635,
-            -4.21851174496326419838e-1,
-            3.92407591418823864515e-1,
-            -5.15751736468430310723e-1,
-            -1.00586302292113696777e-1,
-            3.93321253252138236522e-1,
-            5.00387610877810029564e-1,
-            -3.4695631845395863424e-1,
-            -6.86862236653716817791e-1,
-            -3.32175645637408256672e-1,
-            2.64848350108849617257,
-            1.4818242098361600334,
-            -3.14825068064928770273e-1,
-            -6.25284952009357297698e-1,
-            1.2798249439002433725,
-            4.4248568554145273346e-1,
-            -1.18075475469376089954,
-            2.56042439268051091883e-1,
-            -1.07306155468161690258,
-            -1.01124306747118386518,
-            -1.29188134433588674987,
-            -2.46223321032591729862e-1,
-            -4.56628988003885405433e-1,
-            -6.31513283812437986597e-1,
-            7.04908021416528529635e-1,
-            -2.75757101546837170292e-2,
-            2.76571776239949058962e-2,
-            6.87730905212784016101e-1,
-            -8.76629486932537171917e-1,
-            -6.13544364817093998421e-2,
-            -3.76485657301000531394e-1,
-            4.26564104119518672231e-2,
-            -7.03389412370983624356e-1,
-            -2.74836649439987823484,
-            1.49975962251316392165e-2,
-            -4.97387055372241038143e-1,
-            7.82721520525824221437e-1,
-            -9.14498867819286687109e-1,
-            -8.70163356902000195703e-1,
-            -6.13782672871211576471e-1,
-            -1.80696287339342354095,
-            7.0094945308513692539e-2,
-            3.98054446452997257033e-1,
-            -1.2774715442009376698,
-            2.99227312931861111345e-1
+            9.99548485469084480037e-1,
+            -1.06463456016692470385,
+            2.33199772752080614069,
+            5.3150487381432998113e-1,
+            2.16219249559142312478,
+            3.78216121258864668153e-1,
+            -9.12509404622328323953e-1,
+            7.15126633900562636015e-1,
+            -1.45570731915355700004,
+            9.36694442920683711939e-1,
+            1.40511858361050268051,
+            2.15568591015749166928,
+            -6.1527454676924242527e-1,
+            2.85840241169755371331e-1,
+            -1.63378197485501155083e-3,
+            -1.13852749544817855032,
+            -1.7143994261450923311,
+            -1.97580161077933680325,
+            -4.78880863285521984896e-1,
+            -4.27459600779108772617e-1,
+            3.23337617503315966072e-1,
+            2.71535536394036469687,
+            1.83796377073147249037e-1,
+            7.60377004867810013522e-1,
+            -2.77269555037701387334,
+            1.34060012089167535088,
+            -1.20331184522953327232,
+            7.09272879811347761736e-2,
+            -6.87072777521378408316e-1,
+            5.56940946442847417686e-1,
+            3.27252007419466806049e-1,
+            1.93049941761407706231,
+            -6.24617575134208680154e-2,
+            -9.27427001202370981936e-1,
+            -1.97810637750593903972e-1,
+            -9.61613813699600417095e-1,
+            2.91386672179777583835,
+            9.24309207797794574191e-1,
+            3.95879408395761189787e-1,
+            -4.2755171401109631768e-1,
+            -3.26678085126251405157e-1,
+            1.78589135888835692789,
+            -1.41653248997532443809,
+            -5.04347762738961286066e-2,
+            1.61299129967635790361e-1,
+            -3.93270336016095567455e-1,
+            -2.51204130194193464565e-1,
+            1.53975933574604617604,
+            9.18133561024426891883e-1,
+            -9.17417618552670455223e-1,
+            1.76396504242066543e-1,
+            2.19176293126158078239e-1,
+            -5.81387438143298185267e-2,
+            -2.16318221241675301414,
+            -7.4169992966050546368e-1,
+            2.38123432668761264575e-1,
+            -1.5004624186294499566,
+            -1.48676709359031278268,
+            -6.21076336086091917998e-1,
+            6.54764539680128154764e-1,
+            -8.139079938366649003e-1,
+            -5.85336099025256850759e-1,
+            4.50356965139658393937e-1,
+            -2.2392104205793201821,
+            3.79414150402386185501e-1,
+            8.93009270425280776706e-1,
+            -1.33696141927377248892e-1,
+            -7.56122150039992835246e-1,
+            1.97450616747361706871,
+            1.4890058903656719913,
+            2.08895264969070265648e-1,
+            -9.52118852722224962015e-1,
+            -1.2188250819146397852,
+            2.2385171481722390685e-1,
+            -1.6310986251697410232,
+            5.46945092884765227126e-1,
+            1.24908653561639004792,
+            8.39793248824611482384e-1,
+            1.10740961110487501351,
+            1.5233687257025656514,
+            -1.38357732867211202787,
+            -1.59046153510956633781,
+            -2.02379776188703411344e-2,
+            -5.85424312195731433306e-2,
+            1.22201595770389115359,
+            -5.52533109495568997005e-1,
+            -3.98228090779160839863e-2,
+            3.05791503728886304714e-1,
+            -4.11439801528047333079,
+            -1.89931654210461486887e-1,
+            -3.21403426687662752137e-1,
+            -2.32157495912094613555e-1,
+            4.36717726633561342808e-1,
+            2.81315205097397547096e-1,
+            -1.92066307331679353432,
+            6.91814382660836733711e-4,
+            -1.14302405144527852165,
+            -1.11100921964529852914,
+            -6.72948785712434327522e-1,
+            -9.57163184124915744633e-1
          ]
-         prettyName: "FrPiProd_N"
-         systParamId: 82
+         prettyName: "MFP_pi"
+         responseParamId: 96
+         systParamId: 97
       }
-      FrPiProd_pi: {
+      MaCCRES: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            -3.84882148950258309861e-2,
-            -1.59617321553699387238,
-            -7.36221010510012541239e-2,
-            2.57018597217297006807,
-            -1.90234462624955513732,
-            -3.36823742497843525712e-1,
-            -9.04799915215464878315e-1,
-            6.03493206874020637898e-1,
-            -7.28196039007315887304e-1,
-            8.88850209197052931742e-1,
-            1.64600981751017960697,
-            3.5651923188289436073e-1,
-            -1.51263674720224794434,
-            2.63959735812067997074e-1,
-            9.224615208582426229e-1,
-            -2.96597124744395534979e-1,
-            1.26011389356033537412e-1,
-            1.81664623873064967619,
-            2.41879136508717090814e-1,
-            -1.88811846779164271837,
-            -7.61107101772592664624e-1,
-            -1.68488680495693959882e-1,
-            -1.2398502375856632618,
-            1.93174219933033208818,
-            1.8489854128032395808e-1,
-            -4.38272203967916829104e-1,
-            5.91896760972740465512e-1,
-            7.68171522659714889336e-1,
-            2.40022222125532724846,
-            -3.24698970764358774144e-1,
-            -2.45516337843007276254e-1,
-            9.13605192318038272781e-2,
-            6.50426684394285414825e-1,
-            9.7873205995866768836e-2,
-            8.27664028911611948658e-1,
-            -1.01660496413103684787,
-            4.56462800643327115679e-1,
-            4.27473304297414702368e-1,
-            -7.36541049072519604657e-1,
-            -6.21281171342909832589e-1,
-            4.68644025089868743184e-1,
-            -4.87570001895808124992e-1,
-            -3.04847509380613157504,
-            7.5121749040743562853e-2,
-            1.0197537488774846004,
-            -1.5404706730377501489e-1,
-            -1.31461223839877083819,
-            1.13319422098974542656,
-            7.64685641812171801313e-1,
-            -2.20365049627597819892,
-            1.19938936850432220638,
-            1.47042646261100884431,
-            1.00447358650541684888,
-            -1.78622846938777324333,
-            5.94889312982639362204e-1,
-            8.17987406528479232826e-2,
-            -6.94839723705390766018e-2,
-            -2.05601636802874077059e-1,
-            -4.94924921070867662731e-1,
-            6.27456547836641287397e-1,
-            -2.3705797893071534066e-1,
-            9.42229154707036276051e-1,
-            -1.65554284959602449057e-1,
-            -7.90242622858901788696e-1,
-            -1.39058128954513660069,
-            -2.04806344896981573633e-1,
-            -3.9684450225364831244e-1,
-            5.31294079314589495766e-1,
-            -3.93651453983253019064e-1,
-            7.72768955609470509227e-2,
-            5.97357819524355404539e-1,
-            -7.70633127566012099408e-1,
-            -8.53842923909433171303e-1,
-            -2.38446547235657302366,
-            -2.66111267621358571489,
-            -1.95401780237049127464e-1,
-            -6.22039241531538111829e-1,
-            -1.44896884779676038413,
-            -1.39404070111159006373,
-            4.12887385740698720227e-1,
-            3.054037008737378045e-1,
-            8.59543193181945719417e-1,
-            -8.62648459525970134898e-1,
-            6.40705379384833295653e-2,
-            2.8071775776501373123,
-            -1.80962806613510629461,
-            6.94587703418457547144e-1,
-            -7.13493694331004957299e-2,
-            7.58337267088279642913e-1,
-            2.652394563836886765e-1,
-            -9.52776342977169066195e-1,
-            9.46194369591763173588e-1,
-            -6.11983859285441966769e-1,
-            -6.31488061938624500868e-1,
-            -6.79506228790082156266e-1,
-            -8.26831973781836371273e-1,
-            -2.39631117699665385778e-1,
-            7.51288957988206718142e-1,
-            3.83428168634343480292e-1,
-            1.75623640605025355121
+            6.59703296845596809383e-1,
+            1.18967147722833721524,
+            -3.00952588981685131841,
+            -1.13427673572954912373,
+            2.41160832372976891014e-1,
+            -1.48854464010010589803,
+            -2.61970401354705417774,
+            1.22602798830925241447,
+            -1.5355245318376273822,
+            1.3548684372469628201,
+            1.72892896753422675715e-2,
+            -1.23406420950993522823,
+            2.60493680568078200821e-1,
+            1.43576455360115673443,
+            5.12443908068766273978e-1,
+            -4.60024469691920456782e-1,
+            -4.83623765237640501624e-1,
+            -6.12944787265308765889e-1,
+            1.36108851815421494358,
+            1.83003895928241355762,
+            -1.31262385899052658189,
+            1.46433740535191869725,
+            1.25650374082166660372,
+            7.27658423735253356845e-1,
+            -4.90689844732437319141e-1,
+            -8.51156790497106241489e-1,
+            -6.74629894808050356581e-1,
+            -3.52561878382280757815e-1,
+            -1.00690814335867373508,
+            -6.23089525385267517521e-1,
+            -6.5989062020096234118e-1,
+            -6.69125568248525759429e-1,
+            -1.65470150445018338026,
+            -5.04961415570615357318e-1,
+            4.72980858289695660357e-1,
+            -2.94486943652424226769e-1,
+            -9.1287639900917338931e-1,
+            9.80958821601173536209e-1,
+            8.58172478810479200106e-1,
+            1.53246970839094470707e-1,
+            -1.83337295146926593237e-1,
+            6.4237622576459174617e-1,
+            -1.05647372444035858585,
+            -1.19763877142433372569,
+            6.24460736873490018795e-1,
+            -5.25101644253404831186e-2,
+            1.76515149073226407239,
+            -4.37605449182982848139e-3,
+            -1.45054791682934758335,
+            -1.54407009472079281842,
+            -4.78668357840411562432e-1,
+            -7.24366124181955672867e-1,
+            -5.83712112336004618207e-1,
+            3.39067285746627811172e-1,
+            -1.08359463612165862756,
+            -3.20529826258318051302e-1,
+            -5.13439017658653962251e-1,
+            -8.98846230331082129972e-1,
+            2.65817335618580785628e-1,
+            6.84108420933323913005e-1,
+            1.40364247938897879209,
+            4.59417242652299523398e-2,
+            -5.34147299474106551642e-1,
+            -1.57458290044369553229,
+            -1.15748754179182511415,
+            1.10044708776293242991,
+            3.24891800963376442546e-1,
+            1.08143398411554580996,
+            -7.83989880483869638894e-1,
+            2.17162863591556981602e-1,
+            3.01411943955074534962e-1,
+            9.82261420614782720939e-1,
+            1.20430798253845794399,
+            -4.76919558284767952649e-1,
+            1.17888663264120799323e-2,
+            6.81832349084657063365e-1,
+            1.06178006061668606108e-1,
+            -1.97690751647823836912,
+            1.49368902163144223749,
+            1.58873352788341554165e-1,
+            -7.47975387497780974666e-2,
+            -1.90481509023607897824,
+            4.95472052269454454887e-2,
+            8.04570251885439513551e-1,
+            2.61990319824956185979e-1,
+            2.5182928235770157821e-1,
+            -8.69144584895400806879e-1,
+            1.07926133274149016472,
+            1.33623778162881090559,
+            1.53215128123599109156e-1,
+            7.66970219716332612947e-1,
+            -1.31882864766161689296,
+            2.30570257024159230852,
+            -2.33423815469153889124e-1,
+            1.41019125477257611934,
+            -1.252817408374060415,
+            -4.9699657220344456432e-1,
+            1.17209352400703070707,
+            8.28817186141420775281e-2,
+            6.63196409865129399286e-1
          ]
-         prettyName: "FrPiProd_pi"
-         systParamId: 77
+         prettyName: "MaCCRES"
+         responseParamId: 64
+         systParamId: 65
       }
-      MFP_N: {
+      MaNCEL: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            -5.55663065362345776066e-1,
-            3.04873756887606095489e-1,
-            3.42795871684202946295e-1,
-            -1.59670999358916843036,
-            6.21665006246596707484e-1,
-            9.14549517681221557641e-2,
-            -9.11500875913047514665e-1,
-            9.66019949597418770004e-1,
-            -2.18102554040575435934e-1,
-            -7.65440898019311366518e-1,
-            1.93012086756083389716e-1,
-            -5.60813408794411993874e-1,
-            1.99816611959898998707e-1,
-            -2.35446329694626044216,
-            -9.50363952917463450376e-2,
-            -2.40140970339272508127e-1,
-            -2.16018238880953461489,
-            -2.53589959792812291717e-1,
-            5.3229188611151334598e-1,
-            -1.52757452511237334924,
-            -6.37778639361211929781e-1,
-            -3.90986876614196454671e-1,
-            -5.19806674514397992759e-1,
-            2.35183754231550068425,
-            3.39500963782927503432e-2,
-            6.46508606291100296204e-1,
-            3.93914166185333647352e-1,
-            -3.24887361769297444702e-1,
-            2.76723965178225483896,
-            8.60206167052847830989e-2,
-            -1.3663989146691806198,
-            -1.21946397588919674959e-1,
-            1.69060104638300368052,
-            1.09311738838880651015e-1,
-            5.61383869217394693152e-1,
-            1.34890857314559697855,
-            -3.89429686784409714861e-2,
-            -4.19075938279839466105e-1,
-            1.28599623621010650254,
-            8.71385619819460721658e-1,
-            1.24431988090746492581,
-            8.87655475225707202291e-1,
-            -2.07311815438032187586,
-            -2.1364274779590735065,
-            2.02402993161587413384e-2,
-            -1.36248532310684478119,
-            6.85969309573338459352e-1,
-            1.61021479726606603355e-1,
-            1.36802639907376455408e-1,
-            -4.26038374420452059521e-1,
-            8.31986377085463080228e-1,
-            3.01952343479768292589e-1,
-            -1.04667904881671214312,
-            2.53700106850295425964e-1,
-            -4.96381674426968400038e-1,
-            -1.33249738821876273498,
-            -2.3067518501255987462e-1,
-            2.89804981830404173593,
-            -7.15870291269234626519e-1,
-            1.52491503477309375825,
-            -3.71079297209891190157e-1,
-            6.10834233899001266543e-1,
-            1.29435288129029224535,
-            1.0888457479686555196,
-            1.89598218674515273108,
-            4.15430622990805520356e-1,
-            9.15861522046385934104e-1,
-            5.51957945518496306825e-1,
-            3.44821907573156782867e-1,
-            1.52785152206445062895,
-            1.08459350211985738888,
-            -6.19223369804028034302e-1,
-            -1.00284918920817278654,
-            5.51288647001836995543e-1,
-            -1.37667923806104575135,
-            -1.02560070691857130321,
-            9.8519234633116259392e-1,
-            -1.75914658578464067062,
-            3.56922683260478962319e-2,
-            1.02662434968096971666,
-            -2.22706901518518324279e-1,
-            6.24778729910440006057e-2,
-            -5.13750886206425394498e-1,
-            8.28654738561874437686e-1,
-            1.17519655405647971413,
-            5.91893345549182381404e-1,
-            6.8956399185238104188e-1,
-            5.27310238563659772204e-1,
-            -1.4665130377912194426e-1,
-            -1.41015904466433500408e-1,
-            1.82977330173797164692e-1,
-            -2.24558040554154647594,
-            1.99601824891430235098,
-            1.86448263644848011289,
-            1.11929322937928188431,
-            7.56504673485220768825e-1,
-            -3.97521142697451645986e-1,
-            -5.96148374919918788706e-1,
-            1.84336742856098867449,
-            3.26475841461199678406e-1
+            -8.24358078884167233547e-1,
+            1.80125140292992846902,
+            8.11437053121615847751e-1,
+            -7.70470191858262265505e-1,
+            2.85301801518404840596e-1,
+            2.43316374337258639615e-1,
+            -8.78668260409334878069e-1,
+            -9.21334857763406178677e-1,
+            -7.19698126788389291875e-1,
+            -2.72454873147557397051e-1,
+            -2.04667859026719939353e-1,
+            1.82461003863358017796,
+            6.11861772268112003026e-1,
+            1.69923672996860752882,
+            3.97568016907366081347e-2,
+            -9.90489445103632515366e-2,
+            1.32436149573034667171,
+            -5.76035927557249527453e-1,
+            3.71168033271541131235e-1,
+            -1.63189238447986217917e-1,
+            -2.83487282204723634038e-1,
+            -2.23111773000480706486,
+            6.25307713924865837818e-1,
+            -5.36494444229285827319e-1,
+            5.51435829041522329597e-1,
+            1.75258498517411931417,
+            1.18867628975849404238e-1,
+            -6.5010026444021407066e-1,
+            1.66919973197126769726,
+            -7.19083990798682015644e-1,
+            -7.24242806284002060835e-1,
+            -5.67674286478971334979e-1,
+            -1.23189151017248343933,
+            -5.42864495878530028961e-1,
+            5.25373306298021924832e-1,
+            -4.56472053995830295836e-1,
+            -7.38147403177046412814e-1,
+            1.93475696531783003529,
+            -8.08208572693608573445e-1,
+            1.27223664912356038137,
+            1.81495311238684453592e-1,
+            -9.2687364650016434986e-1,
+            -6.16324189283010581697e-1,
+            -2.44486265304332567316e-1,
+            2.06579810297122329343e-1,
+            -2.92413329895016560478e-1,
+            4.96383902784652719653e-1,
+            -6.45228340387890120233e-1,
+            -3.17727776646928194992e-1,
+            4.47298724208215092712e-1,
+            1.26739387531469072101,
+            -6.76195395689056955035e-1,
+            5.98013442413099949313e-1,
+            4.94389721515157559706e-2,
+            -9.65297501226355714188e-1,
+            6.11020530592229271782e-1,
+            1.20965899843418034365,
+            -4.07981092597723749016e-1,
+            3.34782390865300760741e-1,
+            -3.89233173950447097766e-1,
+            3.45002261751298500148e-1,
+            -1.63718797518741343566,
+            6.62165730526454776594e-1,
+            -5.58012302115386882306e-1,
+            6.51213097502335913624e-1,
+            5.0613559664018881179e-1,
+            -2.43024539722576343737e-1,
+            -1.73479812919615755673e-1,
+            -5.78329037296511305755e-1,
+            -1.69360806414926456931e-1,
+            -3.19616357992812682998e-2,
+            -1.30183908882272847407,
+            -8.81047717929426155159e-1,
+            -5.4102319991102387764e-1,
+            4.30118626114721180898e-1,
+            -1.05322385567050935684,
+            -7.31867939200206429895e-1,
+            7.74998454615676402035e-1,
+            -1.02795578449456681547,
+            -9.9143672717927303073e-2,
+            -2.4849768782194253669e-1,
+            -9.37820550272946973358e-1,
+            4.57124669617839707314e-1,
+            -2.3195628030071530068e-1,
+            -1.3641110650009427574e-1,
+            1.13585420703918638097,
+            -1.12418054028186609195,
+            -4.13946663618719457034e-1,
+            9.63433877049509335144e-1,
+            8.79011195876702067231e-1,
+            1.24226758557390004611,
+            1.56008282731366687557,
+            -3.69756932642537228251e-1,
+            -1.89723592629676418575,
+            -7.7617739344288660952e-1,
+            2.09546030476543576615e-1,
+            6.85148020740877106149e-1,
+            2.22615445759708735496e-1,
+            6.77576497901368979271e-1,
+            1.31382595640156307759
          ]
-         prettyName: "MFP_N"
-         systParamId: 78
+         prettyName: "MaNCEL"
+         responseParamId: 61
+         systParamId: 62
       }
-      MFP_pi: {
+      MaNCRES: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            -3.30219145732023100503e-1,
-            1.11315243977621558535,
-            9.20620260976484861004e-1,
-            2.68142671739933557973e-1,
-            6.43760423372641610307e-1,
-            2.05143322223005603044e-1,
-            1.48315719453559746732,
-            -1.12894389926231963894e-1,
-            5.69356391531890881907e-1,
-            2.08585049458894689067,
-            -2.36451597767730659072,
-            9.70830782686790239033e-1,
-            2.8127539342358339608e-2,
-            -4.61404327864005092685e-1,
-            5.67637524890329148164e-1,
-            9.24501620385687061798e-1,
-            -2.5457722186338695991,
-            4.98237344420984773485e-1,
-            -2.27942259544293657214,
-            3.44054348638178422726e-2,
-            4.50400124560967410337e-2,
-            -9.48292206790285696627e-1,
-            6.88823664074130481705e-2,
-            1.94454040220278523421,
-            1.77696760292237826429e-1,
-            -6.87990076124986416062e-1,
-            2.46860971102312687364,
-            7.94762950548677182816e-1,
-            -2.28836291446727280174,
-            -1.35466177850289515305,
-            9.84068718774874784394e-1,
-            1.44966407460922347417e-2,
-            -1.3120024442349544902,
-            5.41190871165413978083e-1,
-            -7.23430223643221959051e-1,
-            -5.11556555890086903093e-2,
-            3.08056124962888033814e-1,
-            -1.25574790720702544888,
-            9.04995513324829081725e-1,
-            1.69365763180545170208,
-            -9.69389738171112846921e-1,
-            4.79490985846396766679e-1,
-            -2.20888273646717703258,
-            2.76323123716168406183e-1,
-            -1.63008431840480860764,
-            4.01607905803997411454e-1,
-            -2.16619537422912378233,
-            -2.42713867536841876316e-1,
-            -1.17182959983026990791,
-            5.22651978633579594735e-1,
-            6.54525507713881737892e-1,
-            1.06456958106168220191,
-            -8.88901495710707756359e-1,
-            -1.06975876452064883049e-1,
-            1.1675456146713893979,
-            1.80591091695726596589e-1,
-            4.6038144607676095843e-1,
-            -1.47375024595468358951e-2,
-            -1.83158105225930262216e-1,
-            6.73082550997115336422e-1,
-            -2.1977645064039671996e-1,
-            6.78882122554479994214e-1,
-            7.6437501517252715022e-1,
-            2.94059954449588378811e-1,
-            -1.74550507149089839665,
-            2.49175208051028523881e-1,
-            1.15639794461868827824,
-            -4.73554033084490733074e-1,
-            9.69848033897711458984e-1,
-            5.68008465807378293277e-1,
-            -5.24531869331867572903e-1,
-            -1.15766550765546827328,
-            -3.7017991663916907652e-2,
-            -9.225666383692408129e-3,
-            -5.29532960402688712698e-1,
-            5.76778301774446486294e-2,
-            -1.70019403585291217773,
-            3.78584735551722950664e-1,
-            -6.59917137215759619373e-1,
-            7.86044701566701697892e-1,
-            -9.80914505162499894553e-1,
-            -1.69473912361863349174e-1,
-            -2.60555958267967180397e-1,
-            6.62122559964837376079e-1,
-            -3.86166830044872899652e-1,
-            -3.85558324160250265322e-1,
-            7.71053714523253885815e-1,
-            -5.01453996327493989327e-1,
-            -1.52010852663163920084,
-            3.0343654997329427836e-1,
-            6.97737427289560341315e-1,
-            -1.01869644380124024785,
-            3.45224853487440697108e-1,
-            2.12486632347209769556e-1,
-            -4.9037283036491963184e-1,
-            1.64872631838034744423e-1,
-            -9.3833567467008338614e-1,
-            -3.37189949992322823835e-1,
-            -1.53152423170163694971e-2,
-            -1.27327580650931904138
-         ]
-         prettyName: "MFP_pi"
-         systParamId: 73
-      }
-      MaCCQE: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            -7.75415001257697272807e-2,
-            -4.3942080534975763717e-1,
-            2.23563754555254767808,
-            2.66818805173176742951e-1,
-            -5.95617319592336436074e-1,
-            -6.32804787305854321566e-1,
-            -1.86321746342071221936e-2,
-            1.45695561640467419195,
-            1.49588241019690881828,
-            -1.7239204753020573313e-1,
-            1.38445881876445131553,
-            9.85729512370523697218e-2,
-            -3.7023625267585708043e-1,
-            1.53086870753780490695,
-            -1.37283330038332240797,
-            -1.10673376779539944792,
-            -2.13672878573531732638e-1,
-            -5.9428196813417311084e-1,
-            -1.60685716518305365952,
-            -1.73669270291719080035,
-            -1.63347661867511950717,
-            -8.55023480725630391497e-1,
-            -1.9246898778683951825,
-            -2.73371313757495293384e-2,
-            6.48249059622117707047e-2,
-            -6.18824254398816275824e-1,
-            3.45328051572382332957e-1,
-            5.39590594577143284338e-2,
-            -3.20345643243115762999e-1,
-            6.24363530772028330063e-1,
-            1.03473307939687875212,
-            -1.07106380494398512049,
-            3.75516598964841630259e-1,
-            1.69197075631017795905e-1,
-            2.40494405748326228744e-1,
-            -9.95642141712730910363e-1,
-            1.23626147235542882541,
-            4.04586880558288841669e-1,
-            9.43739488993909469983e-1,
-            -5.4033864503987405481e-1,
-            2.12543321446008048881,
-            -6.52276532846971401902e-1,
-            -2.59269606735154922728e-1,
-            -2.61774551620895534754,
-            -8.81450992653108111874e-1,
-            5.7035411773222399745e-1,
-            4.58656252409957942984e-1,
-            6.14403826359025906356e-1,
-            -1.1714787417937606584,
-            2.64882300540784820786e-1,
-            6.82919500819788249935e-1,
-            5.21341896572573237911e-1,
-            -4.77925822057659210884e-1,
-            1.15214371645860391702,
-            3.21811659552288142905,
-            3.85411503632276664089e-1,
-            -3.45823991738815561536e-1,
-            -8.62417669171707146347e-1,
-            1.59412859917998872561,
-            -3.90162244575140371161e-1,
-            1.18840773194142781954e-1,
-            1.60792676420000002491e-1,
-            -9.02912387456761278415e-2,
-            3.47654863892465498809e-2,
-            1.26695893386678348769,
-            1.47194129246228461172e-1,
-            -9.36934511983365747589e-1,
-            -7.01766748570719967049e-1,
-            -5.50469260079816669062e-1,
-            -2.61734349934127030757e-1,
-            -4.17483177331501920104e-1,
-            -1.1529376418403751714,
-            -3.95771636800314519089e-1,
-            -9.86001204001877851191e-2,
-            -6.72888520628783681765e-1,
-            -2.96755593985944399193,
-            1.627461962440432508,
-            3.9437891025716306781e-2,
-            -5.48775318529240857535e-2,
-            -1.35070240406882668971,
-            -1.1553006153621898644,
-            -6.43370241106497653405e-1,
-            1.17457629634385285478,
-            5.2127133453889218373e-1,
-            -1.7796048046801631326,
-            1.16164211133494343908e-1,
-            -7.34951454264397230354e-1,
-            9.03127592059417422243e-2,
-            -3.17377959437059098402e-1,
-            -8.16706042489006911467e-1,
-            -1.24201537332325462337,
-            1.90066812081821079339e-1,
-            -7.99973817451931301648e-1,
-            6.53034096894414162193e-1,
-            -5.18218891814464677203e-1,
-            3.57539722252149139159e-1,
-            1.11533657727408530569,
-            7.11902915457079621397e-1,
-            -2.62361520078451315729e-1,
-            -1.1570133603817296386
-         ]
-         prettyName: "MaCCQE"
-         systParamId: 43
-      }
-      MaCCRES: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            -9.03009166916357353116e-1,
-            8.44175850373375724622e-1,
-            7.12251667832254575785e-1,
-            -1.76829660444920144791,
-            -5.51565946713681087843e-1,
-            1.0879153764232134538,
-            1.36947392936421130649,
-            -1.65503441270503259819e-1,
-            1.77827048900233619655,
-            1.59059469968136624196,
-            -1.26397321069854440267,
-            -1.29123462491636908922,
-            -6.49913066737569544706e-1,
-            -3.47420892892573718314e-1,
-            -1.19316090622801951326,
-            -2.08383271892685328908,
-            5.81813535568390549635e-1,
-            8.61074801902143582844e-1,
-            9.18707450655891988411e-1,
-            4.96308721179394007894e-1,
-            -2.1388989601829916376e-1,
-            -2.93016955790269872928e-1,
-            3.18128646875989129494e-1,
-            3.26014243295289496416e-1,
-            8.57002986212395123644e-1,
-            -8.33498517606052313766e-1,
-            -4.04649758147707303002e-2,
-            -9.30399587476899880834e-1,
-            -4.04517780764545475947e-1,
-            -2.84158294933536337279e-1,
-            -4.3754774100529003622e-1,
-            7.15598702800786634626e-1,
-            2.84154300262940640032e-1,
-            1.34695061416021055756,
-            9.84398423037052716644e-1,
-            -6.75632084197387988711e-2,
-            1.30375087517738919018,
-            -3.68728745252493494977e-1,
-            2.60063894508739767986,
-            9.52018180990410328723e-2,
-            1.73529696724219806292e-1,
-            1.86492385593868692517,
-            5.48723468121773860773e-1,
-            3.57207031097428517885e-1,
-            8.65106205285339768807e-2,
-            5.44199358628025264828e-1,
-            6.51051376167385620342e-1,
-            -5.46413164322234079506e-1,
-            4.19842642528531151402e-1,
-            -2.18635923817468269537e-1,
-            -2.47947926872290613787e-1,
-            -6.85134755277799989415e-1,
-            -3.07240324330984415635e-1,
-            -6.22855593118568418021e-1,
-            1.8531387749766303763,
-            -1.64803859813091269082,
-            -7.65712604339761182537e-1,
-            -5.60219590843644144051e-1,
-            -1.41588074112133721627,
-            4.84722956487924558355e-2,
-            -1.31309670040184234274,
-            3.17997314663374330834e-1,
-            -2.33513438387321442535e-1,
-            4.72327546877322701491e-1,
-            6.9027823451909353647e-1,
-            -1.62425895072537751496,
-            -9.46925510263202707684e-1,
-            9.563103747739193361e-1,
-            7.12402674787981027293e-1,
-            -1.60186380472116973728,
-            -4.9155520762782889399e-1,
-            7.44892332608716012388e-1,
-            -1.05901364336052505877,
-            -3.17922013697756355999e-1,
-            -5.07057590132002800054e-1,
-            -2.31854256371385503144,
-            -1.22924982606255978057e-1,
-            3.7019456493988051049e-1,
-            -4.64310619663590939954e-1,
-            -1.31582796854962791322,
-            1.05509047186573967636,
-            -4.66589051812010491282e-1,
-            1.47954297470520956814,
-            -5.57742278788591061556e-1,
-            4.36200404557682941409e-1,
-            1.6862472592679675909,
-            -2.19095431092385029004,
-            -9.51772622104839038926e-1,
-            1.75933969429629311065,
-            -2.1693497282004354787,
-            1.01329483231767758511,
-            7.73315243693772580436e-1,
-            -1.22768068508931249561,
-            -3.41382584128727351036e-1,
-            -1.1791561104164367535,
-            9.03823881141389673388e-1,
-            1.07038451732914922931e-2,
-            -9.68915244912534112665e-1,
-            -2.05777020017313475031e-2,
-            -8.46724686522570935132e-1
-         ]
-         prettyName: "MaCCRES"
-         systParamId: 46
-      }
-      MaNCEL: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            -1.18475275981846461804,
-            6.579507844974448183e-1,
-            -1.38703258942139751042e-1,
-            -7.37739777081910103051e-2,
-            8.54528900020974147012e-1,
-            9.32952093628574286033e-2,
-            1.4959066679774279951,
-            -3.96468651606989713754e-2,
-            1.11512814061003862065,
-            2.8852482369055409972e-1,
-            1.07554377512222343327,
-            3.60621123854121261587e-2,
-            3.59706312756737978109e-1,
-            -6.41747229359121873493e-1,
-            1.61826567491448747305e-2,
-            -6.33313363597722167597e-1,
-            -5.24124646979894581733e-1,
-            2.13680604450663808036e-1,
-            -1.75886957888793471483,
-            -1.08915974514366409309,
-            5.02415287563055312781e-1,
-            5.71367506570045202707e-1,
-            3.17487141199044919926e-1,
-            -1.73812361925046410249,
-            2.59977277468585621367e-1,
-            -1.8300753695516475128e-1,
-            2.63833080250180707083e-1,
-            9.20506224905751402332e-1,
-            1.52198591943678196436,
-            1.58978157701812616853e-1,
-            -2.26242375769471454339e-1,
-            -1.35797635667702587536e-1,
-            -6.03146695115351572092e-1,
-            5.08322968845457245912e-1,
-            2.03274971361314138463,
-            9.49252159357577007803e-1,
-            8.77143082201997548175e-1,
-            -3.44604826136609421194e-2,
-            6.10054970885600345021e-1,
-            1.7497468378065436645e-1,
-            9.92246522829324240078e-2,
-            -1.0899090598879495051,
-            7.32366549935095978441e-1,
-            -7.2687722662434439691e-1,
-            -4.95599658007301602236e-2,
-            -6.26151417327901804732e-1,
-            1.97354834241904975034e-1,
-            3.3394232363340364822e-1,
-            1.13671434448667540984,
-            1.87258816422009033431e-1,
-            1.13804256061480435491,
-            -2.68185169666317446691e-1,
-            7.67051400712456254993e-1,
-            -6.33629367702252643824e-1,
-            -2.09288235946547107602,
-            1.77962084071256887441,
-            1.08987227249960860753,
-            2.4010531480687652417e-1,
-            -6.87187951401366792226e-1,
-            3.64820822418611911964e-1,
-            -4.06522592818854444641e-1,
-            -5.14334307013034952583e-1,
-            8.99817341907616086161e-1,
-            -1.04600853606082155878,
-            1.20396629688810175018,
-            3.64696127783018630986e-1,
-            -1.13137655242096957231,
-            1.43629466118932666574e-2,
-            -1.9349541392460645195e-1,
-            9.92953965927416914994e-1,
-            -2.67721405853776417416,
-            5.01266226928676172925e-1,
-            1.58003583709233927194e-3,
-            2.77709293666345780061e-1,
-            -1.199446427559857975,
-            -1.01535737765071054639,
-            -6.2898261035036526212e-2,
-            -9.79082389900410854366e-1,
-            2.19143344989364774467e-1,
-            -1.52376800209000440312,
-            -1.04099805512671883534,
-            -1.63446201109504682392e-2,
-            -5.07671313651639755093e-1,
-            7.96584109268097972922e-1,
-            6.05069868567888802247e-1,
-            -1.16629889335968892072e-1,
-            -9.25521459276378410941e-1,
-            -7.31045536393652439777e-1,
-            -2.72733138614947578926e-1,
-            -9.23167967035480985238e-1,
-            -4.67502535486201797887e-1,
-            -4.99988558710801611618e-1,
-            1.19547331305925985667,
-            1.49898212271439423837,
-            6.92569786261464037658e-1,
-            -3.5346181293247691535e-1,
-            1.19974452903614059451,
-            -7.12856332489991917356e-1,
-            -1.18451369874957621042e-1,
-            -1.4096150214252691768
-         ]
-         prettyName: "MaNCEL"
-         systParamId: 44
-      }
-      MaNCRES: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            1.93964464443630935087,
-            -3.66034625386855771989e-1,
-            -2.18255365349029006872e-1,
-            9.58499950076439899416e-2,
-            4.1107706052996167978e-1,
-            -1.23759811363573479781,
-            -9.25906361423152468593e-3,
-            -1.29501031267674454606e-1,
-            -4.06216771124144476746e-2,
-            -4.72369607357114695834e-1,
-            7.20042307542238191331e-1,
-            -4.4689519487019058186e-1,
-            1.40051300064269845791,
-            -3.30648334390675480154e-1,
-            6.4189349732943912219e-1,
-            1.80692510730974142952,
-            5.93439839652066924991e-1,
-            -1.72082016689489927797e-2,
-            -9.03002841001539602317e-1,
-            -1.08533155772260681005,
-            5.14414183419074411141e-1,
-            -7.46678959930401675571e-1,
-            -7.57203073907992268987e-2,
-            1.60300861511736902898,
-            7.71584608147314221505e-1,
-            -3.40762094072237620157e-1,
-            -7.61470606398767180245e-1,
-            -6.25141566074054882973e-2,
-            -1.22220024900962132008,
-            1.90489451379139973497,
-            2.75825154871074618157e-1,
-            2.06390081073495212927e-1,
-            -6.46431069423691440079e-1,
-            -2.6169748096761830114e-1,
-            1.16714292739405167687,
-            -8.75462886075357382687e-1,
-            9.97745829953920193578e-2,
-            1.0098971734827635327,
-            2.60706031316934316866e-1,
-            6.55253182887898355524e-1,
-            1.05473480989273768471e-1,
-            6.00368685321990502857e-1,
-            1.11507541295132323045e-2,
-            8.20370683520338594974e-1,
-            5.30708045001215378278e-1,
-            -1.06223613464775668014,
-            -1.06682040400254707357,
-            -3.62700919736013926986e-1,
-            -1.07014530566119558941,
-            -2.28717981538421710752e-1,
-            -8.22491996249453238832e-1,
-            5.39847937617036977009e-1,
-            -1.11196286190202209276,
-            9.5799576332105829124e-1,
-            2.87468750831253949674e-1,
-            -8.48136897883013829436e-1,
-            1.40932463265531082719,
-            9.79111190660383323703e-1,
-            -8.08566818850751434233e-1,
-            3.50351811788130240721e-1,
-            -2.35395086627359473308e-1,
-            -9.90730516396638449805e-2,
-            -9.83491993912860906768e-1,
-            4.09598900396879905816e-1,
-            -6.1198289461849419979e-1,
-            1.41910777276588140339,
-            -4.13654952969202183155e-1,
-            5.41103316666814659897e-1,
-            9.91749000139710235047e-1,
-            -1.7259482673947241782,
-            1.79327079427777175136e-1,
-            1.21864880065994762859,
-            -8.65324998682386881121e-1,
-            -4.6468520387611766953e-1,
-            -2.65717702804352251533e-1,
-            -1.03354308896889635072,
-            -5.94354747521494974904e-1,
-            4.60605231929372693767e-1,
-            -9.94149018295738540196e-1,
-            1.18894551199807296804,
-            1.35720134075098197712,
-            -9.88875965368475329242e-1,
-            -1.82593921532511127559,
-            3.65864937124248945644e-1,
-            -6.20793285690354523787e-1,
-            -3.65944345368911072569e-1,
-            -4.1440012640250006859e-1,
-            -6.65901748143488569909e-1,
-            1.59646396577006322026,
-            -2.76053391071802434187e-1,
-            1.74919465874826596252e-1,
-            5.27766664259762818823e-1,
-            -2.60633665980349205071e-1,
-            -7.62669896548469838926e-1,
-            3.38954507965189166807e-1,
-            -5.11595685319062992713e-2,
-            4.18380564652282918581e-2,
-            3.38802235026994386091e-2,
-            2.80898850973928804198e-1,
-            5.28614538889673024613e-1
+            -1.15283549541644592118,
+            -8.08767914733292681007e-1,
+            8.20022578660356882274e-1,
+            1.93566217995863842916,
+            -5.04829640006487001536e-1,
+            3.49014689749240991645e-1,
+            2.22288621584697670963e-2,
+            1.25896201738297341954,
+            -1.24475574876325789653,
+            -4.69314001328364982513e-1,
+            1.89130595260708811445,
+            -1.07939738424007436457,
+            -1.9585541523112415252e-1,
+            -2.82871677168818536074,
+            -2.94442912294941183671e-1,
+            -8.99813423166224923833e-1,
+            -1.73902512144823728768,
+            -1.83287092894563463652,
+            7.94804151220169008418e-1,
+            1.82124809816652050154e-1,
+            1.11116282460598514437e-2,
+            -4.89710368351783942309e-1,
+            -2.49983910593272184997,
+            3.46281283435695641515e-1,
+            2.77294656931828864543e-1,
+            -4.01146880533388539014e-1,
+            1.0825567081375351286,
+            -3.57505798498686411246e-1,
+            8.92577828056265842882e-1,
+            1.37561882582175859513e-1,
+            -2.2373337001491472309e-1,
+            -8.02566294116245693147e-1,
+            2.34378443999041330414,
+            1.51910790144141638613,
+            -2.72644665698182420144,
+            3.23916939024653682822e-1,
+            1.04727225361159792527,
+            2.1479727587917150089,
+            -6.05488432976188595269e-1,
+            7.57482538771714480896e-2,
+            -4.1118511258417797527e-2,
+            -4.87240378508160876248e-1,
+            1.6937314331515818111e-1,
+            -1.08024341637383702874,
+            -1.01874830927315085383,
+            -9.27831422319906451435e-1,
+            -7.14697276926395619334e-1,
+            -1.80845947862849965038e-1,
+            1.15838940138180634953,
+            7.28451332599434508985e-1,
+            1.99759762012058161851,
+            -2.30925485093510435286e-1,
+            -2.02049799233647542351,
+            -2.11294689436500737756,
+            -9.18980795509065917503e-2,
+            7.27159648609925657325e-1,
+            1.92179364396549301475,
+            -5.75116951305308043985e-1,
+            7.83087130879070891787e-1,
+            -2.42156352633070309777e-1,
+            -1.45345557512858558624,
+            -1.67665086397674212293,
+            -2.12947115504831030464,
+            8.81750500722658370201e-1,
+            1.97225775987581997128,
+            1.47993204405159217707,
+            4.01548333785547939545e-1,
+            1.93924128961526082149e-1,
+            3.3540811115707069856e-1,
+            1.25921099956571502787,
+            6.32712240472849574147e-1,
+            3.83753214853816748686e-1,
+            -1.17707414283609779204,
+            9.90870760005540043847e-3,
+            6.00615227524610717502e-1,
+            1.93226986379142540162e-1,
+            -1.81359166788751569044,
+            -1.22730900497431671958,
+            -3.68550467358834177301e-1,
+            -2.17825218812838850013,
+            -1.20691738330080955421,
+            -5.42283494347668204583e-1,
+            5.17591342819753386095e-1,
+            4.48398671748916566315e-1,
+            -8.94558628287273505109e-1,
+            -1.83803100959074455778e-1,
+            1.33407196443377562556e-1,
+            -2.97831227966417422248e-1,
+            5.6502428591403397462e-1,
+            -6.00925121416810537056e-1,
+            7.74644559429762735725e-1,
+            9.37997938013778731481e-1,
+            2.06289723798343260786e-1,
+            -5.73396768958215341527e-1,
+            1.7500378927884976954e-1,
+            -1.22523667439844263782,
+            -5.26606454724743433538e-1,
+            5.44110440220084368157e-1,
+            1.58528347892123999685,
+            -1.62308748607753883242
          ]
          prettyName: "MaNCRES"
-         systParamId: 48
+         responseParamId: 67
+         systParamId: 68
       }
       MvCCRES: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            3.98824074658026495044e-1,
-            -2.59212792587668605648e-1,
-            -7.47976386382104285744e-1,
-            -2.81996274851381567572e-1,
-            7.42004492367318801982e-1,
-            -1.24795651714397370924,
-            -7.65736108761373546194e-1,
-            -5.9829788125217298056e-1,
-            1.98649091372115194076,
-            -1.54973362212890958256e-1,
-            -3.02071326979372722921e-1,
-            1.28932754440651553551,
-            1.76384499191018417896,
-            1.64806508810363938622,
-            -3.1659919898511301728e-1,
-            1.30521923702967473924e-1,
-            1.01158263678019189058,
-            4.81034919171344665934e-1,
-            -9.41840666294965989103e-1,
-            7.15195662570059287333e-1,
-            6.84758317297404772717e-1,
-            -7.05160817297838860007e-1,
-            -8.52563988023390728621e-1,
-            -1.41332070600140372041e-2,
-            9.32112802944911278402e-1,
-            2.33717115800878560972e-1,
-            8.84267329480134867126e-1,
-            1.32247108975748456361e-1,
-            -1.94733732529043246373,
-            5.03006827881934071023e-1,
-            2.13566859486851212679,
-            -8.47295429041803882519e-1,
-            3.03550610779980312159,
-            -1.12147390949279968098,
-            -5.17355686425028271636e-1,
-            -2.46178248706996033457e-1,
-            1.48211717045595303688,
-            1.16265138470962603456,
-            9.85714672525324214769e-2,
-            -1.21866562918141324579e-1,
-            -1.59490001400627212647,
-            -2.06485303135730963175e-1,
-            -1.51159645504361361823,
-            -1.61596423034670477747,
-            1.67139857763470245366,
-            -7.76106381325787242353e-1,
-            -2.42663017621465998408e-1,
-            -1.02001319087041930622,
-            -8.87698096558058424854e-1,
-            -3.83600847259737920414e-1,
-            -4.05905076297233491367e-1,
-            1.70717884576482248349,
-            -1.29672701496263309551,
-            -1.2321221453367205978,
-            -1.60335821453140048298,
-            -2.19837371872334930156e-1,
-            1.21829982481906706759,
-            -7.40286830643299476051e-1,
-            -2.92984445003393267903e-1,
-            -4.99642330094197228973e-1,
-            1.45910479207873633456,
-            -9.30479987034667166412e-1,
-            2.56469138746130476125e-1,
-            6.65500298570927739661e-1,
-            -2.76935952629803416869e-1,
-            1.4965062145569265617,
-            1.52522762604847827994,
-            -2.74278672253943645032e-1,
-            -1.6551649105365915382,
-            1.98368904676272383991e-1,
-            4.10237028872365572241e-1,
-            3.03157731512137429419e-1,
-            -4.23800439783242333114e-1,
-            5.25543672178789167404e-1,
-            1.55541165704890471666,
-            9.23565433929474322028e-1,
-            -6.4775264253859654584e-1,
-            -3.63720072636643807287e-3,
-            7.40351493712311792272e-1,
-            1.33918722630350262026e-1,
-            5.29755365766003127881e-1,
-            -6.54859046995091342858e-1,
-            -1.38472814718236447717,
-            2.31943669948509900713e-1,
-            1.35252354581044476056,
-            7.68983887903629481642e-1,
-            -1.89653790762264495839,
-            7.91474258097325189532e-1,
-            1.35022322172156594711,
-            -3.10954307885846603643e-1,
-            -5.31781730068341396134e-1,
-            -7.79088388629086137094e-1,
-            -2.22773268963264908793e-1,
-            -6.11794916043804426486e-1,
-            -8.45483545826184235139e-1,
-            1.41300175503692915235,
-            2.23760136554753907845,
-            -1.80269541736700156243,
-            7.52373064641124411622e-1,
-            1.28175811798820360465
-         ]
-         prettyName: "MvCCRES"
-         systParamId: 47
-      }
-      MvNCRES: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            6.75964793277269326843e-1,
-            -1.70515867766133433214,
-            5.76759843574863428906e-1,
-            -1.41002522421818521359,
-            1.46286120317168744087,
-            -2.33396375964204150222e-1,
-            -4.75248145974243030309e-1,
-            1.5682713239273232686e-1,
-            1.59009581802875787915,
-            1.27038907770487186077,
-            -1.07899090870736658054,
-            5.59728142056908239965e-1,
-            2.73829158681076423321,
-            3.35328259471049661133e-1,
-            1.50545155922130496906e-1,
-            -6.91434641848439647538e-3,
-            -6.89082674430070540872e-1,
-            -1.71928022104162248063e-1,
-            -5.7379475502038435053e-1,
-            -8.60011496455806656591e-1,
-            2.50825036942734325152,
-            3.10336270996258711818e-1,
-            1.44936234092663140949,
-            1.28127199293678417646,
-            -1.28650722424796271071,
-            4.22424592000214704779e-1,
-            -1.32666206232709327217,
-            -1.39161180567946574094,
-            3.13197738888147003689e-1,
-            1.10736466122765234155e-1,
-            -2.33429210274551934834e-1,
-            -2.18568190893847313916,
-            2.84243252683993419261e-1,
-            -7.48435825651999508956e-1,
-            1.25343850564271552805e-1,
-            1.71467841369850071409,
-            1.11460532482448892999,
-            1.24130932870985466465,
-            8.02634199306203610647e-1,
-            1.67248336071519632107,
-            1.89915623155440305148,
-            -1.14014371516567791787,
-            -9.85097169360846902642e-1,
-            -4.01552001944553926815e-1,
-            -3.74270052030898303652e-1,
-            -8.57918749924206358592e-1,
-            -1.10849577669044574435,
-            2.84533356925738312171,
-            -8.89651926577599505563e-1,
-            6.33908031035286811949e-1,
-            9.90751315942665189418e-1,
-            -5.96739123514370972678e-1,
-            -1.285740361455916414,
-            -6.60841160984120601363e-1,
-            7.43471766131306166514e-1,
-            -5.63390195283565931028e-1,
-            4.67133257905088083994e-1,
-            5.6406264573573716703e-1,
-            -1.72076498449906245547,
-            -4.79063459246341916131e-1,
-            1.09833559580655015786,
-            -1.27848682666687873954,
-            -1.35801496247518094229,
-            1.01750732853198821992,
-            -6.94548367679874045777e-1,
-            4.77922067939882344589e-1,
-            1.81720268084537006636,
-            -6.66547522244320567175e-1,
-            5.37094935109553417441e-1,
-            1.62549850164376424866e-1,
-            -9.84042761758436301811e-1,
-            2.38715307400073983857,
-            -4.93056675199353755534e-1,
-            -1.08944640803060766032,
-            9.35689387283541895712e-1,
-            -3.73007151891386223852e-1,
-            -2.58919038458051142815e-1,
-            -4.12509281294416718655e-1,
-            7.04455476420157933326e-1,
-            -1.70947744122209838169e-1,
-            -6.5306212595189228054e-1,
-            -1.24016163820122859995,
-            -1.09278070377683200753,
-            7.25731569133883036571e-1,
-            2.22280793403631160565e-1,
-            -2.17371459898138552624e-1,
-            2.09418990201503896209e-1,
-            2.32749193039038265729e-1,
-            3.27896664268681359289e-1,
-            -8.0840607361852834245e-1,
-            -7.23783290992327521529e-1,
-            4.86475075384552479996e-1,
-            -4.67276624670941789774e-2,
-            2.1338203962118265089,
-            -4.21851522903491038541e-1,
-            -1.11782643358790267918,
-            4.21449842573258848244e-1,
-            3.95239575371855944574e-1,
-            -3.29719013962982074317e-2,
-            8.74804306639696993564e-1
-         ]
-         prettyName: "MvNCRES"
-         systParamId: 49
-      }
-      NonRESBGvbarnCC1pi: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            -8.24358078884167233547e-1,
-            1.80125140292992846902,
-            8.11437053121615847751e-1,
-            -7.70470191858262265505e-1,
-            2.85301801518404840596e-1,
-            2.43316374337258639615e-1,
-            -8.78668260409334878069e-1,
-            -9.21334857763406178677e-1,
-            -7.19698126788389291875e-1,
-            -2.72454873147557397051e-1,
-            -2.04667859026719939353e-1,
-            1.82461003863358017796,
-            6.11861772268112003026e-1,
-            1.69923672996860752882,
-            3.97568016907366081347e-2,
-            -9.90489445103632515366e-2,
-            1.32436149573034667171,
-            -5.76035927557249527453e-1,
-            3.71168033271541131235e-1,
-            -1.63189238447986217917e-1,
-            -2.83487282204723634038e-1,
-            -2.23111773000480706486,
-            6.25307713924865837818e-1,
-            -5.36494444229285827319e-1,
-            5.51435829041522329597e-1,
-            1.75258498517411931417,
-            1.18867628975849404238e-1,
-            -6.5010026444021407066e-1,
-            1.66919973197126769726,
-            -7.19083990798682015644e-1,
-            -7.24242806284002060835e-1,
-            -5.67674286478971334979e-1,
-            -1.23189151017248343933,
-            -5.42864495878530028961e-1,
-            5.25373306298021924832e-1,
-            -4.56472053995830295836e-1,
-            -7.38147403177046412814e-1,
-            1.93475696531783003529,
-            -8.08208572693608573445e-1,
-            1.27223664912356038137,
-            1.81495311238684453592e-1,
-            -9.2687364650016434986e-1,
-            -6.16324189283010581697e-1,
-            -2.44486265304332567316e-1,
-            2.06579810297122329343e-1,
-            -2.92413329895016560478e-1,
-            4.96383902784652719653e-1,
-            -6.45228340387890120233e-1,
-            -3.17727776646928194992e-1,
-            4.47298724208215092712e-1,
-            1.26739387531469072101,
-            -6.76195395689056955035e-1,
-            5.98013442413099949313e-1,
-            4.94389721515157559706e-2,
-            -9.65297501226355714188e-1,
-            6.11020530592229271782e-1,
-            1.20965899843418034365,
-            -4.07981092597723749016e-1,
-            3.34782390865300760741e-1,
-            -3.89233173950447097766e-1,
-            3.45002261751298500148e-1,
-            -1.63718797518741343566,
-            6.62165730526454776594e-1,
-            -5.58012302115386882306e-1,
-            6.51213097502335913624e-1,
-            5.0613559664018881179e-1,
-            -2.43024539722576343737e-1,
-            -1.73479812919615755673e-1,
-            -5.78329037296511305755e-1,
-            -1.69360806414926456931e-1,
-            -3.19616357992812682998e-2,
-            -1.30183908882272847407,
-            -8.81047717929426155159e-1,
-            -5.4102319991102387764e-1,
-            4.30118626114721180898e-1,
-            -1.05322385567050935684,
-            -7.31867939200206429895e-1,
-            7.74998454615676402035e-1,
-            -1.02795578449456681547,
-            -9.9143672717927303073e-2,
-            -2.4849768782194253669e-1,
-            -9.37820550272946973358e-1,
-            4.57124669617839707314e-1,
-            -2.3195628030071530068e-1,
-            -1.3641110650009427574e-1,
-            1.13585420703918638097,
-            -1.12418054028186609195,
-            -4.13946663618719457034e-1,
-            9.63433877049509335144e-1,
-            8.79011195876702067231e-1,
-            1.24226758557390004611,
-            1.56008282731366687557,
-            -3.69756932642537228251e-1,
-            -1.89723592629676418575,
-            -7.7617739344288660952e-1,
-            2.09546030476543576615e-1,
-            6.85148020740877106149e-1,
-            2.22615445759708735496e-1,
-            6.77576497901368979271e-1,
-            1.31382595640156307759
+            9.18978106101183023213e-1,
+            -4.26767002052192034878e-1,
+            -1.22824815824226818428,
+            8.98987388793314884383e-2,
+            -5.19781384866260576239e-1,
+            -5.74701119163321894057e-1,
+            -1.13573675121484241046,
+            -3.25347077157281616699e-1,
+            -1.15088495570642090904,
+            8.27623257326093431097e-1,
+            -3.31246145754213794365e-1,
+            1.98732376414679423604,
+            1.16818816855460205772,
+            1.67788536798723808552,
+            7.1758204612501830244e-1,
+            -9.89701544989251780216e-1,
+            -7.80045558183283666009e-2,
+            2.02981946672650015451e-1,
+            9.83036731664455487589e-1,
+            -2.03455096801697127296e-1,
+            -1.65395212600463525909,
+            -4.68589206835309801669e-1,
+            4.05564214399202649375e-1,
+            -1.83861707419803988017,
+            3.46241016851698668599e-1,
+            1.29305759743435777498e-1,
+            -9.31209297313340123026e-2,
+            -2.00263023927199990126,
+            2.39892992963750245616e-1,
+            4.15699860230424600438e-1,
+            1.18251639729713575733,
+            -5.66117044519978906969e-1,
+            2.11118288111274338137e-1,
+            -6.23450688619021087256e-1,
+            1.17340808422407105738,
+            2.00857034479790597103,
+            -1.70997557230005226003,
+            -5.75890869819183248701e-1,
+            -3.04916301693273980589e-2,
+            -2.18382348470981507704e-1,
+            -4.26618049477844540895e-1,
+            -3.25292201118669577209e-1,
+            7.7143929190142634944e-1,
+            -5.74491218690430849314e-1,
+            3.65266373025450619139e-1,
+            -1.97074362179321838084,
+            -5.87614155925583858675e-1,
+            4.21614342942018327509e-1,
+            -1.46012194882523793638,
+            4.06724723629958817561e-1,
+            -7.58218277580138821925e-1,
+            -3.89796189536569404749e-3,
+            8.83859924115511730314e-1,
+            -1.89893809558031062545e-1,
+            9.44647941004262081677e-1,
+            -2.18467621836035474914,
+            8.76295441040075839823e-2,
+            5.91861084402399262316e-1,
+            -1.43435429330471375664,
+            1.5377053820978048293,
+            1.93223183767026296387e-1,
+            -2.04480461948428748897,
+            5.07142764146055080587e-1,
+            -1.85076488184278220572,
+            -5.07649681989440160201e-1,
+            8.15130499153077447971e-1,
+            -6.33009074321389197948e-1,
+            -9.29017372975015853775e-1,
+            8.11849924600230199445e-1,
+            7.4279836533931387077e-2,
+            8.00299829118543026851e-1,
+            -5.8165776898577126186e-1,
+            -2.08737642830001002281,
+            -3.04360762110511218204e-1,
+            3.48127764382326843062e-1,
+            -7.63638702341849634481e-2,
+            1.53645456676892305792e-1,
+            1.3852038839199214415,
+            -1.09991426056211052953e-1,
+            -7.69131710359084563855e-1,
+            1.16270572610788391898,
+            -2.50712394303621222136,
+            9.53082424624334234586e-1,
+            2.85082692200899145973,
+            6.01851437540254496916e-1,
+            2.75215977895749419613e-1,
+            6.53904471761350275516e-2,
+            -5.92480227960626271155e-1,
+            4.33380651755276569137e-2,
+            -3.03133155455726888139e-1,
+            1.27685420218081411431e-2,
+            1.36895498578640451015,
+            -8.41828539409353648892e-1,
+            -3.96612144060652094257e-1,
+            2.66857014726405231131e-2,
+            4.13777142872802927709e-1,
+            1.19658308452203665517,
+            -8.28531442993400979447e-1,
+            -3.82782398934110923427e-1,
+            8.3111027654266333986e-1
+         ]
+         prettyName: "MvCCRES"
+         responseParamId: 64
+         systParamId: 66
+      }
+      MvNCRES: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         isResponselessParam: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            -1.83956979198874570613,
+            5.90424047519744088497e-1,
+            9.8861786316205380043e-1,
+            -4.96913001612253713013e-1,
+            -1.0108830268944066777,
+            -1.01842822045192335501e-1,
+            -4.17511318927096475306e-1,
+            -3.54573052132173327511e-1,
+            1.13809202489118344026,
+            -1.260315829861432535,
+            3.68179179977733028739e-1,
+            -4.0920675105375825531e-1,
+            7.7100053074412777665e-1,
+            -8.84404661249544449264e-2,
+            1.66091883822323121978e-1,
+            -3.79136278994147091215e-1,
+            -2.14613022163388789121e-1,
+            -3.52892734306374578068e-1,
+            7.9246212891544709489e-1,
+            -4.39351177854677477086e-1,
+            7.8720734080535303967e-1,
+            6.74895529486280842946e-1,
+            2.15045084088158977575e-1,
+            3.19084341883888900071e-1,
+            8.198069676318808785e-1,
+            -1.06317820488430858639e-1,
+            -6.00706258757199296205e-1,
+            1.28793660366509787885,
+            -3.09312706701375006446e-1,
+            8.43079636450256408864e-1,
+            -5.15534686752740611837e-1,
+            4.63627262557912200869e-1,
+            4.88504556815979651407e-1,
+            3.86404495091041910726e-1,
+            -1.25983951475387478958,
+            -6.35316228031649887775e-1,
+            2.98259368005891312148e-1,
+            -1.11353810646359532854e-1,
+            1.02058803261151506692e-1,
+            -2.46793123021775778758e-1,
+            -1.2134746706995285237,
+            7.62310479021343523343e-1,
+            3.35313307262544602061e-1,
+            -4.20601002778238086677e-1,
+            2.20467402754020769251e-1,
+            -5.19532984068525438559e-1,
+            -1.56381896970153588811e-1,
+            -1.91008662602967227429,
+            -1.31501500958864170343,
+            -1.97438404442331427724,
+            -7.82680447858987993204e-2,
+            -3.87532018903742475624e-2,
+            1.70672495648681876723,
+            1.07968009380283221782e-2,
+            9.55204970992571067434e-1,
+            -1.36521258446479487603,
+            -1.04914057452992759423,
+            5.10809085872322640731e-2,
+            5.23208835462574906039e-1,
+            -2.53916237484430240556,
+            -2.57517066046731968321e-1,
+            1.09354430597176338624e-1,
+            9.55759250421886030757e-1,
+            1.90769778812959556191,
+            -3.55860721344405895802e-3,
+            4.39730843203140375763e-1,
+            -8.1308247957300905373e-1,
+            -5.74021072217194006093e-2,
+            8.68989536961883635158e-1,
+            2.92885957016672282549,
+            9.29723768979692000158e-1,
+            2.55170357934042524306e-1,
+            -6.7254122431719798314e-1,
+            -1.52149277286532180753,
+            1.20163593065602070098,
+            -3.89674772166094363079e-1,
+            7.63310459843520194845e-1,
+            5.48109321565409146615e-1,
+            3.60320347045239075534e-1,
+            -9.17216404171742993867e-1,
+            -8.40478188217062549548e-1,
+            -2.27364673586249210757,
+            -2.31810685908506203257e-1,
+            5.56673009597374382484e-2,
+            1.4893591563500119257e-1,
+            1.28687925587768842162e-1,
+            -1.87811617670407993153,
+            -5.210006018995078092e-1,
+            8.35809804333025874179e-1,
+            -1.53643800307890621148,
+            1.02066356962506521455,
+            6.96947760969447882573e-1,
+            7.07595412451846983437e-1,
+            1.19896212546422659129e-1,
+            1.06370681857719792673e-1,
+            -1.14176094911803494014,
+            2.14630427229966447289e-1,
+            -1.49516657721223711341,
+            7.06034539027121932353e-2,
+            6.65003434653861136283e-1
+         ]
+         prettyName: "MvNCRES"
+         responseParamId: 67
+         systParamId: 69
+      }
+      NCELVariationResponse: {
+         paramVariations: [
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38,
+            39,
+            40,
+            41,
+            42,
+            43,
+            44,
+            45,
+            46,
+            47,
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            58,
+            59,
+            60,
+            61,
+            62,
+            63,
+            64,
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            91,
+            92,
+            93,
+            94,
+            95,
+            96,
+            97,
+            98,
+            99
+         ]
+         prettyName: "NCELVariationResponse"
+         systParamId: 61
+      }
+      NCRESVariationResponse: {
+         paramVariations: [
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38,
+            39,
+            40,
+            41,
+            42,
+            43,
+            44,
+            45,
+            46,
+            47,
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            58,
+            59,
+            60,
+            61,
+            62,
+            63,
+            64,
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            91,
+            92,
+            93,
+            94,
+            95,
+            96,
+            97,
+            98,
+            99
+         ]
+         prettyName: "NCRESVariationResponse"
+         systParamId: 67
+      }
+      NonRESBGvbarnCC1pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            6.42119325167997273551e-2,
+            -2.4537337290827938574,
+            -1.13617200923541106228,
+            9.28513089834070770578e-1,
+            2.85159075839141462616e-1,
+            1.14199903820717740821,
+            7.00626997122478889501e-1,
+            2.56758967221478506815e-1,
+            3.0761082462381716951,
+            1.48070842645428490947,
+            3.61907750599764377331e-1,
+            -1.71653168774223185977,
+            1.02846877035128669853,
+            -3.45331338594105918816e-1,
+            1.02507168337183540707,
+            2.63363032581157043011e-2,
+            7.70557542843447240699e-1,
+            1.01458483792542542012,
+            -6.53606723048905241535e-2,
+            -1.31402145473626763561,
+            -1.60429342283565223859,
+            1.10455777843259772553,
+            1.03668450318881033567,
+            -7.32963328918026235659e-2,
+            5.62753387540943506018e-1,
+            1.98908740555165963748,
+            -8.7431183978164495052e-1,
+            -8.05997917022011241273e-3,
+            -5.04372253535478529129e-3,
+            4.72273357515916147875e-1,
+            1.12562170437922395849e-1,
+            3.47480482584626604314e-1,
+            1.91717430679178546526,
+            2.98960258038592330276e-1,
+            -5.25726272010207273944e-1,
+            7.17568601836598984889e-1,
+            -8.30307647873041010378e-1,
+            -5.44945265426775710127e-2,
+            -6.37116568914422254366e-1,
+            9.22005426106963676958e-1,
+            1.31668419121240809488,
+            4.49712873805749535627e-1,
+            1.20280792846425121922,
+            -2.3168019593426101288,
+            -1.95802819826538798686e-1,
+            -1.92049545714278613318,
+            1.27585886819121685498,
+            1.01102295871412128925,
+            -7.89676029777379828722e-1,
+            5.72392933705818229839e-1,
+            -1.47865499637506370156,
+            -1.80816491961347125539,
+            -1.06063286050371208269,
+            -1.34013093807783278955,
+            -1.2188615200485144463,
+            -1.01709507548935884635,
+            -4.21851174496326419838e-1,
+            3.92407591418823864515e-1,
+            -5.15751736468430310723e-1,
+            -1.00586302292113696777e-1,
+            3.93321253252138236522e-1,
+            5.00387610877810029564e-1,
+            -3.4695631845395863424e-1,
+            -6.86862236653716817791e-1,
+            -3.32175645637408256672e-1,
+            2.64848350108849617257,
+            1.4818242098361600334,
+            -3.14825068064928770273e-1,
+            -6.25284952009357297698e-1,
+            1.2798249439002433725,
+            4.4248568554145273346e-1,
+            -1.18075475469376089954,
+            2.56042439268051091883e-1,
+            -1.07306155468161690258,
+            -1.01124306747118386518,
+            -1.29188134433588674987,
+            -2.46223321032591729862e-1,
+            -4.56628988003885405433e-1,
+            -6.31513283812437986597e-1,
+            7.04908021416528529635e-1,
+            -2.75757101546837170292e-2,
+            2.76571776239949058962e-2,
+            6.87730905212784016101e-1,
+            -8.76629486932537171917e-1,
+            -6.13544364817093998421e-2,
+            -3.76485657301000531394e-1,
+            4.26564104119518672231e-2,
+            -7.03389412370983624356e-1,
+            -2.74836649439987823484,
+            1.49975962251316392165e-2,
+            -4.97387055372241038143e-1,
+            7.82721520525824221437e-1,
+            -9.14498867819286687109e-1,
+            -8.70163356902000195703e-1,
+            -6.13782672871211576471e-1,
+            -1.80696287339342354095,
+            7.0094945308513692539e-2,
+            3.98054446452997257033e-1,
+            -1.2774715442009376698,
+            2.99227312931861111345e-1
+         ]
+         prettyName: "NonRESBGvbarnCC1pi"
+         systParamId: 82
+      }
+      NonRESBGvbarnCC2pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            1.34025471632212433981,
+            -9.68855139125500253172e-1,
+            -4.17247224833054541904e-1,
+            5.12923677956265033906e-1,
+            2.66819003169423474287e-1,
+            -8.7073079248464257951e-1,
+            -3.95020470116964783625e-1,
+            1.56482439081097129963e-1,
+            2.75169506232888605446e-1,
+            -3.82359501187397199384e-1,
+            1.33387548407516609572,
+            7.33793743779008300621e-1,
+            6.57200480490028438041e-1,
+            -8.21784630049287034836e-1,
+            4.20005082501075266421e-1,
+            7.57031096220446477613e-3,
+            8.76411441099363197615e-1,
+            7.46877640695249866987e-1,
+            1.00345309378232072639,
+            7.42467587867982392602e-1,
+            1.42222841377814113173,
+            5.16980873411876096224e-2,
+            3.97251691418653463117e-1,
+            1.36511056619774739929,
+            1.60376825623107999164,
+            -8.25331468494225672927e-1,
+            1.62397023222266656539,
+            -3.11617137801258825558e-1,
+            1.19788555395322071639,
+            -9.30415223139464342417e-1,
+            -7.3570940509972126975e-1,
+            1.59219258604217306363,
+            1.2602058339376949192,
+            6.98619588998682039538e-1,
+            -8.94756473321896783624e-1,
+            -8.35723346433610458917e-1,
+            -7.57019277111048327633e-1,
+            -1.18944646573944501355,
+            1.24881219562405587631,
+            9.27197812085340467014e-1,
+            -1.6956914954073576407e-1,
+            -1.3160349410746527421e-1,
+            1.48353818550059712855,
+            -1.44502009123698882398,
+            5.62234930521371967238e-1,
+            7.25702015462983518468e-1,
+            3.70681982438189228102e-1,
+            9.32234996292792494899e-1,
+            -9.29444499361194442777e-1,
+            -6.30659793140661339983e-1,
+            9.75304100502648707582e-1,
+            -5.32935789488623190557e-1,
+            -5.24596213333067273865e-1,
+            -1.07184664811643259874,
+            8.53011460685027533835e-1,
+            -6.87544846776005025291e-1,
+            -4.97920992001999296317e-1,
+            5.7868462100644313395e-1,
+            1.30714353549702333446,
+            -9.35938937958634253889e-1,
+            1.19276876871703962912,
+            -2.81261648455683577197e-1,
+            4.16296285922361841703e-1,
+            -1.12303057718433851875,
+            -9.51336823755928540081e-1,
+            7.7655765857821884568e-2,
+            -6.35045938544529176006e-1,
+            2.49395048350685133443,
+            1.62147692305574753213,
+            -5.06023256639554497305e-1,
+            -1.12074563382613479057,
+            5.80181159267578072658e-1,
+            2.83258267611169178846e-1,
+            1.35670374885696071871e-3,
+            2.67137011282134650969,
+            2.68972371555079997618e-2,
+            1.07354704248186072491,
+            5.57030307910849620256e-1,
+            3.63394258710572556903e-2,
+            -6.9330095314323758604e-1,
+            1.1637945159003044715,
+            -1.51600805772217483991,
+            -4.58242849274156816008e-1,
+            1.52896072760994461426,
+            -2.54654797777158936611,
+            -1.86428732665796986767e-1,
+            -3.18153803935640244749e-1,
+            -2.30447447936238558608e-1,
+            -7.73519383436245711039e-1,
+            -1.1664914982737262239e-1,
+            6.49699546554519780095e-1,
+            -4.31826442814708610918e-1,
+            6.99881832546839111053e-1,
+            -1.01820870472930247175,
+            -1.1784028615104154003,
+            1.83522760140770124782e-1,
+            -6.02593578161754961364e-1,
+            7.24025289870607546838e-1,
+            -1.04741533840733147542,
+            1.55208388183042278463e-1
+         ]
+         prettyName: "NonRESBGvbarnCC2pi"
+         systParamId: 83
+      }
+      NonRESBGvbarnNC1pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            9.80245704045638155399e-1,
+            1.88373269407490306904,
+            -4.33968068512766258493e-1,
+            -5.60556914210695755862e-1,
+            6.6760386168819418895e-1,
+            -1.36574961441856346234,
+            3.67321933143188283921e-1,
+            -4.60714326249370254018e-1,
+            -1.84932182874895961744e-1,
+            7.52426774602945935833e-1,
+            -2.30675864378992523385,
+            -8.72839430428650198124e-1,
+            9.02200256582909032588e-2,
+            8.22870837761927487186e-1,
+            9.51162566686044264053e-1,
+            -7.25804143192710804477e-1,
+            8.71361120892577972752e-2,
+            -3.31652550154333203292e-1,
+            1.62232689202578694854,
+            -2.27988151575589492737e-1,
+            -1.28499097960133301655,
+            -1.35383446080827574143,
+            1.04566836994078093959,
+            3.48782764883041718207e-1,
+            -1.56526514515794401561,
+            -1.14142231847383945897,
+            -1.53730572517680230682,
+            -1.52146169271958209279,
+            3.99441814696743058288e-1,
+            8.76119430218236128205e-1,
+            -3.5386936889185366395e-1,
+            -6.48037475718060473895e-1,
+            2.51157189580028461506,
+            6.97294230800476810828e-1,
+            1.11542791136207505853e-1,
+            1.61166209179649122518,
+            -6.6068821481211426061e-1,
+            8.0266467713097811032e-2,
+            1.50325425212200447511,
+            -1.77021879759012568112e-1,
+            2.38431902296130671104,
+            1.09397382474124671425e-1,
+            -9.14733524740674264208e-1,
+            -5.61948386270456956559e-1,
+            1.03786535033100024705,
+            -3.90543518060618100041e-1,
+            1.11271795446351531855e-1,
+            1.0385240524409153906,
+            -1.97229762861890978165e-1,
+            -2.10790022104210161835e-1,
+            1.06779197516634338783,
+            2.25118631506453725777,
+            -1.19818671041174967806e-1,
+            1.42830800737723229155,
+            1.62074289412393701681,
+            -9.43572133634159593285e-1,
+            7.69133201225762341835e-1,
+            2.22887676924738009632,
+            -9.13840100284782630435e-2,
+            1.20137353983399886026,
+            1.73318124863620304232e-1,
+            5.04680214879741240175e-1,
+            -6.91038214580931176023e-1,
+            -5.55081539386649766565e-2,
+            1.31523395637396789404e-1,
+            6.48204125281020143712e-2,
+            6.81947704631157947119e-1,
+            1.51335599870404013956,
+            3.91887270526614428512e-1,
+            -7.93461179626941293108e-1,
+            1.75682170318457370195e-1,
+            -4.52452023097000333163e-1,
+            -6.78783452229268724487e-1,
+            9.17115256230498568368e-3,
+            2.47823531494844884193,
+            8.21898235508500940583e-1,
+            1.27176180287517248679,
+            1.89252502415510670541e-1,
+            -8.12195628767620636523e-1,
+            -1.47418942495940163973,
+            -3.0638063295565343136e-1,
+            6.12751401804637052528e-1,
+            7.55977159906228934894e-1,
+            1.02741656759219743278e-1,
+            1.94444017781939071376,
+            7.64383686463908418318e-1,
+            2.32680218636922253594,
+            5.3365675292206415925e-1,
+            -2.85768398325205008614e-1,
+            1.84037224615121786098e-1,
+            3.35585685134199618318e-1,
+            -1.33108096043029244804,
+            8.24088090015592911186e-1,
+            -1.60119557097085141173e-1,
+            1.91778282578675823844e-1,
+            -1.44327478993031710353,
+            1.51692824520495417318,
+            8.29022417705953418299e-1,
+            7.73249181883173153373e-1,
+            -4.7253787332574742619e-1
+         ]
+         prettyName: "NonRESBGvbarnNC1pi"
+         systParamId: 84
+      }
+      NonRESBGvbarnNC2pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            2.80422088386707146768,
+            -9.72387967200242675503e-1,
+            -1.01495361916588922035,
+            -3.04032253749664693743e-1,
+            6.64051132840312252625e-1,
+            -1.14720364806278807279,
+            1.60551389423057444539,
+            3.97247963916781854365e-1,
+            -6.63682691044014894111e-1,
+            1.07461535547419417824,
+            -3.0310368024705747203e-1,
+            7.18760345195103900195e-1,
+            2.27253158219717654731,
+            5.31661438951571030387e-1,
+            -7.13515703214056440373e-1,
+            -2.55200151701968136475e-1,
+            -3.76278421363588522208e-1,
+            -1.25216723079684078002,
+            -4.15489254411249786525e-1,
+            2.08258602858501351562,
+            9.25345695461111672486e-1,
+            6.73639276737252323812e-1,
+            -2.68848376720405290996,
+            -8.4240776755425639255e-1,
+            -6.35386888496599522291e-1,
+            1.50794398084241798585,
+            -8.41356539218767629507e-1,
+            3.91554556928230268475e-1,
+            -3.41618714785075772156e-1,
+            -4.89591038038721948489e-1,
+            8.57610438818524278837e-1,
+            1.23544130971619514625,
+            2.69745073335647944646,
+            -5.11788152214948222074e-1,
+            -9.38467457620371425797e-1,
+            4.51736877650821821994e-1,
+            1.06209280288861063202e-1,
+            2.55104202682329139762e-1,
+            1.14755401849421997951e-1,
+            7.93696101315738283821e-2,
+            1.89836575299972137865e-1,
+            -1.93159489701704351061e-1,
+            -9.18935193914775294566e-1,
+            -7.57301811171870009609e-1,
+            -5.81388015162693713722e-2,
+            3.53635954292769727481e-1,
+            -3.22094122480783506823e-1,
+            -6.45484539915706090341e-1,
+            -1.19284441566169019389,
+            5.9213227258409029119e-1,
+            -6.10594452612928106916e-1,
+            3.05458995293276025507e-1,
+            -1.74652152941745408832,
+            2.16884172269826647206e-1,
+            -1.32736513394140631661,
+            -2.32943948736741984762e-1,
+            1.11283477245780382248,
+            9.64897797652361055576e-1,
+            2.87297914443170043786e-1,
+            -1.11532672193336068744,
+            -5.78632041411489494998e-1,
+            1.60274232226348134489,
+            -2.16837223008111212863,
+            -9.73396247643604439759e-1,
+            6.20229269278671946353e-1,
+            7.18137913537712946344e-1,
+            -8.93267123316490496698e-1,
+            5.58538893288343274435e-1,
+            -1.10133128995090445734,
+            1.57647980004092258532,
+            -5.23545525312794413075e-1,
+            -1.87640689595872722784,
+            -1.95539434890723590188e-1,
+            -1.04609705349412918096,
+            -1.42942054699528653394,
+            1.10429664490629209084,
+            -1.31771200943356681101,
+            1.22553776051317342421,
+            -8.2689396349900981531e-2,
+            9.01435430233765572217e-2,
+            1.0303707529378105523,
+            -1.68711679604032038782,
+            1.28359124471941443701,
+            -2.28060738732695472697e-1,
+            -1.05450973770961065057,
+            4.8585305116224214439e-1,
+            -2.63856580862083189842e-1,
+            -4.16006349572194233932e-1,
+            5.49296567440466287913e-1,
+            -7.22591396533769081412e-2,
+            -6.09560559149115221977e-1,
+            7.17234224149464694165e-1,
+            -1.1117262650723174211,
+            2.35454507499972043316e-1,
+            -1.2642948656200252433,
+            5.17635709607861094206e-1,
+            -2.44312572740407879524e-2,
+            4.37927737963315355518e-2,
+            -3.97590894443699827132e-1,
+            5.55367486484480421538e-1
+         ]
+         prettyName: "NonRESBGvbarnNC2pi"
+         systParamId: 85
+      }
+      NonRESBGvbarpCC1pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            -5.55663065362345776066e-1,
+            3.04873756887606095489e-1,
+            3.42795871684202946295e-1,
+            -1.59670999358916843036,
+            6.21665006246596707484e-1,
+            9.14549517681221557641e-2,
+            -9.11500875913047514665e-1,
+            9.66019949597418770004e-1,
+            -2.18102554040575435934e-1,
+            -7.65440898019311366518e-1,
+            1.93012086756083389716e-1,
+            -5.60813408794411993874e-1,
+            1.99816611959898998707e-1,
+            -2.35446329694626044216,
+            -9.50363952917463450376e-2,
+            -2.40140970339272508127e-1,
+            -2.16018238880953461489,
+            -2.53589959792812291717e-1,
+            5.3229188611151334598e-1,
+            -1.52757452511237334924,
+            -6.37778639361211929781e-1,
+            -3.90986876614196454671e-1,
+            -5.19806674514397992759e-1,
+            2.35183754231550068425,
+            3.39500963782927503432e-2,
+            6.46508606291100296204e-1,
+            3.93914166185333647352e-1,
+            -3.24887361769297444702e-1,
+            2.76723965178225483896,
+            8.60206167052847830989e-2,
+            -1.3663989146691806198,
+            -1.21946397588919674959e-1,
+            1.69060104638300368052,
+            1.09311738838880651015e-1,
+            5.61383869217394693152e-1,
+            1.34890857314559697855,
+            -3.89429686784409714861e-2,
+            -4.19075938279839466105e-1,
+            1.28599623621010650254,
+            8.71385619819460721658e-1,
+            1.24431988090746492581,
+            8.87655475225707202291e-1,
+            -2.07311815438032187586,
+            -2.1364274779590735065,
+            2.02402993161587413384e-2,
+            -1.36248532310684478119,
+            6.85969309573338459352e-1,
+            1.61021479726606603355e-1,
+            1.36802639907376455408e-1,
+            -4.26038374420452059521e-1,
+            8.31986377085463080228e-1,
+            3.01952343479768292589e-1,
+            -1.04667904881671214312,
+            2.53700106850295425964e-1,
+            -4.96381674426968400038e-1,
+            -1.33249738821876273498,
+            -2.3067518501255987462e-1,
+            2.89804981830404173593,
+            -7.15870291269234626519e-1,
+            1.52491503477309375825,
+            -3.71079297209891190157e-1,
+            6.10834233899001266543e-1,
+            1.29435288129029224535,
+            1.0888457479686555196,
+            1.89598218674515273108,
+            4.15430622990805520356e-1,
+            9.15861522046385934104e-1,
+            5.51957945518496306825e-1,
+            3.44821907573156782867e-1,
+            1.52785152206445062895,
+            1.08459350211985738888,
+            -6.19223369804028034302e-1,
+            -1.00284918920817278654,
+            5.51288647001836995543e-1,
+            -1.37667923806104575135,
+            -1.02560070691857130321,
+            9.8519234633116259392e-1,
+            -1.75914658578464067062,
+            3.56922683260478962319e-2,
+            1.02662434968096971666,
+            -2.22706901518518324279e-1,
+            6.24778729910440006057e-2,
+            -5.13750886206425394498e-1,
+            8.28654738561874437686e-1,
+            1.17519655405647971413,
+            5.91893345549182381404e-1,
+            6.8956399185238104188e-1,
+            5.27310238563659772204e-1,
+            -1.4665130377912194426e-1,
+            -1.41015904466433500408e-1,
+            1.82977330173797164692e-1,
+            -2.24558040554154647594,
+            1.99601824891430235098,
+            1.86448263644848011289,
+            1.11929322937928188431,
+            7.56504673485220768825e-1,
+            -3.97521142697451645986e-1,
+            -5.96148374919918788706e-1,
+            1.84336742856098867449,
+            3.26475841461199678406e-1
+         ]
+         prettyName: "NonRESBGvbarpCC1pi"
+         systParamId: 78
+      }
+      NonRESBGvbarpCC2pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            4.51321735894190279037e-1,
+            -5.31951777648426160638e-1,
+            -2.04758425432991275628,
+            4.62776341555068859712e-1,
+            -1.47612295832996309741,
+            -1.70298284943018640725,
+            -8.95479588472822274348e-1,
+            -4.22264546748328362114e-1,
+            -1.27580451660916072143,
+            6.58926964994337560633e-1,
+            3.40779066962199506108e-1,
+            -5.91342761105523750942e-1,
+            7.25450262255673217204e-1,
+            -2.38571716741941663997,
+            1.45122910266754678865,
+            -1.27929968464397081362,
+            -5.9663143013492558886e-1,
+            2.15952777312571508883e-1,
+            9.54294085797825930584e-1,
+            1.46570287572672830478,
+            1.72604017021131150855e-1,
+            -5.34002388510846581759e-1,
+            3.50756574385447217335e-1,
+            1.21647013451029528674,
+            2.38019828459250681885e-1,
+            -7.693681689921011424e-1,
+            -5.23576980804737912578e-1,
+            8.74662918120905685804e-1,
+            1.68261158461419896293e-1,
+            1.59964604419596478913,
+            1.10108848323484975751,
+            -3.94954208481957169674e-1,
+            3.91780046779065471707e-1,
+            -9.63438173305052325546e-1,
+            1.49899376075147827692,
+            -6.9622632305845288947e-1,
+            -9.08009082463541394858e-1,
+            -4.61300718242309837347e-1,
+            1.37469437286236106921,
+            -9.47745377283353507281e-1,
+            -1.95673609165782025343,
+            -3.84297784213399162834e-1,
+            -6.29084768968805496669e-1,
+            -9.51161717556836983078e-1,
+            9.57060323707529359005e-1,
+            1.34634345651108056074,
+            1.91463616368057021333,
+            -6.14550098790312637753e-1,
+            -4.16307213564069689138e-1,
+            -2.80487988818895139786,
+            7.91191932345274850924e-1,
+            2.11797399267798280853e-1,
+            3.24588636227748916774e-1,
+            1.00184458556826316844,
+            -8.52063875187038188841e-1,
+            2.58180442939861976015e-1,
+            3.84293330576369329687e-1,
+            -1.14689612537031937478,
+            -8.3176934588934992032e-1,
+            4.30164302214970151184e-1,
+            -1.1461946489766976498,
+            -1.99573601747402995521,
+            6.44426232078330496478e-1,
+            -3.90419342532613289354e-1,
+            -2.2072042887185783222,
+            -2.26420250099569919655,
+            6.00279840343879600439e-1,
+            4.76721580402826750067e-1,
+            -1.51355314426077386392e-1,
+            9.97167334281816142294e-1,
+            5.10690334230382125824e-1,
+            3.35464620465713458941e-1,
+            -7.10542821139526270535e-1,
+            -8.34688882807216314674e-1,
+            -1.8771450359904517935,
+            3.08518805172949328597e-1,
+            -2.20057506000120556289e-1,
+            1.68139673322865446092e-1,
+            5.23125636351155498538e-1,
+            2.06103577266987074423e-2,
+            2.29144850478206790756e-1,
+            8.96396705066721422028e-1,
+            3.82684637978275732362e-1,
+            1.49609067888505387067,
+            2.26385821240785767294e-1,
+            1.3943218740177245607,
+            1.02514014117802831905,
+            -1.37186321875100158962,
+            2.54085684640019626723e-1,
+            4.03723748181816721736e-1,
+            -2.83201395710795766902,
+            9.35412071421727664422e-1,
+            1.95493825420551692318,
+            3.03177443479534569626e-1,
+            -1.13751586039567409436,
+            -7.26444915907744737105e-1,
+            4.94366652307641485375e-2,
+            1.37781832486923305758,
+            2.7631877963873235915e-1,
+            -6.98250024466004148849e-1
+         ]
+         prettyName: "NonRESBGvbarpCC2pi"
+         systParamId: 79
+      }
+      NonRESBGvbarpNC1pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            4.09100472607064002961e-1,
+            -7.96722801151438342337e-1,
+            3.97294092862660541687e-1,
+            -1.56585567936309000281,
+            1.35341426491894556428,
+            2.80764104698769889623e-1,
+            -7.95049602565475965754e-1,
+            -4.77146874788590413807e-1,
+            -1.18286332136271835069e-1,
+            -7.47894046826940828154e-1,
+            -2.49107452905815396349,
+            4.94164922460367195267e-1,
+            -5.64200308729225885607e-1,
+            -1.63758805900008952428,
+            1.22915011247370045688e-1,
+            4.80784422353207008261e-1,
+            -1.56857358214877146141e-1,
+            -2.54968766950627534484e-1,
+            2.52525097088809158397e-1,
+            -1.12944128856633962954,
+            4.59989957799430693175e-1,
+            -6.74486919231258474916e-1,
+            9.81453939403986452827e-2,
+            2.59416181690316438591e-1,
+            -8.00691107620626119079e-1,
+            6.30845829187257206572e-2,
+            4.45684284196458557759e-1,
+            -2.46771061226446694614e-2,
+            1.66775817108218671336,
+            -9.11299740591320572847e-1,
+            2.11904646716560574049,
+            -1.90173071257662362754,
+            -6.38853372369398875286e-1,
+            -6.62316251344301831772e-1,
+            2.63752911639641096642e-1,
+            4.17238595124517885893e-1,
+            -1.31174650828077088427,
+            -4.39604777816105241062e-1,
+            8.70778289786951487095e-1,
+            -5.70821315050063282648e-1,
+            7.25996025991816895662e-1,
+            2.08122845866965677786,
+            -8.32283788483054065566e-1,
+            -2.53386366781720551167e-1,
+            -1.22669681105492678341,
+            6.94329142072633742622e-1,
+            -7.25800801535232187334e-1,
+            8.86470604540298245944e-1,
+            -1.14384802478958058636,
+            -2.38528395371001122882,
+            6.51441420836450735266e-1,
+            -1.89153951926113755855e-1,
+            2.05889809022723579979e-1,
+            -6.20914538179934250017e-1,
+            3.18995218377540468158e-1,
+            8.6259196345697120023e-1,
+            2.3622728652753444134e-2,
+            1.32099146832711089594,
+            1.69526152430505416824,
+            2.31583694031043951789e-1,
+            8.19050875563413383063e-1,
+            -1.15243177826382470208,
+            -1.9225655194678911708e-1,
+            -2.43712656269361060968e-1,
+            -8.0009756363315653882e-1,
+            -1.07136788002545468856,
+            -1.78551818181393118223,
+            -1.10559161474640488265,
+            1.69817258856121755528,
+            -7.20729746173384477892e-1,
+            -9.12848769556068084796e-1,
+            1.00497615627677583383,
+            7.11163814274262118253e-1,
+            6.80429779899902831275e-1,
+            1.75748319419335707892,
+            -7.97990889825066052055e-1,
+            3.00169386014413286379e-1,
+            6.01440970988200568348e-2,
+            4.65197544337116297708e-1,
+            -6.36009133127247716644e-1,
+            3.26857700981180498978e-1,
+            -1.18895260371119804166e-1,
+            3.57608004185462846625e-1,
+            -1.2384283914558287254,
+            9.04118458577225919681e-2,
+            3.93207928835070885665e-1,
+            -9.01087275684911648277e-1,
+            2.44151566960265742345e-1,
+            1.09714620698172860003,
+            2.69721465933022153116e-1,
+            4.85744791392892838466e-1,
+            -8.38124940294199038959e-1,
+            -1.17943347188024638683,
+            1.32984244632239301254,
+            -4.63244746514713201524e-1,
+            -1.43563416963316270447,
+            -2.4387637631415466366,
+            -1.75594256400579240562e-1,
+            8.15243009094803405823e-1,
+            -9.15252208679282031056e-1
+         ]
+         prettyName: "NonRESBGvbarpNC1pi"
+         systParamId: 80
+      }
+      NonRESBGvbarpNC2pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            -4.15176310556111261008e-1,
+            3.59149465410228185824e-1,
+            -3.75206247406325299476e-2,
+            3.71439712661597920551e-1,
+            -3.85366235392213041244e-1,
+            1.96317265285402964281,
+            -1.00389595547431276223,
+            -1.24160431567456458479e-1,
+            -4.21836626871825992602e-1,
+            -8.582816078298123319e-1,
+            6.06820157262306092427e-1,
+            1.10503479501541823637,
+            4.79884654794556442248e-1,
+            2.97208809405297647022e-1,
+            1.16886884141800306836,
+            1.72269418760546511038,
+            9.87732528295779177441e-1,
+            -3.95271532647228696078e-1,
+            -7.37017987601455315527e-1,
+            -2.54767148959373601613,
+            -9.53311878830450099009e-1,
+            5.885329985286313903e-1,
+            -3.25858857297710635681e-1,
+            -1.44885199471981440666,
+            -2.47970360908127851474e-1,
+            1.26222967008190845029,
+            -7.63312095279724101005e-1,
+            -1.03073967002067123921,
+            -4.68489660838278643151e-1,
+            4.75902557247625146442e-1,
+            -1.7078385308557151312,
+            6.7465273256342195296e-1,
+            -2.55160923148120000192,
+            -1.10782515311453622076,
+            -2.65705985806241440361e-1,
+            5.70247110889248398635e-1,
+            1.74650790530865118733,
+            -1.95447629468543160325e-1,
+            -9.75574956092046585709e-1,
+            2.74633016323853285101,
+            1.20978977005951793267,
+            -8.8721868809256698718e-1,
+            -3.72512840493350927407e-1,
+            8.93346671190646146599e-1,
+            1.25322645091301088094,
+            -4.59133783809848594615e-1,
+            9.66504086958595021173e-2,
+            1.56380549385855438516,
+            1.91400983654695898417e-2,
+            -1.76366673514972323311e-2,
+            8.62709637918376848198e-1,
+            2.00899049163219406422e-1,
+            -4.15777845969007964211e-1,
+            -5.75683356033811266528e-1,
+            3.52994410275638881291e-1,
+            1.03198995175966024007,
+            9.69478266181289183301e-1,
+            -1.70728288325143173765,
+            1.3155395074765166008,
+            1.44496769873504044002e-1,
+            -1.64478366768909056717,
+            -1.21476301467902181308,
+            -9.89858185002350565718e-1,
+            -9.39074784070047408058e-1,
+            1.9401186021496474865,
+            6.01324606922579163459e-1,
+            8.0794334721779925701e-1,
+            -2.2193948070040496745,
+            -1.95073226796206478095e-1,
+            1.74600414280004345713,
+            -1.36852970640249121947e-1,
+            -1.35528301666643469225,
+            8.35406722618899477695e-1,
+            -1.12285436866737087236,
+            -4.12183748860006138326e-1,
+            2.38677536457292782668e-1,
+            -4.72746473993337967823e-1,
+            1.09806478304872912055,
+            1.52262083122866199308e-2,
+            -2.14827224688454387902e-1,
+            7.97729954089346993129e-1,
+            8.38266374124152724434e-1,
+            -1.03845761492287080863,
+            7.24096338228022995409e-1,
+            -8.45514843560541518031e-1,
+            -7.18219617430395529389e-1,
+            -7.30127436145578179172e-1,
+            1.45853784516922324599e-1,
+            -3.31531580597195008053e-1,
+            5.49467670119792361838e-1,
+            2.2270815990332346046e-1,
+            -1.93036458856815390517e-1,
+            -1.97013374997175150227,
+            9.29752438097768196812e-1,
+            -1.4534900700459727485,
+            -8.50108520560773128771e-1,
+            -4.25350319235606511015e-1,
+            -4.56468351834770358355e-1,
+            -5.4051126310633856864e-1,
+            2.8439542443783527581
+         ]
+         prettyName: "NonRESBGvbarpNC2pi"
+         systParamId: 81
+      }
+      NonRESBGvnCC1pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            1.66918603368249995889,
+            5.64185617669439865018e-1,
+            2.64550836104141540162e-1,
+            -1.83186110585353700841,
+            -5.24420724537941612686e-2,
+            5.49277412878069082325e-1,
+            3.73931434304691001635e-1,
+            2.81044739445170888015e-1,
+            6.09544835769511683665e-1,
+            -1.91028296807140884894,
+            -4.51726401220906181866e-1,
+            5.01068774118984205934e-1,
+            -6.11334195353559817221e-1,
+            -3.7277150137103295946e-2,
+            5.65848181629429292094e-1,
+            -4.59168903978982523295e-1,
+            4.60101580244468011394e-2,
+            -2.56731302220367496592e-1,
+            -1.94660715042050802559,
+            5.32845174137959065597e-1,
+            -8.94688181576643981607e-1,
+            -2.37075565327623388745e-1,
+            7.08897560279334482125e-1,
+            -1.09437001709944470296e-1,
+            -2.15612623741405773359,
+            -9.56797041228041877936e-1,
+            -1.01605309036231816755,
+            -2.35189339351426357494e-1,
+            -3.95526432291312068923e-1,
+            -1.8780382305920020336,
+            -1.44671735416483637771,
+            5.55741459296620221586e-1,
+            -1.89625650790565425385e-1,
+            -1.1986053198279885551e-2,
+            7.96735935614597434729e-1,
+            9.480930238937358423e-1,
+            1.63704070644344290564,
+            2.6063186440402036359e-1,
+            -6.17771094960126831985e-1,
+            9.48096760016085560174e-1,
+            6.63124200869599778052e-1,
+            -7.74166611358174217017e-1,
+            4.03437649683936527811e-1,
+            1.01215130509980877349,
+            4.2875264993484657472e-1,
+            -2.3439564921476963022,
+            2.63329836470105639601e-2,
+            -5.43935392016298036033e-1,
+            3.05311043302578521974e-1,
+            2.33465915833871578977e-1,
+            9.42626454809172398264e-1,
+            1.22654883719120166852,
+            -5.92159606277965377963e-1,
+            1.31460058986055194907,
+            1.35378456594393425938,
+            -1.12707934325026321032e-1,
+            -1.20884494039547263355,
+            1.46944693990572661235,
+            -1.13181033494774885284,
+            -1.90887016011598831255,
+            -1.04666050088060691436,
+            5.84908595942463943596e-2,
+            -8.28878643950489046865e-1,
+            1.10620155886576188031,
+            -1.04909210970673449914,
+            7.37010315243834979171e-1,
+            -5.80499183460443268778e-1,
+            -6.48283921282977182443e-1,
+            -1.78513709437255085888,
+            8.45807834244414191716e-1,
+            -8.72962431602929633812e-1,
+            8.48086213820932188767e-1,
+            1.99895868433522472252,
+            1.31202347417523035311,
+            -1.31350008955750496842e-1,
+            1.78307258289589709577,
+            -3.29048619054783442195e-1,
+            -6.89289491108041163514e-1,
+            -3.93787293880548561198e-1,
+            1.87643398866372312916,
+            -1.59391732128787588785,
+            4.48168971469688148801e-1,
+            -3.48517816627451293421e-1,
+            -2.66553104685270159102e-1,
+            -1.28548272927755569128,
+            1.71541195951280012189,
+            1.46024766417848250732,
+            -2.48405568564593476344e-2,
+            4.96900356902503559375e-1,
+            -1.36896169865758504658e-1,
+            7.80042304399844732554e-2,
+            -1.2499769086845373689,
+            -6.34722117943113173233e-1,
+            -3.19617136151113367948e-1,
+            5.15720399557889397357e-1,
+            1.26609366964689740165,
+            1.91628050809394623322,
+            2.39753948165125274627,
+            -4.84114090964924137506e-1,
+            7.70306923362927720156e-1
+         ]
+         prettyName: "NonRESBGvnCC1pi"
+         systParamId: 74
+      }
+      NonRESBGvnCC2pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            6.53823127273371884627e-2,
+            2.90387768049615913046e-1,
+            3.73853539399723433512e-1,
+            4.84820029777221106482e-1,
+            -1.08085741714277361325,
+            1.47412121203118529067,
+            -6.25581383118423373091e-1,
+            -1.73300740082393334163,
+            1.44656473634776339132,
+            1.03394555218170736133,
+            1.62281753446725768297e-1,
+            2.98343421250197360362e-1,
+            -1.51509016796237139246,
+            1.34516673421277821454,
+            6.49709557212246966579e-3,
+            -2.15108781445647878616e-1,
+            -1.37652080714769242675,
+            3.82283164251092211217e-1,
+            -1.20218368080549486976,
+            1.95489654434854931431,
+            5.50416339332331472356e-1,
+            -4.81200282831566850117e-1,
+            -7.90982931902211583441e-1,
+            -8.09357334494651636803e-1,
+            3.65218065389202706239e-1,
+            -6.53631594742720839486e-2,
+            -7.13349682969677489908e-1,
+            4.79230888602686977418e-1,
+            6.15517279368181027821e-2,
+            -1.15922781624762483155,
+            -1.19078552729037556723,
+            -4.93624160974942771674e-1,
+            -1.71780898932054681971,
+            6.62334653532387074293e-1,
+            -1.52546299957285080851,
+            -1.10748786692903958273e-1,
+            3.80987895205927351583e-1,
+            2.39438170726061355653e-1,
+            -5.51035174919642600777e-1,
+            -3.43349469443885724207e-1,
+            -1.41562991317595820995,
+            6.7753019257675772824e-1,
+            -1.70327955821885451693e-1,
+            9.72232389494287141396e-1,
+            -1.3482900951345827556e-1,
+            -4.17584256311079524138e-2,
+            8.74776101580343801167e-1,
+            4.67161482202993694202e-1,
+            8.77877584638859898014e-1,
+            6.58359490763113286427e-1,
+            4.0161510205015821251e-1,
+            7.77906202334069929449e-1,
+            7.11175840310199647298e-1,
+            2.00655200183495280308e-1,
+            -7.95039975880134974773e-1,
+            2.62752100127561050158,
+            -6.17781094638918532036e-2,
+            -7.65901593188668017298e-1,
+            -2.11718911741583371011,
+            -2.38306219958539844406e-1,
+            2.58289229516202034631e-1,
+            3.43907242383057198953e-1,
+            1.63760647657440627789,
+            -4.0409994939738907993e-1,
+            2.29035525545484355825e-2,
+            -3.54700147128195031332e-1,
+            1.59468493437239344779,
+            -6.50248313549104062226e-1,
+            -1.13906447785544173712,
+            3.84304949679137530794e-1,
+            -1.76557886061080115958,
+            -1.92767963395787922387,
+            -1.87735354320566705244e-1,
+            -2.34180668799243818512,
+            -3.69237688628139992808e-1,
+            -6.28955294410754928158e-1,
+            -2.32728091826247762697e-1,
+            -1.16315516586296130441,
+            1.34104505158412701249,
+            -1.5149023782426027096e-1,
+            -1.14754954248494889235,
+            -9.79111676276327891344e-1,
+            -2.60577034786316663606e-1,
+            1.79412950456682129818,
+            4.52529423536085703694e-2,
+            6.58182687492413764918e-2,
+            1.08567968503238354572,
+            -6.92907138110914422313e-1,
+            -8.63105594113158791636e-1,
+            1.4472370790660602502,
+            -7.27463864861702447229e-1,
+            1.34394063741431768477,
+            -4.9757409313220611613e-2,
+            -3.21987111335006126467e-1,
+            -1.6407878247949849726,
+            -1.48138429213720734801,
+            -1.0894346296387930062e-1,
+            3.68087158646996925881e-1,
+            -1.29809881103336577368,
+            1.36508268372291396986
+         ]
+         prettyName: "NonRESBGvnCC2pi"
+         systParamId: 75
+      }
+      NonRESBGvnNC1pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            1.67302901305684836863,
+            6.33354498688144973428e-1,
+            -7.6188453980490600248e-1,
+            5.86387405409993567318e-1,
+            1.43399284850702746219,
+            2.4916573627749019626e-1,
+            -9.0510442199307894473e-1,
+            -1.06561233581801895198,
+            7.42406668303344341453e-1,
+            -1.00023423158719060311,
+            1.18680937559319787944,
+            1.30449140133825602916,
+            -1.71265414872096455312e-1,
+            6.92937322689462925629e-2,
+            -9.94759557974340680175e-1,
+            1.2071787054526454952,
+            3.68590402929674043619e-1,
+            8.2297734491351715036e-1,
+            2.64387045003779963537e-1,
+            5.87495570284465085109e-1,
+            -7.34429879595163148664e-1,
+            2.6631398548057538811e-1,
+            4.26733115136666230072e-1,
+            1.18075374519913478544,
+            -1.83697296529766362916,
+            7.75841560280547404282e-1,
+            -1.90040166395721432657,
+            -7.32441458639351283821e-1,
+            -1.79969242957501468494e-1,
+            -1.5415988375620641726,
+            -5.36652484985062794287e-1,
+            4.54443905466733744092e-1,
+            -2.00551318394744729212e-2,
+            5.78511878903071874447e-1,
+            3.62888087202120845909e-1,
+            -2.13795178863536428082,
+            1.21577277621619650461,
+            -3.26041263309566065054e-1,
+            2.78390571399092356941,
+            -6.2387538461453151406e-1,
+            -6.64901305009491405684e-1,
+            4.6535935263187977462e-1,
+            -3.99690806746052784693e-1,
+            -1.32288846333614484863,
+            5.92613132559814195788e-2,
+            1.20913531988363143199,
+            -4.15061050206329607004e-1,
+            6.96081243549739214771e-1,
+            -1.07263576504503452269e-1,
+            -6.90827847659397226154e-2,
+            -1.97111450436257829022e-1,
+            1.23014441933850166011e-1,
+            -1.20885974566358878057,
+            2.10090893317200899659,
+            -1.1971839139789162143,
+            1.195445692472061755e-1,
+            9.4747809205353961115e-1,
+            -2.5468281377399715204e-1,
+            -5.3099769028743937227e-1,
+            -2.31147349888274478147,
+            1.37192786703692393147,
+            -4.83646048665470951189e-1,
+            1.8721441650745955787,
+            1.70344720472824584512,
+            3.56984303001834368807e-2,
+            3.65931694602726409471,
+            -2.03790467128877317293,
+            8.15145691739548095001e-1,
+            -2.17907694342915325691,
+            1.26367628933031728167,
+            -4.75274439414368823908e-2,
+            1.65610340000454603349,
+            1.4961928588226605652e-1,
+            1.51954229776044114075,
+            -2.12802855525802758763,
+            6.88564162503228716083e-1,
+            1.68469720359402619358,
+            4.89223709385471439148e-1,
+            4.37095147720247823031e-1,
+            -1.48029011164547585899,
+            1.65667528715923939586e-1,
+            -1.45027940125638199476,
+            -1.49167236568915440031,
+            1.82615269140463754027,
+            2.28109720213492545016e-1,
+            9.1054083793226225918e-1,
+            9.38951048414471078907e-1,
+            -5.69526789859405635497e-1,
+            1.92223780875552252567,
+            8.53390039070667572041e-1,
+            -7.80543419188004738984e-1,
+            2.53047485594098009454e-1,
+            1.19752263198319530701,
+            -1.04720358717831407702,
+            8.5981583429178831679e-1,
+            3.04575959352751057807,
+            1.35179283539119721169,
+            -1.23904888110240962718,
+            2.70585979142002719389e-1,
+            -9.5301381176048638455e-1
          ]
-         prettyName: "NonRESBGvbarnCC1pi"
-         systParamId: 62
+         prettyName: "NonRESBGvnNC1pi"
+         systParamId: 76
       }
-      NonRESBGvbarnCC2pi: {
+      NonRESBGvnNC2pi: {
          centralParamValue: 0
          isRandomlyThrown: true
          oneSigmaShifts: [
@@ -3329,111 +4865,335 @@ generated_systematic_provider_configuration: {
             1
          ]
          paramVariations: [
-            7.79862478412510357062e-2,
-            -1.37376157799648929148e-1,
-            8.48260039441766533486e-1,
-            7.79416555494641616342e-1,
-            -3.39996547785442804201e-1,
-            -2.24294218333482259231e-1,
-            9.24200916760604451738e-1,
-            4.06794856808997962183e-2,
-            3.46446113256398680047e-1,
-            -3.43854211891896188735e-1,
-            -7.39039000952948388345e-1,
-            7.62765442605134680321e-1,
-            2.24212416637272848874,
-            -1.50490880280066052777,
-            1.76110540151305716705,
-            6.33440132887821527596e-1,
-            6.63836694023771434203e-1,
-            2.95761281297258404877,
-            -5.81806425780552194382e-1,
-            8.16414740506980901591e-2,
-            6.59739051510494056707e-1,
-            1.05409276215781710917,
-            -5.17153110149503048021e-2,
-            -2.01790151217334701172,
-            2.76831059718244232304e-1,
-            -1.36373523677294050671,
-            -1.03885249853067063164,
-            -1.42062979353204754673,
-            1.02436965098043386568,
-            1.80542660344982852649,
-            -6.84492235418140304581e-1,
-            8.38762037565201290512e-1,
-            9.45947334910444914691e-1,
-            2.97976269030439888663e-1,
-            -3.37007084182699423458e-1,
-            6.85706063259146070266e-1,
-            -4.11676046493170966212e-2,
-            -6.62779572241201875293e-1,
-            -5.41137615554057482825e-1,
-            1.3804018360496383977,
-            4.40861842836346926044e-2,
-            9.7312200175671781377e-1,
-            -1.38438798201327850634,
-            1.2857917485614608899e-1,
-            -1.11364231016039927358e-1,
-            1.55972094048123421928,
-            7.03933858551509139545e-1,
-            -1.17518379882695731681e-2,
-            -1.4932960517141999901,
-            -4.33461111173392532603e-1,
-            5.31633886900848229295e-1,
-            4.06519143295090146228e-1,
-            8.19950087798621440882e-1,
-            7.38812347972296667997e-1,
-            5.72754523158033657104e-1,
-            -2.5758202158306636731e-1,
-            -1.01321525440561588383,
-            1.21259554158023252768,
-            -8.88236528474095399233e-1,
-            4.83217640494243594329e-1,
-            2.78390993515217344267e-1,
-            8.67836266641786591158e-1,
-            7.27428858394157606959e-1,
-            -4.98676188751911553254e-1,
-            -1.93256117911354619032,
-            5.24948369651280888348e-1,
-            8.6039924188740468658e-1,
-            -1.5531592136773448784e-2,
-            8.30496803184111898055e-1,
-            -1.43014162429600383275e-1,
-            -2.40748226805627574265,
-            -4.11214250722880481081e-1,
-            -7.8462510746900124281e-2,
-            -6.8433972453522205065e-3,
-            -8.7465227558254088347e-2,
-            -2.26207207287912570592,
-            1.48759307189809386607,
-            3.58628973752974589129e-1,
-            -1.51708284807597038046,
-            -5.69731149257585833823e-1,
-            4.74138904838794228436e-1,
-            -3.99669578751750548262e-2,
-            -1.03769644153829077027,
-            -3.0881190205221481504e-1,
-            -1.4597592313698319888,
-            7.35892453000204560531e-1,
-            3.28478605129554013242e-1,
-            1.6255287295283642468,
-            9.47714866403541522644e-1,
-            -6.53039471531321136233e-1,
-            -3.72331797452165658147e-1,
-            5.69839343942829201772e-1,
-            1.09613179330627596997,
-            -4.94657097935140954714e-1,
-            1.83139056605427685831,
-            -2.12387920809657626542e-1,
-            -4.18472242482570977451e-1,
-            1.68689073375931819498,
-            -2.14013652006493071411,
-            -1.48329502695596682216
+            -3.84882148950258309861e-2,
+            -1.59617321553699387238,
+            -7.36221010510012541239e-2,
+            2.57018597217297006807,
+            -1.90234462624955513732,
+            -3.36823742497843525712e-1,
+            -9.04799915215464878315e-1,
+            6.03493206874020637898e-1,
+            -7.28196039007315887304e-1,
+            8.88850209197052931742e-1,
+            1.64600981751017960697,
+            3.5651923188289436073e-1,
+            -1.51263674720224794434,
+            2.63959735812067997074e-1,
+            9.224615208582426229e-1,
+            -2.96597124744395534979e-1,
+            1.26011389356033537412e-1,
+            1.81664623873064967619,
+            2.41879136508717090814e-1,
+            -1.88811846779164271837,
+            -7.61107101772592664624e-1,
+            -1.68488680495693959882e-1,
+            -1.2398502375856632618,
+            1.93174219933033208818,
+            1.8489854128032395808e-1,
+            -4.38272203967916829104e-1,
+            5.91896760972740465512e-1,
+            7.68171522659714889336e-1,
+            2.40022222125532724846,
+            -3.24698970764358774144e-1,
+            -2.45516337843007276254e-1,
+            9.13605192318038272781e-2,
+            6.50426684394285414825e-1,
+            9.7873205995866768836e-2,
+            8.27664028911611948658e-1,
+            -1.01660496413103684787,
+            4.56462800643327115679e-1,
+            4.27473304297414702368e-1,
+            -7.36541049072519604657e-1,
+            -6.21281171342909832589e-1,
+            4.68644025089868743184e-1,
+            -4.87570001895808124992e-1,
+            -3.04847509380613157504,
+            7.5121749040743562853e-2,
+            1.0197537488774846004,
+            -1.5404706730377501489e-1,
+            -1.31461223839877083819,
+            1.13319422098974542656,
+            7.64685641812171801313e-1,
+            -2.20365049627597819892,
+            1.19938936850432220638,
+            1.47042646261100884431,
+            1.00447358650541684888,
+            -1.78622846938777324333,
+            5.94889312982639362204e-1,
+            8.17987406528479232826e-2,
+            -6.94839723705390766018e-2,
+            -2.05601636802874077059e-1,
+            -4.94924921070867662731e-1,
+            6.27456547836641287397e-1,
+            -2.3705797893071534066e-1,
+            9.42229154707036276051e-1,
+            -1.65554284959602449057e-1,
+            -7.90242622858901788696e-1,
+            -1.39058128954513660069,
+            -2.04806344896981573633e-1,
+            -3.9684450225364831244e-1,
+            5.31294079314589495766e-1,
+            -3.93651453983253019064e-1,
+            7.72768955609470509227e-2,
+            5.97357819524355404539e-1,
+            -7.70633127566012099408e-1,
+            -8.53842923909433171303e-1,
+            -2.38446547235657302366,
+            -2.66111267621358571489,
+            -1.95401780237049127464e-1,
+            -6.22039241531538111829e-1,
+            -1.44896884779676038413,
+            -1.39404070111159006373,
+            4.12887385740698720227e-1,
+            3.054037008737378045e-1,
+            8.59543193181945719417e-1,
+            -8.62648459525970134898e-1,
+            6.40705379384833295653e-2,
+            2.8071775776501373123,
+            -1.80962806613510629461,
+            6.94587703418457547144e-1,
+            -7.13493694331004957299e-2,
+            7.58337267088279642913e-1,
+            2.652394563836886765e-1,
+            -9.52776342977169066195e-1,
+            9.46194369591763173588e-1,
+            -6.11983859285441966769e-1,
+            -6.31488061938624500868e-1,
+            -6.79506228790082156266e-1,
+            -8.26831973781836371273e-1,
+            -2.39631117699665385778e-1,
+            7.51288957988206718142e-1,
+            3.83428168634343480292e-1,
+            1.75623640605025355121
+         ]
+         prettyName: "NonRESBGvnNC2pi"
+         systParamId: 77
+      }
+      NonRESBGvpCC1pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            1.31692326280404348182,
+            -4.4897849011760054827e-1,
+            6.67917876118918618644e-1,
+            -7.62606240979719185447e-1,
+            -3.52028460958223710087e-1,
+            -3.46905600007581915722e-1,
+            7.49202985289925238455e-1,
+            -6.52257907209685572347e-1,
+            -8.61811748276340883201e-1,
+            -2.40048831915970567463e-1,
+            -5.81435642670471874993e-1,
+            -6.8820448796835431704e-1,
+            7.49261777699216868776e-1,
+            9.1810564106098291326e-1,
+            5.76398022039051882714e-1,
+            -7.18292644429814219897e-1,
+            -3.57252551060416478901e-1,
+            1.17581335470338843585,
+            2.7821094326124373719e-1,
+            -8.44534144763702032677e-1,
+            1.96727088656227039332e-1,
+            1.14254268417511317679,
+            -4.62372386217198005909e-1,
+            -8.99476825498065735154e-1,
+            4.25439341429151407503e-1,
+            -3.43484224870486756775e-2,
+            3.93686210996247565319e-1,
+            -8.85782919857326489499e-1,
+            -4.40812491269304218555e-1,
+            3.87287269305921222351e-1,
+            1.07429656534996009754,
+            1.48676709897396147619e-1,
+            -3.77300954444149738709e-1,
+            4.48949255636989064122e-1,
+            2.96028504735641961876e-1,
+            1.21338821125827034386,
+            -1.04874149412230788236,
+            4.63598586562870340622e-1,
+            -3.79214475605911705003e-1,
+            -4.00520465848551721066e-1,
+            -9.65504511648215602015e-1,
+            5.50522541473826176883e-1,
+            4.14279169621071363672e-1,
+            -3.33341776562650973781e-2,
+            1.619246067571773251,
+            -8.3757562788375816698e-1,
+            3.56032515520577561019e-2,
+            -4.3716108961992333759e-1,
+            2.64826226575906042982e-1,
+            -1.58891933726248629766e-1,
+            -3.71487417616922499519e-1,
+            -2.14985550109210254988,
+            5.18573227322399521455e-1,
+            -7.95272521373306839898e-1,
+            1.56408577350088418001,
+            8.86166835794422680372e-1,
+            -5.16780546697507392473e-1,
+            8.64920271833780507365e-1,
+            1.16760373664889907652e-1,
+            8.3303183227151722523e-1,
+            1.64912822045130691428,
+            -4.18832300357043441075e-1,
+            -1.93298468677018026041e-1,
+            9.55466778642339087391e-1,
+            7.58327349511944359683e-1,
+            1.24421473255118231194,
+            7.5012389684588169636e-3,
+            -1.32130866593890994309,
+            -3.67649119149643488491e-1,
+            9.41686987347879700394e-1,
+            -9.33592296602142712736e-1,
+            -3.15908611856920273908,
+            5.79488701383138571366e-1,
+            7.24696662561304605354e-1,
+            1.41430252916001730767,
+            -9.21058223446747703633e-1,
+            1.89513028284688050951e-1,
+            -9.52937600456864597476e-1,
+            -1.52201948177269641427,
+            -8.50387379560609613094e-1,
+            -4.0208459280296976468e-1,
+            6.43993237765334902711e-1,
+            7.05169033228495223398e-1,
+            2.48554042529164666286e-2,
+            -1.99407141690319728022e-1,
+            -3.68299587091753533041e-1,
+            8.31456906429665965064e-1,
+            -1.65470312278705011799,
+            -7.80647641016399718161e-1,
+            -8.63712965812261784793e-2,
+            5.00693776226524326321e-4,
+            1.82704679582157303308,
+            -1.42912999325058742706,
+            3.55525042297425541982e-1,
+            -8.3598772853617309142e-1,
+            7.08069450153679502691e-1,
+            -1.15405687733154893593,
+            1.83119908209839876018e-3,
+            6.7892938840390359978e-1,
+            -6.71423826843054349922e-1
          ]
-         prettyName: "NonRESBGvbarnCC2pi"
-         systParamId: 63
+         prettyName: "NonRESBGvpCC1pi"
+         systParamId: 70
       }
-      NonRESBGvbarnNC1pi: {
+      NonRESBGvpCC2pi: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            3.25832315782934089921e-1,
+            -1.61784632865351607478,
+            1.19032723091535075355,
+            2.65357176177523301774e-1,
+            1.53490402857681385029,
+            1.43271968824411866095,
+            1.14427009207384289269,
+            1.90565496427089708931,
+            -8.62745989096666998641e-1,
+            9.55899962627353327882e-1,
+            -6.90999000444140309973e-1,
+            1.51053368762513163213e-3,
+            -9.54377035568547804623e-1,
+            1.12251637330823128558,
+            -8.44253241368400519917e-1,
+            3.73834019448808285713e-1,
+            2.22335372130181480044e-1,
+            9.33936035019697019521e-1,
+            1.14737470119996487483,
+            4.25264808604861183072e-2,
+            -1.02718262022685177803e-1,
+            -3.88675565494088215424e-1,
+            5.20440952248321764273e-1,
+            -2.01940136117495727675e-1,
+            -2.72987973388884519466,
+            -6.86050928762539785621e-2,
+            -9.6260219935876009667e-2,
+            -5.70914110112965667021e-1,
+            1.40939101330270682988e-1,
+            3.871421823466641432e-1,
+            2.14886501091821363607e-1,
+            -5.11098208184367797102e-1,
+            5.42725955695999018324e-1,
+            7.54825381166609354899e-1,
+            7.25320436872122664695e-1,
+            -3.54895517484615286019e-1,
+            -2.04130378835766235213,
+            -7.0084407724904618231e-1,
+            8.70093422837616981003e-2,
+            -8.76186775446116117294e-1,
+            2.63103597896000962475e-1,
+            -1.81740613083710411679,
+            -1.47237352033412816077,
+            -9.04736708200421180237e-1,
+            -1.20250338698922387692,
+            1.24660769096721502081,
+            -1.07775711338839386144,
+            1.49124694013762137956,
+            1.07277359476311007214,
+            6.45855576638300843406e-1,
+            1.10393590452836232174,
+            -1.11468811180698956775,
+            -4.10641382343934768784e-1,
+            -6.40619089788047602063e-1,
+            1.67556767779321402756,
+            3.07593634581440122933e-1,
+            4.74451727900815245498e-1,
+            -4.06935449917124270058e-1,
+            -8.05631344563989881813e-1,
+            2.48790647283374033449,
+            -5.46396717645246443595e-1,
+            1.72708888366079493792,
+            6.02225580626790102379e-1,
+            -1.03857419818767560127e-1,
+            -1.69216480445633710161,
+            8.91289880285445756947e-1,
+            1.59662738268089687832e-1,
+            9.87714321709469933452e-1,
+            -1.21248719362600079763e-1,
+            -1.09914130810804766547,
+            1.34330784771638866992,
+            -9.50545639122689078881e-1,
+            -2.05280294802415108624e-1,
+            5.84237270269550301727e-1,
+            4.08679938466656067497e-1,
+            -6.32937982744433913496e-1,
+            7.046058757673222539e-1,
+            4.6931704606691332371e-1,
+            -5.73681247270204530686e-1,
+            -1.54299961752812242466,
+            3.88177565196026086447e-1,
+            -1.64495422978291516714,
+            3.6097337458100275942e-1,
+            -2.709090201638444384e-1,
+            1.38812276556179803322,
+            1.35960651391662468157,
+            4.32755500036585000201e-3,
+            -7.36705765651916255621e-1,
+            -1.06030458208746680704,
+            -2.8234998280340761756e-1,
+            -9.6011259368757082e-2,
+            1.40100428937573751043,
+            2.33581152871005714999,
+            -2.17756979985699178348e-2,
+            2.65950095287957877233e-1,
+            1.24390733281139653776,
+            -1.77070531451938051326,
+            1.77758284637787339344e-1,
+            -4.21585187417431242474e-2,
+            -2.43977294943629630097
+         ]
+         prettyName: "NonRESBGvpCC2pi"
+         systParamId: 71
+      }
+      NonRESBGvpNC1pi: {
          centralParamValue: 0
          isRandomlyThrown: true
          oneSigmaShifts: [
@@ -3441,111 +5201,111 @@ generated_systematic_provider_configuration: {
             1
          ]
          paramVariations: [
-            8.93900597229840832014e-1,
-            -3.40793993881108731037e-2,
-            -1.68786370701439603081,
-            -7.14551401771276323283e-2,
-            4.86934275370024816088e-1,
-            -3.63287455923542335068e-1,
-            -8.78997942812081545227e-1,
-            -1.04310771900756216191,
-            -6.8292681350796557993e-1,
-            -6.27613043209215404339e-1,
-            2.55264756672410941807e-1,
-            3.51682693636027471351e-2,
-            1.13517871457508845445,
-            -1.81259073155760286333,
-            -2.07361895361292525308,
-            -3.66372164199838479259e-1,
-            1.33212093494812000571e-1,
-            -9.62536798027345930073e-1,
-            -7.93594123932061662474e-2,
-            3.95757913760942381387e-1,
-            1.21537978802989266036,
-            1.12370187452710168508,
-            -5.60871548733309133183e-1,
-            -5.21188053882276486339e-2,
-            -6.76220918088685563063e-1,
-            -3.10808177948275088376e-1,
-            -8.12330712389583764477e-1,
-            3.16081552136278087772e-1,
-            -4.32974535410559413506e-1,
-            1.50486979439842660788,
-            -8.30855389573482261412e-1,
-            -1.097637450258835079,
-            1.74655124726324317841,
-            2.10058748626033375828,
-            1.20061386157080798864e-1,
-            -1.335320058054980219,
-            1.37786617724164628385,
-            5.64593896292630570422e-1,
-            -4.12722802852441894572e-1,
-            7.22696178982275672098e-1,
-            9.91687549030072279521e-1,
-            -1.28402096734735371442,
-            3.39719512592797368011e-1,
-            1.1223311205440233973,
-            8.02656316940044245456e-1,
-            -2.70145535526450542019e-1,
-            4.90885024648025969363e-1,
-            7.97666304701779460551e-1,
-            1.55682240086160827985,
-            -9.08173017928244230568e-1,
-            -4.96511244996302891774e-1,
-            5.26128561844564024419e-1,
-            -3.95557370517860551473e-1,
-            -6.29942145796615893261e-1,
-            -3.96992386051716605877e-1,
-            -4.84913042798984506021e-1,
-            -6.98535553452806601271e-1,
-            8.77289358211507552809e-1,
-            -1.69010310382497097592,
-            -2.05135818261512614669,
-            -5.63146271360433492426e-1,
-            1.5563923545260855974,
-            8.15773968295011808749e-1,
-            5.00131377186810222035e-1,
-            1.81891895666055658509,
-            -7.41383496312022716168e-1,
-            -4.07639981373962623223e-1,
-            1.77585676281232962559,
-            4.94995639717285329517e-1,
-            7.89125654336513548959e-2,
-            -4.99083049863358659687e-3,
-            -1.18490699164941637456,
-            -1.01763810165335477631e-1,
-            8.53378833654015012122e-1,
-            -1.65458918030914781117e-1,
-            9.31339786446012007914e-1,
-            -1.12881868284842235006,
-            -2.53725086530675092433,
-            -6.00006670856059853847e-1,
-            9.21826404265294385709e-1,
-            -9.39238702809757519674e-1,
-            -8.0989061165802167519e-1,
-            -3.91656465768678574424e-2,
-            1.6132373352062814309,
-            1.06598714380019762848e-2,
-            -7.51849594644193874871e-1,
-            2.0498371430599640064,
-            1.03538067852925275147,
-            9.22882618162980783438e-1,
-            6.95775665902482187697e-1,
-            -1.1314989267721093924,
-            1.39818244148028614227,
-            9.19975531705310156649e-2,
-            -5.16130781677737071611e-1,
-            1.07479717525409435019,
-            6.18442922508259163017e-1,
-            -1.65527979823698129236e-1,
-            -1.7964425157387209353e-1,
-            1.19068356808753250675,
-            2.31437255624292115286
+            -1.42671453778882684205,
+            1.66808833696878733299,
+            -4.04369308249553846557e-2,
+            8.65746138236148654599e-1,
+            -1.19879519438615833593,
+            -1.01607240985235303121,
+            -2.41299096441223714926e-1,
+            3.25520946618962025987e-1,
+            -6.33187282897971326356e-1,
+            3.31059551952757491478e-1,
+            3.66108976533669749909e-1,
+            -8.28848993416765877917e-1,
+            6.80000523009632096283e-1,
+            1.79735847362056166965,
+            1.46379383495444792551,
+            3.01141676328741558777e-1,
+            -1.22360252222824955615e-1,
+            1.2349030965721297104,
+            -2.41163897756446393705e-1,
+            2.56045090601908220673e-1,
+            -2.68827423130562848108e-1,
+            -9.42860561809750058471e-2,
+            -5.15970466132545046989e-1,
+            -9.07543493402777290413e-1,
+            -4.90408129053196362168e-1,
+            -2.16336956964551990756e-1,
+            -1.08465391616863193747,
+            9.10683263678479376635e-2,
+            8.55831475072072023202e-1,
+            -3.77345834453731210356e-1,
+            5.98355975500599157613e-1,
+            1.73506983990726670886e-1,
+            -1.02400439730450809606,
+            6.62444927586803733455e-1,
+            -9.64924306468374570755e-1,
+            -1.26112126543987024263,
+            -1.53598070765473881938e-1,
+            -6.89934500206444284442e-2,
+            -2.93671495220886891175,
+            2.56390953744041923124e-2,
+            3.73863062679158197898e-1,
+            3.18856750860205151454e-1,
+            5.15755953452536441972e-1,
+            4.36191816269169807541e-1,
+            -1.30094580502774914699,
+            1.53979267714580869697e-1,
+            -6.6920217997649322772e-1,
+            2.20327653246450316793e-1,
+            1.06341767226426564541,
+            -1.68205526317363784905,
+            -4.26590602725183398736e-1,
+            -6.20285671502138535871e-1,
+            -1.4834932866180474461e-3,
+            -5.49418840543096198559e-1,
+            5.32712181279247243282e-1,
+            2.05515548096238225007e-2,
+            6.9493767104646908539e-1,
+            -4.52568544882718026834e-1,
+            -4.96890825081032994071e-1,
+            4.39364935539624107408e-2,
+            -6.58939787703802348773e-1,
+            -1.83775109864513663815,
+            1.39517656696599545718e-1,
+            5.4526620052457352994e-1,
+            -4.76844829461271491056e-1,
+            -1.32649158149472867763,
+            -1.1790446812481412131,
+            2.00417187406090402391,
+            9.28026848251413460922e-1,
+            1.22213383686973142694,
+            -3.81606350730852972308e-1,
+            -3.01645757558101912377e-1,
+            3.34302960642492208443e-1,
+            -3.39922956569112244551,
+            -7.35088470522057058076e-1,
+            -1.47796370023333878407,
+            -8.58892698326595427361e-1,
+            5.44922593584084347107e-1,
+            5.26348235065977609892e-1,
+            -1.17206277542324199814,
+            -9.63291704868316833732e-1,
+            8.88531029425842361347e-3,
+            2.06307379394838702469e-1,
+            6.82045323055010116464e-2,
+            1.16345254818406762531,
+            8.57501220742628245119e-1,
+            -5.46348051930338862725e-1,
+            2.10177720219072661223,
+            -4.40694899247870530701e-1,
+            -4.63918508052016953513e-1,
+            -6.09997652277216140249e-1,
+            -1.40072833879388913836,
+            -7.69090950566806319522e-1,
+            4.3399056552841153156e-2,
+            1.14966318416512103262,
+            7.29518033195411419456e-1,
+            -3.417003576452455893e-1,
+            1.81123749406776474169e-1,
+            -1.26361650666282399058,
+            1.4746336161490420924
          ]
-         prettyName: "NonRESBGvbarnNC1pi"
-         systParamId: 64
+         prettyName: "NonRESBGvpNC1pi"
+         systParamId: 72
       }
-      NonRESBGvbarnNC2pi: {
+      NonRESBGvpNC2pi: {
          centralParamValue: 0
          isRandomlyThrown: true
          oneSigmaShifts: [
@@ -3553,223 +5313,225 @@ generated_systematic_provider_configuration: {
             1
          ]
          paramVariations: [
-            6.59703296845596809383e-1,
-            1.18967147722833721524,
-            -3.00952588981685131841,
-            -1.13427673572954912373,
-            2.41160832372976891014e-1,
-            -1.48854464010010589803,
-            -2.61970401354705417774,
-            1.22602798830925241447,
-            -1.5355245318376273822,
-            1.3548684372469628201,
-            1.72892896753422675715e-2,
-            -1.23406420950993522823,
-            2.60493680568078200821e-1,
-            1.43576455360115673443,
-            5.12443908068766273978e-1,
-            -4.60024469691920456782e-1,
-            -4.83623765237640501624e-1,
-            -6.12944787265308765889e-1,
-            1.36108851815421494358,
-            1.83003895928241355762,
-            -1.31262385899052658189,
-            1.46433740535191869725,
-            1.25650374082166660372,
-            7.27658423735253356845e-1,
-            -4.90689844732437319141e-1,
-            -8.51156790497106241489e-1,
-            -6.74629894808050356581e-1,
-            -3.52561878382280757815e-1,
-            -1.00690814335867373508,
-            -6.23089525385267517521e-1,
-            -6.5989062020096234118e-1,
-            -6.69125568248525759429e-1,
-            -1.65470150445018338026,
-            -5.04961415570615357318e-1,
-            4.72980858289695660357e-1,
-            -2.94486943652424226769e-1,
-            -9.1287639900917338931e-1,
-            9.80958821601173536209e-1,
-            8.58172478810479200106e-1,
-            1.53246970839094470707e-1,
-            -1.83337295146926593237e-1,
-            6.4237622576459174617e-1,
-            -1.05647372444035858585,
-            -1.19763877142433372569,
-            6.24460736873490018795e-1,
-            -5.25101644253404831186e-2,
-            1.76515149073226407239,
-            -4.37605449182982848139e-3,
-            -1.45054791682934758335,
-            -1.54407009472079281842,
-            -4.78668357840411562432e-1,
-            -7.24366124181955672867e-1,
-            -5.83712112336004618207e-1,
-            3.39067285746627811172e-1,
-            -1.08359463612165862756,
-            -3.20529826258318051302e-1,
-            -5.13439017658653962251e-1,
-            -8.98846230331082129972e-1,
-            2.65817335618580785628e-1,
-            6.84108420933323913005e-1,
-            1.40364247938897879209,
-            4.59417242652299523398e-2,
-            -5.34147299474106551642e-1,
-            -1.57458290044369553229,
-            -1.15748754179182511415,
-            1.10044708776293242991,
-            3.24891800963376442546e-1,
-            1.08143398411554580996,
-            -7.83989880483869638894e-1,
-            2.17162863591556981602e-1,
-            3.01411943955074534962e-1,
-            9.82261420614782720939e-1,
-            1.20430798253845794399,
-            -4.76919558284767952649e-1,
-            1.17888663264120799323e-2,
-            6.81832349084657063365e-1,
-            1.06178006061668606108e-1,
-            -1.97690751647823836912,
-            1.49368902163144223749,
-            1.58873352788341554165e-1,
-            -7.47975387497780974666e-2,
-            -1.90481509023607897824,
-            4.95472052269454454887e-2,
-            8.04570251885439513551e-1,
-            2.61990319824956185979e-1,
-            2.5182928235770157821e-1,
-            -8.69144584895400806879e-1,
-            1.07926133274149016472,
-            1.33623778162881090559,
-            1.53215128123599109156e-1,
-            7.66970219716332612947e-1,
-            -1.31882864766161689296,
-            2.30570257024159230852,
-            -2.33423815469153889124e-1,
-            1.41019125477257611934,
-            -1.252817408374060415,
-            -4.9699657220344456432e-1,
-            1.17209352400703070707,
-            8.28817186141420775281e-2,
-            6.63196409865129399286e-1
+            -3.30219145732023100503e-1,
+            1.11315243977621558535,
+            9.20620260976484861004e-1,
+            2.68142671739933557973e-1,
+            6.43760423372641610307e-1,
+            2.05143322223005603044e-1,
+            1.48315719453559746732,
+            -1.12894389926231963894e-1,
+            5.69356391531890881907e-1,
+            2.08585049458894689067,
+            -2.36451597767730659072,
+            9.70830782686790239033e-1,
+            2.8127539342358339608e-2,
+            -4.61404327864005092685e-1,
+            5.67637524890329148164e-1,
+            9.24501620385687061798e-1,
+            -2.5457722186338695991,
+            4.98237344420984773485e-1,
+            -2.27942259544293657214,
+            3.44054348638178422726e-2,
+            4.50400124560967410337e-2,
+            -9.48292206790285696627e-1,
+            6.88823664074130481705e-2,
+            1.94454040220278523421,
+            1.77696760292237826429e-1,
+            -6.87990076124986416062e-1,
+            2.46860971102312687364,
+            7.94762950548677182816e-1,
+            -2.28836291446727280174,
+            -1.35466177850289515305,
+            9.84068718774874784394e-1,
+            1.44966407460922347417e-2,
+            -1.3120024442349544902,
+            5.41190871165413978083e-1,
+            -7.23430223643221959051e-1,
+            -5.11556555890086903093e-2,
+            3.08056124962888033814e-1,
+            -1.25574790720702544888,
+            9.04995513324829081725e-1,
+            1.69365763180545170208,
+            -9.69389738171112846921e-1,
+            4.79490985846396766679e-1,
+            -2.20888273646717703258,
+            2.76323123716168406183e-1,
+            -1.63008431840480860764,
+            4.01607905803997411454e-1,
+            -2.16619537422912378233,
+            -2.42713867536841876316e-1,
+            -1.17182959983026990791,
+            5.22651978633579594735e-1,
+            6.54525507713881737892e-1,
+            1.06456958106168220191,
+            -8.88901495710707756359e-1,
+            -1.06975876452064883049e-1,
+            1.1675456146713893979,
+            1.80591091695726596589e-1,
+            4.6038144607676095843e-1,
+            -1.47375024595468358951e-2,
+            -1.83158105225930262216e-1,
+            6.73082550997115336422e-1,
+            -2.1977645064039671996e-1,
+            6.78882122554479994214e-1,
+            7.6437501517252715022e-1,
+            2.94059954449588378811e-1,
+            -1.74550507149089839665,
+            2.49175208051028523881e-1,
+            1.15639794461868827824,
+            -4.73554033084490733074e-1,
+            9.69848033897711458984e-1,
+            5.68008465807378293277e-1,
+            -5.24531869331867572903e-1,
+            -1.15766550765546827328,
+            -3.7017991663916907652e-2,
+            -9.225666383692408129e-3,
+            -5.29532960402688712698e-1,
+            5.76778301774446486294e-2,
+            -1.70019403585291217773,
+            3.78584735551722950664e-1,
+            -6.59917137215759619373e-1,
+            7.86044701566701697892e-1,
+            -9.80914505162499894553e-1,
+            -1.69473912361863349174e-1,
+            -2.60555958267967180397e-1,
+            6.62122559964837376079e-1,
+            -3.86166830044872899652e-1,
+            -3.85558324160250265322e-1,
+            7.71053714523253885815e-1,
+            -5.01453996327493989327e-1,
+            -1.52010852663163920084,
+            3.0343654997329427836e-1,
+            6.97737427289560341315e-1,
+            -1.01869644380124024785,
+            3.45224853487440697108e-1,
+            2.12486632347209769556e-1,
+            -4.9037283036491963184e-1,
+            1.64872631838034744423e-1,
+            -9.3833567467008338614e-1,
+            -3.37189949992322823835e-1,
+            -1.53152423170163694971e-2,
+            -1.27327580650931904138
          ]
-         prettyName: "NonRESBGvbarnNC2pi"
-         systParamId: 65
+         prettyName: "NonRESBGvpNC2pi"
+         systParamId: 73
       }
-      NonRESBGvbarpCC1pi: {
+      NormCCCOH: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            5.5785198979947880904e-1,
-            7.29239821070120974866e-1,
-            4.28761738641903533686e-1,
-            5.51915545779653515801e-1,
-            -1.13874452720082230961,
-            -5.64813301588044325285e-1,
-            3.04248531230259688929e-1,
-            -8.09765299133478944071e-1,
-            1.06668367120433024708e-1,
-            -8.42389116708627261332e-2,
-            2.84820883602903640597e-1,
-            1.02614487775196328023,
-            1.30639114684905388586,
-            -1.19677218353113667959,
-            -4.32033518858073839475e-1,
-            -1.08243238237569228133,
-            8.29618618760650794464e-1,
-            -6.33634676049072642634e-1,
-            2.06591931766957603855,
-            4.66965724021061456828e-1,
-            -9.98414594017957623961e-1,
-            1.29484899968466171671,
-            -4.24233379200523452734e-1,
-            -1.17528036679159009203,
-            3.84484453992178232262e-1,
-            1.63473137120576295089,
-            -1.50851236230280100203e-1,
-            8.28390152960362557977e-1,
-            4.11390698815161881541e-1,
-            1.52572568242483863621,
-            2.13485289144531409367e-1,
-            2.72982243202131436011e-1,
-            -8.18206944536390756717e-1,
-            -7.67336689449193559698e-2,
-            -3.67368824321052611648e-1,
-            1.12568433366332576462,
-            4.94453040364354001746e-1,
-            -7.29401378119286958324e-1,
-            -8.43938087326181474168e-1,
-            -8.60145751620313481212e-1,
-            4.16872429002450750612e-1,
-            -1.77111093322697782382e-1,
-            1.43570157126332614839e-1,
-            -1.66530421739742151566,
-            4.91290852356666252199e-1,
-            -6.70369467752582992581e-1,
-            1.75240299129666166067,
-            -1.94693639723785127948,
-            1.25522277334714577046e-1,
-            -2.30398062369811251759e-1,
-            1.37985309820004076187,
-            1.62611219610431900762e-1,
-            5.83928219044444030139e-1,
-            1.73916725985540665533,
-            4.47093396032285816943e-1,
-            -7.2537179805016249734e-1,
-            -2.28718084406731386737e-1,
-            -8.49934357479208646424e-1,
-            -2.55152345499015398289,
-            -1.74336304410918546681e-1,
-            7.99301471187440076838e-2,
-            -5.64910446747588279592e-1,
-            -3.44695980753148334408e-1,
-            1.42428832425646989535,
-            9.11953178736546798966e-1,
-            -1.11277899556225334798,
-            9.66459945984755597337e-1,
-            1.29791011525127897297e-1,
-            -1.07674922101271941521,
-            2.91138256116830862474e-1,
-            -1.27169172591378276671e-1,
-            -5.00170676686876092276e-1,
-            -5.33101537210393106037e-1,
-            4.17152263785150800857e-1,
-            6.29512457565917782354e-1,
-            5.10824983042709623859e-1,
-            -7.14578801951039066509e-1,
-            1.15008986001856827741,
-            -5.33947183121380342108e-1,
-            1.75848361257500007682,
-            7.61192822771865729159e-1,
-            -1.89694386428871430983e-1,
-            1.03982517591576373306,
-            -1.95084466509573206672,
-            2.16957035864474456766e-1,
-            -1.61980654704901055885e-1,
-            6.45382474120336224743e-1,
-            -2.43162957409308572165e-1,
-            -1.44889146248859912447,
-            4.8003409726170692684e-1,
-            4.97896567488953278868e-1,
-            6.9395479433196272101e-1,
-            3.09728519612611885581e-1,
-            -2.04318733256941165166,
-            -7.52753409503356674115e-1,
-            1.32502144272766991806e-1,
-            5.11351428048257394821e-1,
-            -2.62339980108095283118e-1,
-            -5.36366066258795681776e-1,
-            -1.04399595998198857494
-         ]
-         prettyName: "NonRESBGvbarpCC1pi"
-         systParamId: 58
+            2.66220258998417991236,
+            4.16100479259833400114e-1,
+            -1.4975973374202620203,
+            2.73216283952510338717e-2,
+            3.34949037184910158871,
+            8.41630572683134348111e-1,
+            -2.02345963281704843695e-1,
+            1.80281036126367677497,
+            1.00548540487898629969,
+            3.28822256663582945801e-1,
+            -3.957652143918549692e-1,
+            7.23977711105986743156e-1,
+            8.7723171523124232607e-1,
+            1.03934726854546144459,
+            -1.82211299002633975164,
+            4.49949264771230927895e-1,
+            -1.24852989497072619507,
+            -1.91921587524574804862e-1,
+            9.71913362058628327311e-1,
+            -4.54003358771337905964e-1,
+            1.7174440147966385517,
+            1.11455998030081082639,
+            3.7370104636371764828e-1,
+            7.6430109030013260174e-1,
+            -8.13472384517218816136e-1,
+            6.71246251748536804094e-1,
+            1.10937489528874846934e-1,
+            2.3549949053889491779,
+            -3.26007359919167793993e-1,
+            -7.47673088529816176617e-1,
+            6.29681838800224769059e-1,
+            -3.66816115324629266059e-1,
+            -6.98486082555978993192e-1,
+            -5.55538093691602008484e-1,
+            1.05968578187985840167,
+            -1.73329735243950078249,
+            -4.61430843140415491987e-1,
+            3.5885002548762873209e-1,
+            -6.00173879826853759467e-2,
+            1.48609684997714386334,
+            4.68779556718470602483e-1,
+            -2.94625170420807491745e-1,
+            1.59452686008894328751,
+            -1.1178176441409013453,
+            2.14250975893515827053,
+            7.1842638548584247804e-1,
+            -1.56883046842686924016,
+            -1.22990041775421521386,
+            8.59331205223051841635e-1,
+            -3.16421728452532455278e-2,
+            -1.680746847692208501,
+            -1.52702882990743482594,
+            -7.35427634267797003531e-1,
+            1.13364567899749379976,
+            8.15850786997084354013e-1,
+            -1.42276683317232068016e-2,
+            -1.30283546562308838457e-1,
+            2.28936211533025540943e-1,
+            2.20741509586327405712e-1,
+            7.22329423425623451394e-1,
+            -1.38247187531865756149,
+            3.5621453776262218538e-1,
+            -1.399202605892903295e-1,
+            -7.25333324656128319852e-1,
+            3.39763255591008839218e-1,
+            7.15556871621169987563e-1,
+            -3.39631919298166995436e-1,
+            -1.71984620004243482505,
+            -4.18527015083216324953e-1,
+            3.29434336522673909542,
+            -4.50347562795185632489e-2,
+            -1.61075966435148876243,
+            5.57281660240946385976e-1,
+            -1.7937803366722391285,
+            1.0457180176468762467e-1,
+            -3.10192445667103966489e-1,
+            1.49980586796479270495e-1,
+            -1.0047127671257152226,
+            -1.17921484486711067308e-1,
+            2.89723665652637796253e-1,
+            -8.86480048569700307404e-1,
+            -3.04432632813213976952e-1,
+            -9.66014768762851638861e-1,
+            -9.01801584087867591499e-1,
+            -6.9511765118728485735e-1,
+            1.69297513705706892395e-1,
+            -3.36930242456864981193e-1,
+            9.80672312241804733368e-1,
+            6.53593258694424195099e-1,
+            -5.79920445029394437952e-1,
+            -2.90635190674960797175e-1,
+            -4.93373961355420762032e-2,
+            -3.80152894083224446309e-1,
+            -2.65352259429331771567e-1,
+            -3.94972626842061635966e-1,
+            7.49421194083217390158e-1,
+            -1.11069263242952653847,
+            -2.09995614829967452986e-1,
+            -3.94825714720435261285e-1,
+            7.10718007930561834762e-1
+         ]
+         prettyName: "NormCCCOH"
+         responseParamId: 88
+         systParamId: 89
       }
-      NonRESBGvbarpCC2pi: {
+      NormCCMEC: {
          centralParamValue: 0
          isRandomlyThrown: true
          oneSigmaShifts: [
@@ -3853,371 +5615,149 @@ generated_systematic_provider_configuration: {
             -1.52794031940831787075,
             2.19647316195977243547e-1,
             -4.68480112514331581419e-1,
-            -9.66067102138216782237e-1,
-            3.26525858656582179673e-1,
-            5.14436859997139173117e-1,
-            1.61437742101763581637,
-            -4.70270188174213621402e-1,
-            -1.11502612774825871078,
-            1.30489632563101976004,
-            -6.42003808655091434687e-1,
-            -8.56764169228447336479e-1,
-            1.91509980868299356516,
-            1.06442359447853163168,
-            -2.85609066546957945931,
-            7.2175567481253433133e-1,
-            -2.92798519731033324298e-1,
-            -7.8723454685887561677e-1,
-            5.72474684307489267709e-1,
-            1.16288831986725051115e-2,
-            6.69295992536710349086e-1,
-            2.22389260179469561152,
-            -2.48504207260333287444e-1,
-            1.29365144583492219788,
-            7.44417302794399549093e-1,
-            6.18272799411339543663e-2,
-            5.97667433444098339379e-1
-         ]
-         prettyName: "NonRESBGvbarpCC2pi"
-         systParamId: 59
-      }
-      NonRESBGvbarpNC1pi: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            2.96470660337833091802e-1,
-            -8.10594182554877140667e-1,
-            1.3101092289127478363,
-            -1.53456537693142691658,
-            2.03117314108433033581,
-            3.41376162207267130899e-1,
-            -7.70329705923946228552e-1,
-            -8.31198913218630264232e-1,
-            3.60772391797067881747e-1,
-            -3.09740473713968310354e-2,
-            3.0280540499383341857e-2,
-            5.87379227581908414102e-1,
-            5.93086801034818145162e-1,
-            -3.95981775876490138533e-1,
-            -9.13198704820613937905e-1,
-            -1.29495937010424766456,
-            -1.18017577263421125089,
-            -2.75200270568977223284e-1,
-            -1.29070579797653928189,
-            -1.78124182777710776682e-1,
-            4.50185086575977777557e-1,
-            1.80784813169332791993,
-            1.66506283419908940324,
-            -1.10584186596654410195,
-            4.45998008701020076661e-1,
-            1.36668109471948850953,
-            -3.36170171766535796909e-1,
-            -2.72482035109573528242e-1,
-            9.3351912459183894466e-1,
-            -6.71818353629352604806e-1,
-            6.51408844824012844832e-1,
-            -4.08666330274187694638e-1,
-            1.60682215423235064122,
-            7.26097062974406459723e-1,
-            1.44192399551154015747,
-            -4.35325214970536444881e-1,
-            3.54770636585645615657e-1,
-            1.1433553426844689227e-1,
-            -5.23805500372201415793e-1,
-            1.71969693728130534893,
-            1.59427361804503320286,
-            4.37807060999818656311e-2,
-            6.99875571403486829158e-2,
-            8.19473397112675638887e-1,
-            -2.34408241495179137104e-1,
-            4.89410478556111916415e-1,
-            1.65517398951283500885,
-            1.42509262411091186529,
-            1.366018811307012637e-1,
-            9.32966339741285066722e-1,
-            -1.83912527214489296412,
-            8.92715430925907493798e-2,
-            -1.21121669779445184645,
-            -5.05104770083396270586e-1,
-            -7.13706011169990772736e-1,
-            -1.85500567882312750179,
-            4.43795849650823248655e-1,
-            -5.07332038093360804254e-1,
-            -7.30549085983337120886e-1,
-            -4.24398088498501357968e-1,
-            -1.94852149953439440777e-1,
-            -9.00974252570921896321e-1,
-            -1.2209093265027268771,
-            1.51367319695286361991,
-            -1.35941206466858055535,
-            3.62411970713727160653e-1,
-            -1.52334161825157266001,
-            1.21975003205202181533,
-            6.08532489451000024872e-1,
-            -6.6105279411227058084e-1,
-            3.32895020683008427409e-2,
-            5.97785311619204104416e-2,
-            2.8968651838127784659e-1,
-            -4.1630004776863249738e-1,
-            -5.93688697780178853414e-1,
-            -6.18189629555044861675e-1,
-            9.20465659435917737952e-1,
-            1.93035530820123679696,
-            1.29563669721196195184,
-            -1.22245781300435529815,
-            -6.17544920304067157524e-1,
-            -4.81985845288896097571e-1,
-            7.25582864513069414336e-1,
-            8.03466636157416425057e-1,
-            -1.60535721474508297213,
-            -1.47669473987737909226,
-            9.25189064768240143621e-1,
-            1.03811263756937743885,
-            2.04105193705586135389e-1,
-            -2.43601970159709774189e-1,
-            -1.03740251885210937877e-1,
-            8.80637539261902135834e-1,
-            -7.36416641293101692511e-2,
-            4.12610499726539445287e-2,
-            5.00204932558875048354e-2,
-            3.0084499015765692187e-1,
-            1.15758603885636990327,
-            -1.18358054973549786659,
-            1.52958335729485361831,
-            -6.14300039443016809848e-1
-         ]
-         prettyName: "NonRESBGvbarpNC1pi"
-         systParamId: 60
-      }
-      NonRESBGvbarpNC2pi: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            -1.31830734620609146823,
-            1.10035056831099975483,
-            1.85758840927121848807,
-            -3.69564300135411694104e-1,
-            -1.54254756114175939352,
-            -9.48255493785988945454e-1,
-            7.90323841133435900375e-1,
-            -1.27272962516246357367,
-            -2.5480462339264348115e-1,
-            -2.23469446879114475024,
-            9.28618551389043922484e-1,
-            4.57706018471900177857e-1,
-            -1.40338149028561565146,
-            1.07370372225800148058,
-            -1.08856511213068762878,
-            -2.6870556880948606171,
-            -1.87265369376483414854e-1,
-            5.27612755933921762086e-1,
-            1.24742454275039094114,
-            -3.72442533128102604145e-1,
-            1.48190192817762156352,
-            1.9281618507438400556,
-            -8.49591066414760565095e-1,
-            1.13666165164454113778,
-            5.69652910299861536814e-1,
-            -1.22542019790904355148,
-            8.38968713514492425709e-1,
-            -7.12516164384626171646e-1,
-            -3.45674446995675788141e-1,
-            1.11988925680863626866,
-            -1.12734047193865327685,
-            1.2003222517408540515,
-            -8.47652017270675295357e-2,
-            -6.22994812270764031226e-1,
-            1.83229883378058833188,
-            -2.88535110280298823238e-1,
-            1.40073159651676770743,
-            6.57332860842933408563e-1,
-            1.56186419597242842627,
-            -3.31221329847721623896e-1,
-            -1.46092753151810939016,
-            3.42590345233465543018e-1,
-            1.03749707697983484245,
-            -1.17142991896815673591,
-            -1.08767796829255125601,
-            9.63764417524251015834e-1,
-            1.30132279302398812248,
-            -9.12552729950242391688e-1,
-            8.26130941031895937865e-2,
-            -9.39818109443395943714e-1,
-            -1.82575848622093128704,
-            3.3847156679470241647e-1,
-            -1.33147178251832376539,
-            1.73582854735794683831e-2,
-            -1.8429985830546347092e-1,
-            3.30899947687665840768e-1,
-            1.82331584308701533104,
-            6.23044047854046309509e-2,
-            -9.9783151494923727487e-2,
-            -4.90526595562749911927e-1,
-            1.32483295547793700209,
-            -1.27146891006076967479,
-            2.02295976690122980557,
-            5.74790582362922908288e-1,
-            -9.74907907724058109267e-1,
-            -1.1298823858337352366,
-            -1.60876159970351040318e-1,
-            -4.0573404681482472256e-1,
-            -3.46000534501267109633e-1,
-            -1.5689784887816233816,
-            2.02180721835601762137,
-            5.93776291751144214004e-1,
-            8.3164791964567552629e-1,
-            -2.45263003984030447668e-1,
-            7.64555371238844982962e-1,
-            1.80690853776332205349,
-            -1.79855217197537320395,
-            -1.47629485408772143096,
-            6.03909648587513170348e-1,
-            -1.94007244788918042921,
-            -1.06684797877868953186,
-            -9.9962219397965046408e-1,
-            -9.40362502477903872133e-1,
-            -1.32855805052945613598e-1,
-            -8.03391293175861775921e-1,
-            8.25053274436755357257e-1,
-            4.04831009440987099612e-1,
-            -2.17724962651236170208e-1,
-            -3.93148268069554218673e-1,
-            2.8263967272463914604,
-            6.29629012536342069772e-1,
-            5.78781387494970434027e-1,
-            -5.31533762327965675354e-1,
-            2.97887566730829778106e-1,
-            8.72990554034480559231e-1,
-            -5.15456143257834842331e-1,
-            8.94357369202288365884e-1,
-            6.44176542353276815334e-1,
-            -1.35337651058664332204,
-            -1.73400232764712947109
+            -9.66067102138216782237e-1,
+            3.26525858656582179673e-1,
+            5.14436859997139173117e-1,
+            1.61437742101763581637,
+            -4.70270188174213621402e-1,
+            -1.11502612774825871078,
+            1.30489632563101976004,
+            -6.42003808655091434687e-1,
+            -8.56764169228447336479e-1,
+            1.91509980868299356516,
+            1.06442359447853163168,
+            -2.85609066546957945931,
+            7.2175567481253433133e-1,
+            -2.92798519731033324298e-1,
+            -7.8723454685887561677e-1,
+            5.72474684307489267709e-1,
+            1.16288831986725051115e-2,
+            6.69295992536710349086e-1,
+            2.22389260179469561152,
+            -2.48504207260333287444e-1,
+            1.29365144583492219788,
+            7.44417302794399549093e-1,
+            6.18272799411339543663e-2,
+            5.97667433444098339379e-1
          ]
-         prettyName: "NonRESBGvbarpNC2pi"
-         systParamId: 61
+         prettyName: "NormCCMEC"
+         systParamId: 59
       }
-      NonRESBGvnCC1pi: {
+      NormNCCOH: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            -2.65353127892004381216e-1,
-            7.61949548030397494358e-1,
-            -2.04111915405827115677,
-            2.51884494485683840814e-1,
-            -8.75488362879044856868e-1,
-            -4.74698073146430421509e-1,
-            9.3782781343063448265e-2,
-            -3.07696750882536695926,
-            -1.37750744484974263493,
-            1.20818951987998435271,
-            1.58002662471260024724,
-            -7.39941987339103657284e-1,
-            -1.88518272426173028045,
-            -1.29066120141910850583e-1,
-            -2.17783905139434796894e-1,
-            -6.7000318876059883344e-1,
-            -2.96539694944854825831e-1,
-            -4.58460372411752248301e-1,
-            1.33469782418532867396,
-            1.05515491696908925157,
-            -2.99960354238912804692e-2,
-            5.60897784116980879787e-1,
-            2.84695880787662669587e-1,
-            8.73774965440023088092e-1,
-            9.38819811957932515156e-1,
-            -1.94413964965127283868,
-            1.94257768936824759543,
-            -1.96191537943098154306e-1,
-            7.20988218950873616109e-1,
-            -1.59675344960519993709e-1,
-            -5.93457919169904091206e-2,
-            -1.52459559020837120968,
-            1.78309083811810520359,
-            -1.77032596761844618349,
-            -4.70902332419395275309e-1,
-            1.98920557967910749397,
-            4.53877759007684178361e-1,
-            -1.30517557889026636353,
-            -5.29889827261651791268e-1,
-            1.60652835307454711078,
-            -6.7098251096936761817e-2,
-            1.70953750335897852741e-1,
-            -2.34085713913698784117e-1,
-            -1.1203577787291146492e-2,
-            8.9023963951237472525e-1,
-            -6.38327856732716414356e-1,
-            -1.59486637218163473939,
-            1.30872140990869034738,
-            1.91736429694922633216e-1,
-            -6.94844912018092064621e-1,
-            -1.16732946043339635978,
-            -2.41185482215779817272e-1,
-            -1.42440524142019309117,
-            1.85211362048604644137,
-            9.37426590943800097655e-2,
-            1.31830825100379001036,
-            6.45597891684733915518e-1,
-            -4.29676068471114558367e-1,
-            -4.94192017244413972499e-1,
-            1.14560904854908857109e-2,
-            3.80955826860341961737e-1,
-            5.55351493534771978311e-1,
-            7.32568100468229510547e-1,
-            -2.29590032070154853594e-1,
-            8.69297011254385187939e-1,
-            -4.58130489066087609462e-1,
-            -6.27620227019938470292e-1,
-            -4.04243935395971643043e-1,
-            4.34105411453229672603e-1,
-            -7.18553299717936022617e-1,
-            -7.52791357306079933487e-1,
-            -1.33219865407564386217,
-            -9.38664545932450855581e-1,
-            -1.3087245641118327999,
-            5.05170906231730554303e-2,
-            1.94463790997067142996,
-            -8.96945932646982968528e-1,
-            1.51581073863489040887e-1,
-            -3.26598475563602774763e-1,
-            7.63818664429650670544e-3,
-            5.75017803733140819844e-1,
-            4.11646961013841572452e-1,
-            -1.32444578086908726355,
-            1.86046289259350716705,
-            6.19875327112026752729e-1,
-            -6.77010128028027846625e-1,
-            -5.7588088655796398907e-1,
-            -5.59674013666018876911e-1,
-            1.71522565887630862314,
-            9.57888064733693811448e-1,
-            1.54431657080503192958,
-            -1.55407964082502392245,
-            9.03467698094237103845e-1,
-            9.43751255122868948355e-1,
-            -1.83848829978582850586,
-            -6.88166977554014014373e-1,
-            8.34827542514208653657e-1,
-            5.39272474088247966151e-1,
-            -6.21426888632986562655e-1,
-            1.15498321764908218334
-         ]
-         prettyName: "NonRESBGvnCC1pi"
-         systParamId: 54
+            4.87907148627514053452e-1,
+            4.07503448532938128412e-1,
+            1.276663871309211995,
+            1.90543709986334935946e-1,
+            5.61546162209196730863e-1,
+            7.41295965227720232704e-1,
+            1.65138900582912986903e-2,
+            -6.28175893916217420454e-1,
+            -1.60272432731557112895,
+            4.98226416290847129442e-1,
+            -1.31926067900679555578,
+            -2.45928768113814005813e-1,
+            -5.60025419532159229874e-1,
+            4.0849942207892858681e-1,
+            -1.33473074732933638664,
+            9.1530500403624248662e-1,
+            3.38826666613993368604e-2,
+            1.37576461836996094545e-1,
+            1.10100272044211511258,
+            -1.48439311099085635703,
+            1.5764774559845038393,
+            -1.24199633193711544976,
+            -1.10944743708698756457,
+            3.36225471881499760052e-1,
+            -1.69260632380808329067,
+            -1.03786593191943410375,
+            9.65307118390744567371e-1,
+            -1.01656144786426749782,
+            7.36530654112061533567e-1,
+            1.31030322910956814608e-1,
+            3.55843870056380545686e-2,
+            4.27452335424325258195e-1,
+            -1.1992579424644251862,
+            -1.71056906096104333059,
+            -4.44094364149351591986e-2,
+            6.24675913981893482507e-1,
+            -7.45248131070578190283e-1,
+            1.51908636528722906789,
+            -1.01244344659066620729,
+            -3.21923288986815214763e-1,
+            4.74366831002252908878e-1,
+            -2.5877073241863135511e-1,
+            -3.45511276796985400406e-1,
+            -3.80894710494671773215e-1,
+            4.41179412608527721229e-1,
+            9.19310170820639371847e-1,
+            2.80198891486637291504e-1,
+            -8.09084772676532226754e-1,
+            -1.85190941168201694822,
+            -3.48450688859288596616e-3,
+            1.55035412289448104595,
+            5.17287755152193606811e-1,
+            -8.90703734544825653785e-1,
+            -2.03340642567247709138,
+            1.17748569674520764394,
+            1.70421288996951836303,
+            -2.08487258540904463189,
+            6.27376200531952088468e-1,
+            -4.98656103937569650242e-1,
+            1.59885119165861677715,
+            -1.87524977565141992564,
+            1.41735513941921098535,
+            2.04861982618230659137e-1,
+            4.4070673484282602006e-1,
+            5.33964983633452350276e-1,
+            -1.52407015530213030274,
+            -9.02997716441564651779e-2,
+            -1.22901867291263476589e-2,
+            4.8155937135433402041e-1,
+            1.52705037165097490259,
+            -9.98737667500135040122e-1,
+            3.4808598549707864267e-1,
+            1.24088459547745055822,
+            4.69698820528215488235e-1,
+            7.18140570366990194096e-1,
+            1.31509175722819993126,
+            1.94421390581567848921e-1,
+            5.65837460789296198271e-1,
+            -1.44204458441467980867e-1,
+            -2.69889914501181160666e-1,
+            1.79121452298179772988,
+            -6.58176537127889843548e-2,
+            5.78434080780847681424e-1,
+            1.85454653136874414443,
+            6.86937965387249604987e-1,
+            -1.88868968688749777618e-1,
+            -1.95771373315751584521,
+            8.30831760549809006378e-1,
+            8.35388439041240937755e-1,
+            -3.22369829907033389471e-1,
+            1.91563313547816060911,
+            -1.24787038184146537034,
+            2.4364966602587077027,
+            2.5092905734873656165,
+            5.90188660563260691916e-1,
+            -1.95504483073957535666,
+            2.05610944596087996672,
+            1.18352347258472834213,
+            2.22262438051584534926e-2,
+            1.43814587061640380972e-1
+         ]
+         prettyName: "NormNCCOH"
+         responseParamId: 88
+         systParamId: 90
       }
-      NonRESBGvnCC2pi: {
+      NormNCMEC: {
          centralParamValue: 0
          isRandomlyThrown: true
          oneSigmaShifts: [
@@ -4225,111 +5765,111 @@ generated_systematic_provider_configuration: {
             1
          ]
          paramVariations: [
-            1.57667260416952181856,
-            -2.34663728688710992998,
-            -1.40856810028031596838e-2,
-            -9.24647718675356833362e-2,
-            -1.46995818677501866034,
-            -1.36196990023590064345e-1,
-            6.60653673373411964853e-1,
-            2.58982332911597445957e-1,
-            9.93990310350777866999e-2,
-            -4.13095075758972030133e-1,
-            -2.15572439497466650238,
-            1.84703958802770379366e-1,
-            -1.43996413248577792565,
-            4.26040238207540528093e-2,
-            2.25373265531945005113e-1,
-            -1.49627007504628262158e-1,
-            1.35257729024652428862,
-            2.33544483907774313991,
-            -4.193956946533898833e-1,
-            7.1405140588789151046e-1,
-            5.5646229053902995787e-1,
-            6.91478542987449484869e-1,
-            6.56825873468414589418e-1,
-            -9.92616442274037516502e-3,
-            -1.21960389381864064973,
-            -2.86846728147253893226,
-            -1.24352563763401979813,
-            -1.26845263645624650728,
-            1.44523426471334115462,
-            2.72557759650068176516e-1,
-            -9.54644458487457381324e-1,
-            -6.96304444946387879334e-1,
-            -7.20775654182279290616e-1,
-            1.70679601105847500442,
-            -8.07443082035758985526e-1,
-            3.32929226427131075283e-2,
-            -6.39333422141059259936e-1,
-            6.73778144061583317281e-1,
-            5.72862952799025437756e-1,
-            -7.6922357580315481318e-1,
-            -4.28192931105489171806e-1,
-            1.67166840475696809598,
-            6.76003848335391677171e-2,
-            1.47026688876196742761,
-            -7.34983173097723652134e-1,
-            2.79646654077533085569e-1,
-            1.34193728094616582247,
-            3.89011659459263081651e-1,
-            -1.7412570337058003167e-1,
-            5.46719685524843845847e-1,
-            1.8195055849216470456,
-            6.1955271321022109543e-1,
-            -7.02129262935715314775e-1,
-            -9.77734943639435721829e-2,
-            8.44790139790579930335e-1,
-            -8.26627777068386082604e-1,
-            -1.31259581461504848399e-1,
-            9.10855241777955182414e-1,
-            -1.22923546495818478141e-1,
-            2.8917404231867638309e-1,
-            1.47237607942112069814,
-            7.64434023735217405005e-1,
-            2.17431148845969790528,
-            6.68099993423381777191e-1,
-            -9.65078751092685926949e-1,
-            1.14520018333291262458,
-            -1.2118557899166195746,
-            -3.73167137703515339187e-1,
-            -4.0614881500531579972e-1,
-            4.78088877327848049692e-1,
-            1.01675690815826769153,
-            1.57575528320809038485e-1,
-            -1.45000306774554693634e-1,
-            -1.96583232467493607132,
-            6.35653136065823104461e-2,
-            1.06744463070922512848,
-            1.48058480520779567335,
-            -9.48110445672709856169e-1,
-            -1.22258693485630476339,
-            -3.53267250673760579982e-1,
-            -1.18975969059613317924,
-            5.21989881739310934705e-1,
-            1.12251248520624802296,
-            -1.08827771268880657551,
-            2.21332426207836274745e-1,
-            -5.51495829778529955689e-1,
-            -1.17933189507226171555e-1,
-            -6.21464981324781229333e-1,
-            1.05019713533468173061,
-            -8.88517164097138545387e-1,
-            6.06438975217205356039e-1,
-            -6.91804281071440541062e-1,
-            8.52032411441338788372e-1,
-            8.27239263520658907325e-1,
-            -1.36817720800476583243,
-            5.63163214618165985925e-1,
-            7.02172026316870423468e-2,
-            7.87185682169022848953e-1,
-            3.07681521315566419705e-1,
-            1.09959141556711093024
+            2.96470660337833091802e-1,
+            -8.10594182554877140667e-1,
+            1.3101092289127478363,
+            -1.53456537693142691658,
+            2.03117314108433033581,
+            3.41376162207267130899e-1,
+            -7.70329705923946228552e-1,
+            -8.31198913218630264232e-1,
+            3.60772391797067881747e-1,
+            -3.09740473713968310354e-2,
+            3.0280540499383341857e-2,
+            5.87379227581908414102e-1,
+            5.93086801034818145162e-1,
+            -3.95981775876490138533e-1,
+            -9.13198704820613937905e-1,
+            -1.29495937010424766456,
+            -1.18017577263421125089,
+            -2.75200270568977223284e-1,
+            -1.29070579797653928189,
+            -1.78124182777710776682e-1,
+            4.50185086575977777557e-1,
+            1.80784813169332791993,
+            1.66506283419908940324,
+            -1.10584186596654410195,
+            4.45998008701020076661e-1,
+            1.36668109471948850953,
+            -3.36170171766535796909e-1,
+            -2.72482035109573528242e-1,
+            9.3351912459183894466e-1,
+            -6.71818353629352604806e-1,
+            6.51408844824012844832e-1,
+            -4.08666330274187694638e-1,
+            1.60682215423235064122,
+            7.26097062974406459723e-1,
+            1.44192399551154015747,
+            -4.35325214970536444881e-1,
+            3.54770636585645615657e-1,
+            1.1433553426844689227e-1,
+            -5.23805500372201415793e-1,
+            1.71969693728130534893,
+            1.59427361804503320286,
+            4.37807060999818656311e-2,
+            6.99875571403486829158e-2,
+            8.19473397112675638887e-1,
+            -2.34408241495179137104e-1,
+            4.89410478556111916415e-1,
+            1.65517398951283500885,
+            1.42509262411091186529,
+            1.366018811307012637e-1,
+            9.32966339741285066722e-1,
+            -1.83912527214489296412,
+            8.92715430925907493798e-2,
+            -1.21121669779445184645,
+            -5.05104770083396270586e-1,
+            -7.13706011169990772736e-1,
+            -1.85500567882312750179,
+            4.43795849650823248655e-1,
+            -5.07332038093360804254e-1,
+            -7.30549085983337120886e-1,
+            -4.24398088498501357968e-1,
+            -1.94852149953439440777e-1,
+            -9.00974252570921896321e-1,
+            -1.2209093265027268771,
+            1.51367319695286361991,
+            -1.35941206466858055535,
+            3.62411970713727160653e-1,
+            -1.52334161825157266001,
+            1.21975003205202181533,
+            6.08532489451000024872e-1,
+            -6.6105279411227058084e-1,
+            3.32895020683008427409e-2,
+            5.97785311619204104416e-2,
+            2.8968651838127784659e-1,
+            -4.1630004776863249738e-1,
+            -5.93688697780178853414e-1,
+            -6.18189629555044861675e-1,
+            9.20465659435917737952e-1,
+            1.93035530820123679696,
+            1.29563669721196195184,
+            -1.22245781300435529815,
+            -6.17544920304067157524e-1,
+            -4.81985845288896097571e-1,
+            7.25582864513069414336e-1,
+            8.03466636157416425057e-1,
+            -1.60535721474508297213,
+            -1.47669473987737909226,
+            9.25189064768240143621e-1,
+            1.03811263756937743885,
+            2.04105193705586135389e-1,
+            -2.43601970159709774189e-1,
+            -1.03740251885210937877e-1,
+            8.80637539261902135834e-1,
+            -7.36416641293101692511e-2,
+            4.12610499726539445287e-2,
+            5.00204932558875048354e-2,
+            3.0084499015765692187e-1,
+            1.15758603885636990327,
+            -1.18358054973549786659,
+            1.52958335729485361831,
+            -6.14300039443016809848e-1
          ]
-         prettyName: "NonRESBGvnCC2pi"
-         systParamId: 55
+         prettyName: "NormNCMEC"
+         systParamId: 60
       }
-      NonRESBGvnNC1pi: {
+      RDecBR1eta: {
          centralParamValue: 0
          isRandomlyThrown: true
          oneSigmaShifts: [
@@ -4337,111 +5877,223 @@ generated_systematic_provider_configuration: {
             1
          ]
          paramVariations: [
-            -1.50197848258609090166,
-            -1.48747215662368614808,
-            -1.48144120597425121844,
-            -4.18626183842879917574e-1,
-            5.90168526780543101218e-1,
-            -1.3702146341224774595,
-            9.79974248924423863016e-1,
-            1.28907486012896033145,
-            -9.16421276286613295525e-1,
-            9.28263823848249014503e-1,
-            -4.11692589948413012468e-1,
-            5.24100481444811583387e-1,
-            6.1861861211321700349e-1,
-            6.10828582444434831089e-1,
-            -5.8338981411128765231e-1,
-            3.16231806823839056708e-1,
-            -9.05712590840413556137e-1,
-            2.68526290110949507339e-2,
-            -8.87402952460618954511e-1,
-            -9.16779984300138295339e-1,
-            -6.70443758634314129763e-2,
-            2.8589738432329689366e-2,
-            1.12273829086454912662,
-            1.38525981590131830323,
-            6.06612397373353262608e-1,
-            7.46654420414066599676e-1,
-            1.7763098659342264618,
-            4.69045068821135391346e-1,
-            -6.72909125026514454149e-1,
-            -2.69639598076437558838e-1,
-            9.13036347605338582945e-1,
-            8.52320719052414577099e-2,
-            -5.19265565717262567169e-1,
-            3.47661609858902986847e-1,
-            -5.6274760697837111767e-1,
-            2.39879740094428306474e-2,
-            4.40269277962005711746e-1,
-            -1.11391271641881739463,
-            8.26947597641288889569e-1,
-            2.06673826122081738532e-1,
-            -1.25407422958444225713,
-            1.35427772997122874976,
-            1.46068432047655405448,
-            1.76891645780697981394,
-            1.44282072126619226315e-1,
-            2.94022804953975258613e-1,
-            4.11525615470396399775e-1,
-            8.6884761427032164427e-1,
-            1.4596627094123109103,
-            -1.20355390359995517713,
-            -2.05701427703613631826e-1,
-            -1.74081076900158326914,
-            -8.19396251430403066429e-1,
-            -6.07289335809471308991e-1,
-            3.25999702825323200983e-1,
-            -8.93806820919468059117e-1,
-            6.37997023779085625783e-1,
-            -1.07738377189584277893,
-            1.08975029421288960307,
-            2.97273455462497393498e-1,
-            1.37903104614107530068,
-            -8.63361161910024987876e-1,
-            -4.20128455762564356757e-1,
-            -4.27291910734089341872e-1,
-            4.01580045597692780746e-1,
-            -1.460401530349095367,
-            -4.35989578131129817962e-1,
-            -1.74009835431912529558,
-            6.58674761564128519176e-1,
-            3.82510302486229747387e-1,
-            4.95163490188887056576e-1,
-            3.1143005523191269468e-1,
-            1.23968001744426195576e-1,
-            -3.16184915939643262917e-1,
-            -1.76810101913505185456e-1,
-            2.20834390206209763008,
-            9.57008716688112270887e-1,
-            7.5611636496016265685e-2,
-            1.10390041058486443326,
-            1.28660384528125920633e-1,
-            -1.03356280457984617271e-1,
-            -4.23196989567622861017e-1,
-            1.15512465130792785217,
-            6.94725626107971644396e-2,
-            -8.93242409323963815204e-1,
-            -8.23662232188725362825e-1,
-            9.31719257380037468863e-1,
-            -1.16082931090653662665,
-            1.25492439155855195487,
-            6.96652245297915029276e-1,
-            -1.53479605077582448303,
-            -1.03165903249278168019,
-            -6.049393024259033802e-2,
-            -4.78121644849069049599e-1,
-            1.01693603566204981981,
-            1.90262256418631037214e-1,
-            7.85464414955549194985e-1,
-            -1.32848968712597637065,
-            1.39666557107985300767,
-            -2.90398253846863019234e-1
+            -3.35014970118408805799e-1,
+            2.30511442349367434712e-1,
+            1.43633697075060440262,
+            5.42734960132294719237e-1,
+            -1.38976891075524999764,
+            -3.21831268232325529155,
+            3.93859150913283342921e-2,
+            -2.3409732175905609286e-1,
+            -2.91209901476697397005e-1,
+            4.15393201856989555815e-3,
+            -3.17258922139547927532e-1,
+            -1.40394835366210224414,
+            -1.06405995392832086743,
+            4.42802948958555875336e-1,
+            1.49282908821226384388e-1,
+            -9.59231512761359983443e-1,
+            1.00990046099478436581,
+            3.63507214720452664913e-2,
+            -8.41283524070157051611e-1,
+            8.5441257686351723688e-1,
+            7.29457092162142523017e-2,
+            -1.48745634996254399995e-1,
+            -7.87443407795880734312e-1,
+            -3.516142104111928679e-2,
+            -1.2486279723760169702,
+            5.8908682288113523029e-1,
+            1.80428841348210511342,
+            2.06541249451336839105e-1,
+            -6.39160900051074176709e-1,
+            -7.8749652927786772949e-1,
+            2.71682403506012049021,
+            1.65272588328090996868e-1,
+            -1.00110121012508468397,
+            1.0248792581610601804,
+            1.21596281246702520029,
+            -4.64737124000946022484e-1,
+            -2.54638921175011079256e-2,
+            1.88494469677364245852e-1,
+            6.90813305273839217691e-1,
+            6.47390374959116110531e-1,
+            5.29516890200289469526e-1,
+            -2.21338529484266244296,
+            -2.01672549756498620255,
+            -1.44626070514137516909,
+            -6.53741465875891547554e-1,
+            -6.3301871738632764508e-1,
+            -1.30381730946121349168e-1,
+            -9.40081442173798520479e-1,
+            -5.71941650457496231219e-1,
+            -7.2144436244929843749e-1,
+            8.25544390939478955893e-1,
+            3.34639383589945993425e-1,
+            -4.88615430892402169416e-1,
+            -1.05470586910752728294,
+            7.46189753266826238942e-1,
+            -1.60607504513227672405,
+            1.6009990290233453436,
+            -1.48442255945834089559,
+            5.17600911947581954209e-1,
+            3.40314781631234131165e-1,
+            1.12219156627662597359,
+            -4.07029608541871756877e-1,
+            -8.05002904874528746326e-1,
+            6.80816765331479833989e-1,
+            1.33776567555247627439,
+            6.73442970498120629941e-1,
+            -1.52596392954133630582,
+            6.33959058742779579809e-1,
+            -1.29561395896567455033,
+            -8.40698765272471781884e-1,
+            -1.25492316609472631672e-1,
+            -4.75877398311515209528e-1,
+            -8.97396646202144210314e-1,
+            4.41676712345970223783e-1,
+            4.60443175878015475977e-1,
+            7.3246719969605378342e-1,
+            1.04774350854333819782,
+            3.87493229753628765089e-1,
+            5.48081489520512388225e-1,
+            7.34725609536786117282e-1,
+            1.11465384292503924546e-1,
+            8.06932002376677059985e-1,
+            -9.94171384108709976779e-1,
+            -1.97747042331123890069e-1,
+            6.49823043716552528615e-1,
+            2.31496934466189963064e-1,
+            -4.84908398872498536125e-1,
+            -3.48587393397752798307e-1,
+            1.96603018472755686208e-1,
+            -7.04192249418688909213e-2,
+            1.13128515988241318269,
+            3.65460315308509531285e-1,
+            -7.99021969679464816316e-1,
+            4.58289090616140037948e-1,
+            -3.61022050465473254288e-1,
+            7.54308052265172390705e-2,
+            -3.01919809143927686534e-1,
+            -3.97012155032932689824e-1,
+            4.17585698020205342562e-1,
+            2.33940430340930172193
          ]
-         prettyName: "NonRESBGvnNC1pi"
-         systParamId: 56
+         prettyName: "RDecBR1eta"
+         systParamId: 87
       }
-      NonRESBGvnNC2pi: {
+      RDecBR1gamma: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            -2.48673694184315757782e-1,
+            4.76811675608279916805e-1,
+            8.01398365939942070035e-1,
+            7.84914136639520476635e-1,
+            2.01180970428175454057e-1,
+            -3.96156439909142843447e-1,
+            -5.44662338113197974643e-1,
+            -1.08737062463661637857,
+            2.09702594128424790743e-1,
+            -1.06103843526624697091,
+            9.85422062734535475492e-1,
+            3.74088035304512067647e-1,
+            2.98631851195655939613e-2,
+            -3.95708235782924966362e-1,
+            -5.37668601115315267225e-2,
+            5.91666552837889603289e-1,
+            2.6140227712878627564e-1,
+            -1.49194273463561999371,
+            -1.63875017342163031842,
+            1.86041452822998731875,
+            -1.03703534871075153667,
+            2.91892123794288936567e-2,
+            8.72941423528008852983e-1,
+            3.98808053531489792309e-1,
+            -8.43504031440587498381e-1,
+            1.89407777279760908273e-1,
+            -7.89728269840671015523e-2,
+            -1.25333811879592083027e-1,
+            1.27459954481487369726,
+            -6.71297784007623077329e-1,
+            -2.17827843141226251689,
+            -3.96572553629808588482e-1,
+            -9.94134253630135966695e-1,
+            -7.48724021805834749621e-1,
+            -7.76831359627003781299e-1,
+            1.17194395620555646964,
+            1.78038385010786670559e-2,
+            6.70702946739594962899e-1,
+            1.98393522666643173924e-1,
+            -2.68136225845345632646e-1,
+            -1.70703839647117239231,
+            -1.2445102853211327254,
+            -1.2262176615617361719,
+            1.69596028532676545986,
+            -1.0673954044690896481,
+            -5.17648887484370212597e-1,
+            -1.30136228166800038686,
+            -7.61379368747563400888e-1,
+            -9.16743473032193278982e-1,
+            -8.94957806672447397922e-1,
+            9.72221130808077704799e-1,
+            -6.01730705420003633699e-2,
+            -7.76540922014818391084e-1,
+            9.78575235936445464446e-1,
+            -4.36872523879641982969e-1,
+            6.11088049996412419063e-1,
+            2.99249303219491613604e-1,
+            -1.27952295938276239262,
+            1.68695195337420944526e-1,
+            4.83701419171470414771e-1,
+            -3.93316824194852587837e-1,
+            -1.24680588828336791352,
+            1.85731467861668719799e-1,
+            -2.27558374869696877774e-2,
+            4.53962938612970656749e-1,
+            2.223012516565016361e-1,
+            -2.31034572955622269363e-1,
+            -2.33723976767333363469,
+            -4.51619746582407166624e-1,
+            8.57805797550480364499e-1,
+            -4.2106456609004122571e-1,
+            -1.25774404139017481619,
+            1.5849217116930156557,
+            3.9181992663180187364e-1,
+            3.76097585911948695259e-1,
+            -1.05691554931605580236,
+            -7.49722721790700152855e-2,
+            2.14632490923874508226,
+            2.89861104245182521488e-1,
+            -4.06756322648603729775e-2,
+            1.91360557268475311998e-1,
+            -1.07979499882103224806,
+            1.29715573315428955858,
+            -8.60532854034038785507e-1,
+            -3.1837541027926075099e-1,
+            3.44815581821682592967e-1,
+            -8.17474732500356959797e-1,
+            -8.97649818564279167177e-1,
+            -8.06396204793144888434e-1,
+            -1.03945773934501017877,
+            -5.18620723922109949644e-2,
+            -1.17211488298323396329,
+            -1.17358162011884070708,
+            -1.4230621298767390237e-1,
+            8.52958071187612132391e-1,
+            1.01319670109380588485,
+            -2.95228612832165671076e-1,
+            7.10868143028849819309e-1,
+            2.08261777310414064601,
+            -2.78088987554557520721e-1
+         ]
+         prettyName: "RDecBR1gamma"
+         systParamId: 86
+      }
+      RPA_CCQE: {
          centralParamValue: 0
          isRandomlyThrown: true
          oneSigmaShifts: [
@@ -4528,370 +6180,35 @@ generated_systematic_provider_configuration: {
             -3.08385506360463954034e-2,
             1.46156854039345041052,
             -1.31221719302834372023,
-            -6.85739610879820715716e-1,
-            1.68150110710633504674,
-            -6.51990535178231356284e-1,
-            -1.86060785682793217166e-1,
-            1.97277100142371009106,
-            1.85324017427229148502e-1,
-            -4.7568146456269994049e-1,
-            -1.39873694165665751754e-1,
-            2.71596990035294014176e-2,
-            -8.23928960971450075057e-1,
-            6.73830794086099360563e-1,
-            -3.69349440613941037981e-1,
-            8.69320130981590999397e-1,
-            1.50589364953070542485e-1,
-            -1.78297683265939949093e-1,
-            -1.38003375642973352688e-1,
-            -2.7952976697665294914,
-            2.55105902732848874304e-2,
-            2.35098156022628290707e-1,
-            -3.47515165965583294749e-1,
-            5.37058838111776053886e-3
-         ]
-         prettyName: "NonRESBGvnNC2pi"
-         systParamId: 57
-      }
-      NonRESBGvpCC1pi: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            -5.72671011428393939013e-2,
-            -1.0807294795686617217,
-            -2.36585953309003826917,
-            4.55094647329360668664e-1,
-            9.08135856299191246421e-1,
-            -1.07059959135268711883,
-            -1.64007447111849180565,
-            -1.03895661876633971232,
-            3.10304672923543634067e-1,
-            -7.30104294043690482674e-1,
-            -1.61428075642738022566,
-            1.97260966217275712786,
-            -1.00198382451881506938,
-            -9.32169233430951593711e-1,
-            2.60061449328544114223,
-            -3.92144526722385741713e-2,
-            -1.30700951210915139455,
-            -1.04130420153550629081,
-            -1.21503490013289883187,
-            5.25488713757007591676e-2,
-            8.25514105098246075976e-1,
-            -6.18515736852172648419e-1,
-            -1.03830433845065006615,
-            4.0204524170540723027e-1,
-            8.85564596598866105026e-1,
-            -1.24790856268237229654e-1,
-            4.76884628223692264015e-1,
-            4.84288022277896912371e-1,
-            8.9654203640670315778e-1,
-            -1.00830439775636926392,
-            6.54819941710863662188e-1,
-            -9.76992484266010624561e-2,
-            -5.41265752381692832884e-1,
-            2.07963951647467615302,
-            -1.33106852221593063845,
-            -6.05759649024982027576e-1,
-            7.35108170535950899982e-1,
-            -6.8221347303040164034e-2,
-            3.52671996917751251477e-1,
-            -4.87490392518560633484e-1,
-            -1.77705353854016173676e-1,
-            9.56305293151308744015e-1,
-            -1.48354888856499805838e-1,
-            -2.65898514347493142296,
-            2.23491868404579657748e-1,
-            4.1239623484808224374e-1,
-            9.65848811089761727366e-1,
-            -3.76786157118310760517e-1,
-            -1.5586766316841065283,
-            4.90002600779356589644e-1,
-            2.21502477145674475656e-1,
-            -1.92838455399811836699,
-            1.64534436291747909742,
-            -5.51544283795246115254e-1,
-            -2.21222610017781096126e-1,
-            -1.30881010131068981073e-1,
-            8.23003664731824846612e-1,
-            3.55312331031194417186e-1,
-            1.87021285418379945575,
-            -2.39727879184839315352e-1,
-            1.30500126756425138819e-1,
-            3.54035890851781998023e-1,
-            -1.12773249721041435301,
-            -3.30017457791706603221e-1,
-            1.31039939736979760276,
-            -1.94826203768988209797e-1,
-            3.09983276175232969063e-1,
-            1.75897973600503521041e-1,
-            -1.44910144209894542477,
-            1.59324602100753121015,
-            3.90230813345352478549e-1,
-            8.79612681966026488389e-1,
-            1.76100375315406038057e-1,
-            -4.87698488464504142925e-1,
-            -2.7494062439450034363e-1,
-            1.45956404304083853241e-1,
-            -3.18473341203802384758e-1,
-            2.26616407675458919613,
-            -2.10511254065918917977e-1,
-            -5.11884786524084534065e-1,
-            -7.77588403137971173607e-1,
-            -2.66264670406684667014,
-            8.39122663637962507011e-1,
-            -6.84429684959762862917e-1,
-            2.66408647770065121207e-1,
-            1.01854849044741735398,
-            -9.23039907599138009786e-1,
-            9.03493395183116110303e-1,
-            4.84709320216125782999e-1,
-            1.32243169599290344429,
-            -5.62708966674572041988e-1,
-            9.26725835527518748691e-2,
-            1.61841207223076238852e-1,
-            4.73293963676276407959e-1,
-            1.19801595262683990839,
-            3.3536264484255356999e-1,
-            4.80685073390727857223e-1,
-            6.48909487387634653643e-1,
-            -1.32292511177417387858e-1,
-            1.50818295137235303116
-         ]
-         prettyName: "NonRESBGvpCC1pi"
-         systParamId: 50
-      }
-      NonRESBGvpCC2pi: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            1.31406613029945218418e-1,
-            4.57183400471492418227e-1,
-            7.74756467287383121523e-1,
-            4.26225735532838267972e-1,
-            1.13851280466405413438e-1,
-            -1.54340511029329463533,
-            1.80633069883423669211,
-            3.48622389088644388244e-2,
-            6.55623438997838148268e-1,
-            -1.2783465967166948718e-1,
-            -3.18823542363372514075e-1,
-            9.24874449653403374327e-1,
-            -1.51768074352108173208,
-            -4.45815398939836904368e-1,
-            -2.56323310594766762271e-1,
-            1.28344189094997479517e-1,
-            -7.21418364090133795719e-2,
-            -6.93307238292249827794e-1,
-            -4.18646429622764493228e-1,
-            -1.08090315094828426368,
-            1.66568275143363297985,
-            6.29968330699713918719e-1,
-            -6.19487569744388344439e-1,
-            -1.68846189651763706197e-1,
-            -5.89136379805806242871e-1,
-            3.54019883004328794751e-1,
-            -9.22411153454954391151e-1,
-            4.57974574291065306131e-1,
-            -1.08387537225518235107e-1,
-            4.51133579375830984226e-1,
-            1.27461106404912283274,
-            -3.41017066524030521002e-1,
-            -5.16141313562182624253e-1,
-            -2.05936106985638134326e-1,
-            -1.16515710795731264326,
-            3.91922165894992957647e-1,
-            -7.77805396580662833372e-1,
-            1.70527832769746945374,
-            -1.62042347846421042057,
-            -1.61936558642745742631,
-            7.58954055973617647268e-1,
-            -1.03507397338983420099,
-            4.49683126153672119152e-1,
-            -2.51811983440890685415,
-            -6.16893422515032652242e-1,
-            1.22631532873119986071,
-            3.39816169139019075285e-1,
-            -1.76181806067351204304e-1,
-            -2.20419240763804979988e-1,
-            3.69349833071845323751e-1,
-            1.75035245311590625938,
-            -4.26100108150963718945e-1,
-            9.60064758197512246873e-1,
-            -2.70522638826036931903,
-            7.18108767395434166581e-1,
-            -2.22662051978564479171e-1,
-            1.47900200721349484034,
-            -1.20081283694217400004,
-            -9.7522090001663189196e-2,
-            1.16774635106998014855,
-            8.3545865220040138599e-1,
-            -8.94843154720370792532e-1,
-            -2.34468147535589244157,
-            1.52310893575321570914e-1,
-            8.00489069105672301774e-1,
-            3.79555916852692243335e-1,
-            -8.39331257540344849444e-2,
-            5.80348581034644539489e-2,
-            -1.19121123260385805565e-1,
-            -1.38431041414679878443e-1,
-            -6.7431082426493882398e-1,
-            -1.03602755336973628708,
-            -1.49387866385135414937,
-            1.50606196540654546645,
-            8.6884170628269097314e-1,
-            -3.01965876308915026627e-1,
-            7.80872819124755895848e-2,
-            6.0628853978246755041e-1,
-            -1.53376867458637732022e-2,
-            -1.75123191135229755444e-1,
-            -2.6092807632260712758,
-            -1.32673863241101841481,
-            9.06574887041181831648e-1,
-            6.55051377380369559411e-2,
-            1.59031940354899603562,
-            1.43589107377237096275e-1,
-            1.14029225296870917461,
-            -1.53433756511997110294,
-            -1.82866029808489138908,
-            -1.86202418836871663732e-1,
-            1.02910001709915377432,
-            -6.5666684063393832016e-1,
-            1.22728235310904251754e-1,
-            1.26131435825235588277e-1,
-            -1.1421015308709523417,
-            8.3737186594922807803e-1,
-            3.78355395362520829927e-1,
-            1.40751251331289051194,
-            6.47653180407173345579e-1,
-            7.30146951039584934939e-1
-         ]
-         prettyName: "NonRESBGvpCC2pi"
-         systParamId: 51
-      }
-      NonRESBGvpNC1pi: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
-         paramVariations: [
-            2.41696422723556014756e-1,
-            -3.57228785838558382526e-1,
-            -2.76387284397195620578e-1,
-            -1.92212431343597534017,
-            -1.30913920441023479135,
-            2.96486496943111965674e-1,
-            -4.68538270712483051472e-1,
-            -6.56546541080119894218e-1,
-            -3.94815859043586916965e-2,
-            -9.87279937639703120134e-1,
-            -1.59285244449929336286e-1,
-            -1.50432442783125841501,
-            -8.52769751887145210922e-1,
-            -4.79634601738767023943e-3,
-            -1.68962593068600219759,
-            -2.77772427304492398881e-2,
-            4.78708681081206288699e-1,
-            1.32638904347801034334,
-            -1.51528757581184891912e-1,
-            1.38033288314352420301,
-            8.30601578913413018945e-1,
-            -1.01652013736025104151,
-            -2.34008119865535019199e-1,
-            -1.94690455093199932257,
-            6.82224379119886426004e-1,
-            2.0497160927793461882e-1,
-            -2.18750631239135762129,
-            -7.32515680967479543284e-1,
-            7.88463339560503850834e-1,
-            3.98749569794725922112e-1,
-            8.42552885768984349824e-1,
-            2.06090609678600877874e-1,
-            7.89638158680827317859e-1,
-            -4.04116777961299467048e-2,
-            7.22928389152815320529e-1,
-            1.58602119163552690573,
-            -5.29096646695271455307e-1,
-            4.35636880915951707482e-1,
-            -9.9100958630794572235e-2,
-            3.78519843025199864694e-1,
-            8.22089815927144695884e-1,
-            6.38959225468649472113e-1,
-            -1.45096628658911974696,
-            1.1477273990332981235,
-            7.18990845036225012521e-1,
-            9.22899514105430029964e-1,
-            -2.93126851861242987418e-1,
-            -1.46605429988055147028e-1,
-            -2.04370619749159015965e-1,
-            -7.47294832576716139272e-1,
-            -1.55617009237581438441,
-            2.31704081000094486154e-1,
-            -6.64327865379871540519e-1,
-            5.70652012701625341307e-2,
-            7.79370599669444663604e-1,
-            -2.61650422263063453521e-1,
-            1.15759643680640289531,
-            6.78686177893605635525e-1,
-            -3.43397799012922710915,
-            8.81535500832391349935e-2,
-            -1.61841357077872512182e-2,
-            -9.14776576865454660314e-1,
-            2.77847904312813476224e-1,
-            -2.35810044284251313362e-1,
-            -1.09055697287105091142,
-            -7.24435600083513264735e-1,
-            -1.0295946815673282515,
-            4.5411735549092185904e-1,
-            1.2016928367443528991,
-            4.87955796517223594488e-1,
-            2.29160459213809941659,
-            -1.22256625682843456104,
-            2.25425956760503420906e-1,
-            -1.27293523726683943664,
-            6.26331393163641836352e-1,
-            4.45566741178759842534e-2,
-            -1.18521341410773040081,
-            8.62153178702436129299e-2,
-            9.14350404576763753361e-1,
-            -2.51930358910359697422e-1,
-            -2.16873860075197655295e-1,
-            9.47103459414532777849e-1,
-            -7.0280443049234120334e-1,
-            -3.64755904015473197965e-1,
-            -8.00856115603483464938e-1,
-            1.10102259381506376035e-1,
-            1.11285822732390671241,
-            6.39535160263215995968e-1,
-            1.67093368947334103888e-4,
-            1.39407504417286065568,
-            -8.17777285728161773548e-1,
-            -1.7756178684955916669,
-            1.10104321640030356627e-2,
-            5.58085280627283020216e-1,
-            -1.98918890976166906626,
-            -1.11312842596841710119,
-            1.55012343619378611947,
-            -2.49964100473538397562e-1,
-            -8.15136350445936574971e-1,
-            -1.18712762876966326786
+            -6.85739610879820715716e-1,
+            1.68150110710633504674,
+            -6.51990535178231356284e-1,
+            -1.86060785682793217166e-1,
+            1.97277100142371009106,
+            1.85324017427229148502e-1,
+            -4.7568146456269994049e-1,
+            -1.39873694165665751754e-1,
+            2.71596990035294014176e-2,
+            -8.23928960971450075057e-1,
+            6.73830794086099360563e-1,
+            -3.69349440613941037981e-1,
+            8.69320130981590999397e-1,
+            1.50589364953070542485e-1,
+            -1.78297683265939949093e-1,
+            -1.38003375642973352688e-1,
+            -2.7952976697665294914,
+            2.55105902732848874304e-2,
+            2.35098156022628290707e-1,
+            -3.47515165965583294749e-1,
+            5.37058838111776053886e-3
          ]
-         prettyName: "NonRESBGvpNC1pi"
-         systParamId: 52
+         prettyName: "RPA_CCQE"
+         systParamId: 57
       }
-      NonRESBGvpNC2pi: {
+      ZExpA1CCQE: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
@@ -4998,240 +6315,476 @@ generated_systematic_provider_configuration: {
             -1.21298363059967462263,
             2.97537443643744237143e-1
          ]
-         prettyName: "NonRESBGvpNC2pi"
+         prettyName: "ZExpA1CCQE"
+         responseParamId: 52
          systParamId: 53
       }
-      RDecBR1eta: {
+      ZExpA2CCQE: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         isResponselessParam: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            -2.65353127892004381216e-1,
+            7.61949548030397494358e-1,
+            -2.04111915405827115677,
+            2.51884494485683840814e-1,
+            -8.75488362879044856868e-1,
+            -4.74698073146430421509e-1,
+            9.3782781343063448265e-2,
+            -3.07696750882536695926,
+            -1.37750744484974263493,
+            1.20818951987998435271,
+            1.58002662471260024724,
+            -7.39941987339103657284e-1,
+            -1.88518272426173028045,
+            -1.29066120141910850583e-1,
+            -2.17783905139434796894e-1,
+            -6.7000318876059883344e-1,
+            -2.96539694944854825831e-1,
+            -4.58460372411752248301e-1,
+            1.33469782418532867396,
+            1.05515491696908925157,
+            -2.99960354238912804692e-2,
+            5.60897784116980879787e-1,
+            2.84695880787662669587e-1,
+            8.73774965440023088092e-1,
+            9.38819811957932515156e-1,
+            -1.94413964965127283868,
+            1.94257768936824759543,
+            -1.96191537943098154306e-1,
+            7.20988218950873616109e-1,
+            -1.59675344960519993709e-1,
+            -5.93457919169904091206e-2,
+            -1.52459559020837120968,
+            1.78309083811810520359,
+            -1.77032596761844618349,
+            -4.70902332419395275309e-1,
+            1.98920557967910749397,
+            4.53877759007684178361e-1,
+            -1.30517557889026636353,
+            -5.29889827261651791268e-1,
+            1.60652835307454711078,
+            -6.7098251096936761817e-2,
+            1.70953750335897852741e-1,
+            -2.34085713913698784117e-1,
+            -1.1203577787291146492e-2,
+            8.9023963951237472525e-1,
+            -6.38327856732716414356e-1,
+            -1.59486637218163473939,
+            1.30872140990869034738,
+            1.91736429694922633216e-1,
+            -6.94844912018092064621e-1,
+            -1.16732946043339635978,
+            -2.41185482215779817272e-1,
+            -1.42440524142019309117,
+            1.85211362048604644137,
+            9.37426590943800097655e-2,
+            1.31830825100379001036,
+            6.45597891684733915518e-1,
+            -4.29676068471114558367e-1,
+            -4.94192017244413972499e-1,
+            1.14560904854908857109e-2,
+            3.80955826860341961737e-1,
+            5.55351493534771978311e-1,
+            7.32568100468229510547e-1,
+            -2.29590032070154853594e-1,
+            8.69297011254385187939e-1,
+            -4.58130489066087609462e-1,
+            -6.27620227019938470292e-1,
+            -4.04243935395971643043e-1,
+            4.34105411453229672603e-1,
+            -7.18553299717936022617e-1,
+            -7.52791357306079933487e-1,
+            -1.33219865407564386217,
+            -9.38664545932450855581e-1,
+            -1.3087245641118327999,
+            5.05170906231730554303e-2,
+            1.94463790997067142996,
+            -8.96945932646982968528e-1,
+            1.51581073863489040887e-1,
+            -3.26598475563602774763e-1,
+            7.63818664429650670544e-3,
+            5.75017803733140819844e-1,
+            4.11646961013841572452e-1,
+            -1.32444578086908726355,
+            1.86046289259350716705,
+            6.19875327112026752729e-1,
+            -6.77010128028027846625e-1,
+            -5.7588088655796398907e-1,
+            -5.59674013666018876911e-1,
+            1.71522565887630862314,
+            9.57888064733693811448e-1,
+            1.54431657080503192958,
+            -1.55407964082502392245,
+            9.03467698094237103845e-1,
+            9.43751255122868948355e-1,
+            -1.83848829978582850586,
+            -6.88166977554014014373e-1,
+            8.34827542514208653657e-1,
+            5.39272474088247966151e-1,
+            -6.21426888632986562655e-1,
+            1.15498321764908218334
+         ]
+         prettyName: "ZExpA2CCQE"
+         responseParamId: 52
+         systParamId: 54
+      }
+      ZExpA3CCQE: {
+         centralParamValue: 0
+         isRandomlyThrown: true
+         isResponselessParam: true
+         oneSigmaShifts: [
+            -1,
+            1
+         ]
+         paramVariations: [
+            1.57667260416952181856,
+            -2.34663728688710992998,
+            -1.40856810028031596838e-2,
+            -9.24647718675356833362e-2,
+            -1.46995818677501866034,
+            -1.36196990023590064345e-1,
+            6.60653673373411964853e-1,
+            2.58982332911597445957e-1,
+            9.93990310350777866999e-2,
+            -4.13095075758972030133e-1,
+            -2.15572439497466650238,
+            1.84703958802770379366e-1,
+            -1.43996413248577792565,
+            4.26040238207540528093e-2,
+            2.25373265531945005113e-1,
+            -1.49627007504628262158e-1,
+            1.35257729024652428862,
+            2.33544483907774313991,
+            -4.193956946533898833e-1,
+            7.1405140588789151046e-1,
+            5.5646229053902995787e-1,
+            6.91478542987449484869e-1,
+            6.56825873468414589418e-1,
+            -9.92616442274037516502e-3,
+            -1.21960389381864064973,
+            -2.86846728147253893226,
+            -1.24352563763401979813,
+            -1.26845263645624650728,
+            1.44523426471334115462,
+            2.72557759650068176516e-1,
+            -9.54644458487457381324e-1,
+            -6.96304444946387879334e-1,
+            -7.20775654182279290616e-1,
+            1.70679601105847500442,
+            -8.07443082035758985526e-1,
+            3.32929226427131075283e-2,
+            -6.39333422141059259936e-1,
+            6.73778144061583317281e-1,
+            5.72862952799025437756e-1,
+            -7.6922357580315481318e-1,
+            -4.28192931105489171806e-1,
+            1.67166840475696809598,
+            6.76003848335391677171e-2,
+            1.47026688876196742761,
+            -7.34983173097723652134e-1,
+            2.79646654077533085569e-1,
+            1.34193728094616582247,
+            3.89011659459263081651e-1,
+            -1.7412570337058003167e-1,
+            5.46719685524843845847e-1,
+            1.8195055849216470456,
+            6.1955271321022109543e-1,
+            -7.02129262935715314775e-1,
+            -9.77734943639435721829e-2,
+            8.44790139790579930335e-1,
+            -8.26627777068386082604e-1,
+            -1.31259581461504848399e-1,
+            9.10855241777955182414e-1,
+            -1.22923546495818478141e-1,
+            2.8917404231867638309e-1,
+            1.47237607942112069814,
+            7.64434023735217405005e-1,
+            2.17431148845969790528,
+            6.68099993423381777191e-1,
+            -9.65078751092685926949e-1,
+            1.14520018333291262458,
+            -1.2118557899166195746,
+            -3.73167137703515339187e-1,
+            -4.0614881500531579972e-1,
+            4.78088877327848049692e-1,
+            1.01675690815826769153,
+            1.57575528320809038485e-1,
+            -1.45000306774554693634e-1,
+            -1.96583232467493607132,
+            6.35653136065823104461e-2,
+            1.06744463070922512848,
+            1.48058480520779567335,
+            -9.48110445672709856169e-1,
+            -1.22258693485630476339,
+            -3.53267250673760579982e-1,
+            -1.18975969059613317924,
+            5.21989881739310934705e-1,
+            1.12251248520624802296,
+            -1.08827771268880657551,
+            2.21332426207836274745e-1,
+            -5.51495829778529955689e-1,
+            -1.17933189507226171555e-1,
+            -6.21464981324781229333e-1,
+            1.05019713533468173061,
+            -8.88517164097138545387e-1,
+            6.06438975217205356039e-1,
+            -6.91804281071440541062e-1,
+            8.52032411441338788372e-1,
+            8.27239263520658907325e-1,
+            -1.36817720800476583243,
+            5.63163214618165985925e-1,
+            7.02172026316870423468e-2,
+            7.87185682169022848953e-1,
+            3.07681521315566419705e-1,
+            1.09959141556711093024
+         ]
+         prettyName: "ZExpA3CCQE"
+         responseParamId: 52
+         systParamId: 55
+      }
+      ZExpA4CCQE: {
          centralParamValue: 0
          isRandomlyThrown: true
+         isResponselessParam: true
          oneSigmaShifts: [
             -1,
             1
          ]
          paramVariations: [
-            4.30185015568998185831e-1,
-            6.73248486566776160878e-1,
-            -1.08827149647598764304,
-            -1.20746153677574907803,
-            -4.81265962465847851881e-1,
-            -8.31551999589040802263e-1,
-            -7.83885829719032978247e-1,
-            8.24827560327802800089e-1,
-            -9.90911396522774712281e-1,
-            7.39790020835277117861e-1,
-            1.14506457652735177399e-1,
-            7.07120514890618556691e-1,
-            -6.30178021622021633519e-1,
-            -2.54518416054782736779,
-            9.22278133774025343783e-1,
-            2.80448348717339868141e-1,
-            3.59090094323049391356e-1,
-            -1.14866585981195057364,
-            1.62213038296022848961e-1,
-            -1.56272131477482467687,
-            7.92456276305261386739e-1,
-            1.20847335411064715771,
-            -7.26326537641710928694e-2,
-            1.62236317523804229879,
-            -1.99252157053469236558,
-            1.58885656348658410586,
-            -2.31601179017518976622e-1,
-            1.47590885438049101985,
-            2.97076338058251898655e-1,
-            -3.34956410412517946451e-1,
-            -2.97484537326339171237e-1,
-            -4.96223130368735609874e-1,
-            -4.71836217404251523355e-1,
-            -5.1835000127262942371e-1,
-            -3.00270608012246087437e-2,
-            -6.82529536967889982613e-1,
-            -1.60754939825036258227,
-            7.17914145071423481781e-1,
-            4.87663380884784725122e-1,
-            -1.72342500919966368222,
-            -8.64196737973564471647e-2,
-            4.62313743509144003951e-1,
-            -1.1875656062733389029e-1,
-            2.24991966787164918151e-2,
-            -4.78515140676391947938e-1,
-            -1.83449487485838225176e-1,
-            3.88356681217953192409e-1,
-            8.33642624356662920171e-1,
-            8.12038983007396381053e-2,
-            4.34598890441204310786e-1,
-            -6.87072983871677034351e-1,
-            -4.96853832367499470557e-1,
-            -1.32627222415615508844,
-            -8.7707548915303634729e-1,
-            5.17892900535705580367e-1,
-            -4.41478964175277599491e-1,
-            1.25289140104333318604,
-            5.7554967212203100857e-1,
-            1.83676616676837078934,
-            -7.62927626870604780329e-1,
-            4.37215786550510188135e-1,
-            8.25460000437772539739e-2,
-            -1.91294219938077580956,
-            -8.29462224824830673953e-1,
-            9.76572434912655745753e-2,
-            1.07470541730606750086,
-            -1.20563583297158771757,
-            1.72862088388632761937e-1,
-            -3.71031215264781888408e-1,
-            1.27049356132499902117,
-            -6.64134431547396375528e-1,
-            -1.63805207165319588469,
-            -2.98608142143497901078e-1,
-            -1.57246279163958460612e-2,
-            -9.68668973277849509884e-1,
-            1.22857024445339679808,
-            3.62465117482979826136e-1,
-            -3.9038854120851708418e-2,
-            1.03926248810281984802,
-            -7.01280596669630190698e-2,
-            5.90669246088859400956e-1,
-            1.09016517148980099372e-1,
-            -9.15900652448594532196e-1,
-            1.25690899246720655391,
-            -1.88020485809470816463,
-            -1.9268066464594887921e-1,
-            -1.05312043686132628117,
-            7.86455719029914290807e-2,
-            -2.53263487286451960401,
-            1.44317941562860402316e-1,
-            7.88831324147391543811e-1,
-            -2.07214286003436221062e-1,
-            1.31162538696539332506,
-            -5.31129542630108697487e-1,
-            -7.90387386615843401394e-1,
-            5.46537448578284457135e-1,
-            -2.4129449773349329611,
-            1.27504821287318237388,
-            -1.52503266049454011544,
-            7.49243388852820380031e-1
+            -1.50197848258609090166,
+            -1.48747215662368614808,
+            -1.48144120597425121844,
+            -4.18626183842879917574e-1,
+            5.90168526780543101218e-1,
+            -1.3702146341224774595,
+            9.79974248924423863016e-1,
+            1.28907486012896033145,
+            -9.16421276286613295525e-1,
+            9.28263823848249014503e-1,
+            -4.11692589948413012468e-1,
+            5.24100481444811583387e-1,
+            6.1861861211321700349e-1,
+            6.10828582444434831089e-1,
+            -5.8338981411128765231e-1,
+            3.16231806823839056708e-1,
+            -9.05712590840413556137e-1,
+            2.68526290110949507339e-2,
+            -8.87402952460618954511e-1,
+            -9.16779984300138295339e-1,
+            -6.70443758634314129763e-2,
+            2.8589738432329689366e-2,
+            1.12273829086454912662,
+            1.38525981590131830323,
+            6.06612397373353262608e-1,
+            7.46654420414066599676e-1,
+            1.7763098659342264618,
+            4.69045068821135391346e-1,
+            -6.72909125026514454149e-1,
+            -2.69639598076437558838e-1,
+            9.13036347605338582945e-1,
+            8.52320719052414577099e-2,
+            -5.19265565717262567169e-1,
+            3.47661609858902986847e-1,
+            -5.6274760697837111767e-1,
+            2.39879740094428306474e-2,
+            4.40269277962005711746e-1,
+            -1.11391271641881739463,
+            8.26947597641288889569e-1,
+            2.06673826122081738532e-1,
+            -1.25407422958444225713,
+            1.35427772997122874976,
+            1.46068432047655405448,
+            1.76891645780697981394,
+            1.44282072126619226315e-1,
+            2.94022804953975258613e-1,
+            4.11525615470396399775e-1,
+            8.6884761427032164427e-1,
+            1.4596627094123109103,
+            -1.20355390359995517713,
+            -2.05701427703613631826e-1,
+            -1.74081076900158326914,
+            -8.19396251430403066429e-1,
+            -6.07289335809471308991e-1,
+            3.25999702825323200983e-1,
+            -8.93806820919468059117e-1,
+            6.37997023779085625783e-1,
+            -1.07738377189584277893,
+            1.08975029421288960307,
+            2.97273455462497393498e-1,
+            1.37903104614107530068,
+            -8.63361161910024987876e-1,
+            -4.20128455762564356757e-1,
+            -4.27291910734089341872e-1,
+            4.01580045597692780746e-1,
+            -1.460401530349095367,
+            -4.35989578131129817962e-1,
+            -1.74009835431912529558,
+            6.58674761564128519176e-1,
+            3.82510302486229747387e-1,
+            4.95163490188887056576e-1,
+            3.1143005523191269468e-1,
+            1.23968001744426195576e-1,
+            -3.16184915939643262917e-1,
+            -1.76810101913505185456e-1,
+            2.20834390206209763008,
+            9.57008716688112270887e-1,
+            7.5611636496016265685e-2,
+            1.10390041058486443326,
+            1.28660384528125920633e-1,
+            -1.03356280457984617271e-1,
+            -4.23196989567622861017e-1,
+            1.15512465130792785217,
+            6.94725626107971644396e-2,
+            -8.93242409323963815204e-1,
+            -8.23662232188725362825e-1,
+            9.31719257380037468863e-1,
+            -1.16082931090653662665,
+            1.25492439155855195487,
+            6.96652245297915029276e-1,
+            -1.53479605077582448303,
+            -1.03165903249278168019,
+            -6.049393024259033802e-2,
+            -4.78121644849069049599e-1,
+            1.01693603566204981981,
+            1.90262256418631037214e-1,
+            7.85464414955549194985e-1,
+            -1.32848968712597637065,
+            1.39666557107985300767,
+            -2.90398253846863019234e-1
          ]
-         prettyName: "RDecBR1eta"
-         systParamId: 67
+         prettyName: "ZExpA4CCQE"
+         responseParamId: 52
+         systParamId: 56
       }
-      RDecBR1gamma: {
-         centralParamValue: 0
-         isRandomlyThrown: true
-         oneSigmaShifts: [
-            -1,
-            1
-         ]
+      ZExpAVariationResponse: {
          paramVariations: [
-            9.18978106101183023213e-1,
-            -4.26767002052192034878e-1,
-            -1.22824815824226818428,
-            8.98987388793314884383e-2,
-            -5.19781384866260576239e-1,
-            -5.74701119163321894057e-1,
-            -1.13573675121484241046,
-            -3.25347077157281616699e-1,
-            -1.15088495570642090904,
-            8.27623257326093431097e-1,
-            -3.31246145754213794365e-1,
-            1.98732376414679423604,
-            1.16818816855460205772,
-            1.67788536798723808552,
-            7.1758204612501830244e-1,
-            -9.89701544989251780216e-1,
-            -7.80045558183283666009e-2,
-            2.02981946672650015451e-1,
-            9.83036731664455487589e-1,
-            -2.03455096801697127296e-1,
-            -1.65395212600463525909,
-            -4.68589206835309801669e-1,
-            4.05564214399202649375e-1,
-            -1.83861707419803988017,
-            3.46241016851698668599e-1,
-            1.29305759743435777498e-1,
-            -9.31209297313340123026e-2,
-            -2.00263023927199990126,
-            2.39892992963750245616e-1,
-            4.15699860230424600438e-1,
-            1.18251639729713575733,
-            -5.66117044519978906969e-1,
-            2.11118288111274338137e-1,
-            -6.23450688619021087256e-1,
-            1.17340808422407105738,
-            2.00857034479790597103,
-            -1.70997557230005226003,
-            -5.75890869819183248701e-1,
-            -3.04916301693273980589e-2,
-            -2.18382348470981507704e-1,
-            -4.26618049477844540895e-1,
-            -3.25292201118669577209e-1,
-            7.7143929190142634944e-1,
-            -5.74491218690430849314e-1,
-            3.65266373025450619139e-1,
-            -1.97074362179321838084,
-            -5.87614155925583858675e-1,
-            4.21614342942018327509e-1,
-            -1.46012194882523793638,
-            4.06724723629958817561e-1,
-            -7.58218277580138821925e-1,
-            -3.89796189536569404749e-3,
-            8.83859924115511730314e-1,
-            -1.89893809558031062545e-1,
-            9.44647941004262081677e-1,
-            -2.18467621836035474914,
-            8.76295441040075839823e-2,
-            5.91861084402399262316e-1,
-            -1.43435429330471375664,
-            1.5377053820978048293,
-            1.93223183767026296387e-1,
-            -2.04480461948428748897,
-            5.07142764146055080587e-1,
-            -1.85076488184278220572,
-            -5.07649681989440160201e-1,
-            8.15130499153077447971e-1,
-            -6.33009074321389197948e-1,
-            -9.29017372975015853775e-1,
-            8.11849924600230199445e-1,
-            7.4279836533931387077e-2,
-            8.00299829118543026851e-1,
-            -5.8165776898577126186e-1,
-            -2.08737642830001002281,
-            -3.04360762110511218204e-1,
-            3.48127764382326843062e-1,
-            -7.63638702341849634481e-2,
-            1.53645456676892305792e-1,
-            1.3852038839199214415,
-            -1.09991426056211052953e-1,
-            -7.69131710359084563855e-1,
-            1.16270572610788391898,
-            -2.50712394303621222136,
-            9.53082424624334234586e-1,
-            2.85082692200899145973,
-            6.01851437540254496916e-1,
-            2.75215977895749419613e-1,
-            6.53904471761350275516e-2,
-            -5.92480227960626271155e-1,
-            4.33380651755276569137e-2,
-            -3.03133155455726888139e-1,
-            1.27685420218081411431e-2,
-            1.36895498578640451015,
-            -8.41828539409353648892e-1,
-            -3.96612144060652094257e-1,
-            2.66857014726405231131e-2,
-            4.13777142872802927709e-1,
-            1.19658308452203665517,
-            -8.28531442993400979447e-1,
-            -3.82782398934110923427e-1,
-            8.3111027654266333986e-1
-         ]
-         prettyName: "RDecBR1gamma"
-         systParamId: 66
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            9,
+            10,
+            11,
+            12,
+            13,
+            14,
+            15,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            25,
+            26,
+            27,
+            28,
+            29,
+            30,
+            31,
+            32,
+            33,
+            34,
+            35,
+            36,
+            37,
+            38,
+            39,
+            40,
+            41,
+            42,
+            43,
+            44,
+            45,
+            46,
+            47,
+            48,
+            49,
+            50,
+            51,
+            52,
+            53,
+            54,
+            55,
+            56,
+            57,
+            58,
+            59,
+            60,
+            61,
+            62,
+            63,
+            64,
+            65,
+            66,
+            67,
+            68,
+            69,
+            70,
+            71,
+            72,
+            73,
+            74,
+            75,
+            76,
+            77,
+            78,
+            79,
+            80,
+            81,
+            82,
+            83,
+            84,
+            85,
+            86,
+            87,
+            88,
+            89,
+            90,
+            91,
+            92,
+            93,
+            94,
+            95,
+            96,
+            97,
+            98,
+            99
+         ]
+         prettyName: "ZExpAVariationResponse"
+         systParamId: 52
       }
-      instance_name: "ICARUS_v1_multisim"
+      instance_name: "ICARUS_v2_multisim"
       parameter_headers: [
-         "MaCCQE",
+         "ZExpAVariationResponse",
+         "ZExpA1CCQE",
+         "ZExpA2CCQE",
+         "ZExpA3CCQE",
+         "ZExpA4CCQE",
+         "RPA_CCQE",
+         "CoulombCCQE",
+         "NormCCMEC",
+         "NormNCMEC",
+         "NCELVariationResponse",
          "MaNCEL",
          "EtaNCEL",
+         "CCRESVariationResponse",
          "MaCCRES",
          "MvCCRES",
+         "NCRESVariationResponse",
          "MaNCRES",
          "MvNCRES",
          "NonRESBGvpCC1pi",
@@ -5252,25 +6805,27 @@ generated_systematic_provider_configuration: {
          "NonRESBGvbarnNC2pi",
          "RDecBR1gamma",
          "RDecBR1eta",
+         "COHVariationResponse",
+         "NormCCCOH",
+         "NormNCCOH",
+         "DISBYVariationResponse",
          "AhtBY",
          "BhtBY",
          "CV1uBY",
          "CV2uBY",
-         "FormZone",
+         "FSI_pi_VariationResponse",
          "MFP_pi",
-         "FrCEx_pi",
          "FrInel_pi",
          "FrAbs_pi",
          "FrPiProd_pi",
+         "FSI_N_VariationResponse",
          "MFP_N",
-         "FrCEx_N",
          "FrInel_N",
          "FrAbs_N",
-         "FrPiProd_N",
-         "CCQEPauliSupViaKF"
+         "FrPiProd_N"
       ]
       tool_options: {
-         AxFFCCQEDipoleToZExp: false
+         AxFFCCQEDipoleToZExp: true
          CCRESIsShapeOnly: false
          DISBYIsShapeOnly: false
          MaCCQEIsShapeOnly: false
@@ -5279,7 +6834,7 @@ generated_systematic_provider_configuration: {
          evgen_list_name: ""
          fill_valid_tree: false
          genie_tune_name: "${GENIE_XSEC_TUNE}"
-         ignore_parameter_dependence: true
+         ignore_parameter_dependence: false
       }
       tool_type: "GENIEReWeight"
    }
@@ -5295,7 +6850,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "E2p2h_A_nu"
-         systParamId: 84
+         systParamId: 106
       }
       E2p2h_A_nubar: {
          centralParamValue: 0
@@ -5308,7 +6863,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "E2p2h_A_nubar"
-         systParamId: 86
+         systParamId: 108
       }
       E2p2h_B_nu: {
          centralParamValue: 0
@@ -5321,7 +6876,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "E2p2h_B_nu"
-         systParamId: 85
+         systParamId: 107
       }
       E2p2h_B_nubar: {
          centralParamValue: 0
@@ -5334,7 +6889,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "E2p2h_B_nubar"
-         systParamId: 87
+         systParamId: 109
       }
       instance_name: "ICARUS_v1"
       parameter_headers: [
@@ -5363,7 +6918,7 @@ generated_systematic_provider_configuration: {
             4
          ]
          prettyName: "Mnv2p2hGaussEnhancement"
-         systParamId: 88
+         systParamId: 110
       }
       instance_name: "ICARUS_v1"
       parameter_headers: [
@@ -5391,7 +6946,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "C12ToAr40_2p2hScaling_nu"
-         systParamId: 89
+         systParamId: 111
       }
       C12ToAr40_2p2hScaling_nubar: {
          centralParamValue: 0
@@ -5404,7 +6959,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "C12ToAr40_2p2hScaling_nubar"
-         systParamId: 90
+         systParamId: 112
       }
       SPPLowQ2Suppression: {
          centralParamValue: 0
@@ -5421,7 +6976,7 @@ generated_systematic_provider_configuration: {
             1
          ]
          prettyName: "SPPLowQ2Suppression"
-         systParamId: 93
+         systParamId: 115
       }
       instance_name: "ICARUS_v1"
       nuenuebar_xsec_ratio: {
@@ -5431,7 +6986,7 @@ generated_systematic_provider_configuration: {
             1
          ]
          prettyName: "nuenuebar_xsec_ratio"
-         systParamId: 91
+         systParamId: 113
       }
       nuenumu_xsec_ratio: {
          centralParamValue: 1
@@ -5440,7 +6995,7 @@ generated_systematic_provider_configuration: {
             1
          ]
          prettyName: "nuenumu_xsec_ratio"
-         systParamId: 92
+         systParamId: 114
       }
       parameter_headers: [
          "C12ToAr40_2p2hScaling_nu",
@@ -5466,7 +7021,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_n_CC_2Pi"
-         systParamId: 94
+         systParamId: 116
       }
       NR_nu_n_CC_3Pi: {
          centralParamValue: 0
@@ -5479,7 +7034,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_n_CC_3Pi"
-         systParamId: 95
+         systParamId: 117
       }
       NR_nu_n_NC_1Pi: {
          centralParamValue: 0
@@ -5492,7 +7047,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_n_NC_1Pi"
-         systParamId: 99
+         systParamId: 121
       }
       NR_nu_n_NC_2Pi: {
          centralParamValue: 0
@@ -5505,7 +7060,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_n_NC_2Pi"
-         systParamId: 100
+         systParamId: 122
       }
       NR_nu_n_NC_3Pi: {
          centralParamValue: 0
@@ -5518,7 +7073,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_n_NC_3Pi"
-         systParamId: 101
+         systParamId: 123
       }
       NR_nu_np_CC_1Pi: {
          centralParamValue: -1.1399999999999999023
@@ -5533,7 +7088,7 @@ generated_systematic_provider_configuration: {
             -1.07999999999999984901
          ]
          prettyName: "NR_nu_np_CC_1Pi"
-         systParamId: 98
+         systParamId: 120
       }
       NR_nu_p_CC_2Pi: {
          centralParamValue: 0
@@ -5546,7 +7101,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_p_CC_2Pi"
-         systParamId: 96
+         systParamId: 118
       }
       NR_nu_p_CC_3Pi: {
          centralParamValue: 0
@@ -5559,7 +7114,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_p_CC_3Pi"
-         systParamId: 97
+         systParamId: 119
       }
       NR_nu_p_NC_1Pi: {
          centralParamValue: 0
@@ -5572,7 +7127,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_p_NC_1Pi"
-         systParamId: 102
+         systParamId: 124
       }
       NR_nu_p_NC_2Pi: {
          centralParamValue: 0
@@ -5585,7 +7140,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_p_NC_2Pi"
-         systParamId: 103
+         systParamId: 125
       }
       NR_nu_p_NC_3Pi: {
          centralParamValue: 0
@@ -5598,7 +7153,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nu_p_NC_3Pi"
-         systParamId: 104
+         systParamId: 126
       }
       NR_nubar_n_CC_1Pi: {
          centralParamValue: 0
@@ -5611,7 +7166,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_n_CC_1Pi"
-         systParamId: 105
+         systParamId: 127
       }
       NR_nubar_n_CC_2Pi: {
          centralParamValue: 0
@@ -5624,7 +7179,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_n_CC_2Pi"
-         systParamId: 106
+         systParamId: 128
       }
       NR_nubar_n_CC_3Pi: {
          centralParamValue: 0
@@ -5637,7 +7192,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_n_CC_3Pi"
-         systParamId: 107
+         systParamId: 129
       }
       NR_nubar_n_NC_1Pi: {
          centralParamValue: 0
@@ -5650,7 +7205,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_n_NC_1Pi"
-         systParamId: 111
+         systParamId: 133
       }
       NR_nubar_n_NC_2Pi: {
          centralParamValue: 0
@@ -5663,7 +7218,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_n_NC_2Pi"
-         systParamId: 112
+         systParamId: 134
       }
       NR_nubar_n_NC_3Pi: {
          centralParamValue: 0
@@ -5676,7 +7231,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_n_NC_3Pi"
-         systParamId: 113
+         systParamId: 135
       }
       NR_nubar_p_CC_1Pi: {
          centralParamValue: 0
@@ -5689,7 +7244,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_p_CC_1Pi"
-         systParamId: 108
+         systParamId: 130
       }
       NR_nubar_p_CC_2Pi: {
          centralParamValue: 0
@@ -5702,7 +7257,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_p_CC_2Pi"
-         systParamId: 109
+         systParamId: 131
       }
       NR_nubar_p_CC_3Pi: {
          centralParamValue: 0
@@ -5715,7 +7270,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_p_CC_3Pi"
-         systParamId: 110
+         systParamId: 132
       }
       NR_nubar_p_NC_1Pi: {
          centralParamValue: 0
@@ -5728,7 +7283,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_p_NC_1Pi"
-         systParamId: 114
+         systParamId: 136
       }
       NR_nubar_p_NC_2Pi: {
          centralParamValue: 0
@@ -5741,7 +7296,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_p_NC_2Pi"
-         systParamId: 115
+         systParamId: 137
       }
       NR_nubar_p_NC_3Pi: {
          centralParamValue: 0
@@ -5754,7 +7309,7 @@ generated_systematic_provider_configuration: {
             3
          ]
          prettyName: "NR_nubar_p_NC_3Pi"
-         systParamId: 116
+         systParamId: 138
       }
       instance_name: "ICARUS_v1"
       parameter_headers: [
@@ -5793,8 +7348,8 @@ generated_systematic_provider_configuration: {
       tool_type: "NOvAStyleNonResPionNorm"
    }
    syst_providers: [
-      "GENIEReWeight_ICARUS_v1_multisigma",
-      "GENIEReWeight_ICARUS_v1_multisim",
+      "GENIEReWeight_ICARUS_v2_multisigma",
+      "GENIEReWeight_ICARUS_v2_multisim",
       "MINERvAE2p2h_ICARUS_v1",
       "MINERvAq0q3Weighting_ICARUS_v1",
       "MiscInteractionSysts_ICARUS_v1",
diff --git a/fcl/caf/cafmakerjob_icarus_data_rereco_numi.fcl b/fcl/caf/cafmakerjob_icarus_data_rereco_numi.fcl
new file mode 100644
index 000000000..bf467fd7d
--- /dev/null
+++ b/fcl/caf/cafmakerjob_icarus_data_rereco_numi.fcl
@@ -0,0 +1,68 @@
+#include "stage1_icarus_defs.fcl"
+#include "cafmakerjob_icarus_data.fcl"
+
+process_name: stage1REDO
+
+services:
+{
+  TFileService:           { }
+  IICARUSChannelMap:      @local::icarus_channelmappinggservice
+                          @table::icarus_wirecalibration_services
+  SpaceChargeService: @local::icarus_spacecharge
+  IFBeam: {}
+}
+
+physics.producers: {
+  @table::physics.producers
+  @table::icarus_stage1_producers
+}
+
+physics.filters: {
+  @table::icarus_stage1_filters
+}
+
+physics.analyzers: {
+  @table::icarus_stage1_analyzers
+}
+
+physics.runprod: [
+  @sequence::icarus_filter_cluster3D,
+  @sequence::icarus_pandora_Gauss,
+  # @sequence::icarus_reco_fm,
+  # @sequence::icarus_crttrack,
+  # @sequence::icarus_crtt0match,
+  caloskimCalorimetryCryoE, caloskimCalorimetryCryoW,
+  
+  @sequence::physics.runprod
+]
+physics.outana:            [ caloskimE, caloskimW]
+physics.stream1: []
+
+physics.trigger_paths:     [ runprod ]
+physics.end_paths:         [ outana, stream1 ]
+
+source.inputCommands: [
+  "keep *_*_*_*",
+  "drop *_*_*_stage1"
+]
+
+physics.analyzers.caloskimE.SelectEvents: [ runprod ]
+physics.analyzers.caloskimW.SelectEvents: [ runprod ]
+
+services.SpaceChargeService: {
+    EnableCalEfieldSCE: false
+    EnableCalSpatialSCE: false
+    EnableCorrSCE: false
+    EnableSimEfieldSCE: false
+    EnableSimSpatialSCE: false
+    InputFilename: "SCEoffsets/SCEoffsets_ICARUS_E500_voxelTH3.root"
+    RepresentationType: "Voxelized_TH3"
+    service_provider: "SpaceChargeServiceICARUS"
+}
+
+### adding t0 info in the calorimetry variables
+physics.producers.pandoraCaloGausCryoE.T0ModuleLabel: "pandoraGausCryoE"
+physics.producers.pandoraCaloGausCryoW.T0ModuleLabel: "pandoraGausCryoW" 
+
+# physics.producers.pandoraCaloGausCryoE.ChargeMethod: 2 # SumADC
+# physics.producers.pandoraCaloGausCryoW.ChargeMethod: 2 # SumADC
diff --git a/fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run1.fcl b/fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run1.fcl
new file mode 100644
index 000000000..cfcc0095b
--- /dev/null
+++ b/fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run1.fcl
@@ -0,0 +1,3 @@
+#include "cafmakerjob_icarus_data_rereco_numi.fcl"
+
+services.Geometry: @local::icarus_geometry_services_no_overburden_legacy_icarus_v3.Geometry
diff --git a/fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run2OffBeam.fcl b/fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run2OffBeam.fcl
new file mode 100644
index 000000000..540458d17
--- /dev/null
+++ b/fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run2OffBeam.fcl
@@ -0,0 +1,4 @@
+#include "cafmakerjob_icarus_data_rereco_numi.fcl"
+
+# Get EXT
+physics.runprod: [numiextinfo, @sequence::physics.runprod]
diff --git a/fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run2OnBeam.fcl b/fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run2OnBeam.fcl
new file mode 100644
index 000000000..ba8162933
--- /dev/null
+++ b/fcl/caf/cafmakerjob_icarus_data_rereco_numi_Run2OnBeam.fcl
@@ -0,0 +1,5 @@
+#include "cafmakerjob_icarus_data_rereco_numi.fcl"
+
+# Get POT
+# physics.runprod: [numiinfo, @sequence::physics.runprod]
+
diff --git a/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl b/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl
index 7ba1d48a3..75f7d6250 100644
--- a/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl
+++ b/fcl/caf/cafmakerjob_icarus_systtools_and_fluxwgt.fcl
@@ -1,6 +1,6 @@
 #include "cafmakerjob_icarus.fcl"
 
-physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, fluxweight, cafmaker ]
+physics.runprod: [ @sequence::caf_preprocess_sequence, rns, systtools, fluxweight, geant4weight, cafmaker ]
 
-physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight"]
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight", "geant4weight"]
 
diff --git a/fcl/caf/cafmakerjob_rereco_numi_icarus_systtools_and_fluxwgt.fcl b/fcl/caf/cafmakerjob_rereco_numi_icarus_systtools_and_fluxwgt.fcl
new file mode 100644
index 000000000..e16f69c6b
--- /dev/null
+++ b/fcl/caf/cafmakerjob_rereco_numi_icarus_systtools_and_fluxwgt.fcl
@@ -0,0 +1,60 @@
+#include "stage1_icarus_defs.fcl"
+#include "services_icarus_simulation.fcl"
+#include "cafmakerjob_icarus.fcl"
+
+process_name: stage1REDO
+
+services:
+{
+  TFileService:           { }
+  IICARUSChannelMap:      @local::icarus_channelmappinggservice
+                          @table::icarus_wirecalibration_services
+  SpaceChargeService: @local::icarus_spacecharge
+  IFBeam: {}
+}
+services.ParticleInventoryService:  @local::standard_particleinventoryservice
+
+
+physics.producers: {
+  @table::physics.producers
+  @table::icarus_stage1_producers
+}
+
+physics.filters: {
+  @table::icarus_stage1_filters
+}
+
+physics.analyzers: {
+  @table::icarus_stage1_analyzers
+}
+
+physics.runprod: [
+  rns, 
+  @sequence::icarus_filter_cluster3D,
+  @sequence::icarus_pandora_Gauss,
+  # @sequence::icarus_reco_fm,
+  # @sequence::icarus_crttrack,
+  # @sequence::icarus_crtt0match,
+  caloskimCalorimetryCryoE, caloskimCalorimetryCryoW,
+  systtools, fluxweight, geant4weight,
+  
+  @sequence::physics.runprod
+]
+
+physics.outana:            [ caloskimE, caloskimW]
+physics.stream1: []
+
+physics.trigger_paths:     [ runprod ]
+physics.end_paths:         [ outana, stream1 ]
+
+source.inputCommands: [
+  "keep *_*_*_*",
+  "drop *_*_*_stage1"
+]
+
+physics.analyzers.caloskimE.SelectEvents: [ runprod ]
+physics.analyzers.caloskimW.SelectEvents: [ runprod ]
+
+physics.producers.cafmaker.SystWeightLabels: ["systtools", "fluxweight", "geant4weight"]
+#include "cafmaker_add_detsim2d_icarus.fcl"
+
diff --git a/fcl/configurations/database_icarus.fcl b/fcl/configurations/database_icarus.fcl
index 6f1855f4e..f0b22def7 100644
--- a/fcl/configurations/database_icarus.fcl
+++ b/fcl/configurations/database_icarus.fcl
@@ -21,7 +21,7 @@ icarus_siov_channelstatus_service: @local::standard_siov_channelstatus_service
 
 icarus_siov_channelstatus_service.service_provider:                                        SIOVChannelStatusICARUSService
 icarus_siov_channelstatus_service.ChannelStatusProvider.DatabaseRetrievalAlg.DBFolderName: "tpc_channelstatus_data"
-icarus_siov_channelstatus_service.ChannelStatusProvider.DatabaseRetrievalAlg.DBTag:        "v1r1"
+icarus_siov_channelstatus_service.ChannelStatusProvider.DatabaseRetrievalAlg.DBTag:        "v3r1"
 icarus_siov_channelstatus_service.ChannelStatusProvider.DatabaseRetrievalAlg.DBUrl:        "https://dbdata0vm.fnal.gov:9443/icarus_con_prod/app/"
 icarus_siov_channelstatus_service.ChannelStatusProvider.DatabaseRetrievalAlg.UseSQLite:    true
 icarus_siov_channelstatus_service.ChannelStatusProvider.UseDB:                             true
diff --git a/fcl/gen/MultiVertex/cohlikevertex_icarus.fcl b/fcl/gen/MultiVertex/cohlikevertex_icarus.fcl
new file mode 100644
index 000000000..0e6501bc9
--- /dev/null
+++ b/fcl/gen/MultiVertex/cohlikevertex_icarus.fcl
@@ -0,0 +1,91 @@
+#include "services_icarus_simulation.fcl"
+#include "beamgates_icarus.fcl"
+
+process_name: CohLikeVertexGen
+
+CohLikeVertex: {
+    module_type  : "MultiPartVertex"
+    DebugMode    : 1
+    G4Time       : 1500
+    G4TimeJitter : 0
+    TPCRange     : [[0,0], [0,1], [0,2], [0,3], [1,0], [1,1], [1,2], [1,3]]
+    XRange       : [10]
+    YRange       : [10]
+    ZRange       : [10, 100]
+    MultiMax     : 2
+    MultiMin     : 2
+    ParticleParameter: {
+        PDGCode      : [   [13, -13], [211,-211]]
+        MinMulti     : [          1,           1]
+        MaxMulti     : [          1,           1]
+        ProbWeight   : [          1,           1]
+        KERange      : [ [0.2,4],   [0.2,4]]
+        MomRange     : []
+    }
+}
+
+services:
+{
+  scheduler:    { defaultExceptions: false }    # Make all uncaught exceptions fatal.
+  # Load the service that manages root files for histograms.
+  TFileService: { fileName: "multivertex_hist_uboone.root" }
+  TimeTracker:  {}
+  MemoryTracker:     { ignoreTotal: 1 } # default is one
+  RandomNumberGenerator: {} #ART native random number generator
+  #FileCatalogMetadata:  @local::art_file_catalog_mc
+  @table::icarus_gen_services
+}
+
+#Start each new event with an empty event.
+source:
+{
+  module_type: EmptyEvent
+  timestampPlugin: { plugin_type: "GeneratedEventTimestamp" }
+  maxEvents:   10          # Number of events to create
+  firstRun:    1           # Run number to use for this file
+  firstEvent:  1           # number of first event in the file
+}
+
+# Define and configure some modules to do work on each event.
+# First modules are defined; they are scheduled later.
+# Modules are grouped by type.
+physics:
+{
+
+ producers:
+ {
+   generator: @local::CohLikeVertex
+   beamgate:  @local::icarus_standardbeamgate_NuMI  # from beamgates_icarus.fcl
+   rns:       { module_type: "RandomNumberSaver" }
+ }
+
+ #define the producer and filter modules for this path, order matters, 
+ #filters reject all following items.  see lines starting physics.producers below
+ simulate: [ rns, generator, beamgate ]
+
+ #define the output stream, there could be more than one if using filters 
+ stream1:  [ out1 ]
+
+ #trigger_paths is a keyword and contains the paths that modify the art::event, 
+ #ie filters and producers
+ trigger_paths: [simulate] 
+
+ #end_paths is a keyword and contains the paths that do not modify the art::Event, 
+ #ie analyzers and output streams.  these all run simultaneously
+ end_paths:     [stream1]  
+}
+
+#block to define where the output goes.  if you defined a filter in the physics
+#block and put it in the trigger_paths then you need to put a SelectEvents: {SelectEvents: [XXX]}
+#entry in the output stream you want those to go to, where XXX is the label of the filter module(s)
+outputs:
+{
+ out1:
+ {
+   module_type: RootOutput
+   fileName:    "prod_multivertex_icarus_%tc_gen.root"
+   dataTier:    "generated"
+   compressionLevel: 1
+   saveMemoryObjectThreshold: 0
+ }
+}
diff --git a/fcl/gen/mevprtl/CMakeLists.txt b/fcl/gen/mevprtl/CMakeLists.txt
index 46cd33cdf..0a19a999e 100644
--- a/fcl/gen/mevprtl/CMakeLists.txt
+++ b/fcl/gen/mevprtl/CMakeLists.txt
@@ -1,2 +1,3 @@
+add_subdirectory(alp)
 add_subdirectory(higgs)
 add_subdirectory(hnl)
diff --git a/fcl/gen/mevprtl/alp/CMakeLists.txt b/fcl/gen/mevprtl/alp/CMakeLists.txt
new file mode 100644
index 000000000..13355789a
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/CMakeLists.txt
@@ -0,0 +1 @@
+install_fhicl()
diff --git a/fcl/gen/mevprtl/alp/alp_corsika_p_gen_icarus.fcl b/fcl/gen/mevprtl/alp/alp_corsika_p_gen_icarus.fcl
new file mode 100644
index 000000000..540c1c067
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_corsika_p_gen_icarus.fcl
@@ -0,0 +1,6 @@
+#include "corsika_icarus.fcl"
+#include "alp_gen_icarus.fcl"
+
+physics.producers.cosmgen: @local::icarus_corsika_p
+physics.runprod: [@sequence::physics.runprod, cosmgen]
+
diff --git a/fcl/gen/mevprtl/alp/alp_em_gen_icarus.fcl b/fcl/gen/mevprtl/alp/alp_em_gen_icarus.fcl
new file mode 100644
index 000000000..bcbe01fcd
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_em_gen_icarus.fcl
@@ -0,0 +1,64 @@
+#include "alp.fcl"
+# service configuration
+#
+#include "services_icarus_simulation.fcl"
+
+
+process_name: ALPTree
+
+services:
+{
+  @table::icarus_simulation_services
+  TFileService: { fileName: "alp_icarus.root" }
+  IFDH: {}
+}
+
+source: {
+  module_type: "EmptyEvent"
+  firstEvent: 1
+  firstRun: 1
+  timestampPlugin: {
+    plugin_type: "GeneratedEventTimestamp"
+  }
+}
+
+physics:
+{
+  producers: {
+    generator: @local::alp
+    rns:       { module_type: "RandomNumberSaver" }
+  }
+ 
+  gen:  [ generator, rns]
+  stream: [out]
+ 
+  trigger_paths: [gen] 
+  end_paths:     [stream] 
+  
+} # physics
+
+outputs: {
+ out:
+ {
+   module_type: RootOutput
+   dataTier: "simulated"
+   compressionLevel: 1
+   saveMemoryObjectThreshold: 0
+ }
+
+}
+
+outputs.out.fileName: "simulation_higgs_icarus_numi_%tc-%p.root"
+
+
+# Set muon coupling to 0
+physics.producers.generator.Flux.cAl: 0
+physics.producers.generator.Decay.ReferenceALPcAl: 0
+physics.producers.generator.Decay.AllowEMDecay: true
+
+# Make art ROOT file
+physics.producers.generator.Produce: true
+physics.producers.generator.AnaOutput: false
+physics.producers.generator.Deweight: true
+
+services.NuRandomService.policy: "random"
diff --git a/fcl/gen/mevprtl/alp/alp_em_tree_icarus.fcl b/fcl/gen/mevprtl/alp/alp_em_tree_icarus.fcl
new file mode 100644
index 000000000..13bb4c355
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_em_tree_icarus.fcl
@@ -0,0 +1,38 @@
+#include "alp.fcl"
+# service configuration
+#
+#include "services_icarus_simulation.fcl"
+
+
+process_name: ALPTree
+
+services:
+{
+  @table::icarus_basic_services
+  TFileService: { fileName: "alp_icarus.root" }
+  IFDH: {}
+}
+
+source: {
+  module_type: EmptyEvent
+}
+
+physics:
+{
+  producers: {
+    alp: @local::alp
+  }
+ 
+  ana:  [ alp ]
+ 
+  trigger_paths: [ana] 
+  end_paths:     [ ] 
+  
+} # physics
+
+# Set muon coupling to 0
+physics.producers.alp.Flux.cAl: 0
+physics.producers.alp.Decay.ReferenceALPcAl: 0
+physics.producers.alp.Decay.AllowEMDecay: true
+
+services.NuRandomService.policy: "random"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus.fcl
new file mode 100644
index 000000000..eae8a4591
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus.fcl
@@ -0,0 +1,60 @@
+#include "alp.fcl"
+#include "beamgates_icarus.fcl"
+# service configuration
+#
+#include "services_icarus_simulation.fcl"
+
+
+process_name: ALPTree
+
+services:
+{
+  @table::icarus_simulation_services
+  TFileService: { fileName: "alp_icarus.root" }
+  IFDH: {}
+}
+
+source: {
+  module_type: "EmptyEvent"
+  firstEvent: 1
+  firstRun: 1
+  timestampPlugin: {
+    plugin_type: "GeneratedEventTimestamp"
+  }
+}
+
+physics:
+{
+  producers: {
+    generator: @local::alp
+    beamgate:  @local::icarus_standardbeamgate_NuMI  # from beamgates_icarus.fcl
+    rns:       { module_type: "RandomNumberSaver" }
+  }
+ 
+  runprod:  [generator, beamgate, rns]
+  stream: [out]
+ 
+  trigger_paths: [runprod] 
+  end_paths:     [stream] 
+  
+} # physics
+
+outputs: {
+ out:
+ {
+   module_type: RootOutput
+   dataTier: "simulated"
+   compressionLevel: 1
+   saveMemoryObjectThreshold: 0
+ }
+
+}
+
+outputs.out.fileName: "simulation_higgs_icarus_numi_%tc-%p.root"
+
+# Make art ROOT file
+physics.producers.generator.Produce: true
+physics.producers.generator.AnaOutput: false
+physics.producers.generator.Deweight: true
+
+services.NuRandomService.policy: "random"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus_M300.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus_M300.fcl
new file mode 100644
index 000000000..c8ff59e41
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus_M300.fcl
@@ -0,0 +1,4 @@
+#include "alp_corsika_p_gen_icarus.fcl"
+
+alpM: 0.3
+#include "set_alpM.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus_M350.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus_M350.fcl
new file mode 100644
index 000000000..12a8568ee
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus_M350.fcl
@@ -0,0 +1,4 @@
+#include "alp_corsika_p_gen_icarus.fcl"
+
+alpM: 0.35
+#include "set_alpM.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus_M400.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus_M400.fcl
new file mode 100644
index 000000000..a3bf280d0
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus_M400.fcl
@@ -0,0 +1,4 @@
+#include "alp_corsika_p_gen_icarus.fcl"
+
+alpM: 0.4
+#include "set_alpM.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus_M450.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus_M450.fcl
new file mode 100644
index 000000000..c142a4e62
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus_M450.fcl
@@ -0,0 +1,4 @@
+#include "alp_corsika_p_gen_icarus.fcl"
+
+alpM: 0.45
+#include "set_alpM.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus_M500.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus_M500.fcl
new file mode 100644
index 000000000..f6d477475
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus_M500.fcl
@@ -0,0 +1,4 @@
+#include "alp_corsika_p_gen_icarus.fcl"
+
+alpM: 0.5
+#include "set_alpM.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus_M600.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus_M600.fcl
new file mode 100644
index 000000000..8be8509aa
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus_M600.fcl
@@ -0,0 +1,6 @@
+#include "alp_corsika_p_gen_icarus.fcl"
+
+alpM: 0.6
+#include "set_alpM.fcl"
+alpfa: 1e6
+#include "set_alpfa.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus_M650.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus_M650.fcl
new file mode 100644
index 000000000..8497209ff
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus_M650.fcl
@@ -0,0 +1,6 @@
+#include "alp_corsika_p_gen_icarus.fcl"
+
+alpM: 0.65
+#include "set_alpM.fcl"
+alpfa: 1e6
+#include "set_alpfa.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus_M700.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus_M700.fcl
new file mode 100644
index 000000000..881606cc0
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus_M700.fcl
@@ -0,0 +1,6 @@
+#include "alp_corsika_p_gen_icarus.fcl"
+
+alpM: 0.7
+#include "set_alpM.fcl"
+alpfa: 1e6
+#include "set_alpfa.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_gen_icarus_M750.fcl b/fcl/gen/mevprtl/alp/alp_gen_icarus_M750.fcl
new file mode 100644
index 000000000..d4cc78e35
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_gen_icarus_M750.fcl
@@ -0,0 +1,6 @@
+#include "alp_corsika_p_gen_icarus.fcl"
+
+alpM: 0.75
+#include "set_alpM.fcl"
+alpfa: 1e6
+#include "set_alpfa.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_tree_icarus.fcl b/fcl/gen/mevprtl/alp/alp_tree_icarus.fcl
new file mode 100644
index 000000000..8fb192087
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_tree_icarus.fcl
@@ -0,0 +1,33 @@
+#include "alp.fcl"
+# service configuration
+#
+#include "services_icarus_simulation.fcl"
+
+
+process_name: ALPTree
+
+services:
+{
+  @table::icarus_basic_services
+  TFileService: { fileName: "alp_icarus.root" }
+  IFDH: {}
+}
+
+source: {
+  module_type: EmptyEvent
+}
+
+physics:
+{
+  producers: {
+    generator: @local::alp
+  }
+ 
+  ana:  [ generator ]
+ 
+  trigger_paths: [ana] 
+  end_paths:     [ ] 
+  
+} # physics
+
+services.NuRandomService.policy: "random"
diff --git a/fcl/gen/mevprtl/alp/alp_tree_icarus_M300.fcl b/fcl/gen/mevprtl/alp/alp_tree_icarus_M300.fcl
new file mode 100644
index 000000000..d45084d2f
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_tree_icarus_M300.fcl
@@ -0,0 +1,4 @@
+#include "alp_tree_icarus.fcl"
+
+alpM: 0.3
+#include "set_alpM.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_tree_icarus_M500.fcl b/fcl/gen/mevprtl/alp/alp_tree_icarus_M500.fcl
new file mode 100644
index 000000000..18ff296e8
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_tree_icarus_M500.fcl
@@ -0,0 +1,4 @@
+#include "alp_tree_icarus.fcl"
+
+alpM: 0.5
+#include "set_alpM.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_tree_icarus_M600.fcl b/fcl/gen/mevprtl/alp/alp_tree_icarus_M600.fcl
new file mode 100644
index 000000000..91cf4888d
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_tree_icarus_M600.fcl
@@ -0,0 +1,4 @@
+#include "alp_tree_icarus.fcl"
+
+alpM: 0.6
+#include "set_alpM.fcl"
diff --git a/fcl/gen/mevprtl/alp/alp_tree_icarus_M700.fcl b/fcl/gen/mevprtl/alp/alp_tree_icarus_M700.fcl
new file mode 100644
index 000000000..199c22050
--- /dev/null
+++ b/fcl/gen/mevprtl/alp/alp_tree_icarus_M700.fcl
@@ -0,0 +1,4 @@
+#include "alp_tree_icarus.fcl"
+
+alpM: 0.7
+#include "set_alpM.fcl"
diff --git a/fcl/gen/mevprtl/higgs/dissH_M280.fcl b/fcl/gen/mevprtl/higgs/dissH_M280.fcl
new file mode 100644
index 000000000..e6fbc4b64
--- /dev/null
+++ b/fcl/gen/mevprtl/higgs/dissH_M280.fcl
@@ -0,0 +1,13 @@
+#include "dissonant_higgs_gen.fcl"
+
+physics.producers.generator.Decay.AllowPionDecay: false
+physics.producers.generator.Decay.AllowPi0Decay: false
+
+physics.producers.generator.Decay.ReferenceHiggsMixing: 3e-5
+physics.producers.generator.Flux.MixingAngle: 3e-5
+
+physics.producers.generator.RayTrace.MaxWeightFudge: 1.
+physics.producers.generator.RayTrace.ReferenceLabSolidAngle: 1e-4
+
+higgsM: 0.28
+#include "set_higgsM.fcl"
diff --git a/fcl/gen/mevprtl/higgs/dissH_M300.fcl b/fcl/gen/mevprtl/higgs/dissH_M300.fcl
index 46854f064..dc75aff32 100644
--- a/fcl/gen/mevprtl/higgs/dissH_M300.fcl
+++ b/fcl/gen/mevprtl/higgs/dissH_M300.fcl
@@ -1,4 +1,13 @@
 #include "dissonant_higgs_gen.fcl"
 
+physics.producers.generator.Decay.AllowPionDecay: false
+physics.producers.generator.Decay.AllowPi0Decay: false
+
+physics.producers.generator.Decay.ReferenceHiggsMixing: 3e-5
+physics.producers.generator.Flux.MixingAngle: 3e-5
+
+physics.producers.generator.RayTrace.MaxWeightFudge: 1.
+physics.producers.generator.RayTrace.ReferenceLabSolidAngle: 1e-4
+
 higgsM: 0.3
 #include "set_higgsM.fcl"
diff --git a/fcl/gen/mevprtl/higgs/dissH_M330.fcl b/fcl/gen/mevprtl/higgs/dissH_M330.fcl
new file mode 100644
index 000000000..328b34f7a
--- /dev/null
+++ b/fcl/gen/mevprtl/higgs/dissH_M330.fcl
@@ -0,0 +1,13 @@
+#include "dissonant_higgs_gen.fcl"
+
+physics.producers.generator.Decay.AllowPionDecay: false
+physics.producers.generator.Decay.AllowPi0Decay: false
+
+physics.producers.generator.Decay.ReferenceHiggsMixing: 2e-5
+physics.producers.generator.Flux.MixingAngle: 2e-5
+
+physics.producers.generator.RayTrace.MaxWeightFudge: 1.
+physics.producers.generator.RayTrace.ReferenceLabSolidAngle: 1e-4
+
+higgsM: 0.33
+#include "set_higgsM.fcl"
diff --git a/fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl b/fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl
index 424c56c06..018783075 100644
--- a/fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl
+++ b/fcl/gen/mevprtl/higgs/dissonant_higgs_gen.fcl
@@ -53,6 +53,12 @@ outputs: {
 
 }
 
+# NuMI-like-timing
+physics.producers.generator.Flux.SpillTimeConfig: @local::FNAL_NuMI_default # from beamspilltimings.fcl
+
+physics.producers.generator.Verbose: false
+phyiscs.producers.generator.RayTrace.Verbose: false
+
 outputs.out.fileName: "simulation_higgs_icarus_numi_%tc-%p.root"
 
 services.NuRandomService.policy: "random"
diff --git a/fcl/numi-anaA/CMakeLists.txt b/fcl/numi-anaA/CMakeLists.txt
new file mode 100644
index 000000000..13355789a
--- /dev/null
+++ b/fcl/numi-anaA/CMakeLists.txt
@@ -0,0 +1 @@
+install_fhicl()
diff --git a/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainhi.fcl b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainhi.fcl
new file mode 100644
index 000000000..34302c68e
--- /dev/null
+++ b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainhi.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 11.8031771
+physics.producers.daq.wcls_main.structs.gain1: 12.1420344
diff --git a/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainlo.fcl b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainlo.fcl
new file mode 100644
index 000000000..ff199a1e0
--- /dev/null
+++ b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainlo.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 8.724087455
+physics.producers.daq.wcls_main.structs.gain1: 12.1420344
diff --git a/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainvhi.fcl b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainvhi.fcl
new file mode 100644
index 000000000..279636478
--- /dev/null
+++ b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainvhi.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 12.316358759999998
+physics.producers.daq.wcls_main.structs.gain1: 12.1420344
diff --git a/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainvlo.fcl b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainvlo.fcl
new file mode 100644
index 000000000..52d60efa2
--- /dev/null
+++ b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0gainvlo.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 8.21090584
+physics.producers.daq.wcls_main.structs.gain1: 12.1420344
diff --git a/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0var.fcl b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0var.fcl
new file mode 100644
index 000000000..0ed634359
--- /dev/null
+++ b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind0var.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+# Add in the tuned field responses
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+# variation on ind 0
+physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind0var.json.bz2"
diff --git a/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind1bin0.fcl b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind1bin0.fcl
new file mode 100644
index 000000000..7bfa4bd01
--- /dev/null
+++ b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind1bin0.fcl
@@ -0,0 +1,13 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+# Add in the tuned field responses
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+# variation on ind 0
+physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind1bin0.json.bz2"
+
+# Set gains to MCNuPhase2
+physics.producers.daq.wcls_main.structs.gain0: 10.2636323
+physics.producers.daq.wcls_main.structs.gain1: 12.1420344
diff --git a/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind1bin14.fcl b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind1bin14.fcl
new file mode 100644
index 000000000..192ba6ced
--- /dev/null
+++ b/fcl/numi-anaA/detsim_2d_icarus_fitFR_ind1bin14.fcl
@@ -0,0 +1,13 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+# Add in the tuned field responses
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+# variation on ind 0
+physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind1bin14.json.bz2"
+
+# Set gains to MCNuPhase2
+physics.producers.daq.wcls_main.structs.gain0: 10.2636323
+physics.producers.daq.wcls_main.structs.gain1: 12.1420344
diff --git a/fcl/numi-anaA/detsim_2d_icarus_fitFR_noise1-2x.fcl b/fcl/numi-anaA/detsim_2d_icarus_fitFR_noise1-2x.fcl
new file mode 100644
index 000000000..32e048ea7
--- /dev/null
+++ b/fcl/numi-anaA/detsim_2d_icarus_fitFR_noise1-2x.fcl
@@ -0,0 +1,11 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 10.2636323
+physics.producers.daq.wcls_main.structs.gain1: 12.1420344
+
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.20
diff --git a/fcl/numi-anaA/detsim_2d_icarus_fitFR_oldgain.fcl b/fcl/numi-anaA/detsim_2d_icarus_fitFR_oldgain.fcl
new file mode 100644
index 000000000..fa40ba0db
--- /dev/null
+++ b/fcl/numi-anaA/detsim_2d_icarus_fitFR_oldgain.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 10.2636323
+physics.producers.daq.wcls_main.structs.gain1: 12.1420344
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-5x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-5x.fcl
new file mode 100644
index 000000000..2b04b4ff4
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-5x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 5.995935050000001
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-6x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-6x.fcl
new file mode 100644
index 000000000..ca3581450
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-6x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 7.1951
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-7x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-7x.fcl
new file mode 100644
index 000000000..fea4df013
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-7x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 8.39430907
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-8x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-8x.fcl
new file mode 100644
index 000000000..928ef849f
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-8x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 9.59349608
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-9x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-9x.fcl
new file mode 100644
index 000000000..7e47dbf84
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-9x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 10.79268309
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0var.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0var.fcl
new file mode 100644
index 000000000..0ed634359
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0var.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+# Add in the tuned field responses
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+# variation on ind 0
+physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind0var.json.bz2"
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin0.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin0.fcl
new file mode 100644
index 000000000..cb23ff7a9
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin0.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+# Add in the tuned field responses
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+# variation on ind 0
+physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind1bin0.json.bz2"
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin14.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin14.fcl
new file mode 100644
index 000000000..1525b8fcc
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin14.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+# Add in the tuned field responses
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+# variation on ind 0
+physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind1bin14.json.bz2"
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-20x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-20x.fcl
new file mode 100644
index 000000000..5687ea2cc
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-20x.fcl
@@ -0,0 +1,7 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.20
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-25x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-25x.fcl
new file mode 100644
index 000000000..d91b69ca7
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-25x.fcl
@@ -0,0 +1,7 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.25
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl
new file mode 100644
index 000000000..49b533782
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.2
+physics.producers.daq.wcls_main.structs.gain0: 5.995935050000001 # 0.5x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl
new file mode 100644
index 000000000..82f1eb059
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.2
+physics.producers.daq.wcls_main.structs.gain0: 7.1951
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl
new file mode 100644
index 000000000..91ca21770
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.2
+physics.producers.daq.wcls_main.structs.gain0: 8.39430907 # 0.7x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl
new file mode 100644
index 000000000..ef924b8b4
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.2
+physics.producers.daq.wcls_main.structs.gain0: 9.593496 # 0.8x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-30x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-30x.fcl
new file mode 100644
index 000000000..5c5e135b7
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-30x.fcl
@@ -0,0 +1,7 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.30
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x.fcl
new file mode 100644
index 000000000..21d6ed4c7
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x.fcl
@@ -0,0 +1,7 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl
new file mode 100644
index 000000000..65d65f694
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
+physics.producers.daq.wcls_main.structs.gain0: 5.995935050000001 # 0.5x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl
new file mode 100644
index 000000000..4d666d5a8
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
+physics.producers.daq.wcls_main.structs.gain0: 7.1951
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl
new file mode 100644
index 000000000..243079f0e
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
+physics.producers.daq.wcls_main.structs.gain0: 8.39430907 # 0.7x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl
new file mode 100644
index 000000000..c74d1703c
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl
@@ -0,0 +1,8 @@
+# Fit field responses, turned up noise on each plane
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
+physics.producers.daq.wcls_main.structs.gain0: 9.593496 # 0.8x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_oldgain.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_oldgain.fcl
new file mode 100644
index 000000000..fa40ba0db
--- /dev/null
+++ b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_oldgain.fcl
@@ -0,0 +1,9 @@
+# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
+#
+#include "detsim_2d_icarus.fcl"
+
+
+physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
+
+physics.producers.daq.wcls_main.structs.gain0: 10.2636323
+physics.producers.daq.wcls_main.structs.gain1: 12.1420344

From ff9f1726b7c36ab2e84137e221290f6c89ef5ae9 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Sat, 21 Oct 2023 20:10:15 -0500
Subject: [PATCH 41/42] Cluster3D ignores hits on channels marked bad.

---
 .../Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/icaruscode/TPC/Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc b/icaruscode/TPC/Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc
index 1fd737383..60d933edd 100644
--- a/icaruscode/TPC/Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc
+++ b/icaruscode/TPC/Tracking/cluster3D/SnippetHit3DBuilderICARUS_tool.cc
@@ -1798,6 +1798,10 @@ void SnippetHit3DBuilderICARUS::CollectArtHits(const art::Event& evt) const
     auto const clock_data = art::ServiceHandle<detinfo::DetectorClocksService const>()->DataFor(evt);
     auto const det_prop   = art::ServiceHandle<detinfo::DetectorPropertiesService const>()->DataFor(evt, clock_data);
 
+    // Bad channel list
+    const lariov::ChannelStatusProvider& channelStatus(
+      art::ServiceHandle<lariov::ChannelStatusService const>()->GetProvider());
+
     // Try to output a formatted string
     std::string debugMessage("");
 
@@ -1854,6 +1858,11 @@ void SnippetHit3DBuilderICARUS::CollectArtHits(const art::Event& evt) const
         // Reject hits with negative charge, these are misreconstructed
         if (recobHit->Integral() < 0.) continue;
 
+        // Reject hits with on a bad channel
+        if (channelStatus.IsBad(recobHit->Channel())) {
+          continue;
+        }
+
         // For some detectors we can have multiple wire ID's associated to a given channel.
         // So we recover the list of these wire IDs
         const std::vector<geo::WireID>& wireIDs = m_geometry->ChannelToWire(recobHit->Channel());

From a9b5abd8d925947675ba73f8bb713b87e192ed80 Mon Sep 17 00:00:00 2001
From: gputnam <gputnam@icarusbuild02.fnal.gov>
Date: Sat, 21 Oct 2023 20:20:14 -0500
Subject: [PATCH 42/42] Remove test detector variations

---
 .../test/detsim_2d_icarus_fitFR_ind0gain0-5x.fcl         | 8 --------
 .../test/detsim_2d_icarus_fitFR_ind0gain0-6x.fcl         | 8 --------
 .../test/detsim_2d_icarus_fitFR_ind0gain0-7x.fcl         | 8 --------
 .../test/detsim_2d_icarus_fitFR_ind0gain0-8x.fcl         | 8 --------
 .../test/detsim_2d_icarus_fitFR_ind0gain0-9x.fcl         | 8 --------
 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0var.fcl    | 9 ---------
 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin0.fcl   | 9 ---------
 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin14.fcl  | 9 ---------
 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-20x.fcl | 7 -------
 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-25x.fcl | 7 -------
 .../detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl    | 8 --------
 .../detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl    | 8 --------
 .../detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl    | 8 --------
 .../detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl    | 8 --------
 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-30x.fcl | 7 -------
 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x.fcl | 7 -------
 .../detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl   | 8 --------
 .../detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl   | 8 --------
 .../detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl   | 8 --------
 .../detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl   | 8 --------
 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_oldgain.fcl    | 9 ---------
 21 files changed, 168 deletions(-)
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-5x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-6x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-7x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-8x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-9x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0var.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin0.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin14.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-20x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-25x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-30x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl
 delete mode 100644 fcl/numi-anaA/test/detsim_2d_icarus_fitFR_oldgain.fcl

diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-5x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-5x.fcl
deleted file mode 100644
index 2b04b4ff4..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-5x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-
-physics.producers.daq.wcls_main.structs.gain0: 5.995935050000001
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-6x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-6x.fcl
deleted file mode 100644
index ca3581450..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-6x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-
-physics.producers.daq.wcls_main.structs.gain0: 7.1951
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-7x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-7x.fcl
deleted file mode 100644
index fea4df013..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-7x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-
-physics.producers.daq.wcls_main.structs.gain0: 8.39430907
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-8x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-8x.fcl
deleted file mode 100644
index 928ef849f..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-8x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-
-physics.producers.daq.wcls_main.structs.gain0: 9.59349608
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-9x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-9x.fcl
deleted file mode 100644
index 7e47dbf84..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0gain0-9x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-
-physics.producers.daq.wcls_main.structs.gain0: 10.79268309
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0var.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0var.fcl
deleted file mode 100644
index 0ed634359..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind0var.fcl
+++ /dev/null
@@ -1,9 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-# Add in the tuned field responses
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-
-# variation on ind 0
-physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind0var.json.bz2"
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin0.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin0.fcl
deleted file mode 100644
index cb23ff7a9..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin0.fcl
+++ /dev/null
@@ -1,9 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-# Add in the tuned field responses
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-
-# variation on ind 0
-physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind1bin0.json.bz2"
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin14.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin14.fcl
deleted file mode 100644
index 1525b8fcc..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_ind1bin14.fcl
+++ /dev/null
@@ -1,9 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-# Add in the tuned field responses
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-
-# variation on ind 0
-physics.producers.daq.wcls_main.params.files_fields: "icarus_fnal_fit_ks_ind1bin14.json.bz2"
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-20x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-20x.fcl
deleted file mode 100644
index 5687ea2cc..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-20x.fcl
+++ /dev/null
@@ -1,7 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.20
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-25x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-25x.fcl
deleted file mode 100644
index d91b69ca7..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-25x.fcl
+++ /dev/null
@@ -1,7 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.25
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl
deleted file mode 100644
index 49b533782..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-5x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.2
-physics.producers.daq.wcls_main.structs.gain0: 5.995935050000001 # 0.5x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl
deleted file mode 100644
index 82f1eb059..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-6x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.2
-physics.producers.daq.wcls_main.structs.gain0: 7.1951
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl
deleted file mode 100644
index 91ca21770..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-7x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.2
-physics.producers.daq.wcls_main.structs.gain0: 8.39430907 # 0.7x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl
deleted file mode 100644
index ef924b8b4..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-2x_ind0gain0-8x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.2
-physics.producers.daq.wcls_main.structs.gain0: 9.593496 # 0.8x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-30x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-30x.fcl
deleted file mode 100644
index 5c5e135b7..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-30x.fcl
+++ /dev/null
@@ -1,7 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.30
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x.fcl
deleted file mode 100644
index 21d6ed4c7..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x.fcl
+++ /dev/null
@@ -1,7 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl
deleted file mode 100644
index 65d65f694..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-5x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
-physics.producers.daq.wcls_main.structs.gain0: 5.995935050000001 # 0.5x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl
deleted file mode 100644
index 4d666d5a8..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-6x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
-physics.producers.daq.wcls_main.structs.gain0: 7.1951
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl
deleted file mode 100644
index 243079f0e..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-7x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
-physics.producers.daq.wcls_main.structs.gain0: 8.39430907 # 0.7x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl
deleted file mode 100644
index c74d1703c..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_noise1-35x_ind0gain0-8x.fcl
+++ /dev/null
@@ -1,8 +0,0 @@
-# Fit field responses, turned up noise on each plane
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-physics.producers.daq.wcls_main.structs.int_noise_scale: 1.35
-physics.producers.daq.wcls_main.structs.gain0: 9.593496 # 0.8x
diff --git a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_oldgain.fcl b/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_oldgain.fcl
deleted file mode 100644
index fa40ba0db..000000000
--- a/fcl/numi-anaA/test/detsim_2d_icarus_fitFR_oldgain.fcl
+++ /dev/null
@@ -1,9 +0,0 @@
-# Fit field responses, same gains as used in the MCNuPhase2 2023A monte carlo
-#
-#include "detsim_2d_icarus.fcl"
-
-
-physics.producers.daq: @local::icarus_simwire_wirecell_fitSR
-
-physics.producers.daq.wcls_main.structs.gain0: 10.2636323
-physics.producers.daq.wcls_main.structs.gain1: 12.1420344