SUSY Run 2

.github/workflows/OLD/ci_Mac_arm64.yml

@@ -1,12 +1,14 @@
 name: Gambit Mac Arm64 CI
 
-on:
-  push:
-    branches: [ master, ci-* ]
-  pull_request:
-    branches: [ master ]
-  schedule:
-    - cron:  '0 5 * * *'
+on: workflow_dispatch
+
+#on:
+#  push:
+#    branches: [ master, ci-* ]
+#  pull_request:
+#    branches: [ master ]
+#  schedule:
+#    - cron:  '0 5 * * *'
 
 jobs:
   gambit_build:

.github/workflows/OLD/ci_linux.yml

@@ -1,12 +1,14 @@
 name: Gambit Linux X64 CI on Wino
 
-on:
-  push:
-    branches: [ master, ci-* ]
-  pull_request:
-    branches: [ master ]
-  schedule:
-    - cron:  '0 5 * * *'
+on: workflow_dispatch
+
+#on:
+#  push:
+#    branches: [ master, ci-* ]
+#  pull_request:
+#    branches: [ master ]
+#  schedule:
+#    - cron:  '0 5 * * *'
 
 jobs:
   gambit_build:

.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

.github/workflows/ci_sync.yml

@@ -0,0 +1,34 @@
+name: Test sync CI job
+
+#on: workflow_dispatch
+
+on:
+  schedule:
+    - cron:  '0 5 * * *'
+
+permissions:
+  contents: write
+
+jobs:
+  push_changes:
+    runs-on: [self-hosted, Linux, X64]
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [X64]
+    defaults:
+      run:
+        shell: bash -eo pipefail {0}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Pull and push changes
+      run: |
+        git checkout origin/master
+        echo "Pulling from Public Repo"
+        git remote add public https://github.com/GambitBSM/gambit.git
+        git pull public master
+
+        echo "Pushing to Private Repo"
+        git push origin master
+

.gitignore

@@ -70,6 +70,8 @@ contrib/MassSpectra/flexiblesusy/config/flexiblesusy-version
 contrib/pybind11/
 contrib/HepMC3-*/
 contrib/YODA-*/
+contrib/fastjet-*/
+contrib/fjcontrib-*/
 
 # Local configuration files
 config/*_locations.yaml

Backends/examples/ATLAS_FullLikes/1.0/ATLAS_FullLikes_1_0.py

@@ -66,19 +66,24 @@ def Reset(AnalysisName):
 
 
 # Read in background JSON files and store this in ws dictionary
-def ReadIn(AnalysisName,bkgpath):
+def ReadIn(AnalysisName, GAMBIT_DIR, bkgpath):
     global ws
     global Nsamplesdict
     global Nbindict
 
     # First check that it hasn't already been loaded
-    if FileExists(AnalysisName):
-        print("FullLikes Error: Analysis ",AnalysisName," has been loaded twice")
-        return(-1)
+    # TODO: Commented out to protect against the rare occurence that two processes try to load together,
+    #       choosing to just let both load it in this case.
+    #if FileExists(AnalysisName):
+    #    print("FullLikes Error: Analysis ",AnalysisName," has been loaded twice")
+    #    return(-1)
+
+    # Add on a slash to the gambit dir
+    GAMBIT_DIR = GAMBIT_DIR + "/"
 
     # Try to open the analysis bkg json file
     try:
-      with open(bkgpath,'r') as bkg:
+      with open(GAMBIT_DIR + bkgpath,'r') as bkg:
         workspace = json.load(bkg)
 
         # Create empty dictionaries for the analysis
@@ -94,7 +99,7 @@ def ReadIn(AnalysisName,bkgpath):
         Nbindict[AnalysisName][channel["name"]] = len(channel["data"])
 
       # Load json scheme
-      with open('Backends/examples/ATLAS_FullLikes/1.0/workspace.json','r') as wk:
+      with open(GAMBIT_DIR + 'Backends/examples/ATLAS_FullLikes/1.0/workspace.json','r') as wk:
         schema = json.load(wk)
 
       # Validate the workspace against a scheme (only needed for testing new bkg files)
@@ -138,7 +143,10 @@ def Evaluate(mydict,AnalysisName):
   for key,value in Nsamplesdict[AnalysisName].items():
     Signal[str(value[0])+"_"+str(value[1])] = []
     for i in range(Nbindict[AnalysisName][key]):
-      Signal[str(value[0])+"_"+str(value[1])].append(mydict[key+"_"+str(i)])
+      sig = 0.0
+      if ((key+"_"+str(i)) in mydict.keys()):
+        sig = mydict[key+"_"+str(i)]
+      Signal[str(value[0])+"_"+str(value[1])].append(sig)
 
   data['patches'].append({
           "metadata":

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.

Backends/include/gambit/Backends/backend_types/DarkAges.hpp

@@ -53,14 +53,14 @@ namespace Gambit
     struct Energy_injection_efficiency_table
     {
       // Flag whether DarkAges calculates f_c(z) per injection channel or an
-      // effective f(z) which is multiplied with repartition fucntions
+      // effective f(z) which is multiplied with repartition functions
       // chi_c(x_e,z) later on (in classy)
       bool f_eff_mode = false;
 
       // Redshift vector (filled in both modes)
       std::vector<double> redshift;
 
-      // f_c(z) seperated by injection channels
+      // f_c(z) separated by injection channels
       // (filled only if f_eff_mode is false)
       std::vector<double> f_heat;
       std::vector<double> f_lya;

Backends/include/gambit/Backends/backend_types/Pythia_8_312/abstract_Logger.h

@@ -84,13 +84,13 @@ namespace CAT_3(BACKENDNAME,_,SAFE_VERSION)
 
                 virtual ::std::ostream& errorStream() =0;
 
-                virtual ::std::_Rb_tree_iterator<std::pair<const std::basic_string<char>, int>> begin() =0;
+                virtual ::std::map<std::string, int>::iterator begin() =0;
 
-                virtual ::std::_Rb_tree_iterator<std::pair<const std::basic_string<char>, int>> end() =0;
+                virtual ::std::map<std::string, int>::iterator end() =0;
 
-                virtual ::std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char>, int>> begin() const =0;
+                virtual ::std::map<std::string, int>::const_iterator begin() const =0;
 
-                virtual ::std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char>, int>> end() const =0;
+                virtual ::std::map<std::string, int>::const_iterator end() const =0;
 
                 virtual const int& ABORT_ref__BOSS() =0;
 

Backends/include/gambit/Backends/backend_types/Pythia_8_312/wrapper_Logger_decl.h

@@ -92,13 +92,13 @@ namespace CAT_3(BACKENDNAME,_,SAFE_VERSION)
 
                 ::std::ostream& errorStream();
 
-                ::std::_Rb_tree_iterator<std::pair<const std::basic_string<char>, int>> begin();
+                ::std::map<std::string, int>::iterator begin();
 
-                ::std::_Rb_tree_iterator<std::pair<const std::basic_string<char>, int>> end();
+                ::std::map<std::string, int>::iterator end();
 
-                ::std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char>, int>> begin() const;
+                ::std::map<std::string, int>::const_iterator begin() const;
 
-                ::std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char>, int>> end() const;
+                ::std::map<std::string, int>::const_iterator end() const;
 
 
                 // Wrappers for original constructors: 

Backends/include/gambit/Backends/backend_types/Pythia_8_312/wrapper_Logger_def.h

@@ -165,22 +165,22 @@ namespace CAT_3(BACKENDNAME,_,SAFE_VERSION)
             return get_BEptr()->errorStream();
         }
 
-        inline ::std::_Rb_tree_iterator<std::pair<const std::basic_string<char>, int>> Logger::begin()
+        inline ::std::map<std::string, int>::iterator Logger::begin()
         {
             return get_BEptr()->begin();
         }
 
-        inline ::std::_Rb_tree_iterator<std::pair<const std::basic_string<char>, int>> Logger::end()
+        inline ::std::map<std::string, int>::iterator Logger::end()
         {
             return get_BEptr()->end();
         }
 
-        inline ::std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char>, int>> Logger::begin() const
+        inline ::std::map<std::string, int>::const_iterator Logger::begin() const
         {
             return get_BEptr()->begin();
         }
 
-        inline ::std::_Rb_tree_const_iterator<std::pair<const std::basic_string<char>, int>> Logger::end() const
+        inline ::std::map<std::string, int>::const_iterator Logger::end() const
         {
             return get_BEptr()->end();
         }