Skip to content

Roofit task spec ctor fix #3

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

Merged
vincecr0ft merged 4 commits into from
Jul 30, 2017
Merged

Roofit task spec ctor fix #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5620d6a
Changed RooAbsOptTestStat. to RooAbsTestStat. in TaskSpec
egpbos Jul 26, 2017
c38bd25
Add function() and data() virtual fcts to RooAbsTestStatistic
egpbos Jul 26, 2017
dbca675
Compile fix
egpbos Jul 27, 2017
09b057c
Merge branch 'roofit_task_spec' into roofit_task_spec_egp
egpbos Jul 27, 2017
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
8 changes: 4 additions & 4 deletions roofit/roofitcore/inc/RooAbsOptTestStatistic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ class RooAbsOptTestStatistic : public RooAbsTestStatistic {

virtual Double_t combinedValue(RooAbsReal** gofArray, Int_t nVal) const ;

RooAbsReal& function() { return *_funcClone ; }
const RooAbsReal& function() const { return *_funcClone ; }
virtual RooAbsReal& function() { return *_funcClone ; }
virtual const RooAbsReal& function() const { return *_funcClone ; }

RooAbsData& data() ;
const RooAbsData& data() const ;
virtual RooAbsData& data() ;
virtual const RooAbsData& data() const ;


virtual const char* cacheUniqueSuffix() const { return Form("_%lx", (ULong_t)_dataClone) ; }
Expand Down
6 changes: 6 additions & 0 deletions roofit/roofitcore/inc/RooAbsTestStatistic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ class RooAbsTestStatistic : public RooAbsReal {
virtual Double_t offset() const { return _offset ; }
virtual Double_t offsetCarry() const { return _offsetCarry; }

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="") ;
Expand Down
13 changes: 3 additions & 10 deletions roofit/roofitcore/inc/RooTaskSpec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,15 @@
#define ROO_TASK_SPEC

#include "RooFit.h"
#include <cstdlib>
#include <list>
#include <sstream>
#include "RooMsgService.h"
#include "RooNLLVar.h"
#include "RooAbsTestStatistic.h"
#include "RooAbsOptTestStatistic.h"
#include "RooAddition.h"
#include "RooAbsTestStatistic.h"

class RooArgList;

class RooTaskSpec {
public:
RooTaskSpec();
RooTaskSpec(RooAbsOptTestStatistic* nll);
RooTaskSpec(RooAbsTestStatistic* rats_nll);
RooTaskSpec(RooAbsReal* nll);
struct Task {
Int_t id;
Expand All @@ -43,8 +36,8 @@ class RooTaskSpec {
};
std::list<Task> tasks;
private:
void _initialise(RooAbsOptTestStatistic* rats);
Task _fill_task(const Int_t n, RooAbsOptTestStatistic* rats);
void _initialise(RooAbsTestStatistic* rats);
Task _fill_task(const Int_t n, RooAbsTestStatistic* rats);
Int_t _fit_case;
Int_t n_tasks = tasks.size();

Expand Down
20 changes: 10 additions & 10 deletions roofit/roofitcore/src/RooAbsOptTestStatistic.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,33 +815,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 ;
}


39 changes: 14 additions & 25 deletions roofit/roofitcore/src/RooTaskSpec.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,12 @@ ToDo: Simple use demonstration.
**/


#include "Riostream.h"
#include "RooFit.h"
#include <cstdlib>
#include <sstream>
#include "RooMsgService.h"
#include "RooNLLVar.h"
#include "RooTaskSpec.h"
// #include "Riostream.h"
// #include "RooFit.h"
// #include <sstream>
#include "RooAbsTestStatistic.h"
#include "RooAbsOptTestStatistic.h"
#include "RooAddition.h"
#include "RooAbsTestStatistic.h"
#include "RooTaskSpec.h"
#include "RooAbsData.h"

using namespace std;
Expand All @@ -56,17 +51,11 @@ using namespace RooFit;
//ClassImp(RooTaskSpec);
RooTaskSpec::RooTaskSpec(){};

RooTaskSpec::RooTaskSpec(RooAbsOptTestStatistic* nll){
cout <<"starting case1"<<endl;
RooAbsOptTestStatistic* rats = dynamic_cast<RooAbsOptTestStatistic*>(nll) ;
if (rats) {
cout << " NLL is a RooAbsOptTestStatistic (Case 1)" << endl ;
rats->Print();
_fit_case = 1;
_initialise(rats);
} else {
_fit_case = 0;
}
RooTaskSpec::RooTaskSpec(RooAbsTestStatistic* rats_nll){
cout << " NLL is a RooAbsTestStatistic (Case 1)" << endl ;
rats_nll->Print();
_fit_case = 1;
_initialise(rats_nll);
}

RooTaskSpec::RooTaskSpec(RooAbsReal* nll){
Expand All @@ -79,12 +68,12 @@ RooTaskSpec::RooTaskSpec(RooAbsReal* nll){

RooAbsOptTestStatistic* rats = dynamic_cast<RooAbsOptTestStatistic*>(ra->list().at(0)) ;
if (!rats) {
cout << "ERROR: NLL is a RooAddition, but first element of addition is not a RooAbsOptTestStatistic!" << endl ;
cout << "ERROR: NLL is a RooAddition, but first element of addition is not a RooAbsTestStatistic!" << endl ;
_fit_case = 0;
cout << "It is a "<<ra->list().at(0)<<endl;
} else {
_fit_case = 1;
cout << "NLL is a RooAddition (Case 2), first element is a RooAbsOptTestStatistic" << endl ;
cout << "NLL is a RooAddition (Case 2), first element is a RooAbsTestStatistic" << endl ;
_initialise(rats);
}
}
Expand All @@ -95,7 +84,7 @@ RooTaskSpec::RooTaskSpec(RooAbsReal* nll){
}


void RooTaskSpec::_initialise (RooAbsOptTestStatistic* rats){
void RooTaskSpec::_initialise (RooAbsTestStatistic* rats){
// Check if nll is a AbsTestStatistic
if (rats->numSimultaneous()==0){
// _set.add(_fill_task(0, rats));
Expand All @@ -104,13 +93,13 @@ void RooTaskSpec::_initialise (RooAbsOptTestStatistic* rats){
for (Int_t i=0 ; i < rats->numSimultaneous() ; i++) {
cout << "SimComponent #" << i << " = " ;
rats->simComponents()[i]->Print() ;
RooAbsOptTestStatistic* comp = (RooAbsOptTestStatistic*) rats->simComponents()[i] ;
RooAbsTestStatistic* comp = (RooAbsTestStatistic*) rats->simComponents()[i] ;
tasks.push_back(_fill_task(i, comp));
}
}
}

RooTaskSpec::Task RooTaskSpec::_fill_task(Int_t n, RooAbsOptTestStatistic* rats){
RooTaskSpec::Task RooTaskSpec::_fill_task(Int_t n, RooAbsTestStatistic* rats){
Bool_t b = rats->function().getAttribute("BinnedLikelihood") ;
Task t;
t.id = n;
Expand Down