Contur 2.1.1->2.4.4, Rivet 3.1.5->3.1.8 upgrade

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
         echo "export PYTHON_INCLUDE_DIR=$PYTHON_INCLUDE_DIR" >> buildenv.sh
         echo "export LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:$LD_LIBRARY_PATH" >> buildenv.sh
         cat buildenv.sh
-        pip install --upgrade pyyaml pybind11 h5py scipy numpy pyhf configobj pandas matplotlib setuptools==58.2.0
+        pip install --upgrade pyyaml pybind11 h5py scipy numpy pyhf configobj pandas matplotlib setuptools==58.2.0 pathos joblib
     - name: Configure with cmake
       run: |
         cd BUILD/ && . buildenv.sh

Backends/include/gambit/Backends/backend_types/Contur.hpp

@@ -31,9 +31,9 @@
   namespace Gambit
   {
     // Class that manages the input dictionary for Contur
-    class Contur_output
+    class Contur_subOutput
     {
-      friend Contur_output merge_contur_outputs(const Contur_output& output1, const Contur_output& output2);
+      friend Contur_subOutput merge_contur_suboutputs(const Contur_subOutput& output1, const Contur_subOutput& output2);
 
       public:
         //Three member objects:
@@ -42,15 +42,15 @@
         map_str_str pool_tags;
 
         //Default constructor - used if no events produced
-        Contur_output()
+        Contur_subOutput()
         {
-            LLR = 0.0;
-            pool_LLR = {};
-            pool_tags = {};
+          LLR = 0.0;
+          pool_LLR = {};
+          pool_tags = {};
         }
 
         //Constructor using the pybind11::dict we get from contur:
-        Contur_output(pybind11::dict input_dict)
+        Contur_subOutput(pybind11::dict input_dict)
         {
           //Eliminating the factor of -2 for the GAMBIT LLR definition
           LLR = -0.5*input_dict.attr("get")("LLR").cast<double>();
@@ -64,7 +64,7 @@
         }
 
         //Constructor with all parts supplied: for the friend merge function
-        Contur_output(const double newLLR, const map_str_dbl& newPool_LLR, const map_str_str& newPool_tags)
+        Contur_subOutput(const double newLLR, const map_str_dbl& newPool_LLR, const map_str_str& newPool_tags)
         {
           LLR = newLLR;
           pool_LLR = newPool_LLR;
@@ -73,9 +73,59 @@
 
         //Automatic destructor should be fine, no need to define
 
+        //Print the object and all its data in an easy to read format.
+        void print_Contur_subOutput_debug(std::ostream&outstream = std::cout) const;
+      };
+
+      class Contur_output
+      {
+        friend Contur_output merge_contur_outputs(const Contur_output& output1, const Contur_output& output2);
+
+        public:
+        std::vector<std::string> _bkg_types = {"SMBG", "DATABG", "EXP"};
+        std::map<str,Contur_subOutput> outputs;
+
+        //Default constructor - used if no events produced
+        Contur_output()
+        {
+          for (const str& bkg : _bkg_types){
+            outputs[bkg] = Contur_subOutput();
+          }
+        }
+
+        //Constructor using the pybind11::dict we get from contur:
+        Contur_output(pybind11::dict input_dict)
+        {
+          for (const str& bkg : _bkg_types){
+            outputs[bkg] = Contur_subOutput(input_dict.attr("get")(bkg));
+          }
+        }
+        //Automatic destructor should be fine, no need to define
+
         //Print the object and all its data in an easy to read format.
         void print_Contur_output_debug(std::ostream&outstream = std::cout) const;
 
+        // TODO: returning a map is probably not super efficient but it fits the existing syntax.
+        map_str_dbl pool_LLR() const {
+          map_str_dbl return_map;
+          for (const str & bkg : _bkg_types){
+            for (const std::pair<str, double> LLRpair : outputs.at(bkg).pool_LLR){
+              return_map[LLRpair.first + "_" + bkg] = LLRpair.second;
+            }
+          }
+          return return_map;
+        }
+
+        // TODO: returning a map is probably not super efficient but it fits the existing syntax.
+        map_str_str pool_tags() const {
+          map_str_str return_map;
+          for (const str & bkg : _bkg_types){
+            for (const std::pair<str, str> LLRpair : outputs.at(bkg).pool_tags){
+              return_map[LLRpair.first + "_" + bkg] = LLRpair.second;
+            }
+          }
+          return return_map;
+        }
       };
 
       //For running Contur multiple times with different settings.