COMP/CMSDIST/root-5.27-06b-r37582-tmva.patch

diff -Naur orig.root/tmva/inc/Event.h root/tmva/inc/Event.h
--- orig.root/tmva/inc/Event.h  2010-11-05 15:46:51.000000000 +0100
+++ root/tmva/inc/Event.h       2010-12-14 09:46:11.000000000 +0100
@@ -111,7 +111,7 @@
    private:
 
       mutable std::vector<Float_t>   fValues;               // the event values
-      static  std::vector<Float_t*>* fgValuesDynamic;       // the event values
+      mutable std::vector<Float_t*>* fValuesDynamic;       // the event values
       mutable std::vector<Float_t>   fTargets;              // target values for regression
       mutable std::vector<Float_t>   fSpectators;           // "visisting" variables which are never used for any calculation
       mutable std::vector<UInt_t>*   fVariableArrangement;  // needed for MethodCategories, where we can train on other than the main variables
@@ -120,8 +120,6 @@
       Float_t                        fWeight;          // event weight (product of global and individual weights)
       Float_t                        fBoostWeight;     // internal weight to be set by boosting algorithm
       Bool_t                         fDynamic;         // is set when the dynamic values are taken
-      
-      static Int_t                   fgCount;          // count instances of Event
    };
 }
 
diff -Naur orig.root/tmva/src/Event.cxx root/tmva/src/Event.cxx
--- orig.root/tmva/src/Event.cxx        2010-11-05 15:46:50.000000000 +0100
+++ root/tmva/src/Event.cxx     2010-12-14 09:46:14.000000000 +0100
@@ -34,13 +34,11 @@
 #include <iomanip>
 #include <cassert>
 #include "TCut.h"
- 
-Int_t TMVA::Event::fgCount = 0;
-std::vector<Float_t*>* TMVA::Event::fgValuesDynamic = 0;
 
 //____________________________________________________________
 TMVA::Event::Event() 
    : fValues(),
+     fValuesDynamic(0),
      fTargets(),
      fSpectators(),
      fVariableArrangement(0),
@@ -50,7 +48,6 @@
      fDynamic(kFALSE)
 {
    // copy constructor
-   fgCount++; 
 }
 
 //____________________________________________________________
@@ -60,6 +57,7 @@
                     Float_t weight,
                     Float_t boostweight )
    : fValues(ev),
+     fValuesDynamic(0),
      fTargets(tg),
      fSpectators(0),
      fVariableArrangement(0),
@@ -69,7 +67,6 @@
      fDynamic(kFALSE)
 {
    // constructor
-   fgCount++;
 }
 
 //____________________________________________________________
@@ -80,6 +77,7 @@
                     Float_t weight,
                     Float_t boostweight )
    : fValues(ev),
+     fValuesDynamic(0),
      fTargets(tg),
      fSpectators(vi),
      fVariableArrangement(0),
@@ -89,7 +87,6 @@
      fDynamic(kFALSE)
 {
    // constructor
-   fgCount++;
 }
 
 //____________________________________________________________
@@ -98,6 +95,7 @@
                     Float_t weight,
                     Float_t boostweight )
    : fValues(ev),
+     fValuesDynamic(0),
      fTargets(0),
      fSpectators(0),
      fVariableArrangement(0),
@@ -107,12 +105,12 @@
      fDynamic(kFALSE)
 {
    // constructor
-   fgCount++;
 }
 
 //____________________________________________________________
 TMVA::Event::Event( const std::vector<Float_t*>*& evdyn, UInt_t nvar )
    : fValues(nvar),
+     fValuesDynamic( (std::vector<Float_t*>*) evdyn ),
      fTargets(0),
      fSpectators(evdyn->size()-nvar),
      fVariableArrangement(0),
@@ -122,8 +120,7 @@
      fDynamic(true)
 {
    // constructor for single events
-   fgValuesDynamic = (std::vector<Float_t*>*) evdyn;
-   fgCount++;
+   fValuesDynamic = (std::vector<Float_t*>*) evdyn;
 }
 
 //____________________________________________________________
@@ -138,26 +135,23 @@
      fDynamic(event.fDynamic)
 {
    // copy constructor
-   fgCount++; 
 }
 
 //____________________________________________________________
 TMVA::Event::~Event() 
 {
    // Event destructor
-   fgCount--;;
-   if (fDynamic && fgCount==0) TMVA::Event::ClearDynamicVariables();
 }
  
 //____________________________________________________________
 void TMVA::Event::ClearDynamicVariables() 
 { 
    // clear global variable
-   if (fgValuesDynamic != 0) { 
-      fgValuesDynamic->clear();
-      delete fgValuesDynamic;
-      fgValuesDynamic = 0;
-   }
+//    if (fValuesDynamic != 0) { 
+//       fValuesDynamic->clear();
+//       delete fValuesDynamic;
+//       fValuesDynamic = 0;
+//    }
 }
 
 //____________________________________________________________
@@ -188,12 +182,12 @@
    // return value of i'th variable
    Float_t retval;
    if (fVariableArrangement==0) {
-      retval = fDynamic ?( *(*fgValuesDynamic)[ivar] ) : fValues[ivar]; 
+      retval = fDynamic ?( *(*fValuesDynamic)[ivar] ) : fValues[ivar]; 
    } 
    else {
       UInt_t mapIdx = (*fVariableArrangement)[ivar];
       if (fDynamic) {
-         retval = *(*fgValuesDynamic)[mapIdx];
+         retval = *(*fValuesDynamic)[mapIdx];
       } 
       else {
          retval = ( mapIdx<fValues.size() ) ? fValues[mapIdx] : fSpectators[mapIdx-fValues.size()];
@@ -206,7 +200,7 @@
 Float_t TMVA::Event::GetSpectator( UInt_t ivar) const 
 {
    // return spectator content
-   if (fDynamic) return *(fgValuesDynamic->at(GetNVariables()+ivar));
+   if (fDynamic) return *(fValuesDynamic->at(GetNVariables()+ivar));
    else          return fSpectators.at(ivar);
 }
 
@@ -218,13 +212,13 @@
       assert(0);
    }
    if (fDynamic) {
-//       if (fgValuesDynamic->size()-GetNSpectators() != fValues.size()) {
+//       if (fValuesDynamic->size()-GetNSpectators() != fValues.size()) {
 //          std::cout << "ERROR Event::GetValues() is trying to change the size of the variable vector, exiting ..." << std::endl;
 //          assert(0);
 //       }
       fValues.clear();
-      for (std::vector<Float_t*>::const_iterator it = fgValuesDynamic->begin(); 
-           it != fgValuesDynamic->end()-GetNSpectators(); it++) { 
+      for (std::vector<Float_t*>::const_iterator it = fValuesDynamic->begin(); 
+           it != fValuesDynamic->end()-GetNSpectators(); it++) { 
          Float_t val = *(*it); 
          fValues.push_back( val ); 
       }
@@ -268,10 +262,10 @@
 void TMVA::Event::SetVal( UInt_t ivar, Float_t val ) 
 {
    // set variable ivar to val
-   if ((fDynamic ?( (*fgValuesDynamic).size() ) : fValues.size())<=ivar)
-      (fDynamic ?( (*fgValuesDynamic).resize(ivar+1) ) : fValues.resize(ivar+1));
+   if ((fDynamic ?( (*fValuesDynamic).size() ) : fValues.size())<=ivar)
+      (fDynamic ?( (*fValuesDynamic).resize(ivar+1) ) : fValues.resize(ivar+1));
 
-   (fDynamic ?( *(*fgValuesDynamic)[ivar] ) : fValues[ivar])=val;
+   (fDynamic ?( *(*fValuesDynamic)[ivar] ) : fValues[ivar])=val;
 }
 
 //____________________________________________________________
diff -Naur orig.root/tmva/src/Reader.cxx root/tmva/src/Reader.cxx
--- orig.root/tmva/src/Reader.cxx       2010-11-05 15:46:50.000000000 +0100
+++ root/tmva/src/Reader.cxx    2010-12-14 09:46:16.000000000 +0100
@@ -129,15 +129,9 @@
      fLogger ( 0 )
 {
    // constructor
-
-   fLogger = new MsgLogger(this);
-
-//    DataSetManager::CreateInstance(fDataInputHandler); // DSMTEST removed
-//    DataSetManager::Instance().AddDataSetInfo(fDataSetInfo); // DSMTEST removed
-   fDataSetManager = new DataSetManager( fDataInputHandler ); // DSMTEST 
+   fDataSetManager = new DataSetManager( fDataInputHandler ); // DSMTEST
    fDataSetManager->AddDataSetInfo(fDataSetInfo); // DSMTEST
-   
-
+   fLogger = new MsgLogger(this);
 
    SetConfigName( GetName() );
    DeclareOptions();
@@ -158,6 +152,9 @@
      fLogger ( 0 )
 {
    // constructor
+   fDataSetManager = new DataSetManager( fDataInputHandler );
+   fDataSetManager->AddDataSetInfo(fDataSetInfo);
+
    fLogger = new MsgLogger(this);
    SetConfigName( GetName() );
    DeclareOptions();
@@ -184,8 +181,10 @@
      fLogger ( 0 )
 {
    // constructor
+   fDataSetManager = new DataSetManager( fDataInputHandler );
+   fDataSetManager->AddDataSetInfo(fDataSetInfo);
    fLogger = new MsgLogger(this);
-   SetConfigName( GetName() );   
+   SetConfigName( GetName() );
    DeclareOptions();
    ParseOptions();
 
@@ -210,6 +209,8 @@
      fLogger ( 0 )
 {
    // constructor
+   fDataSetManager = new DataSetManager( fDataInputHandler );
+   fDataSetManager->AddDataSetInfo(fDataSetInfo);
    fLogger = new MsgLogger(this);
    SetConfigName( GetName() );
    DeclareOptions();
@@ -233,6 +234,8 @@
      fLogger ( 0 )
 {
    // constructor
+   fDataSetManager = new DataSetManager( fDataInputHandler );
+   fDataSetManager->AddDataSetInfo(fDataSetInfo);
    fLogger = new MsgLogger(this);
    SetConfigName( GetName() );
    DeclareOptions();
@@ -252,7 +255,7 @@
 
    DeclareOptionRef( fVerbose, "V",      "Verbose flag" );
    DeclareOptionRef( fColor,   "Color",  "Color flag (default True)" );
-   DeclareOptionRef( fSilent,  "Silent", "Boolean silent flag (default False)" );   
+   DeclareOptionRef( fSilent,  "Silent", "Boolean silent flag (default False)" );
 }
 
 //_______________________________________________________________________
@@ -353,11 +356,11 @@
 
    MethodBase* method = dynamic_cast<MethodBase*>(this->BookMVA( Types::Instance().GetMethodType(methodType),
                                                                  weightfile ) );
-   if( method->GetMethodType() == Types::kCategory ){ 
-      MethodCategory *methCat = (dynamic_cast<MethodCategory*>(method)); 
-      if( !methCat ) 
-        Log() << kERROR << "Method with type kCategory cannot be casted to MethodCategory. /Reader" << Endl; 
-      methCat->fDataSetManager = fDataSetManager; 
+   if( method->GetMethodType() == Types::kCategory ){
+      MethodCategory *methCat = (dynamic_cast<MethodCategory*>(method));
+      if( !methCat )
+         Log() << kERROR << "Method with type kCategory cannot be casted to MethodCategory. /Reader" << Endl;
+      methCat->fDataSetManager = fDataSetManager;
    }
 
    return fMethodMap[methodTag] = method;
@@ -374,11 +377,11 @@
 
    if (method==0) return im;
 
-   if( method->GetMethodType() == Types::kCategory ){ 
-      MethodCategory *methCat = (dynamic_cast<MethodCategory*>(method)); 
-      if( !methCat ) 
-         Log() << kERROR << "Method with type kCategory cannot be casted to MethodCategory. /Reader" << Endl; 
-      methCat->fDataSetManager = fDataSetManager; 
+   if( method->GetMethodType() == Types::kCategory ){
+      MethodCategory *methCat = (dynamic_cast<MethodCategory*>(method));
+      if( !methCat )
+         Log() << kERROR << "Method with type kCategory cannot be casted to MethodCategory. /Reader" << Endl;
+      methCat->fDataSetManager = fDataSetManager;
    }
 
    method->SetupMethod();
diff -Naur orig.root/tmva/test/setup.sh root/tmva/test/setup.sh
--- orig.root/tmva/test/setup.sh        2010-11-05 15:46:50.000000000 +0100
+++ root/tmva/test/setup.sh     2010-12-14 09:46:18.000000000 +0100
@@ -27,6 +27,9 @@
     return 1
 fi
 
+export TMVASYS=$PWD
+
+
 # On MacOS X $DYLD_LIBRARY_PATH has to be modified, so:
 if [[ `root-config --platform` == "macosx" ]]; then
 
#	Content
1	diff -Naur orig.root/tmva/inc/Event.h root/tmva/inc/Event.h
2	--- orig.root/tmva/inc/Event.h 2010-11-05 15:46:51.000000000 +0100
3	+++ root/tmva/inc/Event.h 2010-12-14 09:46:11.000000000 +0100
4	@@ -111,7 +111,7 @@
5	private:
6
7	mutable std::vector<Float_t> fValues; // the event values
8	- static std::vector<Float_t> fgValuesDynamic; // the event values
9	+ mutable std::vector<Float_t> fValuesDynamic; // the event values
10	mutable std::vector<Float_t> fTargets; // target values for regression
11	mutable std::vector<Float_t> fSpectators; // "visisting" variables which are never used for any calculation
12	mutable std::vector<UInt_t>* fVariableArrangement; // needed for MethodCategories, where we can train on other than the main variables
13	@@ -120,8 +120,6 @@
14	Float_t fWeight; // event weight (product of global and individual weights)
15	Float_t fBoostWeight; // internal weight to be set by boosting algorithm
16	Bool_t fDynamic; // is set when the dynamic values are taken
17	-
18	- static Int_t fgCount; // count instances of Event
19	};
20	}
21
22	diff -Naur orig.root/tmva/src/Event.cxx root/tmva/src/Event.cxx
23	--- orig.root/tmva/src/Event.cxx 2010-11-05 15:46:50.000000000 +0100
24	+++ root/tmva/src/Event.cxx 2010-12-14 09:46:14.000000000 +0100
25	@@ -34,13 +34,11 @@
26	#include <iomanip>
27	#include <cassert>
28	#include "TCut.h"
29	-
30	-Int_t TMVA::Event::fgCount = 0;
31	-std::vector<Float_t> TMVA::Event::fgValuesDynamic = 0;
32
33	//____________________________________________________________
34	TMVA::Event::Event()
35	: fValues(),
36	+ fValuesDynamic(0),
37	fTargets(),
38	fSpectators(),
39	fVariableArrangement(0),
40	@@ -50,7 +48,6 @@
41	fDynamic(kFALSE)
42	{
43	// copy constructor
44	- fgCount++;
45	}
46
47	//____________________________________________________________
48	@@ -60,6 +57,7 @@
49	Float_t weight,
50	Float_t boostweight )
51	: fValues(ev),
52	+ fValuesDynamic(0),
53	fTargets(tg),
54	fSpectators(0),
55	fVariableArrangement(0),
56	@@ -69,7 +67,6 @@
57	fDynamic(kFALSE)
58	{
59	// constructor
60	- fgCount++;
61	}
62
63	//____________________________________________________________
64	@@ -80,6 +77,7 @@
65	Float_t weight,
66	Float_t boostweight )
67	: fValues(ev),
68	+ fValuesDynamic(0),
69	fTargets(tg),
70	fSpectators(vi),
71	fVariableArrangement(0),
72	@@ -89,7 +87,6 @@
73	fDynamic(kFALSE)
74	{
75	// constructor
76	- fgCount++;
77	}
78
79	//____________________________________________________________
80	@@ -98,6 +95,7 @@
81	Float_t weight,
82	Float_t boostweight )
83	: fValues(ev),
84	+ fValuesDynamic(0),
85	fTargets(0),
86	fSpectators(0),
87	fVariableArrangement(0),
88	@@ -107,12 +105,12 @@
89	fDynamic(kFALSE)
90	{
91	// constructor
92	- fgCount++;
93	}
94
95	//____________________________________________________________
96	TMVA::Event::Event( const std::vector<Float_t>& evdyn, UInt_t nvar )
97	: fValues(nvar),
98	+ fValuesDynamic( (std::vector<Float_t>) evdyn ),
99	fTargets(0),
100	fSpectators(evdyn->size()-nvar),
101	fVariableArrangement(0),
102	@@ -122,8 +120,7 @@
103	fDynamic(true)
104	{
105	// constructor for single events
106	- fgValuesDynamic = (std::vector<Float_t>) evdyn;
107	- fgCount++;
108	+ fValuesDynamic = (std::vector<Float_t>) evdyn;
109	}
110
111	//____________________________________________________________
112	@@ -138,26 +135,23 @@
113	fDynamic(event.fDynamic)
114	{
115	// copy constructor
116	- fgCount++;
117	}
118
119	//____________________________________________________________
120	TMVA::Event::~Event()
121	{
122	// Event destructor
123	- fgCount--;;
124	- if (fDynamic && fgCount==0) TMVA::Event::ClearDynamicVariables();
125	}
126
127	//____________________________________________________________
128	void TMVA::Event::ClearDynamicVariables()
129	{
130	// clear global variable
131	- if (fgValuesDynamic != 0) {
132	- fgValuesDynamic->clear();
133	- delete fgValuesDynamic;
134	- fgValuesDynamic = 0;
135	- }
136	+// if (fValuesDynamic != 0) {
137	+// fValuesDynamic->clear();
138	+// delete fValuesDynamic;
139	+// fValuesDynamic = 0;
140	+// }
141	}
142
143	//____________________________________________________________
144	@@ -188,12 +182,12 @@
145	// return value of i'th variable
146	Float_t retval;
147	if (fVariableArrangement==0) {
148	- retval = fDynamic ?( (fgValuesDynamic)[ivar] ) : fValues[ivar];
149	+ retval = fDynamic ?( (fValuesDynamic)[ivar] ) : fValues[ivar];
150	}
151	else {
152	UInt_t mapIdx = (*fVariableArrangement)[ivar];
153	if (fDynamic) {
154	- retval = (fgValuesDynamic)[mapIdx];
155	+ retval = (fValuesDynamic)[mapIdx];
156	}
157	else {
158	retval = ( mapIdx<fValues.size() ) ? fValues[mapIdx] : fSpectators[mapIdx-fValues.size()];
159	@@ -206,7 +200,7 @@
160	Float_t TMVA::Event::GetSpectator( UInt_t ivar) const
161	{
162	// return spectator content
163	- if (fDynamic) return *(fgValuesDynamic->at(GetNVariables()+ivar));
164	+ if (fDynamic) return *(fValuesDynamic->at(GetNVariables()+ivar));
165	else return fSpectators.at(ivar);
166	}
167
168	@@ -218,13 +212,13 @@
169	assert(0);
170	}
171	if (fDynamic) {
172	-// if (fgValuesDynamic->size()-GetNSpectators() != fValues.size()) {
173	+// if (fValuesDynamic->size()-GetNSpectators() != fValues.size()) {
174	// std::cout << "ERROR Event::GetValues() is trying to change the size of the variable vector, exiting ..." << std::endl;
175	// assert(0);
176	// }
177	fValues.clear();
178	- for (std::vector<Float_t*>::const_iterator it = fgValuesDynamic->begin();
179	- it != fgValuesDynamic->end()-GetNSpectators(); it++) {
180	+ for (std::vector<Float_t*>::const_iterator it = fValuesDynamic->begin();
181	+ it != fValuesDynamic->end()-GetNSpectators(); it++) {
182	Float_t val = (it);
183	fValues.push_back( val );
184	}
185	@@ -268,10 +262,10 @@
186	void TMVA::Event::SetVal( UInt_t ivar, Float_t val )
187	{
188	// set variable ivar to val
189	- if ((fDynamic ?( (*fgValuesDynamic).size() ) : fValues.size())<=ivar)
190	- (fDynamic ?( (*fgValuesDynamic).resize(ivar+1) ) : fValues.resize(ivar+1));
191	+ if ((fDynamic ?( (*fValuesDynamic).size() ) : fValues.size())<=ivar)
192	+ (fDynamic ?( (*fValuesDynamic).resize(ivar+1) ) : fValues.resize(ivar+1));
193
194	- (fDynamic ?( (fgValuesDynamic)[ivar] ) : fValues[ivar])=val;
195	+ (fDynamic ?( (fValuesDynamic)[ivar] ) : fValues[ivar])=val;
196	}
197
198	//____________________________________________________________
199	diff -Naur orig.root/tmva/src/Reader.cxx root/tmva/src/Reader.cxx
200	--- orig.root/tmva/src/Reader.cxx 2010-11-05 15:46:50.000000000 +0100
201	+++ root/tmva/src/Reader.cxx 2010-12-14 09:46:16.000000000 +0100
202	@@ -129,15 +129,9 @@
203	fLogger ( 0 )
204	{
205	// constructor
206	-
207	- fLogger = new MsgLogger(this);
208	-
209	-// DataSetManager::CreateInstance(fDataInputHandler); // DSMTEST removed
210	-// DataSetManager::Instance().AddDataSetInfo(fDataSetInfo); // DSMTEST removed
211	- fDataSetManager = new DataSetManager( fDataInputHandler ); // DSMTEST
212	+ fDataSetManager = new DataSetManager( fDataInputHandler ); // DSMTEST
213	fDataSetManager->AddDataSetInfo(fDataSetInfo); // DSMTEST
214	-
215	-
216	+ fLogger = new MsgLogger(this);
217
218	SetConfigName( GetName() );
219	DeclareOptions();
220	@@ -158,6 +152,9 @@
221	fLogger ( 0 )
222	{
223	// constructor
224	+ fDataSetManager = new DataSetManager( fDataInputHandler );
225	+ fDataSetManager->AddDataSetInfo(fDataSetInfo);
226	+
227	fLogger = new MsgLogger(this);
228	SetConfigName( GetName() );
229	DeclareOptions();
230	@@ -184,8 +181,10 @@
231	fLogger ( 0 )
232	{
233	// constructor
234	+ fDataSetManager = new DataSetManager( fDataInputHandler );
235	+ fDataSetManager->AddDataSetInfo(fDataSetInfo);
236	fLogger = new MsgLogger(this);
237	- SetConfigName( GetName() );
238	+ SetConfigName( GetName() );
239	DeclareOptions();
240	ParseOptions();
241
242	@@ -210,6 +209,8 @@
243	fLogger ( 0 )
244	{
245	// constructor
246	+ fDataSetManager = new DataSetManager( fDataInputHandler );
247	+ fDataSetManager->AddDataSetInfo(fDataSetInfo);
248	fLogger = new MsgLogger(this);
249	SetConfigName( GetName() );
250	DeclareOptions();
251	@@ -233,6 +234,8 @@
252	fLogger ( 0 )
253	{
254	// constructor
255	+ fDataSetManager = new DataSetManager( fDataInputHandler );
256	+ fDataSetManager->AddDataSetInfo(fDataSetInfo);
257	fLogger = new MsgLogger(this);
258	SetConfigName( GetName() );
259	DeclareOptions();
260	@@ -252,7 +255,7 @@
261
262	DeclareOptionRef( fVerbose, "V", "Verbose flag" );
263	DeclareOptionRef( fColor, "Color", "Color flag (default True)" );
264	- DeclareOptionRef( fSilent, "Silent", "Boolean silent flag (default False)" );
265	+ DeclareOptionRef( fSilent, "Silent", "Boolean silent flag (default False)" );
266	}
267
268	//_______________________________________________________________________
269	@@ -353,11 +356,11 @@
270
271	MethodBase* method = dynamic_cast<MethodBase*>(this->BookMVA( Types::Instance().GetMethodType(methodType),
272	weightfile ) );
273	- if( method->GetMethodType() == Types::kCategory ){
274	- MethodCategory methCat = (dynamic_cast<MethodCategory>(method));
275	- if( !methCat )
276	- Log() << kERROR << "Method with type kCategory cannot be casted to MethodCategory. /Reader" << Endl;
277	- methCat->fDataSetManager = fDataSetManager;
278	+ if( method->GetMethodType() == Types::kCategory ){
279	+ MethodCategory methCat = (dynamic_cast<MethodCategory>(method));
280	+ if( !methCat )
281	+ Log() << kERROR << "Method with type kCategory cannot be casted to MethodCategory. /Reader" << Endl;
282	+ methCat->fDataSetManager = fDataSetManager;
283	}
284
285	return fMethodMap[methodTag] = method;
286	@@ -374,11 +377,11 @@
287
288	if (method==0) return im;
289
290	- if( method->GetMethodType() == Types::kCategory ){
291	- MethodCategory methCat = (dynamic_cast<MethodCategory>(method));
292	- if( !methCat )
293	- Log() << kERROR << "Method with type kCategory cannot be casted to MethodCategory. /Reader" << Endl;
294	- methCat->fDataSetManager = fDataSetManager;
295	+ if( method->GetMethodType() == Types::kCategory ){
296	+ MethodCategory methCat = (dynamic_cast<MethodCategory>(method));
297	+ if( !methCat )
298	+ Log() << kERROR << "Method with type kCategory cannot be casted to MethodCategory. /Reader" << Endl;
299	+ methCat->fDataSetManager = fDataSetManager;
300	}
301
302	method->SetupMethod();
303	diff -Naur orig.root/tmva/test/setup.sh root/tmva/test/setup.sh
304	--- orig.root/tmva/test/setup.sh 2010-11-05 15:46:50.000000000 +0100
305	+++ root/tmva/test/setup.sh 2010-12-14 09:46:18.000000000 +0100
306	@@ -27,6 +27,9 @@
307	return 1
308	fi
309
310	+export TMVASYS=$PWD
311	+
312	+
313	# On MacOS X $DYLD_LIBRARY_PATH has to be modified, so:
314	if [[ `root-config --platform` == "macosx" ]]; then
315