diff --git a/CIValidations/CovarianceValidations.cpp b/CIValidations/CovarianceValidations.cpp index 89d7b62..502d69b 100755 --- a/CIValidations/CovarianceValidations.cpp +++ b/CIValidations/CovarianceValidations.cpp @@ -154,7 +154,7 @@ void TestPCA(const std::string& label, PCA->AcceptStep(); - PCA->ToggleFixAllParameters(); + PCA->SetFixAllParameters(); for (int i = 0; i < PCA->GetPCAHandler()->GetNumberPCAedParameters(); i++) { outFile << "Param in " << label << " is Fixed: " << i << " = " << PCA->GetPCAHandler()->IsParameterFixedPCA(i) << std::endl; } @@ -222,7 +222,7 @@ void TestAdaptive(std::ostream& outFile, Adapt->SetParCurrProp(i, Adapt->GetParInit(i)); } } - Adapt->ToggleFixAllParameters(); + Adapt->SetFixAllParameters(); for (int i = 0; i < Adapt->GetNumParams(); i++) { outFile << "Adapt " << Name <<" is param " << i << " fixed=" << Adapt->IsParameterFixed(i) << std::endl; } @@ -341,7 +341,7 @@ int main(int argc, char *argv[]) for (int i = 0; i < xsec->GetNumParams(); i++) { outFile << "Is param " << i << " fixed=" << xsec->IsParameterFixed(i) << std::endl; } - xsec->ToggleFixAllParameters(); + xsec->SetFixAllParameters(); for (int i = 0; i < xsec->GetNumParams(); i++) { outFile << "Is param " << i << " fixed=" << xsec->IsParameterFixed(i) << std::endl; } diff --git a/CIValidations/TestOutputs/CovarianceOut.txt b/CIValidations/TestOutputs/CovarianceOut.txt index cd79210..07d5a3f 100644 --- a/CIValidations/TestOutputs/CovarianceOut.txt +++ b/CIValidations/TestOutputs/CovarianceOut.txt @@ -2103,10 +2103,10 @@ Param in PCA_3 is Fixed: 18 = 1 Param in PCA_3 is Fixed: 19 = 1 Param in PCA_3 is Fixed: 20 = 1 Param in PCA_3 is Fixed: 21 = 1 -Param in PCA_3 is Fixed: 22 = 0 -Param in PCA_3 is Fixed: 23 = 0 -Param in PCA_3 is Fixed: 24 = 0 -Param in PCA_3 is Fixed: 25 = 0 +Param in PCA_3 is Fixed: 22 = 1 +Param in PCA_3 is Fixed: 23 = 1 +Param in PCA_3 is Fixed: 24 = 1 +Param in PCA_3 is Fixed: 25 = 1 PCA_4 Eigen Value 0 = 0.0239541 PCA_4 Eigen Value 1 = 0.0121 PCA_4 Eigen Value 2 = 0.0074135 @@ -3125,11 +3125,11 @@ Param in PCA_4 is Fixed: 16 = 1 Param in PCA_4 is Fixed: 17 = 1 Param in PCA_4 is Fixed: 18 = 1 Param in PCA_4 is Fixed: 19 = 1 -Param in PCA_4 is Fixed: 20 = 0 -Param in PCA_4 is Fixed: 21 = 0 -Param in PCA_4 is Fixed: 22 = 0 -Param in PCA_4 is Fixed: 23 = 0 -Param in PCA_4 is Fixed: 24 = 0 +Param in PCA_4 is Fixed: 20 = 1 +Param in PCA_4 is Fixed: 21 = 1 +Param in PCA_4 is Fixed: 22 = 1 +Param in PCA_4 is Fixed: 23 = 1 +Param in PCA_4 is Fixed: 24 = 1 PCA_5 Eigen Value 0 = 1 PCA_5 Eigen Value 1 = 1 PCA_5 Eigen Value 2 = 1