Skip to content

Commit

Permalink
Merge pull request #122 from mach3-software/feature_MinorFixes
Browse files Browse the repository at this point in the history
Changes to CI after I change valaitions into tutorial
  • Loading branch information
KSkwarczynski authored Sep 14, 2024
2 parents f659197 + f105ef0 commit 5632718
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 8 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ updates:
directory: ".github/workflows/" # Location of the GitHub Actions workflow files
schedule:
interval: "weekly" # Check for updates on a weekly basis

# Update Python dependencies
- package-ecosystem: "pip"
directory: "/" # Location of your requirements.txt file
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion .github/workflows/CIValidations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Get MaCh3 Validations
run: |
cd /opt/
git clone https://github.com/mach3-software/MaCh3Validations.git MaCh3Validations
git clone https://github.com/mach3-software/MaCh3Tutorial.git MaCh3Validations
cd MaCh3Validations
mkdir build
cd build
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/TagTutorial.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ jobs:
git config --global user.name "MaCh3 Bot"
git config --global user.email "[email protected]"
- name: Clone MaCh3Validations
- name: Clone MaCh3Tutorial
run: |
git clone https://${{ secrets.MACH3_VALIDATIONS_PAT }}@github.com/mach3-software/MaCh3Validations.git
git clone https://${{ secrets.MACH3_VALIDATIONS_PAT }}@github.com/mach3-software/MaCh3Tutorial.git
- name: Create and push the new tag
run: |
cd MaCh3Validations/
cd MaCh3Tutorial/
# Extract the tag name from GITHUB_REF
TAG_NAME=$(echo "${GITHUB_REF#refs/tags/}")
# Create the new tag
git tag $TAG_NAME
# Push the tag to the MaCh3Validations repository
git push https://${{ secrets.MACH3_VALIDATIONS_PAT }}@github.com/mach3-software/MaCh3Validations.git $TAG_NAME
# Push the tag to the MaCh3Tutorial repository
git push https://${{ secrets.MACH3_VALIDATIONS_PAT }}@github.com/mach3-software/MaCh3Tutorial.git $TAG_NAME
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR)

#KS: Enable language, necessary when using CUDA
enable_language(CXX)
set(MaCh3_VERSION 1.1.3)
set(MaCh3_VERSION 1.1.4)

# Try to find CUDA
find_package(CUDAToolkit QUIET)
Expand Down
2 changes: 1 addition & 1 deletion Doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1.3
PROJECT_NUMBER = 1.1.4

# 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
Expand Down
5 changes: 5 additions & 0 deletions covariance/covarianceOsc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,18 @@ covarianceOsc::covarianceOsc(const std::vector<std::string>& YAMLFile, const cha
if(_fNames[io] == "sin2th_23") kSinTheta23 = io;
if(_fNames[io] == "baseline") kBaseline = io;
if(_fNames[io] == "density") kDensity = io;

// Set covarianceBase parameters (Curr = current, Prop = proposed, Sigma = step)
_fCurrVal[io] = _fPreFitValue[io];
_fPropVal[io] = _fCurrVal[io];
}

/// WARNING HARDCODED
MACH3LOG_CRITICAL("Fixing baseline and density, it is hardcoded sry");
toggleFixParameter("baseline");
toggleFixParameter("density");

/// @todo KS: Technically if we would like to use PCA we have ot initialise parts here...
flipdelM = false;

randomize();
Expand Down

0 comments on commit 5632718

Please sign in to comment.