clean RooAbs(Opt)TestStatistic RooTaskSpec dependencies

Author: egpbos

roofit/roofitcore/inc/RooAbsOptTestStatistic.h

@@ -38,11 +38,11 @@ class RooAbsOptTestStatistic : public RooAbsTestStatistic {
 
   virtual Double_t combinedValue(RooAbsReal** gofArray, Int_t nVal) const ;
 
-  virtual RooAbsReal& function() { return *_funcClone ; }
-  virtual const RooAbsReal& function() const { return *_funcClone ; }
+  RooAbsReal& function() { return *_funcClone ; }
+  const RooAbsReal& function() const { return *_funcClone ; }
 
-  virtual RooAbsData& data() ;
-  virtual const RooAbsData& data() const ;
+  RooAbsData& data() ;
+  const RooAbsData& data() const ;
 
 
   virtual const char* cacheUniqueSuffix() const { return Form("_%lx", (ULong_t)_dataClone) ; }

roofit/roofitcore/inc/RooAbsTestStatistic.h

@@ -37,8 +37,7 @@ typedef RooAbsData* pRooAbsData ;
 typedef RooRealMPFE* pRooRealMPFE ;
 
 class RooAbsTestStatistic : public RooAbsReal {
-  friend class RooRealMPFE;
-  friend class RooWrapperL;
+    friend class RooRealMPFE;
 public:
 
   struct Configuration {
@@ -73,21 +72,12 @@ class RooAbsTestStatistic : public RooAbsReal {
   }
 
   Bool_t setData(RooAbsData& data, Bool_t cloneData=kTRUE) ;
-  //vinces accessors
-  Int_t numSimultaneous() const { return _nGof ; }
-  RooAbsTestStatistic** simComponents() { return _gofArray ; }
 
   void enableOffsetting(Bool_t flag) ;
   Bool_t isOffsetting() const { return _doOffset ; }
   virtual Double_t offset() const { return _offset.Sum() ; }
   virtual Double_t offsetCarry() const { return _offset.Carry(); }
 
-  virtual RooAbsReal& function() { return *_func ; }
-  virtual const RooAbsReal& function() const { return *_func ; }
-
-  virtual RooAbsData& data() { return *_data ; }
-  virtual const RooAbsData& data() const { return *_data ; }
-
 protected:
 
   virtual void printCompactTreeHook(std::ostream& os, const char* indent="") ;
@@ -170,8 +160,6 @@ class RooAbsTestStatistic : public RooAbsReal {
   mutable ROOT::Math::KahanSum<double> _offset = 0.0; //! Offset as KahanSum to avoid loss of precision
   mutable Double_t _evalCarry = 0.0; //! carry of Kahan sum in evaluatePartition
 
-private:
-
   ClassDef(RooAbsTestStatistic,3) // Abstract base class for real-valued test statistics
 };
 

roofit/roofitcore/src/RooAbsOptTestStatistic.cxx

@@ -770,33 +770,33 @@ Bool_t RooAbsOptTestStatistic::setDataSlave(RooAbsData& indata, Bool_t cloneData
 
 ////////////////////////////////////////////////////////////////////////////////
 
-RooAbsData& RooAbsOptTestStatistic::data()
-{
+RooAbsData& RooAbsOptTestStatistic::data() 
+{ 
   if (_sealed) {
     Bool_t notice = (sealNotice() && strlen(sealNotice())) ;
-    coutW(ObjectHandling) << "RooAbsOptTestStatistic::data(" << GetName()
-			  << ") WARNING: object sealed by creator - access to data is not permitted: "
+    coutW(ObjectHandling) << "RooAbsOptTestStatistic::data(" << GetName() 
+			  << ") WARNING: object sealed by creator - access to data is not permitted: " 
 			  << (notice?sealNotice():"<no user notice>") << endl ;
     static RooDataSet dummy ("dummy","dummy",RooArgSet()) ;
     return dummy ;
   }
-  return *_dataClone ;
+  return *_dataClone ; 
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 
-const RooAbsData& RooAbsOptTestStatistic::data() const
-{
+const RooAbsData& RooAbsOptTestStatistic::data() const 
+{ 
   if (_sealed) {
     Bool_t notice = (sealNotice() && strlen(sealNotice())) ;
-    coutW(ObjectHandling) << "RooAbsOptTestStatistic::data(" << GetName()
-			  << ") WARNING: object sealed by creator - access to data is not permitted: "
+    coutW(ObjectHandling) << "RooAbsOptTestStatistic::data(" << GetName() 
+			  << ") WARNING: object sealed by creator - access to data is not permitted: " 
 			  << (notice?sealNotice():"<no user notice>") << endl ;
     static RooDataSet dummy ("dummy","dummy",RooArgSet()) ;
     return dummy ;
   }
-  return *_dataClone ;
+  return *_dataClone ; 
 }