diff --git a/.github/workflows/CIValidations.yml b/.github/workflows/CIValidations.yml new file mode 100644 index 000000000..391de9a62 --- /dev/null +++ b/.github/workflows/CIValidations.yml @@ -0,0 +1,51 @@ +name: Validations CI + +# The events that trigger the workflow +on: + pull_request: + branches: [ develop ] + +permissions: + contents: read + packages: write + +jobs: + build: + runs-on: ubuntu-latest + + name: ${{ matrix.name }} + + strategy: + fail-fast: false # Prevents cancellation of remaining jobs if one fails + matrix: + include: + - name: SplineValidations + - name: CovarianceValidations + - name: FitterValidations + container: + image: ghcr.io/mach3-software/mach3:alma9latest + + steps: + - uses: actions/checkout@v3 + + + - name: Get MaCh3 Validations + run: | + cd /opt/ + git clone https://github.com/mach3-software/MaCh3Validations.git MaCh3Validations + cd MaCh3Validations + mkdir build + cd build + cmake ../ -DMaCh3_Branch=${{ github.head_ref }} + + - name: Build MaCh3 Validations + run: | + cd /opt/MaCh3Validations/build + make install # Build the project + + - name: Validations + run: | + source /opt/MaCh3Validations/build/bin/setup.MaCh3.sh + source /opt/MaCh3Validations/build/bin/setup.MaCh3Validations.sh + cd /opt/MaCh3Validations/build + Apps/${{ matrix.name }} diff --git a/covariance/covarianceBase.cpp b/covariance/covarianceBase.cpp index 16628db7f..ed43b8f42 100644 --- a/covariance/covarianceBase.cpp +++ b/covariance/covarianceBase.cpp @@ -1005,12 +1005,6 @@ void covarianceBase::setParameters(const std::vector& pars) { } } - MACH3LOG_DEBUG("Set parameters to:"); - std::cout << "Set parameters to: " << std::endl; - for(int par_i = 0 ; par_i < pars.size() ; ++par_i){ - MACH3LOG_DEBUG("{} : {}", par_i, _fPropVal[par_i]); - } - // And if pca make the transfer if (pca) { TransferToPCA(); diff --git a/mcmc/FitterBase.cpp b/mcmc/FitterBase.cpp index 4d66d21df..dddb38457 100644 --- a/mcmc/FitterBase.cpp +++ b/mcmc/FitterBase.cpp @@ -175,8 +175,8 @@ void FitterBase::PrepareOutput() { { // Check that we have added samples if (!samples.size()) { - MACH3LOG_CRITICAL("No samples Found! If this is what you want find me here"); - throw MaCh3Exception(__FILE__ , __LINE__ ); + MACH3LOG_CRITICAL("No samples Found! Is this really what you wanted?"); + //throw MaCh3Exception(__FILE__ , __LINE__ ); } // Prepare the output trees diff --git a/mcmc/MinuitFit.cpp b/mcmc/MinuitFit.cpp index a9cb8417a..e54feb94a 100644 --- a/mcmc/MinuitFit.cpp +++ b/mcmc/MinuitFit.cpp @@ -37,7 +37,7 @@ void MinuitFit::runMCMC() { //KS: add config or something minuit->SetPrintLevel(2); minuit->SetTolerance(0.01); - minuit->SetMaxFunctionCalls(fitMan->raw()["General.NSteps"].as()); + minuit->SetMaxFunctionCalls(fitMan->raw()["General"]["Minuit2"]["NSteps"].as()); minuit->SetMaxIterations(10000); MACH3LOG_INFO("Preparing Minuit");