Skip to content

Commit

Permalink
Merge pull request #99 from mach3-software/feature_CIvalidations
Browse files Browse the repository at this point in the history
CI Validations
  • Loading branch information
KSkwarczynski authored Sep 4, 2024
2 parents 846c689 + d123f1a commit 80d98b8
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 9 deletions.
51 changes: 51 additions & 0 deletions .github/workflows/CIValidations.yml
Original file line number Diff line number Diff line change
@@ -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 }}
6 changes: 0 additions & 6 deletions covariance/covarianceBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1005,12 +1005,6 @@ void covarianceBase::setParameters(const std::vector<double>& 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();
Expand Down
4 changes: 2 additions & 2 deletions mcmc/FitterBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mcmc/MinuitFit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<double>());
minuit->SetMaxFunctionCalls(fitMan->raw()["General"]["Minuit2"]["NSteps"].as<double>());
minuit->SetMaxIterations(10000);

MACH3LOG_INFO("Preparing Minuit");
Expand Down

0 comments on commit 80d98b8

Please sign in to comment.