Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix: spline binning printing and TMatrixD reading #280

Merged
merged 3 commits into from
Jan 9, 2025
Merged

bugfix: spline binning printing and TMatrixD reading #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b67ed3
annoying thing with TMatrixDSym being null when reading a TMatrixD fr…
EdAtkin Jan 9, 2025
760652b
fixing printing statement for the spline bins to be on the same line …
EdAtkin Jan 9, 2025
5fd0cbe
Merge branch 'develop' into feature_quick_patches
dbarrow257 Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions covariance/covarianceBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ void covarianceBase::init(std::string name, std::string file) {
throw MaCh3Exception(__FILE__ , __LINE__ );
}

TMatrixDSym *CovMat = infile->Get<TMatrixDSym>(name.c_str());
TMatrixDSym *CovMat = static_cast<TMatrixDSym*>(infile->Get(name.c_str()));
EdAtkin marked this conversation as resolved.
Show resolved Hide resolved

if (CovMat == nullptr) {
if (!CovMat) {
MACH3LOG_ERROR("Could not find covariance matrix name {} in file {}", name, file);
MACH3LOG_ERROR("Are you really sure {} exists in the file?", name);
throw MaCh3Exception(__FILE__ , __LINE__ );
Expand Down
1 change: 0 additions & 1 deletion splines/splineFDBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,6 @@ std::vector<TAxis *> splineFDBase::FindSplineBinning(std::string FileName, std::

MACH3LOG_INFO("Left PrintBinning now tidying up");
delete DummyAxis;
File->Close();

return ReturnVec;
}
Expand Down
Loading