Use new Sigma Var bot and bump versions

.github/workflows/CIValidations.yml

@@ -36,10 +36,10 @@ jobs:
             test_1: ./CIValidations/CovarianceValidations
             test_2: ./CIValidations/MaCh3ModeValidations
             test_3: ./CIValidations/pValueValidations 
-            test_4: ./CIValidations/UnitTests/manager_tests
-            test_5: ./CIValidations/UnitTests/histogram_tests
-            test_6: ./CIValidations/UnitTests/statistical_tests
-            test_7: empty
+            test_4: ./CIValidations/SigmaVarValidations
+            test_5: ./CIValidations/UnitTests/manager_tests
+            test_6: ./CIValidations/UnitTests/histogram_tests
+            test_7: ./CIValidations/UnitTests/statistical_tests
             test_8: empty
             test_9: empty
 

CMakeLists.txt

@@ -3,7 +3,7 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
 # CMake version check
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
-project(MaCh3 VERSION 1.4.4 LANGUAGES CXX)
+project(MaCh3 VERSION 1.4.5 LANGUAGES CXX)
 set(MaCh3_VERSION ${PROJECT_VERSION})
 
 option(MaCh3_PYTHON_ENABLED "Whether to build MaCh3 python bindings" OFF)

Doc/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = "MaCh3"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.4.4
+PROJECT_NUMBER         = 1.4.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

mcmc/FitterBase.cpp

@@ -1067,7 +1067,6 @@ void FitterBase::RunSigmaVar() {
     MACH3LOG_INFO("Found skip vector with {} entries", SkipVector.size());
   }
 
-  bool isxsec = false;
   for (covarianceBase *cov : systematics)
   {
     TMatrixDSym *Cov = cov->getCovMatrix();
@@ -1078,13 +1077,7 @@ void FitterBase::RunSigmaVar() {
       throw MaCh3Exception(__FILE__ , __LINE__ );
     }
 
-    if (cov->getName() == "xsec_cov")
-    {
-      isxsec = true;
-    } else {
-      isxsec = false;
-    }
-
+    bool isxsec = (cov->getName() == "xsec_cov");
     // Loop over xsec parameters
     for (int i = 0; i < cov->GetNumParams(); ++i)
     {
@@ -1123,10 +1116,10 @@ void FitterBase::RunSigmaVar() {
       // Get the initial value of ith parameter
       double init = cov->getParInit(i);
 
-      TH1D ***sigmaArray_x = new TH1D**[numVar]();
-      TH1D ***sigmaArray_y = new TH1D**[numVar]();
-      TH1D ***sigmaArray_x_norm = new TH1D**[numVar]();
-      TH1D ***sigmaArray_y_norm = new TH1D**[numVar]();
+      std::vector<std::vector<TH1D*>> sigmaArray_x(numVar);
+      std::vector<std::vector<TH1D*>> sigmaArray_y(numVar);
+      std::vector<std::vector<TH1D*>> sigmaArray_x_norm(numVar);
+      std::vector<std::vector<TH1D*>> sigmaArray_y_norm(numVar);
 
       // Set up for single mode
       TH1D ****sigmaArray_mode_x = nullptr;
@@ -1155,10 +1148,10 @@ void FitterBase::RunSigmaVar() {
           samples[ivs]->reweight();
         }
 
-        sigmaArray_x[j] = new TH1D*[TotalNSamples]();
-        sigmaArray_y[j] = new TH1D*[TotalNSamples]();
-        sigmaArray_x_norm[j] = new TH1D*[TotalNSamples]();
-        sigmaArray_y_norm[j] = new TH1D*[TotalNSamples]();
+        sigmaArray_x[j].resize(TotalNSamples);
+        sigmaArray_y[j].resize(TotalNSamples);
+        sigmaArray_x_norm[j].resize(TotalNSamples);
+        sigmaArray_y_norm[j].resize(TotalNSamples);
 
         if (DoByMode)
         {
@@ -1344,15 +1337,7 @@ void FitterBase::RunSigmaVar() {
             SampleIterator++;
           }
         }
-        delete[] sigmaArray_x[j];
-        delete[] sigmaArray_y[j];
-        delete[] sigmaArray_x_norm[j];
-        delete[] sigmaArray_y_norm[j];
       }
-      delete[] sigmaArray_x;
-      delete[] sigmaArray_y;
-      delete[] sigmaArray_x_norm;
-      delete[] sigmaArray_y_norm;
 
       dirArryDial->Close();
       delete dirArryDial;