Skip to content

breaking: Rename GetParInit #248

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

Open
KSkwarczynski wants to merge 1 commit into
base: main
Choose a base branch
from
Open

breaking: Rename GetParInit #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions CIValidations/CovarianceValidations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ void TestAdaptive(std::ostream& outFile,
// if not enough params just throw more params
if (Adapt->GetNumParams() > ParAdapt.size()) {
for (size_t i = ParAdapt.size(); i < Adapt->GetNumParams(); ++i) {
ParAdapt.push_back(Adapt->GetParInit(i));
ParAdapt.push_back(Adapt->GetParPreFit(i));
}
}

Expand All @@ -197,7 +197,7 @@ void TestAdaptive(std::ostream& outFile,
for(size_t i = 0; i < ParMeans.size(); i++) {
outFile << "Adapt " << Name << ", Param means: " << i << " = " << ParMeans[i] << std::endl;
}
TMatrixDSym* Matrix = Adapt->GetAdaptiveHandler()->GetAdaptiveCovariance();
auto Matrix = Adapt->GetAdaptiveHandler()->GetAdaptiveCovariance();
double adapt_scale = Adapt->GetAdaptiveHandler()->GetAdaptionScale();
outFile << "Adapt "<< Name <<" scale: " << adapt_scale << std::endl;
int dim = Matrix->GetNrows();
Expand All @@ -219,7 +219,7 @@ void TestAdaptive(std::ostream& outFile,
for (int i = 0; i < Adapt->GetNumParams(); i++) {
auto Value = Adapt->GetParCurr(i);
if(Value > Adapt->GetUpperBound(i) || Value < Adapt->GetLowerBound(i)) {
Adapt->SetParCurrProp(i, Adapt->GetParInit(i));
Adapt->SetParCurrProp(i, Adapt->GetParPreFit(i));
}
}
Adapt->ToggleFixAllParameters();
Expand Down
4 changes: 2 additions & 2 deletions Tutorial/KinemDistributionTutorial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ struct Plot {

int main(int argc, char **argv) {
//JM OscillationChannel kinematic variable does not exist, so only supports looping modes
int Selection = 0; //0 to loop modes, 1 to loop osc channels
constexpr SamplePlotType PlotType = kModePlot; //0 to loop modes, 1 to loop osc channels

// Initialise manger responsible for config handling
auto FitManager = MaCh3ManagerFactory(argc, argv);
Expand Down Expand Up @@ -76,7 +76,7 @@ int main(int argc, char **argv) {
for (size_t iPDF=0; iPDF < mySamples.size(); iPDF++) {
MACH3LOG_INFO("Number of samples: {}", mySamples[iPDF]->GetNSamples());
for(int iSample = 0; iSample < mySamples[iPDF]->GetNSamples(); iSample++){
auto Stack = mySamples[iPDF]->ReturnStackedHistBySelection1D(iSample, vecParams[iParam], Selection);
auto Stack = mySamples[iPDF]->ReturnStackedHistBySelection1D(iSample, vecParams[iParam], PlotType);
std::unique_ptr<TLegend> Legend(new TLegend(*mySamples[iPDF]->ReturnStackHistLegend()));
Canv->cd(1);
Stack->Draw("HIST");
Expand Down
Loading