From: shahoian Date: Fri, 4 Apr 2014 13:33:58 +0000 (+0200) Subject: xxx X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=f83dbe9b80920042642b653feffe490c757720e9 xxx --- diff --git a/.rootrc b/.rootrc deleted file mode 100644 index e09119d656c..00000000000 --- a/.rootrc +++ /dev/null @@ -1,95 +0,0 @@ - -# ROOT Environment settings are handled via the class TEnv. To see -# which values are active do: gEnv->Print(). - -# Temporary change to avoid thrashing -XNet.ReadCacheSize: 40000000 -XNet.ReadAheadSize: 1000000 - -# Path used by dynamic loader to find shared libraries and macros -# Paths are different for Unix and Windows. The example shows the defaults -# for all ROOT applications for either Unix or Windows. -Unix.*.Root.DynamicPath: .:$(ROOTSYS)/lib:$(LD_LIBRARY_PATH) -Unix.*.Root.MacroPath: .:$(ROOTSYS)/macros:$(ALICE_ROOT)/macros -WinNT.*.Root.DynamicPath: ./;$(ROOTSYS);$(ROOTSYS)/bin;$(PATH) -WinNT.*.Root.MacroPath: ./;$(ROOTSYS)/macros - -# Fix include path for aclic -ACLiC.IncludePaths: -I$(ALICE_ROOT)/include -I$(ALICE_ROOT) - -# Path where to look for TrueType fonts -#Unix.*.Root.UseTTFonts: true -#Unix.*.Root.TTFontPath: $(ROOTSYS)/ttf/fonts - -# Show where item is found in the specified path -Root.ShowPath: false - -# Activate memory statistics (size and cnt is used to trap allocation of -# blocks of a certain size after cnt times) -Root.MemStat: 0 -Root.MemStat.size: -1 -Root.MemStat.cnt: -1 -Root.ObjectStat: 0 - -# Global debug mode. When >0 turns on progressively more details debugging. -# When >4 X11 runs in synchronous mode. -#Root.Debug: 0 - -# Default editor -Unix.*.Editor: emacs -WinNT.*.Editor: notepad - -# TCanvas specific settings. Opaque move and resize show full pad during -# the operation instead of only the outline. Especially for resize you'll -# need serious CPU power. UseScreenFactor=true means to size canvas according -# to size of screen, so a canvas still looks good on a low resolution -# laptop screen without having to change canvas size in macros. -# HighLightColor 2 = red. ShowEventStatus allows the event status bar to -# be turned on by default. -Canvas.MoveOpaque: false -Canvas.ResizeOpaque: false -Canvas.UseScreenFactor: true -Canvas.HighLightColor: 2 -Canvas.ShowEventStatus: false - -# THtml specific settings. -#Root.Html.OutputDir: html/ -#Unix.*.Root.Html.SourceDir: ./:src/ -#WinNT.*.Root.Html.SourceDir: ./ -#Root.Html.Author: //*-- Author : -#Root.Html.Author: Fons Rademakers -#Root.Html.Copyright: * Copyright -#Root.Html.LastUpdate: //*CMZ : -#Root.Html.Description: //____________________ -#Root.Html.Root: http://root.cern.ch/root/html -#Root.Html.SearchEngine: ../Search.phtml - -# GUI specific settings -#Gui.NormalFont: -adobe-helvetica-medium-r-*-*-12-*-*-*-*-*-iso8859-1 -#Gui.BoldFont: -adobe-helvetica-bold-r-*-*-12-*-*-*-*-*-iso8859-1 -#Gui.SmallFont: -adobe-helvetica-medium-r-*-*-10-*-*-*-*-*-iso8859-1 -#Gui.ProportionalFont: -adobe-courier-medium-r-*-*-12-*-*-*-*-*-iso8859-1 -#Gui.BackgroundColor: #c0c0c0 -#Gui.ForegroundColor: black -#Gui.SelectForegroundColor: white -#Gui.SelectBackgroundColor: #000080 -#Gui.IconPath: $(HOME)/icons:$(ROOTSYS)/icons:. -#Gui.MimeTypeFile: $(HOME)/.root.mimes -# If above does not exists defaults to this: -#Gui.MimeTypeFile: $ROOTSYS/icons/root.mimes -# Can be either small, big, list, details -Browser.IconStyle: small -# Can be either name, type, size, date -Browser.SortBy: name - -# Rint (interactive ROOT executable) specific alias, logon and logoff macros -Rint.Load: rootalias.C -Rint.Logon: rootlogon.C -Rint.Logoff: rootlogoff.C -Rint.History: $(HOME)/.root_hist - -# Example of custom setting for the Rint application (root.exe). -# This overrides the default specified above for a generic application. -# Color 5 is yellow. -Rint.Canvas.HighLightColor: 5 - diff --git a/ITS/AliITStrackerMI.cxx b/ITS/AliITStrackerMI.cxx index 425bb142f5b..149e414a937 100644 --- a/ITS/AliITStrackerMI.cxx +++ b/ITS/AliITStrackerMI.cxx @@ -4731,7 +4731,7 @@ void AliITStrackerMI::SetForceSkippingOfLayer() { // either we set to skip them in RecoParam // or they were off during data-taking //----------------------------------------------------------------- - + return; const AliEventInfo *eventInfo = GetEventInfo(); for(Int_t l=0; l dXY: %+e %+e | chi2:%.2f pT:%.2f alp:%.3f", iplane,x,t.GetX(),p[0],p[1],cov[0],cov[1],cov[2], p[0]-t.GetY(),p[1]-t.GetZ(), - chi2,t.Pt(),t.GetAlpha())); + chi2,t.Pt()*t.Charge(),t.GetAlpha())); if (chi2 < 1e+10 && ((AliExternalTrackParam&)t).Update(p, cov)){ // Register info to track t.SetNumberOfClusters(); @@ -958,8 +958,15 @@ Int_t AliTRDtrackerV1::FollowBackProlongation(AliTRDtrackV1 &t) Double_t cov[3]; ptrTracklet->GetCovAt(x, cov); Double_t p[2] = { ptrTracklet->GetY(), ptrTracklet->GetZ()}; Double_t chi2 = ((AliExternalTrackParam)t).GetPredictedChi2(p, cov); + + AliInfo(Form("Pl:%d X:%+e : %+e P: %+e %+e Cov:%+e %+e %+e -> dXY: %+e %+e | chi2:%.2f pT:%.2f alp:%.3f", + ily,x,t.GetX(),p[0],p[1],cov[0],cov[1],cov[2], + p[0]-t.GetY(),p[1]-t.GetZ(), + chi2,t.Pt()*t.Charge(),t.GetAlpha())); + // update Kalman with the TRD measurement - if(chi2>1e+10){ // TODO + if(chi2>10){ // RS + // if(chi2>1e+10){ // TODO t.SetErrStat(AliTRDtrackV1::kChi2, ily); if(debugLevel > 2){ UChar_t status(t.GetStatusTRD()); diff --git a/test/ppbench/sim.C b/test/ppbench/sim.C index ac835873dd0..9d99aa4f65b 100644 --- a/test/ppbench/sim.C +++ b/test/ppbench/sim.C @@ -1,4 +1,4 @@ -void sim(Int_t nev=20) { +void sim(Int_t nev=3) { gSystem->Load("liblhapdf"); gSystem->Load("libEGPythia6");