Merge pull request #5 from kreczko/tau-svd-unfolding

Tau svd unfolding

Author: kreczko

.gitignore

@@ -16,4 +16,6 @@ Makefile
 *~
 *Dict.cxx
 *Dict_rdict.pcm
-Test*
+Test/*
+/Test/
+*.pyc

ci/test.sh

@@ -11,8 +11,8 @@ echo "Checking PyROOT installation"
 time python -c 'import ROOT; ROOT.TBrowser()'
 
 # Check that RooUnfold can be imported
-echo "Checking RooUnfold library"
+echo "Checking RooUnfold library in PyROOT"
 time python -c 'from ROOT import gSystem; gSystem.Load("libRooUnfold.so");from ROOT import RooUnfoldResponse'
-
+time python test/test_pyroot.py
 echo "Executing unit tests"
 make test

examples/RooUnfoldDagostini.h

@@ -13,7 +13,7 @@
 #ifndef ROOUNFOLDDAGOSTINI_H_
 #define ROOUNFOLDDAGOSTINI_H_
 
-#include "RooUnfold.h"
+#include "../include/RooUnfold.h"
 
 class RooUnfoldResponse;
 class TH1;

examples/RooUnfoldExample.cxx

@@ -17,8 +17,8 @@ using std::endl;
 #include "TRandom.h"
 #include "TH1D.h"
 
-#include "RooUnfoldResponse.h"
-#include "RooUnfoldBayes.h"
+#include "../include/RooUnfoldResponse.h"
+#include "../include/RooUnfoldBayes.h"
 //#include "RooUnfoldSvd.h"
 //#include "RooUnfoldTUnfold.h"
 #endif

examples/RooUnfoldTestHarness.h

@@ -16,7 +16,7 @@
 #if !defined(__CINT__) || defined(__MAKECINT__)
 #include "TNamed.h"
 #include "TString.h"
-#include "RooUnfold.h"
+#include "../include/RooUnfold.h"
 #if ROOT_VERSION_CODE >= ROOT_VERSION(5,0,0)
 #include "TVectorDfwd.h"
 #include "TMatrixDfwd.h"

examples/RooUnfoldTestHarness.icc

@@ -37,11 +37,11 @@
 #include "TLine.h"
 #include "TNtuple.h"
 #include "TProfile.h"
-#include "RooUnfoldErrors.h"
-#include "RooUnfoldParms.h"
-#include "RooUnfoldResponse.h"
-#include "RooUnfold.h"
-#include "RooUnfoldSvd.h"
+#include "../include/RooUnfoldErrors.h"
+#include "../include/RooUnfoldParms.h"
+#include "../include/RooUnfoldResponse.h"
+#include "../include/RooUnfold.h"
+#include "../include/RooUnfoldSvd.h"
 #ifdef USE_TUNFOLD_H
 #include "RooUnfoldTUnfold.h"
 #endif

examples/RooUnfoldTestHarness2D.icc

@@ -29,7 +29,7 @@
 #include "TVectorD.h"
 #include "TLine.h"
 
-#include "RooUnfoldResponse.h"
+#include "../include/RooUnfoldResponse.h"
 #endif
 
 #include "ArgVars.h"

examples/RooUnfoldTestHarness3D.icc

@@ -27,7 +27,7 @@
 #include "TVectorD.h"
 #include "TLine.h"
 
-#include "RooUnfoldResponse.h"
+#include "../include/RooUnfoldResponse.h"
 #endif
 
 #include "ArgVars.h"

include/RooUnfoldSvd.h

@@ -18,7 +18,7 @@ class RooUnfoldResponse;
 class TH1;
 class TH1D;
 class TH2D;
-class TSVDUnfold;
+class TSVDUnfold_local;
 
 class RooUnfoldSvd : public RooUnfold {
 
@@ -38,16 +38,20 @@ class RooUnfoldSvd : public RooUnfold {
 
   RooUnfoldSvd (const RooUnfoldResponse* res, const TH1* meas, Int_t kreg= 0, Int_t ntoyssvd= 1000,
                 const char* name= 0, const char* title= 0);
+  RooUnfoldSvd (const RooUnfoldResponse* res, const TH1* meas, double taureg, Int_t ntoyssvd= 1000,
+                  const char* name= 0, const char* title= 0);
 
   void SetKterm (Int_t kreg);
+  void SetTauTerm (double taureg);
   void SetNtoysSVD (Int_t ntoyssvd);
   Int_t GetKterm() const;
+  double GetTauTerm() const;
   Int_t GetNtoysSVD() const;
 
   virtual void  SetRegParm (Double_t parm);
   virtual Double_t GetRegParm() const;
   virtual void Reset();
-  TSVDUnfold* Impl();
+  TSVDUnfold_local* Impl();
 
 protected:
   void Assign (const RooUnfoldSvd& rhs); // implementation of assignment operator
@@ -62,8 +66,10 @@ class RooUnfoldSvd : public RooUnfold {
 
 protected:
   // instance variables
-  TSVDUnfold* _svd;  //! Implementation in TSVDUnfold object (no streamer)
+  TSVDUnfold_local* _svd;  //! Implementation in TSVDUnfold object (no streamer)
   Int_t _kreg;
+  double _taureg;
+  bool _use_tau_unfolding;
   Int_t _nb;
   Int_t _ntoyssvd;
 
@@ -155,7 +161,10 @@ inline
 Double_t RooUnfoldSvd::GetRegParm() const
 {
   // Return regularisation parameter
-  return GetKterm();
+  if (_use_tau_unfolding)
+	return _taureg;
+  else
+	return _kreg;
 }
 
 #endif

include/RooUnfoldUtils.h

@@ -0,0 +1,24 @@
+/*
+ * RooUnfoldUtils.h
+ *
+ *  Created on: 24 Feb 2015
+ *      Author: kreczko
+ */
+
+#ifndef INCLUDE_ROOUNFOLDUTILS_H
+#define INCLUDE_ROOUNFOLDUTILS_H
+
+#include "TVectorD.h"
+namespace RooUnfoldUtils {
+
+/**
+ * Calculates equidistant points on a logarithmic scale
+ *
+ * parameters:
+ *  - tau_min: minimal tau value (> 0)
+ *  - tau_max: maximal tau value
+ *  - n_points: number of points (> 3)
+ */
+TVectorD* calculate_tau_scan_points(double tau_min, double tau_max, unsigned int n_points);
+}
+#endif /* INCLUDE_ROOUNFOLDUTILS_H */