From: loizides Date: Sun, 7 Jul 2002 08:55:51 +0000 (+0000) Subject: Smaller changes to make macros work with newest lib version. Also added some comments. X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=086f41d8b79e8a577aaa74fe1a506ca904d4085a;p=u%2Fmrichter%2FAliRoot.git Smaller changes to make macros work with newest lib version. Also added some comments. --- diff --git a/HLT/exa/Binary.C b/HLT/exa/Binary.C index 3638bc961d3..649a775a8f9 100644 --- a/HLT/exa/Binary.C +++ b/HLT/exa/Binary.C @@ -1,10 +1,18 @@ -/* $Id$ */ +// $Id$ /** -Macro for converting AliRoot digits into L3 RawData. Binary create for each patch its own file. singlepatch uses one file per slice. - */ + Macro for converting AliRoot digits into L3 RawData. + Binary creates for each patch its own file. + Singlepatch uses one file per slice (sp=kTRUE). +*/ + +Binary(char* in,int first, int last,char *path=".",Bool_t sp=kFALSE){ + + if(sp) { + singlepatch(in,first,last,path); + return; + } -Binary(char* in,int first, int last,char *path="."){ char name[256]; const Int_t npatch = 6; AliL3Logger l; @@ -39,8 +47,8 @@ void singlepatch(char* in,int first=0, int last=0,char *path=".",int event=0) //l.UnSet(AliL3Logger::kDebug); //l.UnSet(AliL3Logger::kAll); //l.Set(AliL3Logger::kInformational); - //l.UseStdout(); - l.UseStream(); + l.UseStdout(); + //l.UseStream(); char name[256]; AliL3FileHandler *fFileHandler = new AliL3FileHandler(); diff --git a/HLT/exa/Display.C b/HLT/exa/Display.C index 2286b5fd5d7..6bc527688f5 100644 --- a/HLT/exa/Display.C +++ b/HLT/exa/Display.C @@ -1,7 +1,8 @@ +// $Id$ + /** Displays tracks and clusters read from a file. Functionality is now in AliL3Display. See also the - display.C macro. */ void Display(char *trackfile=0,Bool_t rpoints = kFALSE,Bool_t tpoints = kTRUE,Char_t *gfile="/prog/alice/data/GEO/alice.geom") diff --git a/HLT/exa/Eval.C b/HLT/exa/Eval.C index 06db20474df..3c0f25b150c 100644 --- a/HLT/exa/Eval.C +++ b/HLT/exa/Eval.C @@ -1,6 +1,7 @@ +// $Id$ + void Eval(char *rootfile="") { - AliL3Logger l; // l.UnSet(AliL3Logger::kDebug); // l.UnSet(AliL3Logger::kAll); @@ -8,14 +9,12 @@ void Eval(char *rootfile="") l.UseStdout(); //l.UseStream(); - int slice[2] = {1,3}; + int slice[2] = {0,35}; e = new AliL3Evaluate(rootfile,slice); e->SetupSlow("tracks.raw","."); //e->SetupFast("tracks.raw","/nfs/david/subatom/alice/data/V3.04/fast/clusters/hg_8k_v0_s1-3_e0_cl.root","."); - ntuppel = (TNtuple*)e->EvaluatePoints(); - - + TNtuple *ntuppel = (TNtuple*)e->EvaluatePoints(); file = new TFile("CFeval_nodeconv.root","RECREATE"); file->cd(); ntuppel->Write(); @@ -29,11 +28,9 @@ void plotPt(char *rootfile) gStyle->SetOptStat(0); gStyle->SetOptFit(1100); - c = new TCanvas("c","",2); SetCanvasOptions(c); - f1 = new TFile(rootfile); hist = new TH1F("hist","",50,-10,10); @@ -47,13 +44,10 @@ void plotPt(char *rootfile) TF1 *f = new TF1("f","gaus",-rms,rms); hist->Fit("f","R"); - - } void plot(char *rootfile) { - gStyle->SetStatColor(10); gStyle->SetOptStat(1); gStyle->SetOptFit(1); @@ -62,7 +56,6 @@ void plot(char *rootfile) hist = new TH1F("hist","",100,-0.6,0.6); SetTH1Options(hist); - can = new TCanvas("can","Residuals",900,600); can->Divide(2); SetCanvasOptions(can); @@ -85,8 +78,7 @@ void plot(char *rootfile) can->cd(2); ntuppel_fast->Draw("residual_trans>>hist2","nHits>100 && pt>1.0 && padrow > 0 && zHit < 50");//dipangle < 20*3.1415/180"); - can->Update(); - - } + + diff --git a/HLT/exa/Make_Init.C b/HLT/exa/Make_Init.C index 43ec8b8b535..7ba3d912040 100644 --- a/HLT/exa/Make_Init.C +++ b/HLT/exa/Make_Init.C @@ -1,8 +1,9 @@ -/** $Id$ +// $Id$ -Important macro to get certain Aliroot parameters. They are stored -in a file "Init.cxx". New init of AliL3Transform uses output to read certain -TPC parameters. +/** + Important macro to get certain Aliroot parameters. They are stored + in a file "Init.cxx". New init of AliL3Transform uses output to read certain + TPC parameters. */ void Make_Init(char *file, char *tofile="Init.cxx"){ diff --git a/HLT/exa/display.C b/HLT/exa/display.C index a7537bb3820..3f65eb559a8 100644 --- a/HLT/exa/display.C +++ b/HLT/exa/display.C @@ -1,3 +1,5 @@ +// $Id$ + /** Macro for displaying L3 cluster/track or raw data. Uses the AliL3Display class. diff --git a/HLT/exa/eval.C b/HLT/exa/eval.C index 6680c36ad78..b8225b75ddb 100644 --- a/HLT/exa/eval.C +++ b/HLT/exa/eval.C @@ -1,7 +1,7 @@ +// $Id$ + void eval(char *inFile) { - - // Connect the Root Galice file containing Geometry, Kine and Hits file = new TFile(inFile); diff --git a/HLT/exa/read.C b/HLT/exa/read.C index de7d33aa5a3..a21b925b100 100644 --- a/HLT/exa/read.C +++ b/HLT/exa/read.C @@ -1,3 +1,5 @@ +// $Id$ + void read(int min=0,int max=35) { diff --git a/HLT/exa/rootlogon.C b/HLT/exa/rootlogon.C index 79503009689..b2f33383881 100644 --- a/HLT/exa/rootlogon.C +++ b/HLT/exa/rootlogon.C @@ -1,4 +1,3 @@ - { printf("\nWELCOME to the magic world of Level3\n\n"); @@ -18,16 +17,19 @@ } cout<<"TPC libraries loaded"<Load("$(MLUCDIR/lib/linux-i386/libMLUC"); - gSystem->Load("$(TOPDIR)/lib_ALIROOT/libAliL3"); - gSystem->Load("$(TOPDIR)/lib_ALIROOT/libAliL3Hough"); - gSystem->Load("$(TOPDIR)/lib_ALIROOT/libAliL3Comp"); + gSystem->Load("$(TOPDIR)/lib_$(USEPACKAGE)/libAliL3"); + gSystem->Load("$(TOPDIR)/lib_$(USEPACKAGE)/libAliL3Misc"); + gSystem->Load("$(TOPDIR)/lib_$(USEPACKAGE)/libAliL3Hough"); + gSystem->Load("$(TOPDIR)/lib_$(USEPACKAGE)/libAliL3Comp"); } else { gSystem->Load("$(LEVEL3)/kip/MLUC/lib/linux-i386/libMLUC.so"); gSystem->Load("$(LEVEL3)/lib_$(USERNAME)/libAliL3"); + gSystem->Load("$(LEVEL3)/lib_$(USERNAME)/libAliL3Misc"); gSystem->Load("$(LEVEL3)/lib_$(USERNAME)/libAliL3Hough"); gSystem->Load("$(LEVEL3)/lib_$(USERNAME)/libAliL3Comp"); } diff --git a/HLT/exa/runhough.C b/HLT/exa/runhough.C index 7daaf6beb8d..5c69027d32c 100644 --- a/HLT/exa/runhough.C +++ b/HLT/exa/runhough.C @@ -1,8 +1,16 @@ -void runhough(Int_t slice,Char_t *path,Int_t n_eta_segments) +// $Id$ + +/** + Shows how to use the hough code. Stores tracks parameters + in files. +*/ + +void runhough(Int_t slice,Char_t *path,Int_t n_eta_segments,Int_t vseg=-1) { - AliL3Transform::Init("/prog/alice/data/new/fixed-slice0/"); - + //AliL3Transform::Init("/prog/alice/data/new/fixed-slice0/"); + AliL3Transform::Init(path); + hough = new AliL3Hough(); Bool_t binary = kTRUE; Bool_t bit8 = kTRUE; @@ -22,11 +30,12 @@ void runhough(Int_t slice,Char_t *path,Int_t n_eta_segments) track = (AliL3HoughTrack*)tracks->GetCheckedTrack(i); if(!track) continue; cout<<"pt "<GetPt()<<" psi "<GetPsi()<<" eta "<GetEta()<<" etaindex "<GetEtaIndex()<<" weight "<GetWeight()<GetEtaIndex(); } hough->WriteTracks(slice); - cout<<"Found in total "<GetNTracks()<<" tracks"<GetNTracks()<<" tracks"<Init(path_to_use); - phi_segments = 50; - eta_segments = 100; - trackletlength = 3; - tracklength = 5; - rowscopetracklet = 2; - rowscopetrack = 2; - min_pt_fit = 0; - maxangle = 1.31; - goodDist = 5; - maxphi=100; - maxeta=100; - hitChi2Cut = 100; - goodHitChi2 = 20; - trackChi2Cut = 50; + phi_segments = 50; //devide the space into phi_segments and eta_segments + eta_segments = 100; //to access the search of points to that area! + trackletlength = 3; //number of hits a tracklet has to have + tracklength = 5; //number of hits a track has to have + rowscopetracklet = 2;//search range of rows for a tracklet + rowscopetrack = 2; //search range of rows for a track + min_pt_fit = 0; + maxangle = 1.31; //maximum angle for the three point look ahead + goodDist = 5; //threshold distance between two hits when building tracklets + maxphi=100; //maximum phi difference for neighboring hits + maxeta=100; //maximum eta difference for neighboring hits + hitChi2Cut = 100; //maximum chi2 of added hit to track + goodHitChi2 = 20; //stop looking for next hit to add if chi2 is less than goodHitChi2 + trackChi2Cut = 50; //maximum chi2 for track after final fit //main vertex tracking parameters: a->SetTrackerParam(phi_segments,eta_segments,trackletlength,tracklength, diff --git a/HLT/exa/trigger_pp.C b/HLT/exa/trigger_pp.C index ddec0eea9fb..2eab2fb38ea 100644 --- a/HLT/exa/trigger_pp.C +++ b/HLT/exa/trigger_pp.C @@ -1,3 +1,5 @@ +// $Id$ + void trigger_pp(char *outfile="results.root") {