fix some of the new BAT function names

Author: Jojosito

CMakeLists.txt

@@ -7,15 +7,11 @@ set(EXT_PROJECTS_DIR "external")
 
 include(CommonMacros)
 
-=======
 # Includes Catch in the project:
 add_subdirectory(${EXT_PROJECTS_DIR}/catch)
 include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
 enable_testing(true)  # Enables unit-testing.
 
-# setup ROOT includes and libraries
-find_package(ROOT)
-
 #BAT
 # find_program(BAT_CONFIG_EXECUTABLE bat-config)
 # if (BAT_CONFIG_EXECUTABLE)

examples/bat_gen/d3pi.cxx

@@ -145,7 +145,7 @@ double d3pi::LogLikelihood(const std::vector<double>& parameters)
     // if (!std::isfinite(LogAPrioriProbability(parameters)))
     //     return -std::numeric_limits<double>::infinity();
 
-    unsigned c = MCMCGetCurrentChain();
+    unsigned c = GetCurrentChain();
 
     D_->fourMomenta().setSquaredMasses(D_->dataSet()[c], DalitzAxes_, parameters);
 

examples/bat_gen/dkkpi.cxx

@@ -106,7 +106,7 @@ dkkpi::dkkpi(std::string name)
     // freeAmps[i++]->setValue(std::polar(1.1,  -44. * TMath::Pi() / 180.)); // f_0_1500
     // freeAmps[i++]->setValue(std::polar(3.7,   -3. * TMath::Pi() / 180.)); // sigma
 
-    bool b = D_->initializeForMonteCarloGeneration(MCMCGetNChains());
+    bool b = D_->initializeForMonteCarloGeneration(GetNChains());
     std::cout << "success = " << b << std::endl;
     std::cout << "number of data partitions = " << D_->dataPartitions().size() << std::endl;
 
@@ -119,7 +119,7 @@ dkkpi::dkkpi(std::string name)
     event.SetDecay(P, masses.size(), &masses[0]);
     std::vector<yap::FourVector<double> > momenta(masses.size());
     // Generate events
-    for (unsigned i = 0; i < MCMCGetNChains(); ++i) {
+    for (unsigned i = 0; i < GetNChains(); ++i) {
         event.Generate();
         for (unsigned i = 0; i < masses.size(); ++i) {
             TLorentzVector p = *event.GetDecay(i);
@@ -166,7 +166,7 @@ double dkkpi::LogLikelihood(const std::vector<double>& parameters)
     // if (!std::isfinite(LogAPrioriProbability(parameters)))
     //     return -std::numeric_limits<double>::infinity();
 
-    unsigned c = MCMCGetCurrentChain();
+    unsigned c = GetCurrentChain();
 
     DEBUG("Set mass squares to " << parameters[0] << ", " << parameters[1]);
 

examples/bat_gen/runBatGen.cxx

@@ -23,26 +23,30 @@ int main()
     dkkpi m("DKKPI");
 
     // set precision
-    m.MCMCSetPrecision(BCEngineMCMC::kMedium);
-    m.MCMCSetNChains(1);
-    m.MCMCSetNIterationsPreRunCheck(1000);
-    m.MCMCSetPreRunCheckClear(0);
-    m.MCMCSetNIterationsPreRunMax(100000);
-    m.MCMCSetNIterationsPreRunMin(5000);
-    m.MCMCSetNIterationsRun(1000000);
-    m.MCMCSetMultivariateProposalFunctionCovarianceUpdatesMinimum(10);
+    m.SetPrecision(BCEngineMCMC::kMedium);
+    m.SetNChains(1);
+    m.SetNIterationsPreRunCheck(1000);
+    m.SetPreRunCheckClear(0);
+    m.SetNIterationsPreRunMax(100000);
+    m.SetNIterationsPreRunMin(5000);
+    m.SetNIterationsRun(1000000);
+    // \todo has been renamed in latest BAT version
+    // m.SetMultivariateProposalFunctionCovarianceUpdatesMinimum(10);
 
     m.GetObservables().FillHistograms(true, true);
 
-    m.MCMCSetFlagInitialPosition(BCEngineMCMC::kMCMCInitRandomUniform);
+    // \todo has been renamed in latest BAT version
+    //m.SetFlagInitialPosition(BCEngineMCMC::kMCMCInitRandomUniform);
 
-    m.MCMCSetMultivariateProposalFunction(true);
-    m.MCMCSetMultivariateProposalFunctionCovarianceUpdateLambda(0.5);
-    m.MCMCSetMinimumEfficiency(0.15);
-    m.MCMCSetMaximumEfficiency(0.35);
-    m.MCMCSetRValueParametersCriterion(1.25);
+    // \todo has been renamed in latest BAT version
+    //m.SetMultivariateProposalFunction(true);
+    // \todo has been renamed in latest BAT version
+    //m.SetMultivariateProposalFunctionCovarianceUpdateLambda(0.5);
+    m.SetMinimumEfficiency(0.15);
+    m.SetMaximumEfficiency(0.35);
+    m.SetRValueParametersCriterion(1.25);
 
-    m.MCMCSetCorrectRValueForSamplingVariability(true);
+    m.SetCorrectRValueForSamplingVariability(true);
 
     BCLog::OutSummary("Test model created");