Merge pull request #11 from kreczko/fixes-for-v2

Fixes for version 2.00.01 - error calculation

Author: kreczko

src/RooUnfoldSvd.cxx

@@ -180,7 +180,10 @@ RooUnfoldSvd::Unfold()
 	if (_verbose >= 1)
 		cout << "SVD init " << _reshist->GetNbinsX() << " x " << _reshist->GetNbinsY() << " bins, kreg=" << _kreg
 				<< " taureg=" << _taureg << endl;
-  _svd= new TauSVDUnfold (_meas1d, _train1d, _truth1d, _reshist);
+  if(_use_tau_unfolding)
+	  _svd= new TauSVDUnfold (_meas1d, _train1d, _truth1d, _reshist);
+  else
+	  _svd= new TSVDUnfold_local (_meas1d, _train1d, _truth1d, _reshist);
   TH1D* rechist = 0;
   if (_use_tau_unfolding)
 	  rechist = ((TauSVDUnfold*) _svd)->Unfold(_taureg);

src/TauSVDUnfold.cxx

@@ -211,11 +211,8 @@ TH1D* TauSVDUnfold::Unfold(double tau) {
 		M2H(Xtau, *fXtau);
 		M2H(Xinv, *fXinv);
 	}
-
-	// DAVID
-	// Speichere die Kruemmung ab!
-	fCurv = GetCurvature(vw, mCurv);
 	// Get Curvature and also chi2 in case of MC unfolding
+	fCurv = GetCurvature(vw, mCurv);
 	if (!fToyMode && !fMatToyMode) {
 		Info("Unfold", "Unfolding param: %i", k + 1);
 		Info("Unfold", "Curvature of weight distribution: %f", fCurv);
@@ -502,7 +499,10 @@ TH2D* TauSVDUnfold::GetUnfoldCovMatrix(const TH2D* cov, Int_t ntoys, Int_t seed)
 			fToyhisto->SetBinContent(j, fBdat->GetBinContent(j) + g(j - 1));
 			fToyhisto->SetBinError(j, fBdat->GetBinError(j));
 		}
-		unfres = Unfold(GetTau());
+		if (GetKReg() > 0)
+			unfres = Unfold(GetKReg());
+		else
+			unfres = Unfold(GetTau());
 
 		for (Int_t j = 1; j <= fNdim; j++) {
 			toymean->SetBinContent(j, toymean->GetBinContent(j) + unfres->GetBinContent(j) / ntoys);
@@ -530,7 +530,11 @@ TH2D* TauSVDUnfold::GetUnfoldCovMatrix(const TH2D* cov, Int_t ntoys, Int_t seed)
 			fToyhisto->SetBinContent(j, fBdat->GetBinContent(j) + g(j - 1));
 			fToyhisto->SetBinError(j, fBdat->GetBinError(j));
 		}
-		unfres = Unfold(GetTau());
+
+		if (GetKReg() > 0)
+			unfres = Unfold(GetKReg());
+		else
+			unfres = Unfold(GetTau());
 
 		for (Int_t j = 1; j <= fNdim; j++) {
 			for (Int_t k = 1; k <= fNdim; k++) {
@@ -580,8 +584,10 @@ TH2D* TauSVDUnfold::GetAdetCovMatrix(Int_t ntoys, Int_t seed = 1) {
 				}
 			}
 		}
-
-		unfres = Unfold(GetTau());
+		if (GetKReg() > 0)
+			unfres = Unfold(GetKReg());
+		else
+			unfres = Unfold(GetTau());
 
 		for (Int_t j = 1; j <= fNdim; j++) {
 			toymean->SetBinContent(j, toymean->GetBinContent(j) + unfres->GetBinContent(j) / ntoys);
@@ -601,7 +607,10 @@ TH2D* TauSVDUnfold::GetAdetCovMatrix(Int_t ntoys, Int_t seed = 1) {
 			}
 		}
 
-		unfres = Unfold(GetTau());
+		if (GetKReg() > 0)
+			unfres = Unfold(GetKReg());
+		else
+			unfres = Unfold(GetTau());
 
 		for (Int_t j = 1; j <= fNdim; j++) {
 			for (Int_t k = 1; k <= fNdim; k++) {

test/TestRooUnfoldSvd.cpp

@@ -113,6 +113,7 @@ struct RooUnfoldSvdSetup {
 
 	void check_unfolded_data_against_truth(const TH1D* unfolded_data, bool use_sqrt_N = false) {
 		for (auto i = 1; i <= unfolded_data->GetNbinsX(); ++i) {
+//			cout << unfolded_data->GetBinContent(i) << "+-" << unfolded_data->GetBinError(i) << endl;
 			double error = use_sqrt_N ? sqrt(unfolded_data->GetBinContent(i)) : unfolded_data->GetBinError(i);
 			double relative_error = error / unfolded_data->GetBinContent(i);
 			// error for BOOST_CHECK_CLOSE has to be given in %