Skip to content
Snippets Groups Projects
Commit 852b9568 authored by Rene Brun's avatar Rene Brun
Browse files

From Maarten Ballintijn 

- Fix Int_t -> Long64_t
- small assorted fixes


git-svn-id: http://root.cern.ch/svn/root/trunk@10112 27541ba8-7e3a-0410-8455-c3a389f83636
parent 550bd8b5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
test/ProofBench/EventTree_NoProc.C
+ 4
− 2
View file @ 852b9568
......@@ -50,6 +50,7 @@ void EventTree_NoProc::SlaveBegin(TTree *tree)
TString option = GetOption();
fHist = new TH1F("outdist","",100,0,5);
fHist->SetDirectory(0);
fHist->GetXaxis()->SetTitle("p_{T}");
fHist->GetYaxis()->SetTitle("dN/p_{T}dp_{T}");
......@@ -57,7 +58,7 @@ void EventTree_NoProc::SlaveBegin(TTree *tree)
}
Bool_t EventTree_NoProc::Process(Int_t)
Bool_t EventTree_NoProc::Process(Long64_t)
{
// The Process() function is called for each entry in the tree (or possibly
// keyed object in the case of PROOF) to be processed. The entry argument
......@@ -98,6 +99,7 @@ void EventTree_NoProc::Terminate()
canvas->SetBorderMode(0);
//canvas->SetLogy();
TH1F* h = dynamic_cast<TH1F*>(fOutput->FindObject("outdist"));
h->DrawCopy();
if (h) h->DrawCopy();
else Warning("Terminate", "no outdist found");
}
test/ProofBench/EventTree_NoProc.h
+ 15
− 16
View file @ 852b9568
......@@ -29,7 +29,7 @@ public :
Double32_t fTemperature;
Int_t fMeasures[10];
Double32_t fMatrix[4][4];
Double32_t fClosestDistance[0]; //[fNvertex]
Double32_t fClosestDistance[21]; //[fNvertex]
EventHeader fEvtHdr;
TClonesArray* fTracks;
TRef fLastTrack;
......@@ -57,19 +57,19 @@ public :
EventTree_NoProc(TTree *) { }
EventTree_NoProc() { }
~EventTree_NoProc() { }
Int_t Version() const {return 1;}
void Begin(TTree *);
void SlaveBegin(TTree *tree);
void Init(TTree *tree);
Bool_t Notify();
Bool_t Process(Int_t);
void SetOption(const char *option) { fOption = option; }
void SetObject(TObject *obj) { fObject = obj; }
void SetInputList(TList *input) {fInput = input;}
TList *GetOutputList() const { return fOutput; }
void SlaveTerminate();
void Terminate();
virtual ~EventTree_NoProc() { }
virtual Int_t Version() const {return 1;}
virtual void Begin(TTree *);
virtual void SlaveBegin(TTree *tree);
virtual void Init(TTree *tree);
virtual Bool_t Notify();
virtual Bool_t Process(Long64_t);
virtual void SetOption(const char *option) { fOption = option; }
virtual void SetObject(TObject *obj) { fObject = obj; }
virtual void SetInputList(TList *input) {fInput = input;}
virtual TList *GetOutputList() const { return fOutput; }
virtual void SlaveTerminate();
virtual void Terminate();
ClassDef(EventTree_NoProc,0);
};
......@@ -99,8 +99,7 @@ void EventTree_NoProc::Init(TTree *tree)
fChain->SetBranchAddress("fTemperature",&fTemperature);
fChain->SetBranchAddress("fMeasures[10]",fMeasures);
fChain->SetBranchAddress("fMatrix[4][4]",fMatrix);
fChain->SetBranchAddress("fClosestDistance",&fClosestDistance);
fChain->SetBranchStatus("fClosestDistance",0);
fChain->SetBranchAddress("fClosestDistance",fClosestDistance);
fChain->SetBranchAddress("fEvtHdr",&fEvtHdr);
fChain->SetBranchAddress("fTracks",&fTracks);
fChain->SetBranchAddress("fLastTrack",&fLastTrack);
......
test/ProofBench/EventTree_Proc.C
+ 4
− 2
View file @ 852b9568
......@@ -50,6 +50,7 @@ void EventTree_Proc::SlaveBegin(TTree *tree)
TString option = GetOption();
fHist = new TH1F("outdist","",100,0,5);
fHist->SetDirectory(0);
fHist->GetXaxis()->SetTitle("p_{T}");
fHist->GetYaxis()->SetTitle("dN/p_{T}dp_{T}");
......@@ -57,7 +58,7 @@ void EventTree_Proc::SlaveBegin(TTree *tree)
}
Bool_t EventTree_Proc::Process(Int_t entry)
Bool_t EventTree_Proc::Process(Long64_t entry)
{
// The Process() function is called for each entry in the tree (or possibly
// keyed object in the case of PROOF) to be processed. The entry argument
......@@ -105,6 +106,7 @@ void EventTree_Proc::Terminate()
canvas->SetBorderMode(0);
canvas->SetLogy();
TH1F* h = dynamic_cast<TH1F*>(fOutput->FindObject("outdist"));
h->DrawCopy();
if (h) h->DrawCopy();
else Warning("Terminate", "no outdist found");
}
test/ProofBench/EventTree_Proc.h
+ 15
− 16
View file @ 852b9568
......@@ -29,7 +29,7 @@ public :
Double32_t fTemperature;
Int_t fMeasures[10];
Double32_t fMatrix[4][4];
Double32_t fClosestDistance[0]; //[fNvertex]
Double32_t fClosestDistance[21]; //[fNvertex]
EventHeader fEvtHdr;
TClonesArray* fTracks;
TRef fLastTrack;
......@@ -57,19 +57,19 @@ public :
EventTree_Proc(TTree *) { }
EventTree_Proc() { }
~EventTree_Proc() { }
Int_t Version() const {return 1;}
void Begin(TTree *);
void SlaveBegin(TTree *tree);
void Init(TTree *tree);
Bool_t Notify();
Bool_t Process(Int_t entry);
void SetOption(const char *option) { fOption = option; }
void SetObject(TObject *obj) { fObject = obj; }
void SetInputList(TList *input) {fInput = input;}
TList *GetOutputList() const { return fOutput; }
void SlaveTerminate();
void Terminate();
virtual ~EventTree_Proc() { }
virtual Int_t Version() const {return 1;}
virtual void Begin(TTree *);
virtual void SlaveBegin(TTree *tree);
virtual void Init(TTree *tree);
virtual Bool_t Notify();
virtual Bool_t Process(Long64_t entry);
virtual void SetOption(const char *option) { fOption = option; }
virtual void SetObject(TObject *obj) { fObject = obj; }
virtual void SetInputList(TList *input) {fInput = input;}
virtual TList *GetOutputList() const { return fOutput; }
virtual void SlaveTerminate();
virtual void Terminate();
ClassDef(EventTree_Proc,0);
};
......@@ -99,8 +99,7 @@ void EventTree_Proc::Init(TTree *tree)
fChain->SetBranchAddress("fTemperature",&fTemperature);
fChain->SetBranchAddress("fMeasures[10]",fMeasures);
fChain->SetBranchAddress("fMatrix[4][4]",fMatrix);
fChain->SetBranchAddress("fClosestDistance",&fClosestDistance);
fChain->SetBranchStatus("fClosestDistance",0);
fChain->SetBranchAddress("fClosestDistance",fClosestDistance);
fChain->SetBranchAddress("fEvtHdr",&fEvtHdr);
fChain->SetBranchAddress("fTracks",&fTracks);
fChain->SetBranchAddress("fLastTrack",&fLastTrack);
......
test/ProofBench/EventTree_ProcOpt.C
+ 4
− 2
View file @ 852b9568
......@@ -50,6 +50,7 @@ void EventTree_ProcOpt::SlaveBegin(TTree *tree)
TString option = GetOption();
fHist = new TH1F("outdist","",100,0,5);
fHist->SetDirectory(0);
fHist->GetXaxis()->SetTitle("p_{T}");
fHist->GetYaxis()->SetTitle("dN/p_{T}dp_{T}");
......@@ -57,7 +58,7 @@ void EventTree_ProcOpt::SlaveBegin(TTree *tree)
}
Bool_t EventTree_ProcOpt::Process(Int_t entry)
Bool_t EventTree_ProcOpt::Process(Long64_t entry)
{
// The Process() function is called for each entry in the tree (or possibly
// keyed object in the case of PROOF) to be processed. The entry argument
......@@ -105,6 +106,7 @@ void EventTree_ProcOpt::Terminate()
canvas->SetBorderMode(0);
canvas->SetLogy();
TH1F* h = dynamic_cast<TH1F*>(fOutput->FindObject("outdist"));
h->DrawCopy();
if (h) h->DrawCopy();
else Warning("Terminate", "no outdist found");
}
test/ProofBench/EventTree_ProcOpt.h
+ 14
− 15
View file @ 852b9568
......@@ -29,7 +29,7 @@ public :
Double32_t fTemperature;
Int_t fMeasures[10];
Double32_t fMatrix[4][4];
Double32_t fClosestDistance[0]; //[fNvertex]
Double32_t fClosestDistance[21]; //[fNvertex]
EventHeader fEvtHdr;
TClonesArray* fTracks;
TRef fLastTrack;
......@@ -58,18 +58,18 @@ public :
EventTree_ProcOpt(TTree *) { }
EventTree_ProcOpt() { }
~EventTree_ProcOpt() { }
Int_t Version() const {return 1;}
void Begin(TTree *);
void SlaveBegin(TTree *tree);
void Init(TTree *tree);
Bool_t Notify();
Bool_t Process(Int_t entry);
void SetOption(const char *option) { fOption = option; }
void SetObject(TObject *obj) { fObject = obj; }
void SetInputList(TList *input) {fInput = input;}
TList *GetOutputList() const { return fOutput; }
void SlaveTerminate();
void Terminate();
virtual Int_t Version() const {return 1;}
virtual void Begin(TTree *);
virtual void SlaveBegin(TTree *tree);
virtual void Init(TTree *tree);
virtual Bool_t Notify();
virtual Bool_t Process(Long64_t entry);
virtual void SetOption(const char *option) { fOption = option; }
virtual void SetObject(TObject *obj) { fObject = obj; }
virtual void SetInputList(TList *input) {fInput = input;}
virtual TList *GetOutputList() const { return fOutput; }
virtual void SlaveTerminate();
virtual void Terminate();
ClassDef(EventTree_ProcOpt,0);
};
......@@ -99,8 +99,7 @@ void EventTree_ProcOpt::Init(TTree *tree)
fChain->SetBranchAddress("fTemperature",&fTemperature);
fChain->SetBranchAddress("fMeasures[10]",fMeasures);
fChain->SetBranchAddress("fMatrix[4][4]",fMatrix);
fChain->SetBranchAddress("fClosestDistance",&fClosestDistance);
fChain->SetBranchStatus("fClosestDistance",0);
fChain->SetBranchAddress("fClosestDistance",fClosestDistance);
fChain->SetBranchAddress("fEvtHdr",&fEvtHdr);
fChain->SetBranchAddress("fTracks",&fTracks);
fChain->SetBranchAddress("fLastTrack",&fLastTrack);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment