From a286c9a7422a29c3dc118b861c088f1e5fb91c09 Mon Sep 17 00:00:00 2001
From: Wouter Verkerke <verkerke@nikhef.nl>
Date: Tue, 1 Nov 2011 16:39:55 +0000
Subject: [PATCH] o RooAbsArg
- Fix windows static linking issue
o RooAbsData, stressRooFit
- Select vector-based storage by default
git-svn-id: http://root.cern.ch/svn/root/trunk@41685 27541ba8-7e3a-0410-8455-c3a389f83636
---
roofit/roofitcore/inc/RooAbsArg.h | 2 +-
roofit/roofitcore/src/RooAbsArg.cxx | 2 ++
roofit/roofitcore/src/RooAbsData.cxx | 2 +-
test/stressRooFit.cxx | 16 ++++++++--------
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/roofit/roofitcore/inc/RooAbsArg.h b/roofit/roofitcore/inc/RooAbsArg.h
index e109cdc0930..6869e1aad63 100644
--- a/roofit/roofitcore/inc/RooAbsArg.h
+++ b/roofit/roofitcore/inc/RooAbsArg.h
@@ -518,7 +518,7 @@ public:
Bool_t _deleteWatch ; //! Delete watch flag
static Bool_t flipAClean() ;
- inline static Bool_t inhibitDirty() { return _inhibitDirty ; }
+ static Bool_t inhibitDirty() ;
// Value and Shape dirty state bits
void setValueDirty(const RooAbsArg* source) const ;
diff --git a/roofit/roofitcore/src/RooAbsArg.cxx b/roofit/roofitcore/src/RooAbsArg.cxx
index 91edff06f0f..f7f2d9976d0 100644
--- a/roofit/roofitcore/src/RooAbsArg.cxx
+++ b/roofit/roofitcore/src/RooAbsArg.cxx
@@ -77,6 +77,8 @@ Bool_t RooAbsArg::_verboseDirty(kFALSE) ;
Bool_t RooAbsArg::_inhibitDirty(kFALSE) ;
Bool_t RooAbsArg::_flipAClean(kFALSE) ;
+Bool_t RooAbsArg::inhibitDirty() { return _inhibitDirty ; }
+
//_____________________________________________________________________________
RooAbsArg::RooAbsArg() :
TNamed(),
diff --git a/roofit/roofitcore/src/RooAbsData.cxx b/roofit/roofitcore/src/RooAbsData.cxx
index c6eea4ae7f0..d68a496fd97 100644
--- a/roofit/roofitcore/src/RooAbsData.cxx
+++ b/roofit/roofitcore/src/RooAbsData.cxx
@@ -61,7 +61,7 @@ ClassImp(RooAbsData)
static std::map<RooAbsData*,int> _dcc ;
-RooAbsData::StorageType RooAbsData::defaultStorageType=RooAbsData::Tree ;
+RooAbsData::StorageType RooAbsData::defaultStorageType=RooAbsData::Vector ;
//_____________________________________________________________________________
diff --git a/test/stressRooFit.cxx b/test/stressRooFit.cxx
index 14456417fc3..6fe94bdfbe1 100644
--- a/test/stressRooFit.cxx
+++ b/test/stressRooFit.cxx
@@ -611,13 +611,13 @@ Bool_t RooFitTestUnit::runTest()
#include "stressRooFit_tests.cxx"
//______________________________________________________________________________
-Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t oneTest, Bool_t dryRun, Bool_t doDump, Bool_t doVectorStore)
+Int_t stressRooFit(const char* refFile, Bool_t writeRef, Int_t doVerbose, Int_t oneTest, Bool_t dryRun, Bool_t doDump, Bool_t doTreeStore)
{
// Save memory directory location
gMemDir = gDirectory ;
- if (doVectorStore) {
- RooAbsData::defaultStorageType=RooAbsData::Vector ;
+ if (doTreeStore) {
+ RooAbsData::defaultStorageType=RooAbsData::Tree ;
}
TFile* fref = 0 ;
@@ -801,7 +801,7 @@ int main(int argc,const char *argv[])
Int_t oneTest = -1 ;
Int_t dryRun = kFALSE ;
Bool_t doDump = kFALSE ;
- Bool_t doVectorStore = kFALSE ;
+ Bool_t doTreeStore = kFALSE ;
string refFileName = "http://root.cern.ch/files/stressRooFit_v530_ref.root" ;
@@ -824,9 +824,9 @@ int main(int argc,const char *argv[])
dryRun=kTRUE ;
}
- if (arg=="-vs") {
- cout << "stressRooFit: setting vector-based storage for datasets" << endl ;
- doVectorStore=kTRUE ;
+ if (arg=="-ts") {
+ cout << "stressRooFit: setting tree-based storage for datasets" << endl ;
+ doTreeStore=kTRUE ;
}
if (arg=="-v") {
@@ -892,7 +892,7 @@ int main(int argc,const char *argv[])
RooMath::cacheCERF(kFALSE) ;
gBenchmark = new TBenchmark();
- stressRooFit(refFileName.c_str(),doWrite,doVerbose,oneTest,dryRun,doDump,doVectorStore);
+ stressRooFit(refFileName.c_str(),doWrite,doVerbose,oneTest,dryRun,doDump,doTreeStore);
return 0;
}
--
GitLab